summaryrefslogtreecommitdiffstats
path: root/kdevdesigner
diff options
context:
space:
mode:
Diffstat (limited to 'kdevdesigner')
-rw-r--r--kdevdesigner/designer/actiondnd.cpp18
-rw-r--r--kdevdesigner/designer/actiondnd.h16
-rw-r--r--kdevdesigner/designer/actioneditorimpl.cpp10
-rw-r--r--kdevdesigner/designer/actioneditorimpl.h2
-rw-r--r--kdevdesigner/designer/actionlistview.cpp4
-rw-r--r--kdevdesigner/designer/actionlistview.h10
-rw-r--r--kdevdesigner/designer/asciivalidator.cpp12
-rw-r--r--kdevdesigner/designer/asciivalidator.h6
-rw-r--r--kdevdesigner/designer/command.cpp28
-rw-r--r--kdevdesigner/designer/command.h10
-rw-r--r--kdevdesigner/designer/configtoolboxdialog.ui.h18
-rw-r--r--kdevdesigner/designer/connectionitems.h4
-rw-r--r--kdevdesigner/designer/connectiontable.cpp4
-rw-r--r--kdevdesigner/designer/connectiontable.h2
-rw-r--r--kdevdesigner/designer/customwidgeteditorimpl.cpp4
-rw-r--r--kdevdesigner/designer/customwidgeteditorimpl.h2
-rw-r--r--kdevdesigner/designer/database.cpp14
-rw-r--r--kdevdesigner/designer/database.h6
-rw-r--r--kdevdesigner/designer/dbconnectionimpl.cpp4
-rw-r--r--kdevdesigner/designer/dbconnectionimpl.h2
-rw-r--r--kdevdesigner/designer/dbconnectionsimpl.cpp6
-rw-r--r--kdevdesigner/designer/dbconnectionsimpl.h2
-rw-r--r--kdevdesigner/designer/designeraction.h24
-rw-r--r--kdevdesigner/designer/designerappiface.cpp10
-rw-r--r--kdevdesigner/designer/designerappiface.h4
-rw-r--r--kdevdesigner/designer/editfunctionsimpl.cpp6
-rw-r--r--kdevdesigner/designer/editfunctionsimpl.h2
-rw-r--r--kdevdesigner/designer/filechooser.cpp4
-rw-r--r--kdevdesigner/designer/filechooser.h2
-rw-r--r--kdevdesigner/designer/formsettingsimpl.cpp4
-rw-r--r--kdevdesigner/designer/formsettingsimpl.h2
-rw-r--r--kdevdesigner/designer/formwindow.cpp32
-rw-r--r--kdevdesigner/designer/formwindow.h6
-rw-r--r--kdevdesigner/designer/hierarchyview.cpp94
-rw-r--r--kdevdesigner/designer/hierarchyview.h12
-rw-r--r--kdevdesigner/designer/iconvieweditorimpl.cpp4
-rw-r--r--kdevdesigner/designer/iconvieweditorimpl.h2
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.cpp8
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.h4
-rw-r--r--kdevdesigner/designer/layout.cpp60
-rw-r--r--kdevdesigner/designer/layout.h8
-rw-r--r--kdevdesigner/designer/listboxdnd.cpp16
-rw-r--r--kdevdesigner/designer/listboxeditorimpl.cpp6
-rw-r--r--kdevdesigner/designer/listboxeditorimpl.h2
-rw-r--r--kdevdesigner/designer/listviewdnd.cpp34
-rw-r--r--kdevdesigner/designer/listvieweditorimpl.cpp40
-rw-r--r--kdevdesigner/designer/listvieweditorimpl.h2
-rw-r--r--kdevdesigner/designer/mainwindow.cpp36
-rw-r--r--kdevdesigner/designer/mainwindow.h4
-rw-r--r--kdevdesigner/designer/mainwindowactions.cpp2
-rw-r--r--kdevdesigner/designer/menubareditor.cpp28
-rw-r--r--kdevdesigner/designer/menubareditor.h10
-rw-r--r--kdevdesigner/designer/multilineeditorimpl.cpp16
-rw-r--r--kdevdesigner/designer/multilineeditorimpl.h8
-rw-r--r--kdevdesigner/designer/newformimpl.cpp4
-rw-r--r--kdevdesigner/designer/newformimpl.h2
-rw-r--r--kdevdesigner/designer/outputwindow.cpp12
-rw-r--r--kdevdesigner/designer/outputwindow.h4
-rw-r--r--kdevdesigner/designer/paletteeditoradvancedimpl.cpp8
-rw-r--r--kdevdesigner/designer/paletteeditoradvancedimpl.h4
-rw-r--r--kdevdesigner/designer/paletteeditorimpl.cpp8
-rw-r--r--kdevdesigner/designer/paletteeditorimpl.h4
-rw-r--r--kdevdesigner/designer/pixmapchooser.cpp26
-rw-r--r--kdevdesigner/designer/pixmapchooser.h8
-rw-r--r--kdevdesigner/designer/popupmenueditor.cpp28
-rw-r--r--kdevdesigner/designer/popupmenueditor.h10
-rw-r--r--kdevdesigner/designer/previewframe.cpp4
-rw-r--r--kdevdesigner/designer/previewframe.h6
-rw-r--r--kdevdesigner/designer/previewwidgetimpl.cpp4
-rw-r--r--kdevdesigner/designer/previewwidgetimpl.h2
-rw-r--r--kdevdesigner/designer/project.cpp8
-rw-r--r--kdevdesigner/designer/projectsettingsimpl.cpp6
-rw-r--r--kdevdesigner/designer/projectsettingsimpl.h2
-rw-r--r--kdevdesigner/designer/propertyeditor.cpp48
-rw-r--r--kdevdesigner/designer/propertyeditor.h8
-rw-r--r--kdevdesigner/designer/qcompletionedit.cpp4
-rw-r--r--kdevdesigner/designer/qcompletionedit.h2
-rw-r--r--kdevdesigner/designer/resource.cpp80
-rw-r--r--kdevdesigner/designer/resource.h8
-rw-r--r--kdevdesigner/designer/sizehandle.cpp10
-rw-r--r--kdevdesigner/designer/sizehandle.h4
-rw-r--r--kdevdesigner/designer/sourceeditor.cpp4
-rw-r--r--kdevdesigner/designer/sourceeditor.h2
-rw-r--r--kdevdesigner/designer/sourcefile.cpp4
-rw-r--r--kdevdesigner/designer/startdialogimpl.cpp8
-rw-r--r--kdevdesigner/designer/startdialogimpl.h4
-rw-r--r--kdevdesigner/designer/styledbutton.cpp8
-rw-r--r--kdevdesigner/designer/styledbutton.h4
-rw-r--r--kdevdesigner/designer/tableeditorimpl.cpp4
-rw-r--r--kdevdesigner/designer/tableeditorimpl.h2
-rw-r--r--kdevdesigner/designer/timestamp.cpp4
-rw-r--r--kdevdesigner/designer/timestamp.h2
-rw-r--r--kdevdesigner/designer/variabledialogimpl.cpp4
-rw-r--r--kdevdesigner/designer/variabledialogimpl.h2
-rw-r--r--kdevdesigner/designer/widgetaction.cpp2
-rw-r--r--kdevdesigner/designer/widgetaction.h12
-rw-r--r--kdevdesigner/designer/widgetfactory.cpp228
-rw-r--r--kdevdesigner/designer/widgetfactory.h60
-rw-r--r--kdevdesigner/designer/wizardeditorimpl.cpp4
-rw-r--r--kdevdesigner/designer/wizardeditorimpl.h2
-rw-r--r--kdevdesigner/designer/workspace.cpp30
-rw-r--r--kdevdesigner/designer/workspace.h10
-rw-r--r--kdevdesigner/interfaces/actioninterface.h4
-rw-r--r--kdevdesigner/interfaces/classbrowserinterface.h2
-rw-r--r--kdevdesigner/interfaces/designerinterface.h4
-rw-r--r--kdevdesigner/interfaces/editorinterface.h2
-rw-r--r--kdevdesigner/plugins/languageinterfaceimpl.cpp12
-rw-r--r--kdevdesigner/plugins/languageinterfaceimpl.h2
-rw-r--r--kdevdesigner/uilib/database.cpp14
-rw-r--r--kdevdesigner/uilib/database2.h6
-rw-r--r--kdevdesigner/uilib/qwidgetfactory.cpp250
-rw-r--r--kdevdesigner/uilib/qwidgetfactory.h22
112 files changed, 854 insertions, 854 deletions
diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index c250f60e..9eb97cbd 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -131,14 +131,14 @@ void QDesignerAction::remove()
widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE );
}
-QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent,
+QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *parent,
const char* name )
- : TQWidget( tqparent, name )
+ : TQWidget( parent, name )
{
- connect( tqparent, TQT_SIGNAL(orientationChanged(Qt::Orientation)),
+ connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)),
this, TQT_SLOT(setOrientation(Qt::Orientation)) );
setOrientation( o );
- setBackgroundMode( tqparent->backgroundMode() );
+ setBackgroundMode( parent->backgroundMode() );
setBackgroundOrigin( ParentOrigin );
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
}
@@ -177,8 +177,8 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
-QSeparatorAction::QSeparatorAction( TQObject *tqparent )
- : TQAction( tqparent, "qt_designer_separator" ), wid( 0 )
+QSeparatorAction::QSeparatorAction( TQObject *parent )
+ : TQAction( parent, "qt_designer_separator" ), wid( 0 )
{
}
@@ -275,8 +275,8 @@ void QDesignerToolBar::addAction( TQAction *a )
static void fixObject( TQObject *&o )
{
- while ( o && o->tqparent() && !::tqqt_cast<QDesignerToolBar*>(o->tqparent()) )
- o = o->tqparent();
+ while ( o && o->parent() && !::tqqt_cast<QDesignerToolBar*>(o->parent()) )
+ o = o->parent();
}
bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
@@ -692,7 +692,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p )
TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE );
installEventFilters( w );
MainWindow::self->formWindow()->insertWidget( w, TRUE );
- QDesignerAction *a = new QDesignerAction( w, tqparent() );
+ QDesignerAction *a = new QDesignerAction( w, parent() );
int index = actionList.findRef( *actionMap.find( insertAnchor ) );
if ( index != -1 && afterAnchor )
++index;
diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h
index ee3e16ed..5e830949 100644
--- a/kdevdesigner/designer/actiondnd.h
+++ b/kdevdesigner/designer/actiondnd.h
@@ -85,8 +85,8 @@ class QDesignerActionGroup : public TQActionGroup
TQ_OBJECT
public:
- QDesignerActionGroup( TQObject *tqparent )
- : TQActionGroup( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ) { init(); }
+ QDesignerActionGroup( TQObject *parent )
+ : TQActionGroup( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); }
void init();
@@ -121,10 +121,10 @@ class QDesignerAction : public TQAction
TQ_OBJECT
public:
- QDesignerAction( TQObject *tqparent )
- : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); }
- QDesignerAction( TQWidget *w, TQObject *tqparent )
- : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); }
+ QDesignerAction( TQObject *parent )
+ : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); }
+ QDesignerAction( TQWidget *w, TQObject *parent )
+ : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); }
void init();
@@ -158,7 +158,7 @@ class QDesignerToolBarSeparator : public TQWidget
TQ_OBJECT
public:
- QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
+ QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 );
TQSize tqsizeHint() const;
Qt::Orientation orientation() const { return orient; }
@@ -178,7 +178,7 @@ class QSeparatorAction : public TQAction
TQ_OBJECT
public:
- QSeparatorAction( TQObject *tqparent );
+ QSeparatorAction( TQObject *parent );
bool addTo( TQWidget *w );
bool removeFrom( TQWidget *w );
diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp
index 67cb0bdf..84514875 100644
--- a/kdevdesigner/designer/actioneditorimpl.cpp
+++ b/kdevdesigner/designer/actioneditorimpl.cpp
@@ -45,8 +45,8 @@
#include <klocale.h>
-ActionEditor::ActionEditor( TQWidget* tqparent, const char* name, WFlags fl )
- : ActionEditorBase( tqparent, name, fl ), currentAction( 0 ), formWindow( 0 ),
+ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl )
+ : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ),
explicitlyClosed(false)
{
listActions->addColumn( i18n( "Actions" ) );
@@ -150,7 +150,7 @@ void ActionEditor::newAction()
ActionItem *actionParent = (ActionItem*)listActions->selectedItem();
if ( actionParent ) {
if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) )
- actionParent = (ActionItem*)actionParent->tqparent();
+ actionParent = (ActionItem*)actionParent->parent();
}
ActionItem *i = 0;
@@ -186,7 +186,7 @@ void ActionEditor::newActionGroup()
ActionItem *actionParent = (ActionItem*)listActions->selectedItem();
if ( actionParent ) {
if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) )
- actionParent = (ActionItem*)actionParent->tqparent();
+ actionParent = (ActionItem*)actionParent->parent();
}
ActionItem *i = 0;
@@ -231,7 +231,7 @@ void ActionEditor::setFormWindow( FormWindow *fw )
setEnabled( TRUE );
for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) {
ActionItem *i = 0;
- if ( ::tqqt_cast<TQAction*>(a->tqparent()) )
+ if ( ::tqqt_cast<TQAction*>(a->parent()) )
continue;
i = new ActionItem( listActions, a );
i->setText( 0, a->name() );
diff --git a/kdevdesigner/designer/actioneditorimpl.h b/kdevdesigner/designer/actioneditorimpl.h
index cae92b95..248c9e24 100644
--- a/kdevdesigner/designer/actioneditorimpl.h
+++ b/kdevdesigner/designer/actioneditorimpl.h
@@ -39,7 +39,7 @@ class ActionEditor : public ActionEditorBase
TQ_OBJECT
public:
- ActionEditor( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ ActionEditor( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
void setFormWindow( FormWindow *fw );
void updateActionName( TQAction *a );
void updateActionIcon( TQAction *a );
diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp
index c17c641a..3bce8872 100644
--- a/kdevdesigner/designer/actionlistview.cpp
+++ b/kdevdesigner/designer/actionlistview.cpp
@@ -30,8 +30,8 @@
#include <klocale.h>
-ActionListView::ActionListView( TQWidget *tqparent, const char *name )
- : TQListView( tqparent, name )
+ActionListView::ActionListView( TQWidget *parent, const char *name )
+ : TQListView( parent, name )
{
setShowSortIndicator( TRUE );
setResizeMode( LastColumn );
diff --git a/kdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h
index 9c213c99..313f5096 100644
--- a/kdevdesigner/designer/actionlistview.h
+++ b/kdevdesigner/designer/actionlistview.h
@@ -39,10 +39,10 @@ public:
g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); }
ActionItem( TQListView *lv, TQAction *ac );
ActionItem( TQListViewItem *i, TQAction *ac );
- ActionItem( ActionItem *tqparent, bool group = FALSE )
- : TQListViewItem( tqparent ),
- a( group ? 0 : new QDesignerAction( tqparent->actionGroup() ) ),
- g( group ? new QDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); }
+ ActionItem( ActionItem *parent, bool group = FALSE )
+ : TQListViewItem( parent ),
+ a( group ? 0 : new QDesignerAction( parent->actionGroup() ) ),
+ g( group ? new QDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); }
QDesignerAction *action() const { return a; }
QDesignerActionGroup *actionGroup() const { return g; }
@@ -62,7 +62,7 @@ class ActionListView : public TQListView
TQ_OBJECT
public:
- ActionListView( TQWidget *tqparent = 0, const char *name = 0 );
+ ActionListView( TQWidget *parent = 0, const char *name = 0 );
protected:
TQDragObject *dragObject();
diff --git a/kdevdesigner/designer/asciivalidator.cpp b/kdevdesigner/designer/asciivalidator.cpp
index 3b1e4b45..667b0a61 100644
--- a/kdevdesigner/designer/asciivalidator.cpp
+++ b/kdevdesigner/designer/asciivalidator.cpp
@@ -28,18 +28,18 @@
#include <tqstring.h>
-AsciiValidator::AsciiValidator( TQObject * tqparent, const char *name )
- : TQValidator( tqparent, name ), functionName( FALSE )
+AsciiValidator::AsciiValidator( TQObject * parent, const char *name )
+ : TQValidator( parent, name ), functionName( FALSE )
{
}
-AsciiValidator::AsciiValidator( bool funcName, TQObject * tqparent, const char *name )
- : TQValidator( tqparent, name ), functionName( funcName )
+AsciiValidator::AsciiValidator( bool funcName, TQObject * parent, const char *name )
+ : TQValidator( parent, name ), functionName( funcName )
{
}
-AsciiValidator::AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name )
- : TQValidator( tqparent, name ), functionName( FALSE ), allowedChars( allow )
+AsciiValidator::AsciiValidator( const TQString &allow, TQObject * parent, const char *name )
+ : TQValidator( parent, name ), functionName( FALSE ), allowedChars( allow )
{
}
diff --git a/kdevdesigner/designer/asciivalidator.h b/kdevdesigner/designer/asciivalidator.h
index 00ff6b0a..cb5dbc27 100644
--- a/kdevdesigner/designer/asciivalidator.h
+++ b/kdevdesigner/designer/asciivalidator.h
@@ -36,9 +36,9 @@ class AsciiValidator: public TQValidator
Q_OBJECT
TQ_OBJECT
public:
- AsciiValidator( TQObject * tqparent, const char *name = 0 );
- AsciiValidator( bool funcName, TQObject * tqparent, const char *name = 0 );
- AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name = 0 );
+ AsciiValidator( TQObject * parent, const char *name = 0 );
+ AsciiValidator( bool funcName, TQObject * parent, const char *name = 0 );
+ AsciiValidator( const TQString &allow, TQObject * parent, const char *name = 0 );
~AsciiValidator();
TQValidator::State validate( TQString &, int & ) const;
diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp
index 8d3d5161..60a14cdf 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/kdevdesigner/designer/command.cpp
@@ -545,7 +545,7 @@ bool SetPropertyCommand::checkProperty()
return FALSE;
}
- if ( ::tqqt_cast<FormWindow*>(widget->tqparent()) )
+ if ( ::tqqt_cast<FormWindow*>(widget->parent()) )
formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() );
}
return TRUE;
@@ -672,9 +672,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
// ------------------------------------------------------------
LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
- : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase )
+ : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
{
}
@@ -695,9 +695,9 @@ void LayoutHorizontalCommand::unexecute()
// ------------------------------------------------------------
LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
- : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TRUE, TRUE )
+ : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE )
{
}
@@ -718,9 +718,9 @@ void LayoutHorizontalSplitCommand::unexecute()
// ------------------------------------------------------------
LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
- : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase )
+ : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
{
}
@@ -741,9 +741,9 @@ void LayoutVerticalCommand::unexecute()
// ------------------------------------------------------------
LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
- : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TRUE, TRUE )
+ : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE )
{
}
@@ -764,9 +764,9 @@ void LayoutVerticalSplitCommand::unexecute()
// ------------------------------------------------------------
LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl, int xres, int yres )
- : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
+ : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
{
}
@@ -1689,7 +1689,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
from->setSorting( -1 );
for ( ; it.current(); ++it ) {
TQListViewItem *i = it.current();
- if ( i->tqparent() == fromParents.top() ) {
+ if ( i->parent() == fromParents.top() ) {
TQListViewItem *pi = toParents.top();
TQListViewItem *ni = 0;
if ( pi )
@@ -1706,7 +1706,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
if ( pi )
pi->setOpen( TRUE );
} else {
- if ( i->tqparent() == fromLast ) {
+ if ( i->parent() == fromLast ) {
fromParents.push( fromLast );
toParents.push( toLasts.top() );
toLasts.push( 0 );
@@ -1726,7 +1726,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
if ( pi )
pi->setOpen( TRUE );
} else {
- while ( fromParents.top() != i->tqparent() ) {
+ while ( fromParents.top() != i->parent() ) {
fromParents.pop();
toParents.pop();
toLasts.pop();
diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h
index 2bd296bc..909c8ea4 100644
--- a/kdevdesigner/designer/command.h
+++ b/kdevdesigner/designer/command.h
@@ -282,7 +282,7 @@ class LayoutHorizontalCommand : public Command
{
public:
LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@@ -298,7 +298,7 @@ class LayoutHorizontalSplitCommand : public Command
{
public:
LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@@ -314,7 +314,7 @@ class LayoutVerticalCommand : public Command
{
public:
LayoutVerticalCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@@ -330,7 +330,7 @@ class LayoutVerticalSplitCommand : public Command
{
public:
LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@@ -346,7 +346,7 @@ class LayoutGridCommand : public Command
{
public:
LayoutGridCommand( const TQString &n, FormWindow *fw,
- TQWidget *tqparent, TQWidget *layoutBase,
+ TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl, int xres, int yres );
void execute();
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h
index 438ed832..711c51e6 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui.h
+++ b/kdevdesigner/designer/configtoolboxdialog.ui.h
@@ -51,14 +51,14 @@ void ConfigToolboxDialog::init()
a;
a = MainWindow::self->toolActions.prev() ) {
TQString grp = ( (WidgetAction*)a )->group();
- TQListViewItem *tqparent = groups.find( grp );
- if ( !tqparent ) {
- tqparent = new TQListViewItem( listViewTools );
- tqparent->setText( 0, grp );
- tqparent->setOpen( TRUE );
- groups.insert( grp, tqparent );
+ TQListViewItem *parent = groups.find( grp );
+ if ( !parent ) {
+ parent = new TQListViewItem( listViewTools );
+ parent->setText( 0, grp );
+ parent->setOpen( TRUE );
+ groups.insert( grp, parent );
}
- TQListViewItem *i = new TQListViewItem( tqparent );
+ TQListViewItem *i = new TQListViewItem( parent );
i->setText( 0, a->text() );
i->setPixmap( 0, a->iconSet().pixmap() );
}
@@ -99,10 +99,10 @@ void ConfigToolboxDialog::addTool()
// processing tqchildren...if any such item
addKids = TRUE;
nextSibling = (*it)->nextSibling();
- nextParent = (*it)->tqparent();
+ nextParent = (*it)->parent();
while ( nextParent && !nextSibling ) {
nextSibling = nextParent->nextSibling();
- nextParent = nextParent->tqparent();
+ nextParent = nextParent->parent();
}
}
} else if ( ((*it)->childCount() == 0) && addKids ) {
diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h
index 39045ba6..4087c59f 100644
--- a/kdevdesigner/designer/connectionitems.h
+++ b/kdevdesigner/designer/connectionitems.h
@@ -168,9 +168,9 @@ class ConnectionContainer : public TQObject
TQ_OBJECT
public:
- ConnectionContainer( TQObject *tqparent, SenderItem *i1, SignalItem *i2,
+ ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2,
ReceiverItem *i3, SlotItem *i4, int r )
- : TQObject( tqparent ), mod( FALSE ), se( i1 ), si( i2 ),
+ : TQObject( parent ), mod( FALSE ), se( i1 ), si( i2 ),
re( i3 ), sl( i4 ), rw ( r ) {
i1->setConnection( this );
i2->setConnection( this );
diff --git a/kdevdesigner/designer/connectiontable.cpp b/kdevdesigner/designer/connectiontable.cpp
index ce1cabb7..2448f92d 100644
--- a/kdevdesigner/designer/connectiontable.cpp
+++ b/kdevdesigner/designer/connectiontable.cpp
@@ -28,8 +28,8 @@
#include <klocale.h>
-ConnectionTable::ConnectionTable( TQWidget *tqparent, const char *name )
- : TQTable( 0, 4, tqparent, name )
+ConnectionTable::ConnectionTable( TQWidget *parent, const char *name )
+ : TQTable( 0, 4, parent, name )
{
setSorting( TRUE );
setShowGrid( FALSE );
diff --git a/kdevdesigner/designer/connectiontable.h b/kdevdesigner/designer/connectiontable.h
index d3b28900..01c2f119 100644
--- a/kdevdesigner/designer/connectiontable.h
+++ b/kdevdesigner/designer/connectiontable.h
@@ -35,7 +35,7 @@ class ConnectionTable : public TQTable
TQ_OBJECT
public:
- ConnectionTable( TQWidget *tqparent, const char *name );
+ ConnectionTable( TQWidget *parent, const char *name );
void sortColumn( int col, bool ascending, bool wholeRows );
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp
index a5a270c6..d2d0f5b5 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp
@@ -55,8 +55,8 @@
#include <klocale.h>
-CustomWidgetEditor::CustomWidgetEditor( TQWidget *tqparent, MainWindow *mw )
- : CustomWidgetEditorBase( tqparent, 0, TRUE ), mainWindow( mw )
+CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
+ : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw )
{
connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
checkTimer = new TQTimer( this );
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.h b/kdevdesigner/designer/customwidgeteditorimpl.h
index aca6bb8d..e367b37c 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.h
+++ b/kdevdesigner/designer/customwidgeteditorimpl.h
@@ -43,7 +43,7 @@ class CustomWidgetEditor : public CustomWidgetEditorBase
TQ_OBJECT
public:
- CustomWidgetEditor( TQWidget *tqparent , MainWindow *mw);
+ CustomWidgetEditor( TQWidget *parent , MainWindow *mw);
protected slots:
void addWidgetClicked();
diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp
index 9d12aa21..b5baea28 100644
--- a/kdevdesigner/designer/database.cpp
+++ b/kdevdesigner/designer/database.cpp
@@ -46,7 +46,7 @@ DatabaseSupport::DatabaseSupport()
{
con = 0;
frm = 0;
- tqparent = 0;
+ parent = 0;
}
void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o,
@@ -54,7 +54,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
{
tbl = table;
dbControls = databaseControls;
- tqparent = o;
+ parent = o;
if ( connection != "(default)" )
con = TQSqlDatabase::database( connection );
@@ -62,15 +62,15 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
con = TQSqlDatabase::database();
frm = new TQSqlForm( o, table );
for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) {
- TQObject *chld = tqparent->child( it.key(), TQWIDGET_OBJECT_NAME_STRING );
+ TQObject *chld = parent->child( it.key(), TQWIDGET_OBJECT_NAME_STRING );
if ( !chld )
continue;
frm->insert( (TQWidget*)chld, *it );
}
}
-QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *tqparent, const char *name )
- : TQDataBrowser( tqparent, name )
+QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *parent, const char *name )
+ : TQDataBrowser( parent, name )
{
}
@@ -96,8 +96,8 @@ bool QDesignerDataBrowser::event( TQEvent* e )
return b;
}
-QDesignerDataView::QDesignerDataView( TQWidget *tqparent, const char *name )
- : TQDataView( tqparent, name )
+QDesignerDataView::QDesignerDataView( TQWidget *parent, const char *name )
+ : TQDataView( parent, name )
{
}
diff --git a/kdevdesigner/designer/database.h b/kdevdesigner/designer/database.h
index 8fe3442b..4f817e31 100644
--- a/kdevdesigner/designer/database.h
+++ b/kdevdesigner/designer/database.h
@@ -52,7 +52,7 @@ protected:
TQSqlForm* frm;
TQString tbl;
TQMap<TQString, TQString> dbControls;
- TQObject *tqparent;
+ TQObject *parent;
};
@@ -62,7 +62,7 @@ class QDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport
TQ_OBJECT
public:
- QDesignerDataBrowser( TQWidget *tqparent, const char *name );
+ QDesignerDataBrowser( TQWidget *parent, const char *name );
protected:
bool event( TQEvent* e );
@@ -74,7 +74,7 @@ class QDesignerDataView : public TQDataView, public DatabaseSupport
TQ_OBJECT
public:
- QDesignerDataView( TQWidget *tqparent, const char *name );
+ QDesignerDataView( TQWidget *parent, const char *name );
protected:
bool event( TQEvent* e );
diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp
index d326df8a..3cfd1fdc 100644
--- a/kdevdesigner/designer/dbconnectionimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionimpl.cpp
@@ -35,9 +35,9 @@
#include <tqlayout.h>
#include <tqsqldatabase.h>
-DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent,
+DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent,
const char* name, bool modal, WFlags fl )
- : DatabaseConnectionEditorBase( tqparent, name, modal, fl ), conn( connection )
+ : DatabaseConnectionEditorBase( parent, name, modal, fl ), conn( connection )
{
connectionWidget = new DatabaseConnectionWidget( grp );
grpLayout->addWidget( connectionWidget, 0, 0 );
diff --git a/kdevdesigner/designer/dbconnectionimpl.h b/kdevdesigner/designer/dbconnectionimpl.h
index a8bc0f68..be96aeb1 100644
--- a/kdevdesigner/designer/dbconnectionimpl.h
+++ b/kdevdesigner/designer/dbconnectionimpl.h
@@ -39,7 +39,7 @@ class DatabaseConnectionEditor : public DatabaseConnectionEditorBase
TQ_OBJECT
public:
- DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent = 0,
+ DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0,
const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~DatabaseConnectionEditor();
diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp
index 00fb13eb..b5b4409f 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionsimpl.cpp
@@ -45,14 +45,14 @@
static bool blockChanges = FALSE;
/*
- * Constructs a DatabaseConnectionsEditor which is a child of 'tqparent', with the
+ * Constructs a DatabaseConnectionsEditor which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
- : DatabaseConnectionBase( tqparent, name, modal, fl ), project( pro )
+DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl )
+ : DatabaseConnectionBase( parent, name, modal, fl ), project( pro )
{
connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
connectionWidget = new DatabaseConnectionWidget( grp );
diff --git a/kdevdesigner/designer/dbconnectionsimpl.h b/kdevdesigner/designer/dbconnectionsimpl.h
index a12f4dce..5bc4238b 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.h
+++ b/kdevdesigner/designer/dbconnectionsimpl.h
@@ -38,7 +38,7 @@ class DatabaseConnectionsEditor : public DatabaseConnectionBase
TQ_OBJECT
public:
- DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent = 0,
+ DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0,
const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~DatabaseConnectionsEditor();
diff --git a/kdevdesigner/designer/designeraction.h b/kdevdesigner/designer/designeraction.h
index b49874f0..a294698a 100644
--- a/kdevdesigner/designer/designeraction.h
+++ b/kdevdesigner/designer/designeraction.h
@@ -27,18 +27,18 @@ class DesignerAction : public TQAction
Q_OBJECT
TQ_OBJECT
public:
- DesignerAction(TQObject *tqparent = 0, const char *name = 0)
- :TQAction(tqparent, name) {}
- DesignerAction ( const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0 )
- :TQAction(menuText, accel, tqparent, name) {}
- DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0 )
- :TQAction(icon, menuText, accel, tqparent, name) {}
- DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0, bool toggle = FALSE )
- :TQAction(text, icon, menuText, accel, tqparent, name, toggle) {}
- DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0, bool toggle = FALSE )
- :TQAction(text, menuText, accel, tqparent, name, toggle) {}
- DesignerAction ( TQObject * tqparent, const char * name, bool toggle )
- :TQAction(tqparent, name, toggle) {}
+ DesignerAction(TQObject *parent = 0, const char *name = 0)
+ :TQAction(parent, name) {}
+ DesignerAction ( const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 )
+ :TQAction(menuText, accel, parent, name) {}
+ DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 )
+ :TQAction(icon, menuText, accel, parent, name) {}
+ DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE )
+ :TQAction(text, icon, menuText, accel, parent, name, toggle) {}
+ DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE )
+ :TQAction(text, menuText, accel, parent, name, toggle) {}
+ DesignerAction ( TQObject * parent, const char * name, bool toggle )
+ :TQAction(parent, name, toggle) {}
~DesignerAction();
virtual void setEnabled(bool e);
diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp
index d564cd6c..a5780339 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/kdevdesigner/designer/designerappiface.cpp
@@ -190,7 +190,7 @@ TQPtrList<DesignerFormWindow> DesignerProjectImpl::formList() const
while ( it.current() ) {
TQObject *obj = it.current();
++it;
- TQWidget *par = ::tqqt_cast<FormWindow*>(obj->tqparent());
+ TQWidget *par = ::tqqt_cast<FormWindow*>(obj->parent());
if ( !obj->isWidgetType() || !par )
continue;
@@ -582,9 +582,9 @@ void DesignerFormWindowImpl::insertWidget( TQWidget * )
{
}
-TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *tqparent, const char *name )
+TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *parent, const char *name )
{
- TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, name );
+ TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name );
formWindow->insertWidget( w, TRUE );
formWindow->killAccels( TQT_TQOBJECT(formWindow->mainContainer()) );
return w;
@@ -717,9 +717,9 @@ TQPtrList<TQAction> DesignerFormWindowImpl::actionList() const
}
TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel,
- TQObject* tqparent, const char* name, bool toggle )
+ TQObject* parent, const char* name, bool toggle )
{
- QDesignerAction *a = new QDesignerAction( tqparent );
+ QDesignerAction *a = new QDesignerAction( parent );
a->setName( name );
a->setText( text );
if ( !icon.isNull() && !icon.pixmap().isNull() )
diff --git a/kdevdesigner/designer/designerappiface.h b/kdevdesigner/designer/designerappiface.h
index de048be1..2ddcd47c 100644
--- a/kdevdesigner/designer/designerappiface.h
+++ b/kdevdesigner/designer/designerappiface.h
@@ -175,7 +175,7 @@ public:
void save() const;
bool isModified() const;
void insertWidget( TQWidget * );
- TQWidget *create( const char *className, TQWidget *tqparent, const char *name );
+ TQWidget *create( const char *className, TQWidget *parent, const char *name );
void removeWidget( TQWidget * );
TQWidgetList widgets() const;
void undo();
@@ -205,7 +205,7 @@ public:
void setCurrentWidget( TQWidget * );
TQPtrList<TQAction> actionList() const;
TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel,
- TQObject* tqparent, const char* name = 0, bool toggle = FALSE );
+ TQObject* parent, const char* name = 0, bool toggle = FALSE );
void addAction( TQAction * );
void removeAction( TQAction * );
void preview() const;
diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp
index 1c3e2bc9..b28ff0ad 100644
--- a/kdevdesigner/designer/editfunctionsimpl.cpp
+++ b/kdevdesigner/designer/editfunctionsimpl.cpp
@@ -49,8 +49,8 @@
#include <klocale.h>
-EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots )
- : EditFunctionsBase( tqparent, 0, TRUE ), formWindow( fw )
+EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
+ : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw )
{
connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
@@ -116,7 +116,7 @@ EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots
TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) );
// Connect signal-relay to TQLineEdit "functionName"
- TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" );
+ TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" );
TQObject *obj;
TQObjectListIt itemsLineEditIt( *l );
while ( (obj = itemsLineEditIt.current()) != 0 ) {
diff --git a/kdevdesigner/designer/editfunctionsimpl.h b/kdevdesigner/designer/editfunctionsimpl.h
index 03a59b09..fff7b37f 100644
--- a/kdevdesigner/designer/editfunctionsimpl.h
+++ b/kdevdesigner/designer/editfunctionsimpl.h
@@ -41,7 +41,7 @@ class EditFunctions : public EditFunctionsBase
TQ_OBJECT
public:
- EditFunctions( TQWidget *tqparent, FormWindow *fw, bool showOnlySlots = FALSE );
+ EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE );
void setCurrentFunction( const TQString &function );
void functionAdd( const TQString &access = TQString(),
diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp
index 864bab7a..961cfee0 100644
--- a/kdevdesigner/designer/filechooser.cpp
+++ b/kdevdesigner/designer/filechooser.cpp
@@ -32,8 +32,8 @@
#include <kfiledialog.h>
-FileChooser::FileChooser( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name ), md( File )
+FileChooser::FileChooser( TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), md( File )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
tqlayout->setMargin( 0 );
diff --git a/kdevdesigner/designer/filechooser.h b/kdevdesigner/designer/filechooser.h
index 8137b031..a08c2aa1 100644
--- a/kdevdesigner/designer/filechooser.h
+++ b/kdevdesigner/designer/filechooser.h
@@ -42,7 +42,7 @@ class FileChooser : public TQWidget
TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
public:
- FileChooser( TQWidget *tqparent = 0, const char *name = 0);
+ FileChooser( TQWidget *parent = 0, const char *name = 0);
enum Mode { File, Directory };
diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp
index fc2e4445..e29ea157 100644
--- a/kdevdesigner/designer/formsettingsimpl.cpp
+++ b/kdevdesigner/designer/formsettingsimpl.cpp
@@ -40,8 +40,8 @@
#include <tqspinbox.h>
#include <tqcheckbox.h>
-FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw )
- : FormSettingsBase( tqparent, 0, TRUE ), formwindow( fw )
+FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
+ : FormSettingsBase( parent, 0, TRUE ), formwindow( fw )
{
connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(fw) );
diff --git a/kdevdesigner/designer/formsettingsimpl.h b/kdevdesigner/designer/formsettingsimpl.h
index 75aa5cbd..e1511b99 100644
--- a/kdevdesigner/designer/formsettingsimpl.h
+++ b/kdevdesigner/designer/formsettingsimpl.h
@@ -37,7 +37,7 @@ class FormSettings : public FormSettingsBase
TQ_OBJECT
public:
- FormSettings( TQWidget *tqparent, FormWindow *fw );
+ FormSettings( TQWidget *parent, FormWindow *fw );
protected slots:
void okClicked();
diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index 6070b378..fbd7e1ad 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -134,8 +134,8 @@ static void flickerfree_update( TQWidget *w )
event filter which is implemented in MainWindow::eventFilter().
*/
-FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( mw ),
+FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name )
+ : TQWidget( parent, name, WDestructiveClose ), mainwindow( mw ),
commands( 100 ), pixInline( TRUE ), pixProject( FALSE )
{
ff = f;
@@ -143,8 +143,8 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const c
initSlots();
}
-FormWindow::FormWindow( FormFile *f, TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( 0 ),
+FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name )
+ : TQWidget( parent, name, WDestructiveClose ), mainwindow( 0 ),
commands( 100 ), pixInline( TRUE )
{
ff = f;
@@ -261,16 +261,16 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e )
if( !TQPixmapCache::find( grid_name, grid ) ) {
grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) );
grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) );
- TQBitmap tqmask( grid.width(), grid.height() );
- tqmask.fill( color0 );
- TQPainter p( &tqmask );
+ TQBitmap mask( grid.width(), grid.height() );
+ mask.fill( color0 );
+ TQPainter p( &mask );
p.setPen( color1 );
for ( int y = 0; y < grid.width(); y += mainWindow()->grid().y()) {
for ( int x = 0; x < grid.height(); x += mainWindow()->grid().x() ) {
p.drawPoint( x, y );
}
}
- grid.setMask( tqmask );
+ grid.setMask( mask );
TQPixmapCache::insert( grid_name, grid );
}
TQPainter p( w );
@@ -455,7 +455,7 @@ void FormWindow::insertWidget()
np.append( pos );
}
- MoveCommand *mv = new MoveCommand( i18n( "Retqparent Widgets" ), this,
+ MoveCommand *mv = new MoveCommand( i18n( "Reparent Widgets" ), this,
lst, op, np, insertParent, pw );
if ( !toolFixed )
@@ -692,14 +692,14 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
break;
default: // any insert widget tool
if ( e->button() == Qt::LeftButton ) {
- insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow
- if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another tqparent
+ insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow
+ if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another parent
TQWidget *wid = w;
for (;;) {
int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(wid) ) );
if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) &&
!::tqqt_cast<TQLayoutWidget*>(wid) && !::tqqt_cast<TQSplitter*>(wid) ) {
- insertParent = WidgetFactory::containerOfWidget( wid ); // found another tqparent, store it
+ insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it
break;
} else {
wid = wid->parentWidget();
@@ -807,7 +807,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
checkSelectionsForMove( w );
}
- // check whether we would have to reparent the selection and highlight the possible new tqparent container
+ // check whether we would have to reparent the selection and highlight the possible new parent container
TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin();
TQWidget* wa = containerAt( e->globalPos(), it.key() );
if ( wa && !isMainContainer( TQT_TQOBJECT(wa) ) && !isCentralWidget( TQT_TQOBJECT(wa) ) ) {
@@ -1633,7 +1633,7 @@ TQWidget *FormWindow::designerWidget( TQObject *o ) const
return 0;
TQWidget *w = (TQWidget*)o;
while ( w && !isMainContainer( TQT_TQOBJECT(w) ) && !insertedWidgets[ (void*)w ] || isCentralWidget( TQT_TQOBJECT(w) ) )
- w = (TQWidget*)w->tqparent();
+ w = (TQWidget*)w->parent();
return w;
}
@@ -1966,12 +1966,12 @@ void FormWindow::raiseWidgets()
commandHistory()->addCommand( cmd );
}
-void FormWindow::paste( const TQString &cb, TQWidget *tqparent )
+void FormWindow::paste( const TQString &cb, TQWidget *parent )
{
CHECK_MAINWINDOW;
Resource resource( mainWindow() );
resource.setWidget( this );
- resource.paste( cb, tqparent );
+ resource.paste( cb, parent );
}
void FormWindow::selectAll()
diff --git a/kdevdesigner/designer/formwindow.h b/kdevdesigner/designer/formwindow.h
index 0f7d6938..1b27f762 100644
--- a/kdevdesigner/designer/formwindow.h
+++ b/kdevdesigner/designer/formwindow.h
@@ -69,8 +69,8 @@ class FormWindow : public TQWidget
TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
public:
- FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name = 0 );
- FormWindow( FormFile *f, TQWidget *tqparent, const char *name = 0 );
+ FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name = 0 );
+ FormWindow( FormFile *f, TQWidget *parent, const char *name = 0 );
~FormWindow();
void init();
@@ -87,7 +87,7 @@ public:
virtual void undo();
virtual void redo();
virtual TQString copy();
- virtual void paste( const TQString &cb, TQWidget *tqparent );
+ virtual void paste( const TQString &cb, TQWidget *parent );
virtual void lowerWidgets();
virtual void raiseWidgets();
virtual void checkAccels();
diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp
index a617ac31..c91f5333 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/kdevdesigner/designer/hierarchyview.cpp
@@ -68,15 +68,15 @@ TQListViewItem *newItem = 0;
static TQPluginManager<ClassBrowserInterface> *classBrowserInterfaceManager = 0;
-HierarchyItem::HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after,
+HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after,
const TQString &txt1, const TQString &txt2, const TQString &txt3 )
- : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type )
+ : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type )
{
}
-HierarchyItem::HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after,
+HierarchyItem::HierarchyItem( Type type, TQListView *parent, TQListViewItem *after,
const TQString &txt1, const TQString &txt2, const TQString &txt3 )
- : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type )
+ : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type )
{
}
@@ -172,8 +172,8 @@ void HierarchyItem::cancelRename( int col )
-HierarchyList::HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects )
- : TQListView( tqparent ), formWindow( fw )
+HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects )
+ : TQListView( parent ), formWindow( fw )
{
DesignerFormPix = SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance());
DesignerLayoutPix = SmallIcon( "designer_layout.png" , KDevDesignerPartFactory::instance());
@@ -258,20 +258,20 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i )
if ( o->isWidgetType() ) {
TQWidget *w = (TQWidget*)o;
if ( !formWindow->widgets()->find( w ) ) {
- if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) {
- if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) {
- ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w );
- o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent());
+ if ( ::tqqt_cast<TQWidgetStack*>(w->parent()) ) {
+ if (::tqqt_cast<TQTabWidget*>(w->parent()->parent()) ) {
+ ((TQTabWidget*)w->parent()->parent())->showPage( w );
+ o = TQT_TQOBJECT((TQWidget*)w->parent()->parent());
formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
- } else if ( ::tqqt_cast<TQWizard*>(w->tqparent()->tqparent()) ) {
- ((QDesignerWizard*)w->tqparent()->tqparent())->
- setCurrentPage( ( (QDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) );
- o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent());
+ } else if ( ::tqqt_cast<TQWizard*>(w->parent()->parent()) ) {
+ ((QDesignerWizard*)w->parent()->parent())->
+ setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) );
+ o = TQT_TQOBJECT((TQWidget*)w->parent()->parent());
formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
} else {
- ( (TQWidgetStack*)w->tqparent() )->raiseWidget( w );
- if ( (TQWidgetStack*)w->tqparent()->isA( "QDesignerWidgetStack" ) )
- ( (QDesignerWidgetStack*)w->tqparent() )->updateButtons();
+ ( (TQWidgetStack*)w->parent() )->raiseWidget( w );
+ if ( (TQWidgetStack*)w->parent()->isA( "QDesignerWidgetStack" ) )
+ ( (QDesignerWidgetStack*)w->parent() )->updateButtons();
}
} else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) {
formWindow->setActiveObject( TQT_TQOBJECT(w) );
@@ -397,7 +397,7 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b )
TQListView::setOpen( i, b );
}
-void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
+void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
{
if ( TQString( o->name() ).startsWith( "qt_dead_widget_" ) )
return;
@@ -433,29 +433,29 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
#endif
TQString name = o->name();
- if ( ::tqqt_cast<TQWidgetStack*>(o->tqparent()) ) {
- if ( ::tqqt_cast<TQTabWidget*>(o->tqparent()->tqparent()) )
- name = ( (TQTabWidget*)o->tqparent()->tqparent() )->tabLabel( (TQWidget*)o );
- else if ( ::tqqt_cast<TQWizard*>(o->tqparent()->tqparent()) )
- name = ( (TQWizard*)o->tqparent()->tqparent() )->title( (TQWidget*)o );
+ if ( ::tqqt_cast<TQWidgetStack*>(o->parent()) ) {
+ if ( ::tqqt_cast<TQTabWidget*>(o->parent()->parent()) )
+ name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o );
+ else if ( ::tqqt_cast<TQWizard*>(o->parent()->parent()) )
+ name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o );
}
TQToolBox *tb;
- if ( o->tqparent() && o->tqparent()->tqparent() &&
- (tb = ::tqqt_cast<TQToolBox*>(o->tqparent()->tqparent()->tqparent())) )
+ if ( o->parent() && o->parent()->parent() &&
+ (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) )
name = tb->itemLabel( tb->indexOf((TQWidget*)o) );
if ( fakeMainWindow ) {
- name = o->tqparent()->name();
+ name = o->parent()->name();
className = TQMAINWINDOW_OBJECT_NAME_STRING;
}
- if ( !tqparent )
+ if ( !parent )
item = new HierarchyItem( HierarchyItem::Widget, this, 0, name, className, dbInfo );
else
- item = new HierarchyItem( HierarchyItem::Widget, tqparent, 0, name, className, dbInfo );
+ item = new HierarchyItem( HierarchyItem::Widget, parent, 0, name, className, dbInfo );
item->setOpen( TRUE );
- if ( !tqparent )
+ if ( !parent )
item->setPixmap( 0, DesignerFormPix );
else if ( ::tqqt_cast<TQLayoutWidget*>(o) )
item->setPixmap( 0, DesignerLayoutPix );
@@ -478,16 +478,16 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
( (TQWidget*)it.current() )->isHidden() )
continue;
if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) {
- if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) ||
+ if ( ::tqqt_cast<TQWidgetStack*>(it.current()->parent()) ||
::tqqt_cast<TQWidgetStack*>(it.current()) ) {
TQObject *obj = it.current();
- QDesignerTabWidget *tw = ::tqqt_cast<QDesignerTabWidget*>(it.current()->tqparent());
- QDesignerWizard *dw = ::tqqt_cast<QDesignerWizard*>(it.current()->tqparent());
+ QDesignerTabWidget *tw = ::tqqt_cast<QDesignerTabWidget*>(it.current()->parent());
+ QDesignerWizard *dw = ::tqqt_cast<QDesignerWizard*>(it.current()->parent());
TQWidgetStack *stack = 0;
if ( dw || tw || ::tqqt_cast<TQWidgetStack*>(obj) )
stack = (TQWidgetStack*)obj;
else
- stack = (TQWidgetStack*)obj->tqparent();
+ stack = (TQWidgetStack*)obj->parent();
if ( widgetStacks->findRef( stack ) != -1 )
continue;
widgetStacks->append( stack );
@@ -505,10 +505,10 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
insertObject( obj, item );
}
delete l2;
- } else if ( ::tqqt_cast<TQToolBox*>(it.current()->tqparent()) ) {
+ } else if ( ::tqqt_cast<TQToolBox*>(it.current()->parent()) ) {
if ( !::tqqt_cast<TQScrollView*>(it.current()) )
continue;
- TQToolBox *tb = (TQToolBox*)it.current()->tqparent();
+ TQToolBox *tb = (TQToolBox*)it.current()->parent();
for ( int i = tb->count() - 1; i >= 0; --i )
insertObject( TQT_TQOBJECT(tb->item( i )), item );
}
@@ -519,12 +519,12 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
}
if ( fakeMainWindow ) {
- TQObjectList *l = o->tqparent()->queryList( "QDesignerToolBar" );
+ TQObjectList *l = o->parent()->queryList( "QDesignerToolBar" );
TQObject *obj;
for ( obj = l->first(); obj; obj = l->next() )
insertObject( obj, item );
delete l;
- l = o->tqparent()->queryList( "MenuBarEditor" );
+ l = o->parent()->queryList( "MenuBarEditor" );
for ( obj = l->first(); obj; obj = l->next() )
insertObject( obj, item );
delete l;
@@ -676,8 +676,8 @@ void HierarchyList::removeTabPage()
// ------------------------------------------------------------
-FormDefinitionView::FormDefinitionView( TQWidget *tqparent, FormWindow *fw )
- : HierarchyList( tqparent, fw, TRUE )
+FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw )
+ : HierarchyList( parent, fw, TRUE )
{
header()->hide();
removeColumn( 1 );
@@ -976,7 +976,7 @@ void FormDefinitionView::contentsMouseDoubleClickEvent( TQMouseEvent *e )
HierarchyItem::Type t = getChildType( i->rtti() );
if ( (int)t == i->rtti() )
- i = i->tqparent();
+ i = i->parent();
if ( formWindow->project()->isCpp() )
switch( i->rtti() ) {
@@ -1100,7 +1100,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
if ( !lIface )
return;
if ( i->rtti() == HierarchyItem::Definition )
- i = i->tqparent();
+ i = i->parent();
ListEditor dia( this, 0, TRUE );
dia.setCaption( i18n( "Edit %1" ).tqarg( i->text( 0 ) ) );
TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() );
@@ -1114,7 +1114,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
} else if ( res == NEW ) {
HierarchyItem::Type t = getChildType( i->rtti() );
if ( (int)t == i->rtti() )
- i = i->tqparent();
+ i = i->parent();
switch( i->rtti() ) {
case HierarchyItem::SlotPublic:
execFunctionDialog( "public", "slot", TRUE );
@@ -1153,7 +1153,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
} else {
- TQListViewItem *p = i->tqparent();
+ TQListViewItem *p = i->parent();
delete i;
save( p, 0 );
}
@@ -1178,9 +1178,9 @@ void FormDefinitionView::renamed( TQListViewItem *i )
{
if ( newItem == i )
newItem = 0;
- if ( !i->tqparent() )
+ if ( !i->parent() )
return;
- save( i->tqparent(), i );
+ save( i->parent(), i );
}
@@ -1235,8 +1235,8 @@ void FormDefinitionView::addVariable( const TQString &varName, const TQString &a
// ------------------------------------------------------------
-HierarchyView::HierarchyView( TQWidget *tqparent )
- : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
+HierarchyView::HierarchyView( TQWidget *parent )
+ : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
WStyle_Tool |WStyle_MinMax | WStyle_SysMenu )
{
formwindow = 0;
diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h
index f013f507..6ace03d1 100644
--- a/kdevdesigner/designer/hierarchyview.h
+++ b/kdevdesigner/designer/hierarchyview.h
@@ -68,9 +68,9 @@ public:
Variable
};
- HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after,
+ HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after,
const TQString &txt1, const TQString &txt2, const TQString &txt3 );
- HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after,
+ HierarchyItem( Type type, TQListView *parent, TQListViewItem *after,
const TQString &txt1, const TQString &txt2, const TQString &txt3 );
void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
@@ -101,7 +101,7 @@ class HierarchyList : public TQListView
TQ_OBJECT
public:
- HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects = TRUE );
+ HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE );
virtual void setup();
virtual void setCurrent( TQObject *o );
@@ -130,7 +130,7 @@ public slots:
void removeTabPage();
private:
- void insertObject( TQObject *o, TQListViewItem *tqparent );
+ void insertObject( TQObject *o, TQListViewItem *parent );
TQObject *findObject( TQListViewItem *i );
TQListViewItem *findItem( TQObject *o );
TQObject *current() const;
@@ -159,7 +159,7 @@ class FormDefinitionView : public HierarchyList
TQ_OBJECT
public:
- FormDefinitionView( TQWidget *tqparent, FormWindow *fw );
+ FormDefinitionView( TQWidget *parent, FormWindow *fw );
void setup();
void setupVariables();
@@ -193,7 +193,7 @@ class HierarchyView : public TQTabWidget
TQ_OBJECT
public:
- HierarchyView( TQWidget *tqparent );
+ HierarchyView( TQWidget *parent );
~HierarchyView();
void setFormWindow( FormWindow *fw, TQObject *o );
diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp
index 8f0ca643..07db9813 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.cpp
+++ b/kdevdesigner/designer/iconvieweditorimpl.cpp
@@ -37,8 +37,8 @@
#include <klocale.h>
-IconViewEditor::IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
- : IconViewEditorBase( tqparent, 0, TRUE ), formwindow( fw )
+IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
+ : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw )
{
connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
iconview = (TQIconView*)editWidget;
diff --git a/kdevdesigner/designer/iconvieweditorimpl.h b/kdevdesigner/designer/iconvieweditorimpl.h
index b1823770..aae7fb7d 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.h
+++ b/kdevdesigner/designer/iconvieweditorimpl.h
@@ -37,7 +37,7 @@ class IconViewEditor : public IconViewEditorBase
TQ_OBJECT
public:
- IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
+ IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
protected slots:
void insertNewItem();
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index cda34aba..bb0f2955 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -42,8 +42,8 @@
KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widgetName
,
- TQObject *tqparent, const char *name, const TQStringList &args )
- : KInterfaceDesigner::Designer(tqparent, name)
+ TQObject *parent, const char *name, const TQStringList &args )
+ : KInterfaceDesigner::Designer(parent, name)
{
setInstance( KDevDesignerPartFactory::instance() );
@@ -257,11 +257,11 @@ KDevDesignerPartFactory::~KDevDesignerPartFactory()
}
KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const char *classname, const TQStringList &args )
{
// Create an instance of our Part
- KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, tqparent, name, args );
+ KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, parent, name, args );
// See if we are to be read-write or not
if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index 314af47b..5d402856 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -42,7 +42,7 @@ class KDevDesignerPart : public KInterfaceDesigner::Designer
TQ_OBJECT
public:
KDevDesignerPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList &args);
+ TQObject *parent, const char *name, const TQStringList &args);
virtual ~KDevDesignerPart();
virtual void setReadWrite(bool rw);
@@ -136,7 +136,7 @@ public:
KDevDesignerPartFactory();
virtual ~KDevDesignerPartFactory();
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();
diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp
index 8dd642b8..f908dd4b 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/kdevdesigner/designer/layout.cpp
@@ -52,17 +52,17 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &
*/
-/*! \a p specifies the tqparent of the layoutBase \a lb. The tqparent
+/*! \a p specifies the parent of the layoutBase \a lb. The parent
might be changed in setup(). If the layoutBase is a
- container, the tqparent and the layoutBase are the same. Also they
+ container, the parent and the layoutBase are the same. Also they
always have to be a widget known to the designer (e.g. in the case
- of the tabwidget tqparent and layoutBase are the tabwidget and not the
+ of the tabwidget parent and layoutBase are the tabwidget and not the
page which actually gets laid out. For actual usage the correct
widget is found later by Layout.)
*/
Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter )
- : widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter )
+ : widgets( wl ), parent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter )
{
widgets.setAutoDelete( FALSE );
layoutBase = lb;
@@ -85,8 +85,8 @@ void Layout::setup()
TQWidget *w = 0;
// Go through all widgets of the list we got. As we can only
- // tqlayout widgets which have the same tqparent, we first do some
- // sorting which means create a list for each tqparent containing
+ // tqlayout widgets which have the same parent, we first do some
+ // sorting which means create a list for each parent containing
// its child here. After that we keep working on the list of
// childs which has the most entries.
// Widgets which are already laid out are thrown away here too
@@ -135,8 +135,8 @@ void Layout::setup()
// Now we have a new and clean widget list, which makes sense
// to tqlayout
widgets = *lastList;
- // Also use the only correct tqparent later, so store it
- tqparent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
+ // Also use the only correct parent later, so store it
+ parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
// Now calculate the position where the tqlayout-meta-widget should
// be placed and connect to widgetDestroyed() signals of the
// widgets to get informed if one gets deleted to be able to
@@ -160,21 +160,21 @@ void Layout::widgetDestroyed()
widgets.removeRef( (TQWidget*)sender() );
}
-bool Layout::prepareLayout( bool &needMove, bool &needRetqparent )
+bool Layout::prepareLayout( bool &needMove, bool &needReparent )
{
if ( !widgets.count() )
return FALSE;
for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
w->raise();
needMove = !layoutBase;
- needRetqparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase);
+ needReparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase);
if ( !layoutBase ) {
if ( !useSplitter )
layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
- WidgetFactory::containerOfWidget( tqparent ) );
+ WidgetFactory::containerOfWidget( parent ) );
else
layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
- WidgetFactory::containerOfWidget( tqparent ) );
+ WidgetFactory::containerOfWidget( parent ) );
} else {
WidgetFactory::deleteLayout( layoutBase );
}
@@ -211,12 +211,12 @@ void Layout::undoLayout()
for ( ; it != geometries.end(); ++it ) {
if ( !it.key() )
continue;
- it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
+ it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
it.key()->resize( ( *it ).size() );
}
formWindow->selectWidget( TQT_TQOBJECT(layoutBase), FALSE );
WidgetFactory::deleteLayout( layoutBase );
- if ( tqparent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) {
+ if ( parent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) {
layoutBase->hide();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
@@ -239,14 +239,14 @@ void Layout::breakLayout()
rects.insert( w, w->tqgeometry() );
}
WidgetFactory::deleteLayout( layoutBase );
- bool needRetqparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
+ bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(layoutBase) ) ) ) &&
layoutBase != formWindow->mainContainer() );
bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
bool add = geometries.isEmpty();
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
- if ( needRetqparent )
+ if ( needReparent )
w->reparent( layoutBase->parentWidget(), 0,
layoutBase->pos() + w->pos(), TRUE );
if ( needResize ) {
@@ -257,14 +257,14 @@ void Layout::breakLayout()
if ( add )
geometries.insert( w, TQRect( w->pos(), w->size() ) );
}
- if ( needRetqparent ) {
+ if ( needReparent ) {
layoutBase->hide();
- tqparent = layoutBase->parentWidget();
+ parent = layoutBase->parentWidget();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
layoutBase->setName( n );
} else {
- tqparent = layoutBase;
+ parent = layoutBase;
}
if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) )
formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
@@ -307,14 +307,14 @@ void HorizontalLayout::setup()
void HorizontalLayout::doLayout()
{
- bool needMove, needRetqparent;
- if ( !prepareLayout( needMove, needRetqparent ) )
+ bool needMove, needReparent;
+ if ( !prepareLayout( needMove, needReparent ) )
return;
TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
- if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
+ if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
@@ -371,14 +371,14 @@ void VerticalLayout::setup()
void VerticalLayout::doLayout()
{
- bool needMove, needRetqparent;
- if ( !prepareLayout( needMove, needRetqparent ) )
+ bool needMove, needReparent;
+ if ( !prepareLayout( needMove, needReparent ) )
return;
TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
- if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
+ if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
@@ -743,8 +743,8 @@ GridLayout::~GridLayout()
void GridLayout::doLayout()
{
- bool needMove, needRetqparent;
- if ( !prepareLayout( needMove, needRetqparent ) )
+ bool needMove, needReparent;
+ if ( !prepareLayout( needMove, needReparent ) )
return;
QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
@@ -756,7 +756,7 @@ void GridLayout::doLayout()
int r, c, rs, cs;
for ( w = widgets.first(); w; w = widgets.next() ) {
if ( grid->locateWidget( w, r, c, rs, cs) ) {
- if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
+ if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( rs * cs == 1 ) {
tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 );
@@ -863,8 +863,8 @@ void GridLayout::buildGrid()
-Spacer::Spacer( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name, WMouseNoMask ),
+Spacer::Spacer( TQWidget *parent, const char *name )
+ : TQWidget( parent, name, WMouseNoMask ),
orient(Qt::Vertical ), interactive(TRUE), sh( TQSize(20,20) )
{
setSizeType( Expanding );
diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h
index 51e9d48b..d71368ab 100644
--- a/kdevdesigner/designer/layout.h
+++ b/kdevdesigner/designer/layout.h
@@ -50,12 +50,12 @@ public:
virtual void doLayout() = 0;
virtual void undoLayout();
virtual void breakLayout();
- virtual bool prepareLayout( bool &needMove, bool &needRetqparent );
+ virtual bool prepareLayout( bool &needMove, bool &needReparent );
virtual void finishLayout( bool needMove, TQLayout *tqlayout );
protected:
TQWidgetList widgets;
- TQWidget *tqparent;
+ TQWidget *parent;
TQPoint startPoint;
TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries;
TQWidget *layoutBase;
@@ -140,7 +140,7 @@ public:
MinimumExpanding = Minimum|ExpMask,
Expanding = MinimumExpanding|MayShrink };
- Spacer( TQWidget *tqparent, const char *name );
+ Spacer( TQWidget *parent, const char *name );
TQSize tqminimumSize() const;
TQSize tqsizeHint() const;
@@ -166,7 +166,7 @@ class QDesignerGridLayout : public TQGridLayout
Q_OBJECT
TQ_OBJECT
public:
- QDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){};
+ QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){};
QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){};
void addWidget( TQWidget *, int row, int col, int align = 0 );
diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp
index 9c57eb18..920559c5 100644
--- a/kdevdesigner/designer/listboxdnd.cpp
+++ b/kdevdesigner/designer/listboxdnd.cpp
@@ -35,10 +35,10 @@
class ListBoxItemDrag : public TQStoredDrag
{
public:
- ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * tqparent = 0, const char * name = 0 );
+ ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * parent = 0, const char * name = 0 );
~ListBoxItemDrag() {};
static bool canDecode( TQDragMoveEvent * event );
- static bool decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * insertPoint );
+ static bool decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * insertPoint );
enum ItemType { ListBoxText = 1, ListBoxPixmap = 2 };
};
// ------------------------------------------------------------------
@@ -184,8 +184,8 @@ bool ListBoxDnd::canDecode( TQDragEnterEvent * event )
// The Dragobject Implementation ------------------------------------
// ------------------------------------------------------------------
-ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * tqparent, const char * name )
- : TQStoredDrag( "qt/listboxitem", tqparent, name )
+ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * parent, const char * name )
+ : TQStoredDrag( "qt/listboxitem", parent, name )
{
// ### FIX!
TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListBoxItem ) * items.count() );
@@ -238,7 +238,7 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event )
return event->provides( "qt/listboxitem" );
}
-bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * after )
+bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after )
{
TQByteArray data = event->tqencodedData( "qt/listboxitem" );
@@ -262,7 +262,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB
stream >> p;
item = (TQListBoxItem *) p;
- tqparent->insertItem( item, after );
+ parent->insertItem( item, after );
}
@@ -288,9 +288,9 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB
stream >> isSelectable;
if ( hasPixmap ) {
- item = new TQListBoxPixmap( tqparent, pixmap, text, after );
+ item = new TQListBoxPixmap( parent, pixmap, text, after );
} else {
- item = new TQListBoxText( tqparent, text, after );
+ item = new TQListBoxText( parent, text, after );
}
item->setSelectable( isSelectable );
diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp
index 073fdda6..98c5c835 100644
--- a/kdevdesigner/designer/listboxeditorimpl.cpp
+++ b/kdevdesigner/designer/listboxeditorimpl.cpp
@@ -40,8 +40,8 @@
#include <klocale.h>
-ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
- : ListBoxEditorBase( tqparent, 0, TRUE ), formwindow( fw )
+ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
+ : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw )
{
connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
listbox = (TQListBox*)editWidget;
@@ -70,7 +70,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWind
ListBoxRename *editorRename = new ListBoxRename( preview );
- TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
+ TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
TQObjectListIt it( *l );
TQObject *obj;
while ( (obj = it.current()) != 0 ) {
diff --git a/kdevdesigner/designer/listboxeditorimpl.h b/kdevdesigner/designer/listboxeditorimpl.h
index a73865f2..8a3595bb 100644
--- a/kdevdesigner/designer/listboxeditorimpl.h
+++ b/kdevdesigner/designer/listboxeditorimpl.h
@@ -38,7 +38,7 @@ class ListBoxEditor : public ListBoxEditorBase
TQ_OBJECT
public:
- ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
+ ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
protected slots:
void insertNewItem();
diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp
index b1d5323d..953551df 100644
--- a/kdevdesigner/designer/listviewdnd.cpp
+++ b/kdevdesigner/designer/listviewdnd.cpp
@@ -36,10 +36,10 @@ class ListViewItemDrag : public TQStoredDrag
{
public:
enum DropRelation { Sibling, Child };
- ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent = 0, const char * name = 0 );
+ ListViewItemDrag( ListViewItemList & items, TQWidget * parent = 0, const char * name = 0 );
~ListViewItemDrag() {};
static bool canDecode( TQDragMoveEvent * event );
- static bool decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr );
+ static bool decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr );
};
// ------------------------------------------------------------------
@@ -74,7 +74,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event )
} else if ( dpos < item->depth() ) {
// Parent(s) Sibling
while ( item && (item->depth() > dpos) )
- item = item->tqparent();
+ item = item->parent();
}
}
@@ -150,10 +150,10 @@ int ListViewDnd::buildFlatList( ListViewItemList & list )
// processing tqchildren...if any such item
addKids = TRUE;
nextSibling = (*it)->nextSibling();
- nextParent = (*it)->tqparent();
+ nextParent = (*it)->parent();
while ( nextParent && !nextSibling ) {
nextSibling = nextParent->nextSibling();
- nextParent = nextParent->tqparent();
+ nextParent = nextParent->parent();
}
}
} else if ( ((*it)->childCount() == 0) && addKids ) {
@@ -209,13 +209,13 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos )
if ( result && ( pos.ry() < (src->itemPos(result) + result->height()/2) ) )
result = result->itemAbove();
- // Wind back if has tqparent, and we're in flat mode
- while ( result && result->tqparent() && (dMode & Flat) )
- result = result->tqparent();
+ // Wind back if has parent, and we're in flat mode
+ while ( result && result->parent() && (dMode & Flat) )
+ result = result->parent();
- // Wind back if has tqparent, and we're in flat mode
- while ( result && !result->isVisible() && result->tqparent() )
- result = result->tqparent();
+ // Wind back if has parent, and we're in flat mode
+ while ( result && !result->isVisible() && result->parent() )
+ result = result->parent();
if ( !result && src->firstChild() && (pos.y() > src->tqitemRect(src->firstChild()).bottom()) ) {
result = src->lastItem();
@@ -259,8 +259,8 @@ bool ListViewDnd::canDecode( TQDragEnterEvent * event )
TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item );
TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item );
-ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent, const char * name )
- : TQStoredDrag( "qt/listviewitem", tqparent, name )
+ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * parent, const char * name )
+ : TQStoredDrag( "qt/listviewitem", parent, name )
{
// ### FIX!
TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListViewItem ) * items.count() );
@@ -282,10 +282,10 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event )
return event->provides( "qt/listviewitem" );
}
-bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr )
+bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr )
{
TQByteArray data = event->tqencodedData( "qt/listviewitem" );
- TQListViewItem* itemParent = insertPoint ? insertPoint->tqparent() : 0;
+ TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0;
// Change from sibling (default) to child creation
if ( insertPoint && dr == Child ) {
@@ -304,8 +304,8 @@ bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQLis
if ( itemParent ) {
insertPoint = new TQListViewItem( itemParent, insertPoint );
itemParent->setOpen( TRUE );
- } else { // No tqparent for insertPoint, use TQListView
- insertPoint = new TQListViewItem( tqparent, insertPoint );
+ } else { // No parent for insertPoint, use TQListView
+ insertPoint = new TQListViewItem( parent, insertPoint );
}
stream >> *insertPoint;
}
diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp
index ce9ee737..9e6c54ed 100644
--- a/kdevdesigner/designer/listvieweditorimpl.cpp
+++ b/kdevdesigner/designer/listvieweditorimpl.cpp
@@ -46,8 +46,8 @@
#include <klocale.h>
-ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw )
- : ListViewEditorBase( tqparent, 0, TRUE ), listview( lv ), formwindow( fw )
+ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw )
+ : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw )
{
connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
itemText->setEnabled( FALSE );
@@ -86,7 +86,7 @@ ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *
TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) );
// Connect signal-relay to TQLineEdit "itemText"
- TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
+ TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
TQObject *obj;
TQObjectListIt itemsLineEditIt( *l );
while ( (obj = itemsLineEditIt.current()) != 0 ) {
@@ -112,7 +112,7 @@ ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *
TQT_SLOT( columnTextChanged( const TQString & ) ) );
// Find TQLineEdit "colText" and connect
- l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" );
+ l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" );
TQObjectListIt columnsLineEditIt( *l );
while ( (obj = columnsLineEditIt.current()) != 0 ) {
++columnsLineEditIt;
@@ -378,10 +378,10 @@ void ListViewEditor::itemDownClicked()
return;
TQListViewItemIterator it( i );
- TQListViewItem *tqparent = i->tqparent();
+ TQListViewItem *parent = i->parent();
it++;
while ( it.current() ) {
- if ( it.current()->tqparent() == tqparent )
+ if ( it.current()->parent() == parent )
break;
it++;
}
@@ -406,11 +406,11 @@ void ListViewEditor::itemNewClicked()
void ListViewEditor::itemNewSubClicked()
{
- TQListViewItem *tqparent = itemsPreview->currentItem();
+ TQListViewItem *parent = itemsPreview->currentItem();
TQListViewItem *item = 0;
- if ( tqparent ) {
- item = new TQListViewItem( tqparent );
- tqparent->setOpen( TRUE );
+ if ( parent ) {
+ item = new TQListViewItem( parent );
+ parent->setOpen( TRUE );
} else {
item = new TQListViewItem( itemsPreview );
}
@@ -466,10 +466,10 @@ void ListViewEditor::itemUpClicked()
return;
TQListViewItemIterator it( i );
- TQListViewItem *tqparent = i->tqparent();
+ TQListViewItem *parent = i->parent();
--it;
while ( it.current() ) {
- if ( it.current()->tqparent() == tqparent )
+ if ( it.current()->parent() == parent )
break;
--it;
}
@@ -488,13 +488,13 @@ void ListViewEditor::itemRightClicked()
return;
TQListViewItemIterator it( i );
- TQListViewItem *tqparent = i->tqparent();
- tqparent = tqparent ? tqparent->firstChild() : itemsPreview->firstChild();
- if ( !tqparent )
+ TQListViewItem *parent = i->parent();
+ parent = parent ? parent->firstChild() : itemsPreview->firstChild();
+ if ( !parent )
return;
it++;
while ( it.current() ) {
- if ( it.current()->tqparent() == tqparent )
+ if ( it.current()->parent() == parent )
break;
it++;
}
@@ -528,13 +528,13 @@ void ListViewEditor::itemLeftClicked()
return;
TQListViewItemIterator it( i );
- TQListViewItem *tqparent = i->tqparent();
- if ( !tqparent )
+ TQListViewItem *parent = i->parent();
+ if ( !parent )
return;
- tqparent = tqparent->tqparent();
+ parent = parent->parent();
--it;
while ( it.current() ) {
- if ( it.current()->tqparent() == tqparent )
+ if ( it.current()->parent() == parent )
break;
--it;
}
diff --git a/kdevdesigner/designer/listvieweditorimpl.h b/kdevdesigner/designer/listvieweditorimpl.h
index 1555823e..750dd280 100644
--- a/kdevdesigner/designer/listvieweditorimpl.h
+++ b/kdevdesigner/designer/listvieweditorimpl.h
@@ -41,7 +41,7 @@ class ListViewEditor : public ListViewEditorBase
TQ_OBJECT
public:
- ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw );
+ ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw );
signals:
void itemRenamed(const TQString &);
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 8ad20987..dbc2b932 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -931,8 +931,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
{
if ( ::tqqt_cast<MenuBarEditor*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) ||
( o &&
- ( ::tqqt_cast<MenuBarEditor*>(o->tqparent()) ||
- ::tqqt_cast<PopupMenuEditor*>(o->tqparent()) ) ) ) {
+ ( ::tqqt_cast<MenuBarEditor*>(o->parent()) ||
+ ::tqqt_cast<PopupMenuEditor*>(o->parent()) ) ) ) {
if ( e->type() == TQEvent::Accel && ::tqqt_cast<PopupMenuEditor*>(o) ) {
return TRUE; // consume accel events
@@ -993,9 +993,9 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
( ::tqqt_cast<TQComboBox*>(o) ||
::tqqt_cast<TQToolButton*>(o) ||
::tqqt_cast<QDesignerToolBarSeparator*>(o) ) &&
- o->tqparent()
- && ( ::tqqt_cast<QDesignerToolBar*>(o->tqparent())
- || ::tqqt_cast<QDesignerWidgetStack*>(o->tqparent())) ) ) {
+ o->parent()
+ && ( ::tqqt_cast<QDesignerToolBar*>(o->parent())
+ || ::tqqt_cast<QDesignerWidgetStack*>(o->parent())) ) ) {
TQWidget *w = (TQWidget*)o;
if ( ::tqqt_cast<TQToolButton*>(w) ||
::tqqt_cast<TQComboBox*>(w) ||
@@ -1108,7 +1108,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
::tqqt_cast<SizeHandle*>(o) ||
::tqqt_cast<OrderIndicator*>(o) ) {
if ( ::tqqt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() &&
- o->tqparent() && ::tqqt_cast<TQToolBar*>(o->tqparent()) && formWindow() )
+ o->parent() && ::tqqt_cast<TQToolBar*>(o->parent()) && formWindow() )
formWindow()->setToolFixed();
break;
}
@@ -1151,7 +1151,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
::tqqt_cast<SizeHandle*>(o) ||
::tqqt_cast<OrderIndicator*>(o) )
break;
- if ( WidgetFactory::layoutType( (TQWidget*)o->tqparent() ) != WidgetFactory::NoLayout ) {
+ if ( WidgetFactory::layoutType( (TQWidget*)o->parent() ) != WidgetFactory::NoLayout ) {
( (FormWindow*)w )->updateSelection( (TQWidget*)o );
if ( e->type() != TQEvent::Resize )
( (FormWindow*)w )->updateChildSelections( (TQWidget*)o );
@@ -1233,12 +1233,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const
{
- if ( ::tqqt_cast<TQWizard*>(o->tqparent()) && !::tqqt_cast<TQPushButton*>(o) )
+ if ( ::tqqt_cast<TQWizard*>(o->parent()) && !::tqqt_cast<TQPushButton*>(o) )
return 0;
while ( o ) {
if ( ::tqqt_cast<FormWindow*>(o) )
return (TQWidget*)o;
- o = o->tqparent();
+ o = o->parent();
}
return 0;
}
@@ -1250,7 +1250,7 @@ TQWidget *MainWindow::isAToolBarChild( TQObject *o ) const
return (TQWidget*)o;
if ( ::tqqt_cast<FormWindow*>(o) )
return 0;
- o = o->tqparent();
+ o = o->parent();
}
return 0;
}
@@ -2261,7 +2261,7 @@ void MainWindow::readConfig()
if ( !ok ) {
if ( oWindow ) {
oWindow->shuttingDown();
- ( (TQDockWindow*)oWindow->tqparent() )->hide();
+ ( (TQDockWindow*)oWindow->parent() )->hide();
}
TQPixmap pix;
pix.load( backPixName );
@@ -2418,7 +2418,7 @@ void MainWindow::readConfig()
}
if ( readPreviousConfig && oWindow ) {
oWindow->shuttingDown();
- ( (TQDockWindow*)oWindow->tqparent() )->hide();
+ ( (TQDockWindow*)oWindow->parent() )->hide();
}
rebuildCustomWidgetGUI();
@@ -2449,9 +2449,9 @@ HierarchyView *MainWindow::objectHierarchy() const
return hierarchyView;
}
-TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent )
+TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent )
{
- TQPopupMenu *menu = new TQPopupMenu( tqparent );
+ TQPopupMenu *menu = new TQPopupMenu( parent );
actionEditCut->addTo( menu );
actionEditCopy->addTo( menu );
@@ -2461,12 +2461,12 @@ TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent )
return menu;
}
-TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot )
+TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot )
{
- TQPopupMenu *menu = new TQPopupMenu( tqparent );
+ TQPopupMenu *menu = new TQPopupMenu( parent );
- menu->insertItem( i18n( "Add Page" ), tqparent, addSlot );
- menu->insertItem( i18n( "Delete Page" ), tqparent, removeSlot );
+ menu->insertItem( i18n( "Add Page" ), parent, addSlot );
+ menu->insertItem( i18n( "Delete Page" ), parent, removeSlot );
menu->insertSeparator();
actionEditCut->addTo( menu );
actionEditCopy->addTo( menu );
diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h
index 359f1b67..c38c7951 100644
--- a/kdevdesigner/designer/mainwindow.h
+++ b/kdevdesigner/designer/mainwindow.h
@@ -109,8 +109,8 @@ public:
void popupFormWindowMenu( const TQPoint &gp, FormWindow *fw );
void popupWidgetMenu( const TQPoint &gp, FormWindow *fw, TQWidget *w );
- TQPopupMenu *setupNormalHierarchyMenu( TQWidget *tqparent );
- TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot );
+ TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent );
+ TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot );
FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 );
bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w );
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index f701f046..c4790ccc 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -1444,7 +1444,7 @@ void MainWindow::fileCreateTemplate()
void MainWindow::createNewTemplate()
{
- CreateTemplate *dia = (CreateTemplate*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent();
+ CreateTemplate *dia = (CreateTemplate*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent();
TQString fn = dia->editName->text();
TQString cn = dia->listClass->currentText();
if ( fn.isEmpty() || cn.isEmpty() ) {
diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 65b55522..498c6827 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -47,7 +47,7 @@ class MenuBarEditorItemPtrDrag : public TQStoredDrag
{
public:
MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
- TQWidget * tqparent = 0,
+ TQWidget * parent = 0,
const char * name = 0 );
~MenuBarEditorItemPtrDrag() {};
static bool canDecode( TQDragMoveEvent * e );
@@ -57,9 +57,9 @@ public:
// Drag Object Implementation ---------------------------------------
MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
- TQWidget * tqparent,
+ TQWidget * parent,
const char * name )
- : TQStoredDrag( "qt/menubareditoritemptr", tqparent, name )
+ : TQStoredDrag( "qt/menubareditoritemptr", parent, name )
{
TQByteArray data( sizeof( TQ_LONG ) );
TQDataStream stream( data, IO_WriteOnly );
@@ -89,8 +89,8 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
// MenuBarEditorItem ---------------------------------------------------
-MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ),
+MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, const char * name )
+ : TQObject( parent, name ),
menuBar( bar ),
popupMenu( 0 ),
visible( TRUE ),
@@ -99,8 +99,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent,
{ }
MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar,
- TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ),
+ TQObject * parent, const char * name )
+ : TQObject( parent, name ),
menuBar( bar ),
popupMenu( menu ),
visible( TRUE ),
@@ -111,8 +111,8 @@ MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * ba
}
MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar,
- TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ),
+ TQObject * parent, const char * name )
+ : TQObject( parent, name ),
menuBar( bar ),
popupMenu( 0 ),
visible( TRUE ),
@@ -124,8 +124,8 @@ MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor
popupMenu->insert( actionGroup );
}
-MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ),
+MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * parent, const char * name )
+ : TQObject( parent, name ),
menuBar( item->menuBar ),
popupMenu( 0 ),
text( item->text ),
@@ -141,8 +141,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqpar
int MenuBarEditor::clipboardOperation = 0;
MenuBarEditorItem * MenuBarEditor::clipboardItem = 0;
-MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * tqparent, const char * name )
- : TQMenuBar( tqparent, name ),
+MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * name )
+ : TQMenuBar( parent, name ),
formWnd( fw ),
draggedItem( 0 ),
currentIndex( 0 ),
@@ -185,7 +185,7 @@ FormWindow * MenuBarEditor::formWindow()
MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack )
{
MenuBarEditorItem * i =
- new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) tqparent() ), this );
+ new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) parent() ), this );
if ( addToCmdStack ) {
AddMenuCommand * cmd = new AddMenuCommand( i18n( "Add Menu" ), formWnd, this, i, index );
formWnd->commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h
index 6932fe44..0725fd5f 100644
--- a/kdevdesigner/designer/menubareditor.h
+++ b/kdevdesigner/designer/menubareditor.h
@@ -41,15 +41,15 @@ class MenuBarEditorItem : public TQObject
friend class MenuBarEditor;
- MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * tqparent = 0, const char * name = 0 );
+ MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * parent = 0, const char * name = 0 );
public:
MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar,
- TQObject * tqparent = 0, const char * name = 0);
+ TQObject * parent = 0, const char * name = 0);
MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar,
- TQObject * tqparent = 0, const char * name = 0);
+ TQObject * parent = 0, const char * name = 0);
MenuBarEditorItem( MenuBarEditorItem * item,
- TQObject * tqparent = 0, const char * name = 0);
+ TQObject * parent = 0, const char * name = 0);
~MenuBarEditorItem() { };
PopupMenuEditor * menu() { return popupMenu; }
@@ -85,7 +85,7 @@ class MenuBarEditor : public TQMenuBar
TQ_OBJECT
public:
- MenuBarEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 );
+ MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 );
~MenuBarEditor();
FormWindow * formWindow();
diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp
index 20f94f86..166ab877 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/kdevdesigner/designer/multilineeditorimpl.cpp
@@ -46,10 +46,10 @@
#include <klocale.h>
-ToolBarItem::ToolBarItem( TQWidget *tqparent, TQWidget *toolBar,
+ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar,
const TQString &label, const TQString &tagstr,
const TQIconSet &icon, const TQKeySequence &key )
- : TQAction( tqparent )
+ : TQAction( parent )
{
setIconSet( icon );
setText( label );
@@ -69,8 +69,8 @@ void ToolBarItem::wasActivated()
emit clicked( tag );
}
-TextEdit::TextEdit( TQWidget *tqparent, const char *name )
- : TQTextEdit( tqparent, name )
+TextEdit::TextEdit( TQWidget *parent, const char *name )
+ : TQTextEdit( parent, name )
{
setTextFormat( TQt::PlainText );
}
@@ -82,9 +82,9 @@ TQTextParagraph* TextEdit::paragraph()
}
-MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget,
+MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget,
FormWindow *fw, const TQString &text )
- : MultiLineEditorBase( tqparent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE )
+ : MultiLineEditorBase( parent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE )
{
callStatic = call_static;
@@ -378,9 +378,9 @@ TQString MultiLineEditor::getStaticText()
return staticText.stripWhiteSpace();
}
-TQString MultiLineEditor::getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap )
+TQString MultiLineEditor::getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap )
{
- MultiLineEditor medit( TRUE, richtextMode, tqparent, 0, 0, text );
+ MultiLineEditor medit( TRUE, richtextMode, parent, 0, 0, text );
if ( richtextMode )
medit.setUseWrapping( *useWrap );
if ( medit.exec() == TQDialog::Accepted ) {
diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h
index 9fc56257..4756f37c 100644
--- a/kdevdesigner/designer/multilineeditorimpl.h
+++ b/kdevdesigner/designer/multilineeditorimpl.h
@@ -42,7 +42,7 @@ class TextEdit : public TQTextEdit
TQ_OBJECT
public:
- TextEdit( TQWidget *tqparent = 0, const char *name = 0 );
+ TextEdit( TQWidget *parent = 0, const char *name = 0 );
TQTextDocument *document() const { return TQTextEdit::document(); }
TQTextParagraph *paragraph();
@@ -54,7 +54,7 @@ class ToolBarItem : public TQAction
TQ_OBJECT
public:
- ToolBarItem( TQWidget *tqparent, TQWidget *toolBar,
+ ToolBarItem( TQWidget *parent, TQWidget *toolBar,
const TQString &label, const TQString &tagstr,
const TQIconSet &icon, const TQKeySequence &key = 0 );
~ToolBarItem();
@@ -74,11 +74,11 @@ class MultiLineEditor : public MultiLineEditorBase
TQ_OBJECT
public:
- MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget,
+ MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget,
FormWindow *fw, const TQString &text = TQString() );
bool useWrapping() const;
void setUseWrapping( bool );
- static TQString getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap );
+ static TQString getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap );
int exec();
protected slots:
diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index 0c90c056..dcc2c416 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/kdevdesigner/designer/newformimpl.cpp
@@ -364,9 +364,9 @@ NewForm::NewForm( TQIconView *templateView, const TQString &templatePath )
projectChanged( i18n( "<No Project>" ) );
}
-NewForm::NewForm( TQWidget *tqparent, const TQStringList& projects,
+NewForm::NewForm( TQWidget *parent, const TQStringList& projects,
const TQString& currentProject, const TQString &templatePath )
- : NewFormBase( tqparent, 0, TRUE )
+ : NewFormBase( parent, 0, TRUE )
{
connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
diff --git a/kdevdesigner/designer/newformimpl.h b/kdevdesigner/designer/newformimpl.h
index 1ef5c1db..d8206bff 100644
--- a/kdevdesigner/designer/newformimpl.h
+++ b/kdevdesigner/designer/newformimpl.h
@@ -147,7 +147,7 @@ class NewForm : public NewFormBase
public:
NewForm( TQIconView *templateView, const TQString &templatePath );
- NewForm( TQWidget *tqparent, const TQStringList& projects,
+ NewForm( TQWidget *parent, const TQStringList& projects,
const TQString& currentProject, const TQString &templatePath );
void insertTemplates( TQIconView*, const TQString& );
void accept();
diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp
index 28f744b0..ad1cab22 100644
--- a/kdevdesigner/designer/outputwindow.cpp
+++ b/kdevdesigner/designer/outputwindow.cpp
@@ -44,8 +44,8 @@ bool debugToStderr = FALSE;
TQtMsgHandler OutputWindow::oldMsgHandler = 0;
-OutputWindow::OutputWindow( TQWidget *tqparent )
- : TQTabWidget( tqparent, "output_window" ), debugView( 0 ), errorView( 0 )
+OutputWindow::OutputWindow( TQWidget *parent )
+ : TQTabWidget( parent, "output_window" ), debugView( 0 ), errorView( 0 )
{
setupDebug();
setupError();
@@ -175,9 +175,9 @@ void OutputWindow::currentErrorChanged( TQListViewItem *i )
-ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line,
+ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line,
const TQString &locationString, TQObject *locationObject )
- : TQListViewItem( tqparent, after )
+ : TQListViewItem( parent, after )
{
setMultiLinesEnabled( TRUE );
TQString m( message );
@@ -190,8 +190,8 @@ ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQStrin
object = locationObject;
read = !after;
if ( !after ) {
- tqparent->setSelected( this, TRUE );
- tqparent->setCurrentItem( this );
+ parent->setSelected( this, TRUE );
+ parent->setCurrentItem( this );
}
}
diff --git a/kdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h
index 9e1a5aaf..04ebc065 100644
--- a/kdevdesigner/designer/outputwindow.h
+++ b/kdevdesigner/designer/outputwindow.h
@@ -41,7 +41,7 @@ class ErrorItem : public TQListViewItem
public:
enum Type { Error, Warning };
- ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line,
+ ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line,
const TQString &locationString, TQObject *locationObject );
void paintCell( TQPainter *, const TQColorGroup & cg,
@@ -65,7 +65,7 @@ class OutputWindow : public TQTabWidget
TQ_OBJECT
public:
- OutputWindow( TQWidget *tqparent );
+ OutputWindow( TQWidget *parent );
~OutputWindow();
void setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines,
diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
index bf05e0e5..e8c780fc 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
+++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
@@ -65,9 +65,9 @@ void BoldListBoxText::paint( TQPainter* painter )
TQListBoxText::paint( painter );
}
-PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent,
+PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent,
const char * name, bool modal, WFlags f )
- : PaletteEditorAdvancedBase( tqparent, name, modal, f ), formWindow( fw ), selectedPalette(0)
+ : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0)
{
connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
@@ -619,10 +619,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( BackgroundMode mode )
}
TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init,
- BackgroundMode mode, TQWidget* tqparent,
+ BackgroundMode mode, TQWidget* parent,
const char* name, FormWindow *fw )
{
- PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, tqparent, name, TRUE );
+ PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, TRUE );
dlg->setupBackgroundMode( mode );
if ( init != TQPalette() )
diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.h b/kdevdesigner/designer/paletteeditoradvancedimpl.h
index 477a5a79..651c407b 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.h
+++ b/kdevdesigner/designer/paletteeditoradvancedimpl.h
@@ -36,12 +36,12 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase
Q_OBJECT
TQ_OBJECT
public:
- PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent=0, const char * name=0,
+ PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0,
bool modal=FALSE, WFlags f=0 );
~PaletteEditorAdvanced();
static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground,
- TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 );
+ TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 );
protected slots:
void paletteSelected(int);
diff --git a/kdevdesigner/designer/paletteeditorimpl.cpp b/kdevdesigner/designer/paletteeditorimpl.cpp
index edeba05f..ae0cf7fd 100644
--- a/kdevdesigner/designer/paletteeditorimpl.cpp
+++ b/kdevdesigner/designer/paletteeditorimpl.cpp
@@ -36,8 +36,8 @@
#include <tqapplication.h>
#include <tqpushbutton.h>
-PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * tqparent, const char * name, bool modal, WFlags f )
- : PaletteEditorBase( tqparent, name, modal, f ), formWindow( fw )
+PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f )
+ : PaletteEditorBase( parent, name, modal, f ), formWindow( fw )
{
connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
@@ -281,9 +281,9 @@ TQPalette PaletteEditor::pal() const
}
TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, BackgroundMode mode,
- TQWidget* tqparent, const char* name, FormWindow *fw )
+ TQWidget* parent, const char* name, FormWindow *fw )
{
- PaletteEditor* dlg = new PaletteEditor( fw, tqparent, name, TRUE );
+ PaletteEditor* dlg = new PaletteEditor( fw, parent, name, TRUE );
dlg->setupBackgroundMode( mode );
if ( init != TQPalette() )
diff --git a/kdevdesigner/designer/paletteeditorimpl.h b/kdevdesigner/designer/paletteeditorimpl.h
index ed1756ed..285dc7a3 100644
--- a/kdevdesigner/designer/paletteeditorimpl.h
+++ b/kdevdesigner/designer/paletteeditorimpl.h
@@ -37,11 +37,11 @@ class PaletteEditor : public PaletteEditorBase
TQ_OBJECT
public:
- PaletteEditor( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, bool modal=FALSE, WFlags f=0 );
+ PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 );
~PaletteEditor();
static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground,
- TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 );
+ TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 );
protected slots:
void onChooseMainColor();
diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp
index 6992bc77..1da0557b 100644
--- a/kdevdesigner/designer/pixmapchooser.cpp
+++ b/kdevdesigner/designer/pixmapchooser.cpp
@@ -56,8 +56,8 @@
static ImageIconProvider *imageIconProvider = 0;
#endif
-PixmapView::PixmapView( TQWidget *tqparent )
- : TQScrollView( tqparent )
+PixmapView::PixmapView( TQWidget *parent )
+ : TQScrollView( parent )
{
viewport()->setBackgroundMode( PaletteBase );
}
@@ -105,7 +105,7 @@ static void buildImageFormatList( TQString &filter, TQString &all )
filter += tqApp->translate( "qChoosePixmap", "All Files (*)" );
}
-TQStringList qChoosePixmaps( TQWidget *tqparent )
+TQStringList qChoosePixmaps( TQWidget *parent )
{
/* if ( !imageIconProvider && !TQFileDialog::iconProvider() )
TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) );
@@ -114,7 +114,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent )
TQString all;
buildImageFormatList( filter, all );
- TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE );
+ TQFileDialog fd( TQString(), filter, parent, 0, TRUE );
fd.setMode( TQFileDialog::ExistingFiles );
fd.setContentsPreviewEnabled( TRUE );
PixmapView *pw = new PixmapView( &fd );
@@ -126,7 +126,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent )
return fd.selectedFiles();
return TQStringList();*/
TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading );
- KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true);
+ KFileDialog dlg(TQString(), mimetypes.join(" "), parent, "filedialog", true);
dlg.setOperationMode( KFileDialog::Opening );
dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Images..." ) );
dlg.setMode( KFile::Files );
@@ -137,7 +137,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent )
return TQStringList();
}
-TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString *fn )
+TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, TQString *fn )
{
#if defined(DESIGNER)
if ( !fw || fw->savePixmapInline() ) {
@@ -148,7 +148,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
TQString all;
buildImageFormatList( filter, all );
- TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE );
+ TQFileDialog fd( TQString(), filter, parent, 0, TRUE );
fd.setContentsPreviewEnabled( TRUE );
PixmapView *pw = new PixmapView( &fd );
fd.setContentsPreview( pw, pw );
@@ -163,7 +163,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
return pix;
}*/
TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading );
- KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true);
+ KFileDialog dlg(TQString(), mimetypes.join(" "), parent, "filedialog", true);
dlg.setOperationMode( KFileDialog::Opening );
dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
dlg.setMode( KFile::File );
@@ -178,7 +178,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
return pix;
}
} else if ( fw && fw->savePixmapInProject() ) {
- PixmapCollectionEditor dia( tqparent, 0, TRUE );
+ PixmapCollectionEditor dia( parent, 0, TRUE );
dia.setProject( fw->project() );
dia.setChooserMode( TRUE );
dia.setCurrentItem( MetaDataBase::pixmapKey( TQT_TQOBJECT(fw), old.serialNumber() ) );
@@ -188,7 +188,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
return pix;
}
} else {
- PixmapFunction dia( tqparent, 0, TRUE );
+ PixmapFunction dia( parent, 0, TRUE );
TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" );
dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) );
@@ -203,15 +203,15 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old,
}
}
#else
- Q_UNUSED( tqparent );
+ Q_UNUSED( parent );
Q_UNUSED( fw );
Q_UNUSED( old );
#endif
return TQPixmap();
}
-ImageIconProvider::ImageIconProvider( TQWidget *tqparent, const char *name )
- : TQFileIconProvider( TQT_TQOBJECT(tqparent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) )
+ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name )
+ : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) )
{
fmts = TQImage::inputFormats();
}
diff --git a/kdevdesigner/designer/pixmapchooser.h b/kdevdesigner/designer/pixmapchooser.h
index 2513a4c9..e30af751 100644
--- a/kdevdesigner/designer/pixmapchooser.h
+++ b/kdevdesigner/designer/pixmapchooser.h
@@ -41,7 +41,7 @@ class PixmapView : public TQScrollView,
TQ_OBJECT
public:
- PixmapView( TQWidget *tqparent );
+ PixmapView( TQWidget *parent );
void setPixmap( const TQPixmap &pix );
void drawContents( TQPainter *p, int, int, int, int );
void previewUrl( const TQUrl &u );
@@ -57,7 +57,7 @@ class ImageIconProvider : public TQFileIconProvider
TQ_OBJECT
public:
- ImageIconProvider( TQWidget *tqparent = 0, const char *name = 0 );
+ ImageIconProvider( TQWidget *parent = 0, const char *name = 0 );
~ImageIconProvider();
const TQPixmap *pixmap( const TQFileInfo &fi );
@@ -68,7 +68,7 @@ private:
};
-TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 );
-TQStringList qChoosePixmaps( TQWidget *tqparent );
+TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 );
+TQStringList qChoosePixmaps( TQWidget *parent );
#endif
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index 78fe0aca..7770dcda 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -54,7 +54,7 @@
class PopupMenuEditorItemPtrDrag : public TQStoredDrag
{
public:
- PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * tqparent = 0,
+ PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * parent = 0,
const char * name = 0 );
~PopupMenuEditorItemPtrDrag() {};
static bool canDecode( TQDragMoveEvent * e );
@@ -64,8 +64,8 @@ public:
// Drag Object Implementation ---------------------------------------
PopupMenuEditorItemPtrDrag::PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item,
- TQWidget * tqparent, const char * name )
- : TQStoredDrag( "qt/popupmenueditoritemptr", tqparent, name )
+ TQWidget * parent, const char * name )
+ : TQStoredDrag( "qt/popupmenueditoritemptr", parent, name )
{
TQByteArray data( sizeof( TQ_LONG ) );
TQDataStream stream( data, IO_WriteOnly );
@@ -95,8 +95,8 @@ bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem **
// PopupMenuEditorItem Implementation -----------------------------------
-PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ),
+PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * parent, const char * name )
+ : TQObject( parent, name ),
a( 0 ),
s( 0 ),
m( menu ),
@@ -110,8 +110,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqp
PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu,
- TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ),
+ TQObject * parent, const char * name )
+ : TQObject( parent, name ),
a( action ),
s( 0 ),
m( menu ),
@@ -126,8 +126,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * m
}
PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu,
- TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ),
+ TQObject * parent, const char * name )
+ : TQObject( parent, name ),
a( item->a ),
s( 0 ),
m( menu ),
@@ -255,10 +255,10 @@ PopupMenuEditorItem * PopupMenuEditor::draggedItem = 0;
int PopupMenuEditor::clipboardOperation = 0;
PopupMenuEditorItem * PopupMenuEditor::clipboardItem = 0;
-PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const char * name )
+PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * parent, const char * name )
: TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase | WResizeNoErase ),
formWnd( fw ),
- parentMenu( tqparent ),
+ parentMenu( parent ),
iconWidth( 0 ),
textWidth( 0 ),
accelWidth( 0 ),
@@ -271,10 +271,10 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const ch
}
PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu,
- TQWidget * tqparent, const char * name )
+ TQWidget * parent, const char * name )
: TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase ),
formWnd( fw ),
- parentMenu( tqparent ),
+ parentMenu( parent ),
iconWidth( menu->iconWidth ),
textWidth( menu->textWidth ),
accelWidth( menu->accelWidth ),
@@ -338,7 +338,7 @@ void PopupMenuEditor::insert( PopupMenuEditorItem * item, int index )
item->s->parentMenu = this;
resizeToContents();
if ( isVisible() && parentMenu )
- parentMenu->update(); // draw arrow in tqparent menu
+ parentMenu->update(); // draw arrow in parent menu
emit inserted( item->action() );
}
diff --git a/kdevdesigner/designer/popupmenueditor.h b/kdevdesigner/designer/popupmenueditor.h
index 70d7e085..9ae4c7b0 100644
--- a/kdevdesigner/designer/popupmenueditor.h
+++ b/kdevdesigner/designer/popupmenueditor.h
@@ -41,7 +41,7 @@ class PopupMenuEditorItem : public TQObject
friend class PopupMenuEditor;
- PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * tqparent = 0, const char * name = 0 );
+ PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * parent = 0, const char * name = 0 );
public:
enum ItemType {
@@ -51,9 +51,9 @@ public:
};
PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu,
- TQObject * tqparent = 0, const char * name = 0 );
+ TQObject * parent = 0, const char * name = 0 );
PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu,
- TQObject * tqparent = 0, const char * name = 0 );
+ TQObject * parent = 0, const char * name = 0 );
~PopupMenuEditorItem();
void init();
@@ -108,8 +108,8 @@ class PopupMenuEditor : public TQWidget
friend class Resource;
public:
- PopupMenuEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 );
- PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * tqparent, const char * name = 0 );
+ PopupMenuEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 );
+ PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * parent, const char * name = 0 );
~PopupMenuEditor();
void init();
diff --git a/kdevdesigner/designer/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp
index 1722d765..c63e994f 100644
--- a/kdevdesigner/designer/previewframe.cpp
+++ b/kdevdesigner/designer/previewframe.cpp
@@ -29,8 +29,8 @@
#include "previewframe.h"
-PreviewFrame::PreviewFrame( TQWidget *tqparent, const char *name )
- : TQVBox( tqparent, name )
+PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
+ : TQVBox( parent, name )
{
setMinimumSize(200, 200);
setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
diff --git a/kdevdesigner/designer/previewframe.h b/kdevdesigner/designer/previewframe.h
index 23af94ad..97d3741b 100644
--- a/kdevdesigner/designer/previewframe.h
+++ b/kdevdesigner/designer/previewframe.h
@@ -37,8 +37,8 @@ class PreviewWorkspace : public TQWorkspace
Q_OBJECT
TQ_OBJECT
public:
- PreviewWorkspace( TQWidget* tqparent = 0, const char* name = 0 )
- : TQWorkspace( tqparent, name ) {}
+ PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 )
+ : TQWorkspace( parent, name ) {}
~PreviewWorkspace() {}
protected:
@@ -51,7 +51,7 @@ class PreviewFrame : public TQVBox
TQ_OBJECT
public:
- PreviewFrame( TQWidget *tqparent = 0, const char *name = 0 );
+ PreviewFrame( TQWidget *parent = 0, const char *name = 0 );
void setPreviewPalette(TQPalette);
private:
diff --git a/kdevdesigner/designer/previewwidgetimpl.cpp b/kdevdesigner/designer/previewwidgetimpl.cpp
index 3279b284..d574f9ae 100644
--- a/kdevdesigner/designer/previewwidgetimpl.cpp
+++ b/kdevdesigner/designer/previewwidgetimpl.cpp
@@ -27,8 +27,8 @@
#include "tqobjectlist.h"
#include "previewwidgetimpl.h"
-PreviewWidget::PreviewWidget( TQWidget *tqparent, const char *name )
- : PreviewWidgetBase( tqparent, name )
+PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
+ : PreviewWidgetBase( parent, name )
{
// install event filter on child widgets
TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING);
diff --git a/kdevdesigner/designer/previewwidgetimpl.h b/kdevdesigner/designer/previewwidgetimpl.h
index 49f56875..a10a4623 100644
--- a/kdevdesigner/designer/previewwidgetimpl.h
+++ b/kdevdesigner/designer/previewwidgetimpl.h
@@ -35,7 +35,7 @@ class PreviewWidget : public PreviewWidgetBase
TQ_OBJECT
public:
- PreviewWidget( TQWidget *tqparent = 0, const char *name = 0 );
+ PreviewWidget( TQWidget *parent = 0, const char *name = 0 );
void closeEvent(TQCloseEvent *);
bool eventFilter(TQObject *, TQEvent *);
diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp
index d96bd4dd..1410361d 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/kdevdesigner/designer/project.cpp
@@ -1300,8 +1300,8 @@ void Project::addObject( TQObject *o )
fakeFormFiles.insert( (void*)o, ff );
MetaDataBase::addEntry( o );
if ( hasGUI() ) {
- TQWidget *tqparent = MainWindow::self ? MainWindow::self->qWorkspace() : 0;
- FormWindow *fw = new FormWindow( ff, MainWindow::self, tqparent, "qt_fakewindow" );
+ TQWidget *parent = MainWindow::self ? MainWindow::self->qWorkspace() : 0;
+ FormWindow *fw = new FormWindow( ff, MainWindow::self, parent, "qt_fakewindow" );
fw->setProject( this );
if ( TQFile::exists( ff->absFileName() ) )
Resource::loadExtraSource( ff, ff->absFileName(),
@@ -1460,12 +1460,12 @@ bool Project::hasParentObject( TQObject *o )
TQString Project::qualifiedName( TQObject *o )
{
TQString name = o->name();
- TQObject *p = o->tqparent();
+ TQObject *p = o->parent();
while ( p ) {
name.prepend( TQString( p->name() ) + "." );
if ( objs.findRef( p ) != -1 )
break;
- p = p->tqparent();
+ p = p->parent();
}
return name;
}
diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp
index b616930d..5cea9192 100644
--- a/kdevdesigner/designer/projectsettingsimpl.cpp
+++ b/kdevdesigner/designer/projectsettingsimpl.cpp
@@ -48,14 +48,14 @@
#include <tqlabel.h>
/*
- * Constructs a ProjectSettings which is a child of 'tqparent', with the
+ * Constructs a ProjectSettings which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-ProjectSettings::ProjectSettings( Project *pro, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
- : ProjectSettingsBase( tqparent, name, modal, fl ), project( pro )
+ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl )
+ : ProjectSettingsBase( parent, name, modal, fl ), project( pro )
{
connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
diff --git a/kdevdesigner/designer/projectsettingsimpl.h b/kdevdesigner/designer/projectsettingsimpl.h
index 301ceb70..5928a9a4 100644
--- a/kdevdesigner/designer/projectsettingsimpl.h
+++ b/kdevdesigner/designer/projectsettingsimpl.h
@@ -40,7 +40,7 @@ class ProjectSettings : public ProjectSettingsBase
TQ_OBJECT
public:
- ProjectSettings( Project *pro, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~ProjectSettings();
protected slots:
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 6535ef7f..402c1117 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -167,7 +167,7 @@ bool PropertyWhatsThis::clicked( const TQString& href )
*/
/*! If this item should be a child of another property item, specify
- \a prop as the tqparent item.
+ \a prop as the parent item.
*/
PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName )
@@ -308,7 +308,7 @@ bool PropertyItem::hasSubItems() const
return FALSE;
}
-/*! Returns the tqparent property item here if this is a child or 0
+/*! Returns the parent property item here if this is a child or 0
otherwise.
*/
@@ -2592,8 +2592,8 @@ void PropertyKeysequenceItem::setValue( const TQVariant &v )
// --------------------------------------------------------------
-EnumPopup::EnumPopup( TQWidget *tqparent, const char *name, WFlags f )
- : TQFrame( tqparent, name, f )
+EnumPopup::EnumPopup( TQWidget *parent, const char *name, WFlags f )
+ : TQFrame( parent, name, f )
{
setLineWidth( 1 );
setFrameStyle( Panel | Plain );
@@ -2654,8 +2654,8 @@ TQValueList<EnumItem> EnumPopup::enumList() const
return itemList;
}
-EnumBox::EnumBox( TQWidget *tqparent, const char *name )
- : TQComboBox( tqparent, name )
+EnumBox::EnumBox( TQWidget *parent, const char *name )
+ : TQComboBox( parent, name )
{
pop = new EnumPopup( this, "popup", TQObject::WType_Popup );
connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) );
@@ -2730,7 +2730,7 @@ void EnumBox::popup()
popupShown = FALSE;
return;
}
- pop->move( ((TQWidget*)tqparent())->mapToGlobal( tqgeometry().bottomLeft() ) );
+ pop->move( ((TQWidget*)parent())->mapToGlobal( tqgeometry().bottomLeft() ) );
pop->setMinimumWidth( width() );
emit aboutToShowPopup();
pop->show();
@@ -3153,8 +3153,8 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case)
if ( !editor->widget()->isWidgetType() ||
- !editor->widget()->tqparent() ||
- !::tqqt_cast<TQButtonGroup*>(editor->widget()->tqparent()) )
+ !editor->widget()->parent() ||
+ !::tqqt_cast<TQButtonGroup*>(editor->widget()->parent()) )
continue;
}
@@ -3916,8 +3916,8 @@ PropertyList::LastEventType PropertyList::lastEvent()
}
// ------------------------------------------------------------
-EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e )
- : HierarchyList( tqparent, fw, TRUE ), editor( e )
+EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e )
+ : HierarchyList( parent, fw, TRUE ), editor( e )
{
header()->hide();
removeColumn( 1 );
@@ -3991,7 +3991,7 @@ extern TQListViewItem *newItem;
void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
{
TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) );
- if ( !i || i->tqparent() )
+ if ( !i || i->parent() )
return;
TQString s;
if ( !formWindow->project()->isCpp() ) {
@@ -4014,7 +4014,7 @@ void EventList::setCurrent( TQWidget * )
void EventList::objectClicked( TQListViewItem *i )
{
- if ( !i || !i->tqparent() )
+ if ( !i || !i->parent() )
return;
// formWindow->clearSelection(false);
formWindow->mainWindow()->part()->emitEditFunction(formWindow->fileName(), i->text( 0 ));
@@ -4034,20 +4034,20 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
if ( res == NEW_ITEM ) {
TQString s;
if ( !formWindow->project()->isCpp() ) {
- TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 );
+ TQString s1 = ( i->parent() ? i->parent() : i )->text( 0 );
int pt = s1.find( "(" );
if ( pt != -1 )
s1 = s1.left( pt );
s = TQString( editor->widget()->name() ) + "_" + s1;
} else {
- s = TQString( editor->widget()->name() ) + "_" + ( i->tqparent() ? i->tqparent() : i )->text( 0 );
+ s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 );
}
- insertEntry( i->tqparent() ? i->tqparent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s );
- } else if ( res == DEL_ITEM && i->tqparent() ) {
+ insertEntry( i->parent() ? i->parent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s );
+ } else if ( res == DEL_ITEM && i->parent() ) {
MetaDataBase::Connection conn;
conn.sender = editor->widget();
conn.receiver = TQT_TQOBJECT(formWindow->mainContainer());
- conn.signal = i->tqparent()->text( 0 );
+ conn.signal = i->parent()->text( 0 );
conn.slot = i->text( 0 );
delete i;
RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n( "Remove Connection" ),
@@ -4063,9 +4063,9 @@ void EventList::renamed( TQListViewItem *i )
{
if ( newItem == i )
newItem = 0;
- if ( !i->tqparent() )
+ if ( !i->parent() )
return;
- TQListViewItem *itm = i->tqparent()->firstChild();
+ TQListViewItem *itm = i->parent()->firstChild();
bool del = FALSE;
while ( itm ) {
if ( itm != i && itm->text( 0 ) == i->text( 0 ) ) {
@@ -4081,7 +4081,7 @@ void EventList::renamed( TQListViewItem *i )
MetaDataBase::Connection conn;
conn.sender = editor->widget();
conn.receiver = TQT_TQOBJECT(formWindow->mainContainer());
- conn.signal = i->tqparent()->text( 0 );
+ conn.signal = i->parent()->text( 0 );
conn.slot = i->text( 0 );
AddConnectionCommand *cmd = new AddConnectionCommand( i18n( "Add Connection" ),
formWindow,
@@ -4091,7 +4091,7 @@ void EventList::renamed( TQListViewItem *i )
// exists and if we can connect to this one
TQString funcname = i->text( 0 ).latin1();
if ( funcname.find( '(' ) == -1 ) { // try to create a signature
- TQString sig = i->tqparent()->text( 0 );
+ TQString sig = i->parent()->text( 0 );
sig = sig.mid( sig.find( '(' ) + 1 );
sig.remove( (int)sig.length() - 1, 1 );
LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() );
@@ -4138,8 +4138,8 @@ void EventList::save( TQListViewItem *p )
listview for editing properties.
*/
-PropertyEditor::PropertyEditor( TQWidget *tqparent )
- : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
+PropertyEditor::PropertyEditor( TQWidget *parent )
+ : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
WStyle_StaysOnTop | WStyle_Tool |WStyle_MinMax | WStyle_SysMenu )
{
setCaption( i18n( "Property Editor" ) );
diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h
index 9c3250d2..1b0fcc85 100644
--- a/kdevdesigner/designer/propertyeditor.h
+++ b/kdevdesigner/designer/propertyeditor.h
@@ -593,7 +593,7 @@ class EnumPopup : public TQFrame
TQ_OBJECT
public:
- EnumPopup( TQWidget *tqparent, const char *name, WFlags f=0 );
+ EnumPopup( TQWidget *parent, const char *name, WFlags f=0 );
~EnumPopup();
void insertEnums( TQValueList<EnumItem> lst );
TQValueList<EnumItem> enumList() const;
@@ -618,7 +618,7 @@ class EnumBox : public TQComboBox
TQ_OBJECT
public:
- EnumBox( TQWidget *tqparent, const char *name = 0 );
+ EnumBox( TQWidget *parent, const char *name = 0 );
~EnumBox() {}
void setText( const TQString &text );
void insertEnums( TQValueList<EnumItem> lst );
@@ -743,7 +743,7 @@ class EventList : public HierarchyList
TQ_OBJECT
public:
- EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e );
+ EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e );
void setup();
void setCurrent( TQWidget *w );
@@ -771,7 +771,7 @@ class PropertyEditor : public TQTabWidget
TQ_OBJECT
public:
- PropertyEditor( TQWidget *tqparent );
+ PropertyEditor( TQWidget *parent );
TQObject *widget() const;
diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp
index 0c7bd57d..7407370c 100644
--- a/kdevdesigner/designer/qcompletionedit.cpp
+++ b/kdevdesigner/designer/qcompletionedit.cpp
@@ -30,8 +30,8 @@
#include <tqapplication.h>
#include <tqvbox.h>
-QCompletionEdit::QCompletionEdit( TQWidget *tqparent, const char *name )
- : TQLineEdit( tqparent, name ), aAdd( FALSE ), caseSensitive( FALSE )
+QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name )
+ : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE )
{
popup = new TQVBox( 0, 0, WType_Popup );
popup->setFrameStyle( TQFrame::Box | TQFrame::Plain );
diff --git a/kdevdesigner/designer/qcompletionedit.h b/kdevdesigner/designer/qcompletionedit.h
index 6e7ba455..08df157f 100644
--- a/kdevdesigner/designer/qcompletionedit.h
+++ b/kdevdesigner/designer/qcompletionedit.h
@@ -41,7 +41,7 @@ class QCompletionEdit : public TQLineEdit
TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
public:
- QCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 );
+ QCompletionEdit( TQWidget *parent = 0, const char *name = 0 );
bool autoAdd() const;
TQStringList completionList() const;
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index 74ef9862..0d83cb1e 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -761,7 +761,7 @@ TQString Resource::copy()
}
-void Resource::paste( const TQString &cb, TQWidget *tqparent )
+void Resource::paste( const TQString &cb, TQWidget *parent )
{
if ( !formwindow )
return;
@@ -795,30 +795,30 @@ void Resource::paste( const TQString &cb, TQWidget *tqparent )
formwindow->clearSelection( FALSE );
while ( !firstWidget.isNull() ) {
if ( firstWidget.tagName() == "widget" ) {
- TQWidget *w = (TQWidget*)createObject( firstWidget, tqparent, 0 );
+ TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 );
if ( !w )
continue;
widgets.append( w );
int x = w->x() + formwindow->grid().x();
int y = w->y() + formwindow->grid().y();
- if ( w->x() + w->width() > tqparent->width() )
- x = TQMAX( 0, tqparent->width() - w->width() );
- if ( w->y() + w->height() > tqparent->height() )
- y = TQMAX( 0, tqparent->height() - w->height() );
+ if ( w->x() + w->width() > parent->width() )
+ x = TQMAX( 0, parent->width() - w->width() );
+ if ( w->y() + w->height() > parent->height() )
+ y = TQMAX( 0, parent->height() - w->height() );
if ( x != w->x() || y != w->y() )
w->move( x, y );
formwindow->selectWidget( TQT_TQOBJECT(w) );
} else if ( firstWidget.tagName() == "spacer" ) {
- TQWidget *w = createSpacer( firstWidget, tqparent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal );
+ TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal );
if ( !w )
continue;
widgets.append( w );
int x = w->x() + formwindow->grid().x();
int y = w->y() + formwindow->grid().y();
- if ( w->x() + w->width() > tqparent->width() )
- x = TQMAX( 0, tqparent->width() - w->width() );
- if ( w->y() + w->height() > tqparent->height() )
- y = TQMAX( 0, tqparent->height() - w->height() );
+ if ( w->x() + w->width() > parent->width() )
+ x = TQMAX( 0, parent->width() - w->width() );
+ if ( w->y() + w->height() > parent->height() )
+ y = TQMAX( 0, parent->height() - w->height() );
if ( x != w->x() || y != w->y() )
w->move( x, y );
formwindow->selectWidget( TQT_TQOBJECT(w) );
@@ -1756,7 +1756,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c )
ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl;
}
-TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout )
+TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout )
{
lastItem = 0;
TQDomElement n = e.firstChild().toElement();
@@ -1774,7 +1774,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING );
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
- TQString parentClassName = WidgetFactory::classNameOf( tqparent );
+ TQString parentClassName = WidgetFactory::classNameOf( parent );
bool isPlugin =
WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) );
if ( isPlugin )
@@ -1782,7 +1782,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
// ### TODO loading for custom container widgets without pages
#endif
if ( !className.isNull() ) {
- obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, 0, FALSE ));
+ obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE ));
if ( !obj ) {
TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ),
i18n( "Error loading %1.\n"
@@ -1820,21 +1820,21 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
tqlayout = 0;
if ( w && formwindow ) {
- if ( !tqparent ||
- ( !::tqqt_cast<TQTabWidget*>(tqparent) &&
- !::tqqt_cast<TQWidgetStack*>(tqparent) &&
- !::tqqt_cast<TQToolBox*>(tqparent) &&
- !::tqqt_cast<TQWizard*>(tqparent)
+ if ( !parent ||
+ ( !::tqqt_cast<TQTabWidget*>(parent) &&
+ !::tqqt_cast<TQWidgetStack*>(parent) &&
+ !::tqqt_cast<TQToolBox*>(parent) &&
+ !::tqqt_cast<TQWizard*>(parent)
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
&& !isPlugin
#endif
) )
formwindow->insertWidget( w, pasting );
- else if ( tqparent &&
- ( ::tqqt_cast<TQTabWidget*>(tqparent) ||
- ::tqqt_cast<TQWidgetStack*>(tqparent) ||
- ::tqqt_cast<TQToolBox*>(tqparent) ||
- ::tqqt_cast<TQWizard*>(tqparent)
+ else if ( parent &&
+ ( ::tqqt_cast<TQTabWidget*>(parent) ||
+ ::tqqt_cast<TQWidgetStack*>(parent) ||
+ ::tqqt_cast<TQToolBox*>(parent) ||
+ ::tqqt_cast<TQWizard*>(parent)
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
|| isPlugin
#endif
@@ -1877,18 +1877,18 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
} else if ( n.tagName() == "attribute" && w ) {
TQString attrib = n.attribute( "name" );
TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() );
- if ( ::tqqt_cast<TQTabWidget*>(tqparent) ) {
+ if ( ::tqqt_cast<TQTabWidget*>(parent) ) {
if ( attrib == "title" )
- ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() );
- } else if ( ::tqqt_cast<TQWidgetStack*>(tqparent) ) {
+ ( (TQTabWidget*)parent )->insertTab( w, v.toString() );
+ } else if ( ::tqqt_cast<TQWidgetStack*>(parent) ) {
if ( attrib == "id" )
- ( (QDesignerWidgetStack*)tqparent )->insertPage( w, v.toInt() );
- } else if ( ::tqqt_cast<TQToolBox*>(tqparent) ) {
+ ( (QDesignerWidgetStack*)parent )->insertPage( w, v.toInt() );
+ } else if ( ::tqqt_cast<TQToolBox*>(parent) ) {
if ( attrib == "label" )
- ( (TQToolBox*)tqparent )->addItem( w, v.toString() );
- } else if ( ::tqqt_cast<TQWizard*>(tqparent) ) {
+ ( (TQToolBox*)parent )->addItem( w, v.toString() );
+ } else if ( ::tqqt_cast<TQWizard*>(parent) ) {
if ( attrib == "title" )
- ( (TQWizard*)tqparent )->addPage( w, v.toString() );
+ ( (TQWizard*)parent )->addPage( w, v.toString() );
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
} else if ( isPlugin ) {
if ( attrib == "label" ) {
@@ -1899,7 +1899,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
if ( iface2 ) {
iface2->insertPage( parentClassName,
- (TQWidget*)tqparent, v.toString(), -1, w );
+ (TQWidget*)parent, v.toString(), -1, w );
iface2->release();
}
iface->release();
@@ -2104,7 +2104,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
}
}
-TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o )
+TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o )
{
TQDomElement n = e.firstChild().toElement();
int row = e.attribute( "row" ).toInt();
@@ -2117,7 +2117,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL
colspan = 1;
Spacer *spacer = (Spacer*) WidgetFactory::create( WidgetDatabase::idFromClassName("Spacer"),
- tqparent, "spacer", FALSE);
+ parent, "spacer", FALSE);
spacer->setOrientation( o );
spacer->setInteraciveMode( FALSE );
while ( !n.isNull() ) {
@@ -3000,12 +3000,12 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts
ts << makeIndent( indent ) << "</actions>" << endl;
}
-void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e )
+void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
{
TQDomElement n = e;
TQAction *a = 0;
if ( n.tagName() == "action" ) {
- a = new QDesignerAction( tqparent );
+ a = new QDesignerAction( parent );
MetaDataBase::addEntry( a );
TQDomElement n2 = n.firstChild().toElement();
bool hasMenuText = FALSE;
@@ -3022,10 +3022,10 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e )
}
n2 = n2.nextSibling().toElement();
}
- if ( !::tqqt_cast<TQAction*>(tqparent) )
+ if ( !::tqqt_cast<TQAction*>(parent) )
formwindow->actionList().append( a );
} else if ( n.tagName() == "actiongroup" ) {
- a = new QDesignerActionGroup( tqparent );
+ a = new QDesignerActionGroup( parent );
MetaDataBase::addEntry( a );
TQDomElement n2 = n.firstChild().toElement();
bool hasMenuText = FALSE;
@@ -3045,7 +3045,7 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e )
}
n2 = n2.nextSibling().toElement();
}
- if ( !::tqqt_cast<TQAction*>(tqparent) )
+ if ( !::tqqt_cast<TQAction*>(parent) )
formwindow->actionList().append( a );
}
}
diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h
index 3dd20a22..ddbffb07 100644
--- a/kdevdesigner/designer/resource.h
+++ b/kdevdesigner/designer/resource.h
@@ -77,7 +77,7 @@ public:
bool save( const TQString& filename, bool formCodeOnly = FALSE);
bool save( TQIODevice* );
- void paste( const TQString &cb, TQWidget *tqparent );
+ void paste( const TQString &cb, TQWidget *parent );
static void saveImageData( const TQImage &img, TQTextStream &ts, int indent );
static void loadCustomWidgets( const TQDomElement &e, Resource *r );
@@ -111,8 +111,8 @@ private:
void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent );
void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent );
- TQObject *createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout = 0 );
- TQWidget *createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o );
+ TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 );
+ TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o );
void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
void createColumn( const TQDomElement &e, TQWidget *widget );
void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e);
@@ -125,7 +125,7 @@ private:
void loadTabOrder( const TQDomElement &e );
void loadItem( const TQDomElement &n, TQPixmap &pix, TQString &txt, bool &hasPixmap );
void loadActions( const TQDomElement &n );
- void loadChildAction( TQObject *tqparent, const TQDomElement &e );
+ void loadChildAction( TQObject *parent, const TQDomElement &e );
void loadToolBars( const TQDomElement &n );
void loadMenuBar( const TQDomElement &n );
void loadPopupMenu( PopupMenuEditor *pm, const TQDomElement &e );
diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp
index c7134e97..6ba2ba3f 100644
--- a/kdevdesigner/designer/sizehandle.cpp
+++ b/kdevdesigner/designer/sizehandle.cpp
@@ -35,8 +35,8 @@
#include <tqlabel.h>
#include <klocale.h>
-SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s )
- : TQWidget( tqparent )
+SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
+ : TQWidget( parent )
{
active = TRUE;
setBackgroundMode( active ? PaletteText : PaletteDark );
@@ -44,7 +44,7 @@ SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s )
widget = 0;
dir =d ;
setMouseTracking( FALSE );
- formWindow = tqparent;
+ formWindow = parent;
sel = s;
updateCursor();
}
@@ -266,10 +266,10 @@ void SizeHandle::tryResize( TQWidget *w, int width, int height )
// ------------------------------------------------------------------------
-WidgetSelection::WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict )
+WidgetSelection::WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict )
: selectionDict( selDict )
{
- formWindow = tqparent;
+ formWindow = parent;
for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) {
handles.insert( i, new SizeHandle( formWindow, (SizeHandle::Direction)i, this ) );
}
diff --git a/kdevdesigner/designer/sizehandle.h b/kdevdesigner/designer/sizehandle.h
index ee089de3..12cba4df 100644
--- a/kdevdesigner/designer/sizehandle.h
+++ b/kdevdesigner/designer/sizehandle.h
@@ -44,7 +44,7 @@ class SizeHandle : public TQWidget
public:
enum Direction { LeftTop, Top, RightTop, Right, RightBottom, Bottom, LeftBottom, Left };
- SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s );
+ SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s );
void setWidget( TQWidget *w );
void setActive( bool a );
void updateCursor();
@@ -75,7 +75,7 @@ private:
class WidgetSelection
{
public:
- WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict );
+ WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict );
void setWidget( TQWidget *w, bool updateDict = TRUE );
bool isUsed() const;
diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp
index 863abaab..2850e20e 100644
--- a/kdevdesigner/designer/sourceeditor.cpp
+++ b/kdevdesigner/designer/sourceeditor.cpp
@@ -40,8 +40,8 @@
#include <tqtextstream.h>
#include "kdevdesigner_part.h"
-SourceEditor::SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface )
- : TQVBox( tqparent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 )
+SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface )
+ : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 )
{
iFace->addRef();
lIface->addRef();
diff --git a/kdevdesigner/designer/sourceeditor.h b/kdevdesigner/designer/sourceeditor.h
index e8d4cfb8..7ffaee4a 100644
--- a/kdevdesigner/designer/sourceeditor.h
+++ b/kdevdesigner/designer/sourceeditor.h
@@ -43,7 +43,7 @@ class SourceEditor : public TQVBox
TQ_OBJECT
public:
- SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface );
+ SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface );
~SourceEditor();
void setObject( TQObject *fw, Project *p );
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index 7ffb34f0..b1858859 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/kdevdesigner/designer/sourcefile.cpp
@@ -141,9 +141,9 @@ bool SourceFile::saveAs( bool ignoreModified )
ed->setCaption( i18n( "Edit %1" ).tqarg( filename ) );
setModified( TRUE );
if ( pro->isDummy() ) {
- TQObject *o = ed->tqparent();
+ TQObject *o = ed->parent();
while ( o && !o->isA( "MainWindow" ) )
- o = o->tqparent();
+ o = o->parent();
if ( o )
((MainWindow *)o)->addRecentlyOpenedFile( fn );
}
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index a85310be..72978260 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/kdevdesigner/designer/startdialogimpl.cpp
@@ -26,8 +26,8 @@
#include <klocale.h>
-FileDialog::FileDialog( const TQString &dir, TQWidget *tqparent )
- : TQFileDialog( dir, TQString(), tqparent )
+FileDialog::FileDialog( const TQString &dir, TQWidget *parent )
+ : TQFileDialog( dir, TQString(), parent )
{
}
@@ -37,8 +37,8 @@ void FileDialog::accept()
}
-StartDialog::StartDialog( TQWidget *tqparent, const TQString &templatePath )
- : StartDialogBase( tqparent, 0 )
+StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath )
+ : StartDialogBase( parent, 0 )
{
newForm = new NewForm( templateView, templatePath );
recentFiles.clear();
diff --git a/kdevdesigner/designer/startdialogimpl.h b/kdevdesigner/designer/startdialogimpl.h
index 2b5c1866..b1f67990 100644
--- a/kdevdesigner/designer/startdialogimpl.h
+++ b/kdevdesigner/designer/startdialogimpl.h
@@ -43,7 +43,7 @@ class FileDialog : public TQFileDialog
TQ_OBJECT
public:
- FileDialog( const TQString &dir, TQWidget *tqparent );
+ FileDialog( const TQString &dir, TQWidget *parent );
protected slots:
void accept();
@@ -59,7 +59,7 @@ class StartDialog : public StartDialogBase
TQ_OBJECT
public:
- StartDialog( TQWidget *tqparent, const TQString &templatePath );
+ StartDialog( TQWidget *parent, const TQString &templatePath );
void setRecentlyFiles( TQStringList& );
void setRecentlyProjects( TQStringList& );
bool showDialogInFuture() const { return showInFuture; }
diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp
index 709cb035..d2aea25f 100644
--- a/kdevdesigner/designer/styledbutton.cpp
+++ b/kdevdesigner/designer/styledbutton.cpp
@@ -38,8 +38,8 @@
#include <tqdragobject.h>
#include <tqstyle.h>
-StyledButton::StyledButton(TQWidget* tqparent, const char* name)
- : TQButton( tqparent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE )
+StyledButton::StyledButton(TQWidget* parent, const char* name)
+ : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE )
{
setMinimumSize( tqminimumSizeHint() );
setAcceptDrops( TRUE );
@@ -49,8 +49,8 @@ StyledButton::StyledButton(TQWidget* tqparent, const char* name)
setEditor( ColorEditor );
}
-StyledButton::StyledButton( const TQBrush& b, TQWidget* tqparent, const char* name, WFlags f )
- : TQButton( tqparent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 )
+StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name, WFlags f )
+ : TQButton( parent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 )
{
col = b.color();
pix = b.pixmap();
diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h
index 90f35dfe..f5a193b6 100644
--- a/kdevdesigner/designer/styledbutton.h
+++ b/kdevdesigner/designer/styledbutton.h
@@ -49,8 +49,8 @@ class StyledButton : public TQButton
public:
enum EditorType { ColorEditor, PixmapEditor };
- StyledButton( TQWidget* tqparent = 0, const char* name = 0 );
- StyledButton( const TQBrush& b, TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
+ StyledButton( TQWidget* parent = 0, const char* name = 0 );
+ StyledButton( const TQBrush& b, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
~StyledButton();
void setEditor( EditorType );
diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp
index 1027615e..4f549a28 100644
--- a/kdevdesigner/designer/tableeditorimpl.cpp
+++ b/kdevdesigner/designer/tableeditorimpl.cpp
@@ -46,8 +46,8 @@
#include <klocale.h>
-TableEditor::TableEditor( TQWidget* tqparent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
- : TableEditorBase( tqparent, name, modal, fl ),
+TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
+ : TableEditorBase( parent, name, modal, fl ),
#ifndef TQT_NO_TABLE
editTable( (TQTable*)editWidget ),
#endif
diff --git a/kdevdesigner/designer/tableeditorimpl.h b/kdevdesigner/designer/tableeditorimpl.h
index b437f4ce..280db0b1 100644
--- a/kdevdesigner/designer/tableeditorimpl.h
+++ b/kdevdesigner/designer/tableeditorimpl.h
@@ -40,7 +40,7 @@ class TableEditor : public TableEditorBase
TQ_OBJECT
public:
- TableEditor( TQWidget* tqparent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0,
+ TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0,
const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~TableEditor();
diff --git a/kdevdesigner/designer/timestamp.cpp b/kdevdesigner/designer/timestamp.cpp
index eb80c1cd..553d9e3f 100644
--- a/kdevdesigner/designer/timestamp.cpp
+++ b/kdevdesigner/designer/timestamp.cpp
@@ -30,8 +30,8 @@
class TQTimer;
-TimeStamp::TimeStamp( TQObject *tqparent, const TQString &f )
- : TQObject( tqparent ), filename( f ), autoCheck( FALSE )
+TimeStamp::TimeStamp( TQObject *parent, const TQString &f )
+ : TQObject( parent ), filename( f ), autoCheck( FALSE )
{
timer = new TQTimer( this );
connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) );
diff --git a/kdevdesigner/designer/timestamp.h b/kdevdesigner/designer/timestamp.h
index 2c41b62a..ffe71c4b 100644
--- a/kdevdesigner/designer/timestamp.h
+++ b/kdevdesigner/designer/timestamp.h
@@ -37,7 +37,7 @@ class TimeStamp : public TQObject
TQ_OBJECT
public:
- TimeStamp( TQObject *tqparent, const TQString &f );
+ TimeStamp( TQObject *parent, const TQString &f );
void setFileName( const TQString &f );
TQString fileName() const;
diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp
index 8cbf38f6..82461e91 100644
--- a/kdevdesigner/designer/variabledialogimpl.cpp
+++ b/kdevdesigner/designer/variabledialogimpl.cpp
@@ -40,8 +40,8 @@
#include <klocale.h>
-VariableDialog::VariableDialog( FormWindow *fw, TQWidget *tqparent )
- : VariableDialogBase( tqparent ), formWindow( fw )
+VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent )
+ : VariableDialogBase( parent ), formWindow( fw )
{
varView->setSorting( -1 );
TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formWindow) );
diff --git a/kdevdesigner/designer/variabledialogimpl.h b/kdevdesigner/designer/variabledialogimpl.h
index 88cb439e..b8500677 100644
--- a/kdevdesigner/designer/variabledialogimpl.h
+++ b/kdevdesigner/designer/variabledialogimpl.h
@@ -37,7 +37,7 @@ class VariableDialog : public VariableDialogBase
Q_OBJECT
TQ_OBJECT
public:
- VariableDialog( FormWindow *fw, TQWidget* tqparent = 0 );
+ VariableDialog( FormWindow *fw, TQWidget* parent = 0 );
~VariableDialog();
void setCurrentItem( TQString text );
diff --git a/kdevdesigner/designer/widgetaction.cpp b/kdevdesigner/designer/widgetaction.cpp
index 9547b049..c2ce0721 100644
--- a/kdevdesigner/designer/widgetaction.cpp
+++ b/kdevdesigner/designer/widgetaction.cpp
@@ -35,7 +35,7 @@ static TQStyle *windowsStyle = 0;
void WidgetAction::addedTo( TQWidget *w, TQWidget *container )
{
- if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->tqparent()->tqparent()) ) {
+ if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->parent()->parent()) ) {
if ( !windowsStyle )
windowsStyle = TQStyleFactory::create( "windows" );
w->setStyle( windowsStyle );
diff --git a/kdevdesigner/designer/widgetaction.h b/kdevdesigner/designer/widgetaction.h
index 78c0270e..da702468 100644
--- a/kdevdesigner/designer/widgetaction.h
+++ b/kdevdesigner/designer/widgetaction.h
@@ -35,17 +35,17 @@ class WidgetAction : public TQAction
TQ_OBJECT
public:
- WidgetAction( const TQString &grp, TQObject* tqparent,
+ WidgetAction( const TQString &grp, TQObject* parent,
const char* name = 0, bool toggle = FALSE )
- : TQAction( tqparent, name, toggle ) { init( grp ); }
+ : TQAction( parent, name, toggle ) { init( grp ); }
WidgetAction( const TQString &grp, const TQString& text,
const TQIconSet& icon, const TQString& menuText, TQKeySequence accel,
- TQObject* tqparent, const char* name = 0, bool toggle = FALSE )
- : TQAction( text, icon, menuText, accel, tqparent, name, toggle ) { init( grp ); }
+ TQObject* parent, const char* name = 0, bool toggle = FALSE )
+ : TQAction( text, icon, menuText, accel, parent, name, toggle ) { init( grp ); }
WidgetAction( const TQString &grp, const TQString& text,
- const TQString& menuText, TQKeySequence accel, TQObject* tqparent,
+ const TQString& menuText, TQKeySequence accel, TQObject* parent,
const char* name = 0, bool toggle = FALSE )
- : TQAction( text, menuText, accel, tqparent, name, toggle ) { init( grp ); }
+ : TQAction( text, menuText, accel, parent, name, toggle ) { init( grp ); }
~WidgetAction();
#if !defined(TQ_NO_USING_KEYWORD)
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index 55bb4c0d..e31f5d82 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -123,8 +123,8 @@ void TQLayoutWidget::paintEvent( TQPaintEvent* )
}
-QDesignerTabWidget::QDesignerTabWidget( TQWidget *tqparent, const char *name )
- : TQTabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE )
+QDesignerTabWidget::QDesignerTabWidget( TQWidget *parent, const char *name )
+ : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE )
{
tabBar()->setAcceptDrops( TRUE );
tabBar()->installEventFilter( this );
@@ -290,8 +290,8 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
}
-QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *tqparent, const char *name )
- : TQWidgetStack( tqparent, name )
+QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name )
+ : TQWidgetStack( parent, name )
{
prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" );
prev->setAutoRaise( TRUE );
@@ -517,12 +517,12 @@ void WidgetFactory::saveChangedProperties( TQObject *w, int id )
}
/*! Creates a widget of the type which is registered as \a id as
- child of \a tqparent. The \a name is optional. If \a init is TRUE, the
+ child of \a parent. The \a name is optional. If \a init is TRUE, the
widget is initialized with some defaults, else the plain widget is
created.
*/
-TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, bool init, const TQRect *r, Qt::Orientation orient )
+TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient )
{
TQString n = WidgetDatabase::className( id );
if ( n.isEmpty() )
@@ -536,11 +536,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b
TQWidget *w = 0;
TQString str = WidgetDatabase::createWidgetName( id );
const char *s = str.latin1();
- w = createWidget( n, tqparent, name ? name : s, init, r, orient );
+ w = createWidget( n, parent, name ? name : s, init, r, orient );
if ( ::tqqt_cast<TQScrollView*>(w) )
( (TQScrollView*)w )->disableSizeHintCaching();
if ( !w && WidgetDatabase::isCustomWidget( id ) )
- w = createCustomWidget( tqparent, name ? name : s, MetaDataBase::customWidget( id ) );
+ w = createCustomWidget( parent, name ? name : s, MetaDataBase::customWidget( id ) );
if ( !w )
return 0;
MetaDataBase::addEntry( TQT_TQOBJECT(w) );
@@ -677,30 +677,30 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
}
/*! Factory functions for creating a widget of the type \a className
- as child of \a tqparent with the name \a name.
+ as child of \a parent with the name \a name.
If \a init is TRUE, some initial default properties are set. This
has to be in sync with the initChangedProperties() function!
*/
-TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init,
+TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init,
const TQRect *r, Qt::Orientation orient )
{
if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) {
TQPushButton *b = 0;
if ( init ) {
- b = new QDesignerPushButton( tqparent, name );
+ b = new QDesignerPushButton( parent, name );
b->setText( TQString::tqfromLatin1( name ) );
} else {
- b = new QDesignerPushButton( tqparent, name );
+ b = new QDesignerPushButton( parent, name );
}
TQWidget *w = find_formwindow( b );
b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) );
return b;
} else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) {
if ( init ) {
- QDesignerToolButton *tb = new QDesignerToolButton( tqparent, name );
- if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(tqparent))) {
+ QDesignerToolButton *tb = new QDesignerToolButton( parent, name );
+ if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(parent))) {
tb->setUsesTextLabel(TRUE);
tb->setTextLabel("...");
tb->setAutoRaise(TRUE);
@@ -710,32 +710,32 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
}
return tb;
}
- return new QDesignerToolButton( tqparent, name );
+ return new QDesignerToolButton( parent, name );
} else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
if ( init ) {
- QDesignerCheckBox *cb = new QDesignerCheckBox( tqparent, name );
+ QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name );
cb->setText( TQString::tqfromLatin1( name ) );
return cb;
}
- return new QDesignerCheckBox( tqparent, name );
+ return new QDesignerCheckBox( parent, name );
} else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
if ( init ) {
- QDesignerRadioButton *rb = new QDesignerRadioButton( tqparent, name );
+ QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name );
rb->setText( TQString::tqfromLatin1( name ) );
return rb;
}
- return new QDesignerRadioButton( tqparent, name );
+ return new QDesignerRadioButton( parent, name );
} else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
if ( init )
- return new TQGroupBox( TQString::tqfromLatin1( name ), tqparent, name );
- return new TQGroupBox( tqparent, name );
+ return new TQGroupBox( TQString::tqfromLatin1( name ), parent, name );
+ return new TQGroupBox( parent, name );
} else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) {
if ( init )
- return new TQButtonGroup( TQString::tqfromLatin1( name ), tqparent, name );
- return new TQButtonGroup( tqparent, name );
+ return new TQButtonGroup( TQString::tqfromLatin1( name ), parent, name );
+ return new TQButtonGroup( parent, name );
} else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) {
#if !defined(TQT_NO_ICONVIEW)
- TQIconView* iv = new TQIconView( tqparent, name );
+ TQIconView* iv = new TQIconView( parent, name );
if ( init )
(void) new TQIconViewItem( iv, i18n( "New Item" ) );
return iv;
@@ -745,31 +745,31 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
} else if ( className == TQTABLE_OBJECT_NAME_STRING ) {
#if !defined(TQT_NO_TABLE)
if ( init )
- return new TQTable( 3, 3, tqparent, name );
- return new TQTable( tqparent, name );
+ return new TQTable( 3, 3, parent, name );
+ return new TQTable( parent, name );
#else
return 0;
#endif
#ifndef TQT_NO_SQL
} else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) {
- return new TQDataTable( tqparent, name );
+ return new TQDataTable( parent, name );
#endif //TQT_NO_SQL
} else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) {
- return new TQDateEdit( tqparent, name );
+ return new TQDateEdit( parent, name );
} else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) {
- return new TQTimeEdit( tqparent, name );
+ return new TQTimeEdit( parent, name );
} else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) {
- return new TQDateTimeEdit( tqparent, name );
+ return new TQDateTimeEdit( parent, name );
}
else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) {
- TQListBox* lb = new TQListBox( tqparent, name );
+ TQListBox* lb = new TQListBox( parent, name );
if ( init ) {
lb->insertItem( i18n( "New Item" ) );
lb->setCurrentItem( 0 );
}
return lb;
} else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) {
- TQListView *lv = new TQListView( tqparent, name );
+ TQListView *lv = new TQListView( parent, name );
lv->setSorting( -1 );
if ( init ) {
lv->addColumn( i18n( "Column 1" ) );
@@ -777,17 +777,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
}
return lv;
} else if ( className == TQLINEEDIT_OBJECT_NAME_STRING )
- return new TQLineEdit( tqparent, name );
+ return new TQLineEdit( parent, name );
else if ( className == TQSPINBOX_OBJECT_NAME_STRING )
- return new TQSpinBox( tqparent, name );
+ return new TQSpinBox( parent, name );
else if ( className == TQSPLITTER_OBJECT_NAME_STRING )
- return new TQSplitter( tqparent, name );
+ return new TQSplitter( parent, name );
else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING )
- return new TQMultiLineEdit( tqparent, name );
+ return new TQMultiLineEdit( parent, name );
else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING )
- return new TQTextEdit( tqparent, name );
+ return new TQTextEdit( parent, name );
else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" ) {
- QDesignerLabel *l = new QDesignerLabel( tqparent, name );
+ QDesignerLabel *l = new QDesignerLabel( parent, name );
if ( init ) {
l->setText( TQString::tqfromLatin1( name ) );
MetaDataBase::addEntry( TQT_TQOBJECT(l) );
@@ -795,7 +795,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
}
return l;
} else if ( className == "PixmapLabel" ) {
- QDesignerLabel *l = new QDesignerLabel( tqparent, name );
+ QDesignerLabel *l = new QDesignerLabel( parent, name );
if ( init ) {
l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) );
l->setScaledContents( TRUE );
@@ -805,11 +805,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
}
return l;
} else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
- return new TQLayoutWidget( tqparent, name );
+ return new TQLayoutWidget( parent, name );
else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) {
- TQTabWidget *tw = new QDesignerTabWidget( tqparent, name );
+ TQTabWidget *tw = new QDesignerTabWidget( parent, name );
if ( init ) {
- FormWindow *fw = find_formwindow( tqparent );
+ FormWindow *fw = find_formwindow( parent );
TQWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
tw->addTab( w, i18n("Tab 1") );
MetaDataBase::addEntry( TQT_TQOBJECT(w) );
@@ -820,9 +820,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
}
return tw;
} else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) {
- QDesignerWidgetStack *ws = new QDesignerWidgetStack( tqparent, name );
+ QDesignerWidgetStack *ws = new QDesignerWidgetStack( parent, name );
if ( init ) {
- FormWindow *fw = find_formwindow( tqparent );
+ FormWindow *fw = find_formwindow( parent );
TQWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" );
ws->insertPage( w );
MetaDataBase::addEntry( TQT_TQOBJECT(w) );
@@ -830,53 +830,53 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
}
return ws;
} else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) {
- return new TQComboBox( FALSE, tqparent, name );
+ return new TQComboBox( FALSE, parent, name );
} else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
- if ( tqparent &&
- ( ::tqqt_cast<FormWindow*>(tqparent) ||
- ::tqqt_cast<TQWizard*>(tqparent) ||
- ::tqqt_cast<TQTabWidget*>(tqparent) ||
- ::tqqt_cast<TQWidgetStack*>(tqparent) ||
- ::tqqt_cast<TQToolBox*>(tqparent) ||
- ::tqqt_cast<TQMainWindow*>(tqparent) ) ) {
- FormWindow *fw = find_formwindow( tqparent );
+ if ( parent &&
+ ( ::tqqt_cast<FormWindow*>(parent) ||
+ ::tqqt_cast<TQWizard*>(parent) ||
+ ::tqqt_cast<TQTabWidget*>(parent) ||
+ ::tqqt_cast<TQWidgetStack*>(parent) ||
+ ::tqqt_cast<TQToolBox*>(parent) ||
+ ::tqqt_cast<TQMainWindow*>(parent) ) ) {
+ FormWindow *fw = find_formwindow( parent );
if ( fw ) {
- QDesignerWidget *dw = new QDesignerWidget( fw, tqparent, name );
+ QDesignerWidget *dw = new QDesignerWidget( fw, parent, name );
MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
return dw;
}
}
- return new TQWidget( tqparent, name );
+ return new TQWidget( parent, name );
} else if ( className == TQDIALOG_OBJECT_NAME_STRING ) {
TQDialog *dia = 0;
- if ( ::tqqt_cast<FormWindow*>(tqparent) )
- dia = new QDesignerDialog( (FormWindow*)tqparent, tqparent, name );
+ if ( ::tqqt_cast<FormWindow*>(parent) )
+ dia = new QDesignerDialog( (FormWindow*)parent, parent, name );
else
- dia = new TQDialog( tqparent, name );
+ dia = new TQDialog( parent, name );
#if defined(TQT_NON_COMMERCIAL)
- if ( ::tqqt_cast<MainWindow*>(tqparent) )
+ if ( ::tqqt_cast<MainWindow*>(parent) )
#else
- if ( tqparent )
+ if ( parent )
#endif
- dia->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
+ dia->reparent( parent, TQPoint( 0, 0 ), TRUE );
return dia;
} else if ( className == TQWIZARD_OBJECT_NAME_STRING ) {
- TQWizard *wiz = new QDesignerWizard( tqparent, name );
+ TQWizard *wiz = new QDesignerWizard( parent, name );
#if defined(TQT_NON_COMMERCIAL)
- if ( ::tqqt_cast<MainWindow*>(tqparent) )
+ if ( ::tqqt_cast<MainWindow*>(parent) )
#else
- if ( tqparent )
+ if ( parent )
#endif
- wiz->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
- if ( init && ::tqqt_cast<FormWindow*>(tqparent) ) {
- QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" );
+ wiz->reparent( parent, TQPoint( 0, 0 ), TRUE );
+ if ( init && ::tqqt_cast<FormWindow*>(parent) ) {
+ QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" );
MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
wiz->addPage( dw, i18n( "Page" ) );
TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) );
}
return wiz;
} else if ( className == "Spacer" ) {
- Spacer *s = new Spacer( tqparent, name );
+ Spacer *s = new Spacer( parent, name );
MetaDataBase::addEntry( TQT_TQOBJECT(s) );
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "sizeType", TRUE );
@@ -890,17 +890,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
s->setOrientation( Qt::Horizontal );
return s;
} else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING )
- return new TQLCDNumber( tqparent, name );
+ return new TQLCDNumber( parent, name );
else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING )
- return new TQProgressBar( tqparent, name );
+ return new TQProgressBar( parent, name );
else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING )
- return new TQTextView( tqparent, name );
+ return new TQTextView( parent, name );
else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING )
- return new TQTextBrowser( tqparent, name );
+ return new TQTextBrowser( parent, name );
else if ( className == TQDIAL_OBJECT_NAME_STRING )
- return new TQDial( tqparent, name );
+ return new TQDial( parent, name );
else if ( className == TQSLIDER_OBJECT_NAME_STRING ) {
- TQSlider *s = new TQSlider( tqparent, name );
+ TQSlider *s = new TQSlider( parent, name );
if ( !r )
return s;
if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
@@ -911,7 +911,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
return s;
} else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) {
- TQScrollBar *s = new TQScrollBar( tqparent, name );
+ TQScrollBar *s = new TQScrollBar( parent, name );
if ( !r )
return s;
if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
@@ -923,12 +923,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
return s;
} else if ( className == TQFRAME_OBJECT_NAME_STRING ) {
if ( !init )
- return new TQFrame( tqparent, name );
- TQFrame *f = new TQFrame( tqparent, name );
+ return new TQFrame( parent, name );
+ TQFrame *f = new TQFrame( parent, name );
f->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
return f;
} else if ( className == "Line" ) {
- Line *l = new Line( tqparent, name );
+ Line *l = new Line( parent, name );
MetaDataBase::addEntry( TQT_TQOBJECT(l) );
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "orientation", TRUE );
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShadow", TRUE );
@@ -941,9 +941,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
l->setOrientation( Qt::Vertical );
return l;
} else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) {
- TQMainWindow *mw = new TQMainWindow( tqparent, name, 0 );
+ TQMainWindow *mw = new TQMainWindow( parent, name, 0 );
mw->setDockEnabled( TQt::DockMinimized, FALSE );
- QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)tqparent, mw, "central widget" );
+ QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, mw, "central widget" );
mw->setDockMenuEnabled( FALSE );
MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
mw->setCentralWidget( dw );
@@ -952,9 +952,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
return mw;
} else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) {
if ( !init )
- return new QDesignerToolBox( tqparent, name );
- TQToolBox *tb = new QDesignerToolBox( tqparent, name );
- FormWindow *fw = find_formwindow( tqparent );
+ return new QDesignerToolBox( parent, name );
+ TQToolBox *tb = new QDesignerToolBox( parent, name );
+ FormWindow *fw = find_formwindow( parent );
TQWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) :
new TQWidget( tb, "page1" );
tb->addItem( w, i18n("Page 1") );
@@ -967,14 +967,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
}
#ifndef TQT_NO_SQL
else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) {
- TQWidget *w = new QDesignerDataBrowser( tqparent, name );
- if ( tqparent )
- w->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
+ TQWidget *w = new QDesignerDataBrowser( parent, name );
+ if ( parent )
+ w->reparent( parent, TQPoint( 0, 0 ), TRUE );
return w;
} else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) {
- TQWidget *w = new QDesignerDataView( tqparent, name );
- if ( tqparent )
- w->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
+ TQWidget *w = new QDesignerDataView( parent, name );
+ if ( parent )
+ w->reparent( parent, TQPoint( 0, 0 ), TRUE );
return w;
}
#endif
@@ -984,7 +984,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
if ( !iface )
return 0;
- TQWidget *w = iface->create( className, tqparent, name );
+ TQWidget *w = iface->create( className, parent, name );
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
if ( init && WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( className ) ) ) {
TQWidgetContainerInterfacePrivate *iface2 = 0;
@@ -1075,7 +1075,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
while ( o ) {
if ( o->isWidgetType() )
return (TQWidget*)o;
- o = o->tqparent();
+ o = o->parent();
}
return 0;
}
@@ -1124,10 +1124,10 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w )
}
/*! Returns the actual designer widget of the container \a w. This is
- normally \a w itself, but might be a tqparent or grand tqparent of \a w
+ normally \a w itself, but might be a parent or grand parent of \a w
(e.g. when working with a tabwidget and \a w is the container which
contains and layouts childs, but the actual widget known to the
- designer is the tabwidget which is the tqparent of \a w. So this
+ designer is the tabwidget which is the parent of \a w. So this
function returns the tabwidget then.)
*/
@@ -1170,11 +1170,11 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o )
else if ( ::tqqt_cast<TQSizeGrip*>(o) )
return ( lastWasAPassiveInteractor = TRUE );
else if ( ::tqqt_cast<TQButton*>(o) &&
- ( ::tqqt_cast<TQTabBar*>(o->tqparent()) || ::tqqt_cast<TQToolBox*>(o->tqparent()) ) )
+ ( ::tqqt_cast<TQTabBar*>(o->parent()) || ::tqqt_cast<TQToolBox*>(o->parent()) ) )
return ( lastWasAPassiveInteractor = TRUE );
- else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->tqparent()) )
+ else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->parent()) )
return ( lastWasAPassiveInteractor = TRUE );
- else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->tqparent()) )
+ else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->parent()) )
return ( lastWasAPassiveInteractor = TRUE );
// else if ( ::tqqt_cast<TQDockWindowHandle*>(o) )
else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) )
@@ -1314,7 +1314,7 @@ void WidgetFactory::initChangedProperties( TQObject *o )
::tqqt_cast<TQRadioButton*>(o) ||
::tqqt_cast<TQCheckBox*>(o) ||
::tqqt_cast<TQToolButton*>(o) ) {
- if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->tqparent()))) {
+ if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) {
MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE );
MetaDataBase::setPropertyChanged( o, "textLabel", TRUE );
MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE );
@@ -1400,14 +1400,14 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget )
return FALSE;
}
-void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
+void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
{
TQString className = WidgetDatabase::className( id );
if ( className.contains( "ListBox" ) ) {
if ( !::tqqt_cast<TQListBox*>(editWidget) )
return;
- ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw );
+ ListBoxEditor *e = new ListBoxEditor( parent, editWidget, fw );
e->exec();
delete e;
return;
@@ -1417,7 +1417,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget
if ( !::tqqt_cast<TQComboBox*>(editWidget) )
return;
TQComboBox *cb = (TQComboBox*)editWidget;
- ListBoxEditor *e = new ListBoxEditor( tqparent, cb->listBox(), fw );
+ ListBoxEditor *e = new ListBoxEditor( parent, cb->listBox(), fw );
e->exec();
delete e;
cb->update();
@@ -1428,7 +1428,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget
if ( !::tqqt_cast<TQListView*>(editWidget) )
return;
TQListView *lv = (TQListView*)editWidget;
- ListViewEditor *e = new ListViewEditor( tqparent, lv, fw );
+ ListViewEditor *e = new ListViewEditor( parent, lv, fw );
e->exec();
delete e;
return;
@@ -1437,21 +1437,21 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget
if ( className.contains( "IconView" ) ) {
if ( !::tqqt_cast<TQIconView*>(editWidget) )
return;
- IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw );
+ IconViewEditor *e = new IconViewEditor( parent, editWidget, fw );
e->exec();
delete e;
return;
}
if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING ) {
- MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, tqparent, editWidget, fw );
+ MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw );
e->exec();
delete e;
return;
}
#ifndef TQT_NO_TABLE
if (::tqqt_cast<TQTable*>(editWidget) != 0) {
- TableEditor *e = new TableEditor( tqparent, editWidget, fw );
+ TableEditor *e = new TableEditor( parent, editWidget, fw );
e->exec();
delete e;
return;
@@ -1527,11 +1527,11 @@ TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propNam
return p->valueToKey( defaultValue( w, propName ).toInt() );
}
-TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w )
+TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w )
{
if ( !w )
return 0;
- return new CustomWidget( tqparent, name, w );
+ return new CustomWidget( parent, name, w );
}
TQVariant WidgetFactory::property( TQObject *w, const char *name )
@@ -1601,7 +1601,7 @@ bool TQLayoutWidget::event( TQEvent *e )
/*
This function must be called on TQLayoutWidget creation and whenever
- the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout
+ the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout
to a TQVBoxLayout), because of the (illogical) way layouting works.
*/
void TQLayoutWidget::updateSizePolicy()
@@ -1626,12 +1626,12 @@ void TQLayoutWidget::updateSizePolicy()
if ( tqlayout() ) {
/*
- parentLayout is set to the tqparent tqlayout if there is one and if it is
+ parentLayout is set to the parent tqlayout if there is one and if it is
top level, in which case layouting is illogical.
*/
TQLayout *parentLayout = 0;
- if ( tqparent() && tqparent()->isWidgetType() ) {
- parentLayout = ((TQWidget *)tqparent())->tqlayout();
+ if ( parent() && parent()->isWidgetType() ) {
+ parentLayout = ((TQWidget *)parent())->tqlayout();
if ( parentLayout &&
::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) )
parentLayout = 0;
@@ -1748,17 +1748,17 @@ CustomWidgetFactory::CustomWidgetFactory()
{
}
-TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const
+TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const
{
MetaDataBase::CustomWidget *w = MetaDataBase::customWidget( WidgetDatabase::idFromClassName( className ) );
if ( !w )
return 0;
- return WidgetFactory::createCustomWidget( tqparent, name, w );
+ return WidgetFactory::createCustomWidget( parent, name, w );
}
-QDesignerToolBox::QDesignerToolBox( TQWidget *tqparent, const char *name )
- : TQToolBox( tqparent, name )
+QDesignerToolBox::QDesignerToolBox( TQWidget *parent, const char *name )
+ : TQToolBox( parent, name )
{
}
diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h
index 43f19f7f..1bb1f1f3 100644
--- a/kdevdesigner/designer/widgetfactory.h
+++ b/kdevdesigner/designer/widgetfactory.h
@@ -60,7 +60,7 @@ class CustomWidgetFactory : public TQWidgetFactory
{
public:
CustomWidgetFactory();
- TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const;
+ TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const;
};
@@ -76,7 +76,7 @@ public:
NoLayout
};
- static TQWidget *create( int id, TQWidget *tqparent, const char *name = 0, bool init = TRUE,
+ static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE,
const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal );
static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
static void deleteLayout( TQWidget *widget );
@@ -96,7 +96,7 @@ public:
static bool hasSpecialEditor( int id, TQObject *editorWidget );
static bool hasItems( int id, TQObject *editorWidget );
- static void editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
+ static void editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
static bool canResetProperty( TQObject *w, const TQString &propName );
static bool resetProperty( TQObject *w, const TQString &propName );
@@ -110,9 +110,9 @@ public:
static TQString defaultSignal( TQObject *w );
private:
- static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init,
+ static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init,
const TQRect *r = 0, Qt::Orientation orient = Qt::Horizontal );
- static TQWidget *createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w );
+ static TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w );
static TQGuardedPtr<TQObject> *lastPassiveInteractor;
static bool lastWasAPassiveInteractor;
@@ -127,7 +127,7 @@ class QDesignerTabWidget : public TQTabWidget
TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
public:
- QDesignerTabWidget( TQWidget *tqparent, const char *name );
+ QDesignerTabWidget( TQWidget *parent, const char *name );
int currentPage() const;
void setCurrentPage( int i );
@@ -156,7 +156,7 @@ class QDesignerWidgetStack : public TQWidgetStack
TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
public:
- QDesignerWidgetStack( TQWidget *tqparent, const char *name );
+ QDesignerWidgetStack( TQWidget *parent, const char *name );
int currentPage() const;
void setCurrentPage( int i );
@@ -203,8 +203,8 @@ class QDesignerWizard : public TQWizard
TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
public:
- QDesignerWizard( TQWidget *tqparent, const char *name )
- : TQWizard( tqparent, name ), modal(FALSE) {}
+ QDesignerWizard( TQWidget *parent, const char *name )
+ : TQWizard( parent, name ), modal(FALSE) {}
int currentPageNum() const;
void setCurrentPage( int i );
@@ -242,7 +242,7 @@ class TQLayoutWidget : public TQWidget
TQ_OBJECT
public:
- TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( sizePolicy() ) {}
+ TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( sizePolicy() ) {}
TQSizePolicy sizePolicy() const;
void updateSizePolicy();
@@ -261,8 +261,8 @@ class CustomWidget : public TQWidget
TQ_OBJECT
public:
- CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw )
- : TQWidget( tqparent, name ), cusw( cw ) {
+ CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw )
+ : TQWidget( parent, name ), cusw( cw ) {
alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
tqsetSizePolicy( cw->sizePolicy );
if ( !alwaysExpand )
@@ -299,8 +299,8 @@ class Line : public TQFrame
TQ_OVERRIDE( TQRect frameRect DESIGNABLE false )
TQ_OVERRIDE( TQRect contentsRect DESIGNABLE false )
public:
- Line( TQWidget *tqparent, const char *name )
- : TQFrame( tqparent, name, WMouseNoMask ) {
+ Line( TQWidget *parent, const char *name )
+ : TQFrame( parent, name, WMouseNoMask ) {
setFrameStyle( HLine | Sunken );
}
@@ -323,8 +323,8 @@ class QDesignerLabel : public TQLabel
TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
public:
- QDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 )
- : TQLabel( tqparent, name ) { myBuddy = 0; }
+ QDesignerLabel( TQWidget *parent = 0, const char *name = 0 )
+ : TQLabel( parent, name ) { myBuddy = 0; }
void setBuddyWidget( const TQCString &b ) {
myBuddy = b;
@@ -354,9 +354,9 @@ class QDesignerWidget : public TQWidget
TQ_OBJECT
public:
- QDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name, WResizeNoErase ), formwindow( fw ) {
- need_frame = tqparent && tqparent->inherits("QDesignerWidgetStack" );
+ QDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name )
+ : TQWidget( parent, name, WResizeNoErase ), formwindow( fw ) {
+ need_frame = parent && parent->inherits("QDesignerWidgetStack" );
}
protected:
@@ -376,8 +376,8 @@ class QDesignerDialog : public TQDialog
TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
public:
- QDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name )
- : TQDialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {}
+ QDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name )
+ : TQDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {}
bool isModal() const { return modal; }
void setModal(bool b) { modal = b; }
@@ -398,8 +398,8 @@ class QDesignerToolButton : public TQToolButton
TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
public:
- QDesignerToolButton( TQWidget *tqparent, const char *name )
- : TQToolButton( tqparent, name ) {}
+ QDesignerToolButton( TQWidget *parent, const char *name )
+ : TQToolButton( parent, name ) {}
bool isInButtonGroup() const {
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
@@ -422,8 +422,8 @@ class QDesignerRadioButton : public TQRadioButton
TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
public:
- QDesignerRadioButton( TQWidget *tqparent, const char *name )
- : TQRadioButton( tqparent, name ) {}
+ QDesignerRadioButton( TQWidget *parent, const char *name )
+ : TQRadioButton( parent, name ) {}
bool isInButtonGroup() const {
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
@@ -447,8 +447,8 @@ class QDesignerPushButton : public TQPushButton
TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
public:
- QDesignerPushButton( TQWidget *tqparent, const char *name )
- : TQPushButton( tqparent, name ) {}
+ QDesignerPushButton( TQWidget *parent, const char *name )
+ : TQPushButton( parent, name ) {}
bool isInButtonGroup() const {
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
@@ -472,8 +472,8 @@ class QDesignerCheckBox : public TQCheckBox
TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
public:
- QDesignerCheckBox( TQWidget *tqparent, const char *name )
- : TQCheckBox( tqparent, name ) {}
+ QDesignerCheckBox( TQWidget *parent, const char *name )
+ : TQCheckBox( parent, name ) {}
bool isInButtonGroup() const {
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
@@ -499,7 +499,7 @@ class QDesignerToolBox : public TQToolBox
TQ_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
public:
- QDesignerToolBox( TQWidget *tqparent, const char *name );
+ QDesignerToolBox( TQWidget *parent, const char *name );
TQString itemLabel() const;
void setItemLabel( const TQString &l );
diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp
index 587f46d3..850cafef 100644
--- a/kdevdesigner/designer/wizardeditorimpl.cpp
+++ b/kdevdesigner/designer/wizardeditorimpl.cpp
@@ -38,8 +38,8 @@
#include <klocale.h>
-WizardEditor::WizardEditor( TQWidget *tqparent, TQWizard *w, FormWindow *fw )
- : WizardEditorBase( tqparent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 )
+WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
+ : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 )
{
connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
fillListBox();
diff --git a/kdevdesigner/designer/wizardeditorimpl.h b/kdevdesigner/designer/wizardeditorimpl.h
index 94a9e900..84b8c20c 100644
--- a/kdevdesigner/designer/wizardeditorimpl.h
+++ b/kdevdesigner/designer/wizardeditorimpl.h
@@ -41,7 +41,7 @@ class WizardEditor : public WizardEditorBase
TQ_OBJECT
public:
- WizardEditor( TQWidget *tqparent, TQWizard *wizard, FormWindow *fw );
+ WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw );
~WizardEditor();
protected slots:
diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp
index 664a586e..5f92b691 100644
--- a/kdevdesigner/designer/workspace.cpp
+++ b/kdevdesigner/designer/workspace.cpp
@@ -53,8 +53,8 @@
#include <klocale.h>
-WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p )
- : TQListViewItem( tqparent )
+WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
+ : TQListViewItem( parent )
{
init();
project = p;
@@ -63,8 +63,8 @@ WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p )
setExpandable( FALSE );
}
-WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf )
- : TQListViewItem( tqparent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf )
+ : TQListViewItem( parent )
{
init();
sourceFile = sf;
@@ -72,8 +72,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf )
setPixmap( 0, SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) );
}
-WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p )
- : TQListViewItem( tqparent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p )
+ : TQListViewItem( parent )
{
init();
object = o;
@@ -84,8 +84,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p
listView(), TQT_SLOT( update() ) );
}
-WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type )
- : TQListViewItem( tqparent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type )
+ : TQListViewItem( parent )
{
init();
formFile = ff;
@@ -119,8 +119,8 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
if ( type() == FormSourceType &&
( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) &&
- tqparent() && tqparent()->tqparent() && ( (WorkspaceItem*)tqparent()->tqparent() )->project &&
- ( (WorkspaceItem*)tqparent()->tqparent() )->project->isCpp() ) {
+ parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project &&
+ ( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) {
g.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
g.setColor( TQColorGroup::HighlightedText, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
} else {
@@ -252,8 +252,8 @@ TQString WorkspaceItem::key( int column, bool ) const
TQColor WorkspaceItem::backgroundColor()
{
bool b = useOddColor;
- if ( t == FormSourceType && tqparent() )
- b = ( ( WorkspaceItem*)tqparent() )->useOddColor;
+ if ( t == FormSourceType && parent() )
+ b = ( ( WorkspaceItem*)parent() )->useOddColor;
return b ? *backColor2 : *backColor1;
}
@@ -270,8 +270,8 @@ void WorkspaceItem::setAutoOpen( bool b )
autoOpen = b;
}
-Workspace::Workspace( TQWidget *tqparent, MainWindow *mw )
- : TQListView( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
+Workspace::Workspace( TQWidget *parent, MainWindow *mw )
+ : TQListView( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
WStyle_Tool | WStyle_MinMax | WStyle_SysMenu ), mainWindow( mw ),
project( 0 ), completionDirty( FALSE )
{
@@ -499,7 +499,7 @@ void Workspace::closeAutoOpenItems()
TQListViewItemIterator it( this );
for ( ; it.current(); ++it ) {
WorkspaceItem* i = (WorkspaceItem*) it.current();
- WorkspaceItem* ip = (WorkspaceItem*) i->tqparent();
+ WorkspaceItem* ip = (WorkspaceItem*) i->parent();
if ( i->type() == WorkspaceItem::FormSourceType ) {
if ( !i->isSelected() && !ip->isSelected()
&& ip->isAutoOpen() ) {
diff --git a/kdevdesigner/designer/workspace.h b/kdevdesigner/designer/workspace.h
index b3bb705e..ad88dfca 100644
--- a/kdevdesigner/designer/workspace.h
+++ b/kdevdesigner/designer/workspace.h
@@ -47,10 +47,10 @@ class WorkspaceItem : public TQListViewItem
public:
enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType, ObjectType };
- WorkspaceItem( TQListView *tqparent, Project* p );
- WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf );
- WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type t = FormFileType );
- WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p );
+ WorkspaceItem( TQListView *parent, Project* p );
+ WorkspaceItem( TQListViewItem *parent, SourceFile* sf );
+ WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType );
+ WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p );
void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
@@ -90,7 +90,7 @@ class Workspace : public TQListView
TQ_OBJECT
public:
- Workspace( TQWidget *tqparent , MainWindow *mw );
+ Workspace( TQWidget *parent , MainWindow *mw );
void setCurrentProject( Project *pro );
diff --git a/kdevdesigner/interfaces/actioninterface.h b/kdevdesigner/interfaces/actioninterface.h
index 03e1c98e..cf217ee7 100644
--- a/kdevdesigner/interfaces/actioninterface.h
+++ b/kdevdesigner/interfaces/actioninterface.h
@@ -55,12 +55,12 @@ public:
};
/*! This functions is called to create the action with the name \a
- name. \a tqparent should be used as tqparent of the action.
+ name. \a parent should be used as parent of the action.
In the implementation return the TQAction object for the action
\a name.
*/
- virtual TQAction* create( const TQString &name, TQObject* tqparent = 0 ) = 0;
+ virtual TQAction* create( const TQString &name, TQObject* parent = 0 ) = 0;
/*! In the implementation of the interface return the name of the
group of the action \a name.
diff --git a/kdevdesigner/interfaces/classbrowserinterface.h b/kdevdesigner/interfaces/classbrowserinterface.h
index d76df941..99dc4911 100644
--- a/kdevdesigner/interfaces/classbrowserinterface.h
+++ b/kdevdesigner/interfaces/classbrowserinterface.h
@@ -53,7 +53,7 @@ struct ClassBrowserInterface : public TQUnknownInterface
{
enum Type { Class, Function };
- virtual TQListView *createClassBrowser( TQWidget *tqparent ) const = 0;
+ virtual TQListView *createClassBrowser( TQWidget *parent ) const = 0;
virtual void update( const TQString &code ) const = 0;
virtual void clear() const = 0;
diff --git a/kdevdesigner/interfaces/designerinterface.h b/kdevdesigner/interfaces/designerinterface.h
index d6d980cc..d5aeebf6 100644
--- a/kdevdesigner/interfaces/designerinterface.h
+++ b/kdevdesigner/interfaces/designerinterface.h
@@ -180,7 +180,7 @@ struct DesignerFormWindow
virtual bool isModified() const = 0;
virtual void insertWidget( TQWidget * ) = 0;
virtual void removeWidget( TQWidget * ) = 0;
- virtual TQWidget *create( const char *className, TQWidget *tqparent, const char *name ) = 0;
+ virtual TQWidget *create( const char *className, TQWidget *parent, const char *name ) = 0;
virtual TQWidgetList widgets() const = 0;
virtual void undo() = 0;
virtual void redo() = 0;
@@ -209,7 +209,7 @@ struct DesignerFormWindow
virtual void setCurrentWidget( TQWidget * ) = 0;
virtual TQPtrList<TQAction> actionList() const = 0;
virtual TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel,
- TQObject* tqparent, const char* name = 0, bool toggle = FALSE ) = 0;
+ TQObject* parent, const char* name = 0, bool toggle = FALSE ) = 0;
virtual void addAction( TQAction * ) = 0;
virtual void removeAction( TQAction * ) = 0;
virtual void preview() const = 0;
diff --git a/kdevdesigner/interfaces/editorinterface.h b/kdevdesigner/interfaces/editorinterface.h
index 21a76fb1..29055324 100644
--- a/kdevdesigner/interfaces/editorinterface.h
+++ b/kdevdesigner/interfaces/editorinterface.h
@@ -62,7 +62,7 @@ struct EditorInterface : public TQUnknownInterface
};
virtual TQWidget *editor( bool readOnly,
- TQWidget *tqparent,
+ TQWidget *parent,
TQUnknownInterface *designerIface ) = 0;
virtual void setText( const TQString &txt ) = 0;
diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp
index fb05aaeb..d761a9e7 100644
--- a/kdevdesigner/plugins/languageinterfaceimpl.cpp
+++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp
@@ -33,19 +33,19 @@
#include <tqmetaobject.h>
LanguageInterfaceImpl::LanguageInterfaceImpl( TQUnknownInterface *outer )
- : tqparent( outer ), ref( 0 )
+ : parent( outer ), ref( 0 )
{
}
ulong LanguageInterfaceImpl::addRef()
{
- return tqparent ? tqparent->addRef() : ref++;
+ return parent ? parent->addRef() : ref++;
}
ulong LanguageInterfaceImpl::release()
{
- if ( tqparent )
- return tqparent->release();
+ if ( parent )
+ return parent->release();
if ( !--ref ) {
delete this;
return 0;
@@ -55,8 +55,8 @@ ulong LanguageInterfaceImpl::release()
TQRESULT LanguageInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface )
{
- if ( tqparent )
- return tqparent->queryInterface( uuid, iface );
+ if ( parent )
+ return parent->queryInterface( uuid, iface );
*iface = 0;
if ( uuid == IID_TQUnknown )
diff --git a/kdevdesigner/plugins/languageinterfaceimpl.h b/kdevdesigner/plugins/languageinterfaceimpl.h
index 56c675ae..b9db9997 100644
--- a/kdevdesigner/plugins/languageinterfaceimpl.h
+++ b/kdevdesigner/plugins/languageinterfaceimpl.h
@@ -75,7 +75,7 @@ public:
TQStrList signalNames( TQObject *obj ) const;
private:
- TQUnknownInterface *tqparent;
+ TQUnknownInterface *parent;
ulong ref;
};
diff --git a/kdevdesigner/uilib/database.cpp b/kdevdesigner/uilib/database.cpp
index 89e17a6b..2b1956a9 100644
--- a/kdevdesigner/uilib/database.cpp
+++ b/kdevdesigner/uilib/database.cpp
@@ -46,7 +46,7 @@ DatabaseSupport::DatabaseSupport()
{
con = 0;
frm = 0;
- tqparent = 0;
+ parent = 0;
}
void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o,
@@ -54,7 +54,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
{
tbl = table;
dbControls = databaseControls;
- tqparent = o;
+ parent = o;
if ( connection != "(default)" )
con = TQSqlDatabase::database( connection );
@@ -62,15 +62,15 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
con = TQSqlDatabase::database();
frm = new TQSqlForm( o, table.ascii() );
for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) {
- TQObject *chld = tqparent->child( it.key().ascii(), TQWIDGET_OBJECT_NAME_STRING );
+ TQObject *chld = parent->child( it.key().ascii(), TQWIDGET_OBJECT_NAME_STRING );
if ( !chld )
continue;
frm->insert( (TQWidget*)chld, *it );
}
}
-TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *tqparent, const char *name )
- : TQDataBrowser( tqparent, name )
+TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *parent, const char *name )
+ : TQDataBrowser( parent, name )
{
}
@@ -96,8 +96,8 @@ bool TQDesignerDataBrowser::event( TQEvent* e )
return b;
}
-TQDesignerDataView::TQDesignerDataView( TQWidget *tqparent, const char *name )
- : TQDataView( tqparent, name )
+TQDesignerDataView::TQDesignerDataView( TQWidget *parent, const char *name )
+ : TQDataView( parent, name )
{
}
diff --git a/kdevdesigner/uilib/database2.h b/kdevdesigner/uilib/database2.h
index c8881736..c0de2b3d 100644
--- a/kdevdesigner/uilib/database2.h
+++ b/kdevdesigner/uilib/database2.h
@@ -52,7 +52,7 @@ protected:
TQSqlForm* frm;
TQString tbl;
TQMap<TQString, TQString> dbControls;
- TQObject *tqparent;
+ TQObject *parent;
};
@@ -62,7 +62,7 @@ class QDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2
TQ_OBJECT
public:
- QDesignerDataBrowser2( TQWidget *tqparent, const char *name );
+ QDesignerDataBrowser2( TQWidget *parent, const char *name );
protected:
bool event( TQEvent* e );
@@ -74,7 +74,7 @@ class QDesignerDataView2 : public TQDataView, public DatabaseSupport2
TQ_OBJECT
public:
- QDesignerDataView2( TQWidget *tqparent, const char *name );
+ QDesignerDataView2( TQWidget *parent, const char *name );
protected:
bool event( TQEvent* e );
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index 842f8a92..c61584a7 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -260,7 +260,7 @@ TQWidgetFactory::~TQWidgetFactory()
/*!
Loads the \e{TQt Designer} user interface description file \a uiFile
- and returns the top-level widget in that description. \a tqparent and
+ and returns the top-level widget in that description. \a parent and
\a name are passed to the constructor of the top-level widget.
This function also performs signal and slot connections, tab
@@ -278,7 +278,7 @@ TQWidgetFactory::~TQWidgetFactory()
*/
TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector,
- TQWidget *tqparent, const char *name )
+ TQWidget *parent, const char *name )
{
setupPluginDir();
TQFile f( uiFile );
@@ -295,7 +295,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector,
return 0;
qwf_currFileName = uiFile;
- TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&f), connector, tqparent, name );
+ TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&f), connector, parent, name );
if ( !qwf_forms )
qwf_forms = new TQMap<TQWidget*, TQString>;
qwf_forms->insert( w, uiFile );
@@ -308,7 +308,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector,
Loads the user interface description from device \a dev.
*/
-TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *tqparent, const char *name )
+TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *parent, const char *name )
{
setupPluginDir();
TQWidget *w = 0;
@@ -326,12 +326,12 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
TQDataStream in( dev );
in >> magic;
if ( magic == UibMagic ) {
- w = widgetFactory->createFromUibFile( in, connector, tqparent, name );
+ w = widgetFactory->createFromUibFile( in, connector, parent, name );
} else {
in.unsetDevice();
dev->at( start );
if ( doc.setContent( dev, &errMsg, &errLine ) ) {
- w = widgetFactory->createFromUiFile( doc, connector, tqparent, name );
+ w = widgetFactory->createFromUiFile( doc, connector, parent, name );
} else {
// qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine );
}
@@ -405,7 +405,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
}
TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connector,
- TQWidget *tqparent, const char *name )
+ TQWidget *parent, const char *name )
{
DomTool::fixDocument( doc );
@@ -466,7 +466,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
if ( !imageCollection.isNull() )
loadImageCollection( imageCollection );
- createWidgetInternal( widget, tqparent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) );
+ createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) );
TQWidget *w = toplevel;
if ( !w )
return 0;
@@ -652,7 +652,7 @@ void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& i
}
void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
- TQLayout *tqparent )
+ TQLayout *parent )
{
TQCString name;
TQVariant value;
@@ -695,7 +695,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
in >> objectTag;
}
- if ( tqparent != 0 ) {
+ if ( parent != 0 ) {
TQSpacerItem *spacer;
if ( vertical ) {
spacer = new TQSpacerItem( w, h, TQSizePolicy::Minimum, sizeType );
@@ -703,18 +703,18 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
spacer = new TQSpacerItem( w, h, sizeType, TQSizePolicy::Minimum );
}
- if ( tqparent->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
- ((TQGridLayout *) tqparent)->addMultiCell( spacer, row,
+ if ( parent->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+ ((TQGridLayout *) parent)->addMultiCell( spacer, row,
row + rowspan - 1, column, column + colspan - 1,
vertical ? TQt::AlignHCenter : TQt::AlignVCenter );
} else {
- tqparent->addItem( spacer );
+ parent->addItem( spacer );
}
}
}
void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
- TQDataStream& in, TQObject *tqparent,
+ TQDataStream& in, TQObject *parent,
bool isRow )
{
TQString text;
@@ -762,13 +762,13 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
in >> objectTag;
}
- if ( tqparent != 0 ) {
- if ( tqparent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) {
- createListViewColumn( (TQListView *) tqparent, text, pixmap, clickable,
+ if ( parent != 0 ) {
+ if ( parent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) {
+ createListViewColumn( (TQListView *) parent, text, pixmap, clickable,
resizable );
#ifndef TQT_NO_TABLE
- } else if ( tqparent->inherits(TQTABLE_OBJECT_NAME_STRING) ) {
- createTableColumnOrRow( (TQTable *) tqparent, text, pixmap, field,
+ } else if ( parent->inherits(TQTABLE_OBJECT_NAME_STRING) ) {
+ createTableColumnOrRow( (TQTable *) parent, text, pixmap, field,
isRow );
#endif
}
@@ -776,7 +776,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
}
void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
- TQObject *tqparent, TQListViewItem *parentItem )
+ TQObject *parent, TQListViewItem *parentItem )
{
TQStringList texts;
TQValueList<TQPixmap> pixmaps;
@@ -786,8 +786,8 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
TQ_UINT8 objectTag;
TQListView *listView = 0;
- if ( tqparent != 0 && tqparent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) )
- tqparent = TQT_TQOBJECT((TQListView *) tqparent);
+ if ( parent != 0 && parent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) )
+ parent = TQT_TQOBJECT((TQListView *) parent);
TQListViewItem *item = 0;
if ( listView != 0 ) {
if ( parentItem == 0 ) {
@@ -804,7 +804,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
case Object_Item:
if ( listView != 0 )
d->lastItem->setOpen( TRUE );
- inputItem( strings, in, tqparent, item );
+ inputItem( strings, in, parent, item );
break;
case Object_TextProperty:
unpackCString( strings, in, name );
@@ -847,12 +847,12 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
TQString text = texts.last();
TQPixmap pixmap = pixmaps.last();
- if ( tqparent != 0 ) {
- if ( tqparent->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) ||
- tqparent->inherits(TQLISTBOX_OBJECT_NAME_STRING) ) {
- TQListBox *listBox = (TQListBox *) tqparent->qt_cast( TQLISTBOX_OBJECT_NAME_STRING );
+ if ( parent != 0 ) {
+ if ( parent->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) ||
+ parent->inherits(TQLISTBOX_OBJECT_NAME_STRING) ) {
+ TQListBox *listBox = (TQListBox *) parent->qt_cast( TQLISTBOX_OBJECT_NAME_STRING );
if ( listBox == 0 )
- listBox = ((TQComboBox *) tqparent)->listBox();
+ listBox = ((TQComboBox *) parent)->listBox();
if ( pixmap.isNull() ) {
(void) new TQListBoxText( listBox, text );
@@ -860,8 +860,8 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
(void) new TQListBoxPixmap( listBox, pixmap, text );
}
#ifndef TQT_NO_ICONVIEW
- } else if ( tqparent->inherits(TQICONVIEW_OBJECT_NAME_STRING) ) {
- (void) new TQIconViewItem( (TQIconView *) tqparent, text, pixmap );
+ } else if ( parent->inherits(TQICONVIEW_OBJECT_NAME_STRING) ) {
+ (void) new TQIconViewItem( (TQIconView *) parent, text, pixmap );
#endif
}
}
@@ -903,7 +903,7 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects,
TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
const UibStrTable& strings,
TQDataStream& in, TQWidget *ancestorWidget,
- TQObject *tqparent, TQCString className )
+ TQObject *parent, TQCString className )
{
TQObject *obj = 0;
TQWidget *widget = 0;
@@ -913,15 +913,15 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
bool isTQObject = !className.isEmpty();
if ( isTQObject ) {
- if ( tqparent != 0 ) {
- if ( tqparent->isWidgetType() ) {
- if ( tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) ) {
- parentWidget = ((TQMainWindow *) tqparent)->centralWidget();
+ if ( parent != 0 ) {
+ if ( parent->isWidgetType() ) {
+ if ( parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) ) {
+ parentWidget = ((TQMainWindow *) parent)->centralWidget();
} else {
- parentWidget = (TQWidget *) tqparent;
+ parentWidget = (TQWidget *) parent;
}
- } else if ( tqparent->inherits(TQLAYOUT_OBJECT_NAME_STRING) ) {
- parentLayout = (TQLayout *) tqparent;
+ } else if ( parent->inherits(TQLAYOUT_OBJECT_NAME_STRING) ) {
+ parentLayout = (TQLayout *) parent;
parentWidget = ancestorWidget;
}
}
@@ -929,9 +929,9 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
if ( className == TQACTION_OBJECT_NAME_STRING ) {
unpackCString( strings, in, className );
if ( className == TQACTIONGROUP_OBJECT_NAME_STRING ) {
- obj = new TQActionGroup( tqparent );
+ obj = new TQActionGroup( parent );
} else {
- obj = new TQAction( tqparent );
+ obj = new TQAction( parent );
}
} else if ( className == TQLAYOUT_OBJECT_NAME_STRING ) {
unpackCString( strings, in, className );
@@ -949,13 +949,13 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
obj = TQT_TQOBJECT(tqlayout);
} else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) {
unpackCString( strings, in, className );
- widget = ((TQMainWindow *) tqparent)->menuBar();
+ widget = ((TQMainWindow *) parent)->menuBar();
obj = TQT_TQOBJECT(widget);
} else if ( className == TQTOOLBAR_OBJECT_NAME_STRING ) {
TQ_UINT8 dock;
in >> dock;
unpackCString( strings, in, className );
- widget = new TQToolBar( TQString(), (TQMainWindow *) tqparent,
+ widget = new TQToolBar( TQString(), (TQMainWindow *) parent,
(TQt::Dock) dock );
obj = TQT_TQOBJECT(widget);
} else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
@@ -1099,7 +1099,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
break;
case Object_SubAction:
inputObject( objects, numObjects, strings, in, parentWidget,
- obj != 0 ? obj : tqparent, TQACTION_OBJECT_NAME_STRING );
+ obj != 0 ? obj : parent, TQACTION_OBJECT_NAME_STRING );
break;
case Object_SubLayout:
inputObject( objects, numObjects, strings, in, parentWidget, obj,
@@ -1117,11 +1117,11 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
if ( metAttribute > 0 ) {
if ( name == "title" ) {
- if ( tqparent != 0 ) {
- if ( tqparent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ) {
- ((TQTabWidget *) tqparent)->insertTab( widget, str );
- } else if ( tqparent->inherits(TQWIZARD_OBJECT_NAME_STRING) ) {
- ((TQWizard *) tqparent)->addPage( widget, str );
+ if ( parent != 0 ) {
+ if ( parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ) {
+ ((TQTabWidget *) parent)->insertTab( widget, str );
+ } else if ( parent->inherits(TQWIZARD_OBJECT_NAME_STRING) ) {
+ ((TQWizard *) parent)->addPage( widget, str );
}
}
}
@@ -1136,8 +1136,8 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
if ( metAttribute > 0 ) {
if ( name == "id" ) {
- if ( tqparent != 0 && tqparent->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING) )
- ((TQWidgetStack *) tqparent)->addWidget( widget, value.toInt() );
+ if ( parent != 0 && parent->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING) )
+ ((TQWidgetStack *) parent)->addWidget( widget, value.toInt() );
}
} else {
if ( obj != 0 )
@@ -1172,7 +1172,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
}
TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
- TQObject * /* connector */ , TQWidget *tqparent, const char *name )
+ TQObject * /* connector */ , TQWidget *parent, const char *name )
{
#define END_OF_BLOCK() \
( in.atEnd() || in.tqdevice()->at() >= nextBlock )
@@ -1344,7 +1344,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
break;
case Block_Widget:
toplevel = (TQWidget *)
- inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(tqparent),
+ inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(parent),
TQWIDGET_OBJECT_NAME_STRING );
if ( toplevel != 0 )
toplevel->setName( name );
@@ -1370,7 +1370,7 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory )
}
/*!
- Creates a widget of the type \a className passing \a tqparent and \a
+ Creates a widget of the type \a className passing \a parent and \a
name to its constructor.
If \a className is a widget in the TQt library, it is directly
@@ -1406,106 +1406,106 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory )
\endlist
*/
-TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent,
+TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *parent,
const char *name ) const
{
// create widgets we know
if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) {
- return new TQPushButton( tqparent, name );
+ return new TQPushButton( parent, name );
} else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) {
- return new TQToolButton( tqparent, name );
+ return new TQToolButton( parent, name );
} else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
- return new TQCheckBox( tqparent, name );
+ return new TQCheckBox( parent, name );
} else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
- return new TQRadioButton( tqparent, name );
+ return new TQRadioButton( parent, name );
} else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
- return new TQGroupBox( tqparent, name );
+ return new TQGroupBox( parent, name );
} else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) {
- return new TQButtonGroup( tqparent, name );
+ return new TQButtonGroup( parent, name );
} else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) {
#if !defined(TQT_NO_ICONVIEW)
- return new TQIconView( tqparent, name );
+ return new TQIconView( parent, name );
#endif
} else if ( className == TQTABLE_OBJECT_NAME_STRING ) {
#if !defined(TQT_NO_TABLE)
- return new TQTable( tqparent, name );
+ return new TQTable( parent, name );
#endif
} else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) {
- return new TQListBox( tqparent, name );
+ return new TQListBox( parent, name );
} else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) {
- return new TQListView( tqparent, name );
+ return new TQListView( parent, name );
} else if ( className == TQLINEEDIT_OBJECT_NAME_STRING ) {
- return new TQLineEdit( tqparent, name );
+ return new TQLineEdit( parent, name );
} else if ( className == TQSPINBOX_OBJECT_NAME_STRING ) {
- return new TQSpinBox( tqparent, name );
+ return new TQSpinBox( parent, name );
} else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING ) {
- return new TQMultiLineEdit( tqparent, name );
+ return new TQMultiLineEdit( parent, name );
} else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" || className == "PixmapLabel" ) {
- return new TQLabel( tqparent, name );
+ return new TQLabel( parent, name );
} else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
- return new TQWidget( tqparent, name );
+ return new TQWidget( parent, name );
} else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) {
- return new TQTabWidget( tqparent, name );
+ return new TQTabWidget( parent, name );
} else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) {
- return new TQComboBox( FALSE, tqparent, name );
+ return new TQComboBox( FALSE, parent, name );
} else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
if ( !qwf_stays_on_top )
- return new TQWidget( tqparent, name );
- return new TQWidget( tqparent, name, TQt::WStyle_StaysOnTop );
+ return new TQWidget( parent, name );
+ return new TQWidget( parent, name, TQt::WStyle_StaysOnTop );
} else if ( className == TQDIALOG_OBJECT_NAME_STRING ) {
if ( !qwf_stays_on_top )
- return new TQDialog( tqparent, name );
- return new TQDialog( tqparent, name, FALSE, TQt::WStyle_StaysOnTop );
+ return new TQDialog( parent, name );
+ return new TQDialog( parent, name, FALSE, TQt::WStyle_StaysOnTop );
} else if ( className == TQWIZARD_OBJECT_NAME_STRING ) {
- return new TQWizard( tqparent, name );
+ return new TQWizard( parent, name );
} else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING ) {
- return new TQLCDNumber( tqparent, name );
+ return new TQLCDNumber( parent, name );
} else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING ) {
- return new TQProgressBar( tqparent, name );
+ return new TQProgressBar( parent, name );
} else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING ) {
- return new TQTextView( tqparent, name );
+ return new TQTextView( parent, name );
} else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING ) {
- return new TQTextBrowser( tqparent, name );
+ return new TQTextBrowser( parent, name );
} else if ( className == TQDIAL_OBJECT_NAME_STRING ) {
- return new TQDial( tqparent, name );
+ return new TQDial( parent, name );
} else if ( className == TQSLIDER_OBJECT_NAME_STRING ) {
- return new TQSlider( tqparent, name );
+ return new TQSlider( parent, name );
} else if ( className == TQFRAME_OBJECT_NAME_STRING ) {
- return new TQFrame( tqparent, name );
+ return new TQFrame( parent, name );
} else if ( className == TQSPLITTER_OBJECT_NAME_STRING ) {
- return new TQSplitter( tqparent, name );
+ return new TQSplitter( parent, name );
} else if ( className == "Line" ) {
- TQFrame *f = new TQFrame( tqparent, name );
+ TQFrame *f = new TQFrame( parent, name );
f->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
return f;
} else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING ) {
- return new TQTextEdit( tqparent, name );
+ return new TQTextEdit( parent, name );
} else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) {
- return new TQDateEdit( tqparent, name );
+ return new TQDateEdit( parent, name );
} else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) {
- return new TQTimeEdit( tqparent, name );
+ return new TQTimeEdit( parent, name );
} else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) {
- return new TQDateTimeEdit( tqparent, name );
+ return new TQDateTimeEdit( parent, name );
} else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) {
- return new TQScrollBar( tqparent, name );
+ return new TQScrollBar( parent, name );
} else if ( className == TQPOPUPMENU_OBJECT_NAME_STRING ) {
- return new TQPopupMenu( tqparent, name );
+ return new TQPopupMenu( parent, name );
} else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) {
- return new TQWidgetStack( tqparent, name );
+ return new TQWidgetStack( parent, name );
} else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) {
- return new TQToolBox( tqparent, name );
+ return new TQToolBox( parent, name );
} else if ( className == TQVBOX_OBJECT_NAME_STRING ) {
- return new TQVBox( tqparent, name );
+ return new TQVBox( parent, name );
} else if ( className == TQHBOX_OBJECT_NAME_STRING ) {
- return new TQHBox( tqparent, name );
+ return new TQHBox( parent, name );
} else if ( className == TQGRID_OBJECT_NAME_STRING ) {
- return new TQGrid( 4, tqparent, name );
+ return new TQGrid( 4, parent, name );
} else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) {
TQMainWindow *mw = 0;
if ( !qwf_stays_on_top )
- mw = new TQMainWindow( tqparent, name );
+ mw = new TQMainWindow( parent, name );
else
- mw = new TQMainWindow( tqparent, name, TQt::WType_TopLevel | TQt::WStyle_StaysOnTop );
+ mw = new TQMainWindow( parent, name, TQt::WType_TopLevel | TQt::WStyle_StaysOnTop );
mw->setCentralWidget( new TQWidget( mw, "qt_central_widget" ) );
mw->centralWidget()->show();
(void)mw->statusBar();
@@ -1514,11 +1514,11 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq
}
#if !defined(TQT_NO_SQL)
else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) {
- return new TQDataTable( tqparent, name );
+ return new TQDataTable( parent, name );
} else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) {
- return new QDesignerDataBrowser2( tqparent, name );
+ return new QDesignerDataBrowser2( parent, name );
} else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) {
- return new QDesignerDataView2( tqparent, name );
+ return new QDesignerDataView2( parent, name );
}
#endif
@@ -1532,7 +1532,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq
TQInterfacePtr<WidgetInterface> iface = 0;
widgetInterfaceManager->queryInterface( className, &iface );
if ( iface ) {
- TQWidget *w = iface->create( className, tqparent, name );
+ TQWidget *w = iface->create( className, parent, name );
if ( w ) {
d->customWidgets.replace( className.latin1(), new bool(TRUE) );
return w;
@@ -1541,7 +1541,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq
// hope we have a factory which can do it
for ( TQWidgetFactory* f = widgetFactories.first(); f; f = widgetFactories.next() ) {
- TQWidget *w = f->createWidget( className, tqparent, name );
+ TQWidget *w = f->createWidget( className, parent, name );
if ( w )
return w;
}
@@ -1567,7 +1567,7 @@ bool TQWidgetFactory::supportsWidget( const TQString &widget )
return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() );
}
-TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent,
+TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent,
TQLayout* tqlayout, const TQString &classNameArg )
{
d->lastItem = 0;
@@ -1595,9 +1595,9 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
}
if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
// hide tqlayout widgets
- w = tqparent;
+ w = parent;
} else {
- obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, tqparent, 0 ));
+ obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 ));
if ( !obj )
return 0;
w = (TQWidget*)obj;
@@ -1626,8 +1626,8 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
}
}
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
- TQString parentClassName = tqparent ? tqparent->className() : 0;
- bool isPlugin = tqparent ? !!d->customWidgets.find( tqparent->className() ) : FALSE;
+ TQString parentClassName = parent ? parent->className() : 0;
+ bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE;
if ( isPlugin )
qWarning( "####### loading custom container widgets without page support not implemented!" );
// ### TODO loading for custom container widgets without pages
@@ -1682,19 +1682,19 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
} else if ( n.tagName() == "attribute" && w ) {
TQString attrib = n.attribute( "name" );
TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() );
- if ( tqparent ) {
- if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
+ if ( parent ) {
+ if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
if ( attrib == "title" )
- ( (TQTabWidget*)tqparent )->insertTab( w, translate( v.toString() ) );
- } else if ( tqparent->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
+ ( (TQTabWidget*)parent )->insertTab( w, translate( v.toString() ) );
+ } else if ( parent->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
if ( attrib == "id" )
- ( (TQWidgetStack*)tqparent )->addWidget( w, v.toInt() );
- } else if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
+ ( (TQWidgetStack*)parent )->addWidget( w, v.toInt() );
+ } else if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
if ( attrib == "label" )
- ( (TQToolBox*)tqparent )->addItem( w, v.toString() );
- } else if ( tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
+ ( (TQToolBox*)parent )->addItem( w, v.toString() );
+ } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
if ( attrib == "title" )
- ( (TQWizard*)tqparent )->addPage( w, translate( v.toString() ) );
+ ( (TQWizard*)parent )->addPage( w, translate( v.toString() ) );
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
} else if ( isPlugin ) {
if ( attrib == "label" ) {
@@ -1706,7 +1706,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
(TQUnknownInterface**)&iface2 );
if ( iface2 ) {
iface2->insertPage( parentClassName,
- (TQWidget*)tqparent, translate( v.toString() ), -1, w );
+ (TQWidget*)parent, translate( v.toString() ), -1, w );
iface2->release();
}
iface->release();
@@ -1850,8 +1850,8 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
} else if ( prop == "buddy" ) {
buddies.insert( obj->name(), value.toCString() );
} else if ( prop == "buttonGroupId" ) {
- if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->tqparent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) )
- ( (TQButtonGroup*)obj->tqparent() )->insert( (TQButton*)obj, value.toInt() );
+ if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) )
+ ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, value.toInt() );
#ifndef TQT_NO_SQL
} else if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING )
&& !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) {
@@ -2399,13 +2399,13 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis
-void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e )
+void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e )
{
TQDomElement n = e;
TQAction *a = 0;
bool hasMenuText = FALSE;
if ( n.tagName() == "action" ) {
- a = new TQAction( tqparent );
+ a = new TQAction( parent );
TQDomElement n2 = n.firstChild().toElement();
while ( !n2.isNull() ) {
@@ -2417,10 +2417,10 @@ void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e
}
n2 = n2.nextSibling().toElement();
}
- if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+ if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
actionList.append( a );
} else if ( n.tagName() == "actiongroup" ) {
- a = new TQActionGroup( tqparent );
+ a = new TQActionGroup( parent );
TQDomElement n2 = n.firstChild().toElement();
while ( !n2.isNull() ) {
if ( n2.tagName() == "property" ) {
@@ -2435,7 +2435,7 @@ void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e
}
n2 = n2.nextSibling().toElement();
}
- if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+ if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
actionList.append( a );
}
diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h
index ebdb38c0..c6770341 100644
--- a/kdevdesigner/uilib/qwidgetfactory.h
+++ b/kdevdesigner/uilib/qwidgetfactory.h
@@ -52,12 +52,12 @@ public:
TQWidgetFactory();
virtual ~TQWidgetFactory();
- static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 );
- static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 );
+ static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
+ static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
static void addWidgetFactory( TQWidgetFactory *factory );
static void loadImages( const TQString &dir );
- virtual TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const;
+ virtual TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const;
static TQStringList widgets();
static bool supportsWidget( const TQString &widget );
@@ -66,7 +66,7 @@ private:
void loadImageCollection( const TQDomElement &e );
void loadConnections( const TQDomElement &e, TQObject *connector );
void loadTabOrder( const TQDomElement &e );
- TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg );
+ TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg );
TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE );
LayoutType layoutType( TQLayout *l ) const;
void setProperty( TQObject* widget, const TQString &prop, TQVariant value );
@@ -87,7 +87,7 @@ private:
void createColumn( const TQDomElement &e, TQWidget *widget );
void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap );
void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
- void loadChildAction( TQObject *tqparent, const TQDomElement &e );
+ void loadChildAction( TQObject *parent, const TQDomElement &e );
void loadActions( const TQDomElement &e );
void loadToolBars( const TQDomElement &e );
void loadMenuBar( const TQDomElement &e );
@@ -110,21 +110,21 @@ private:
void unpackVariant( const UibStrTable& strings, TQDataStream& in,
TQVariant& value );
void inputSpacer( const UibStrTable& strings, TQDataStream& in,
- TQLayout *tqparent );
+ TQLayout *parent );
void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in,
- TQObject *tqparent, bool isRow );
+ TQObject *parent, bool isRow );
void inputItem( const UibStrTable& strings, TQDataStream& in,
- TQObject *tqparent, TQListViewItem *parentItem = 0 );
+ TQObject *parent, TQListViewItem *parentItem = 0 );
void inputMenuItem( TQObject **objects, const UibStrTable& strings,
TQDataStream& in, TQMenuBar *menuBar );
TQObject *inputObject( TQObject **objects, int& numObjects,
const UibStrTable& strings, TQDataStream& in,
- TQWidget *ancestorWidget, TQObject *tqparent,
+ TQWidget *ancestorWidget, TQObject *parent,
TQCString className = "" );
TQWidget *createFromUiFile( TQDomDocument doc, TQObject *connector,
- TQWidget *tqparent, const char *name );
+ TQWidget *parent, const char *name );
TQWidget *createFromUibFile( TQDataStream& in, TQObject *connector,
- TQWidget *tqparent, const char *name );
+ TQWidget *parent, const char *name );
private:
struct Image {