diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 6c79d50fa9fbdff7f69ca57a8ab5fcc942375593 (patch) | |
| tree | f47737d56c3239a0d8bc600674f0ca04b6e30d6e /kommander | |
| parent | 36c36b53a129509d56fdaa0a7c9fcbcacd0c5826 (diff) | |
| download | tdewebdev-6c79d50fa9fbdff7f69ca57a8ab5fcc942375593.tar.gz tdewebdev-6c79d50fa9fbdff7f69ca57a8ab5fcc942375593.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kommander')
106 files changed, 703 insertions, 703 deletions
diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno index 824c9063..52ab92a5 100644 --- a/kommander/Kommander-TODO.kno +++ b/kommander/Kommander-TODO.kno @@ -284,7 +284,7 @@ <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Georgia"> <li type="disc"><span style="font-weight:600">ChangeLog of Kommander</span></li> <li type="disc"><span style="font-style:italic">See ChangeLog file for details and dates</span></li> -<ul type="disc"><li>added @parentPid evaluated to tqparent process pid</li> +<ul type="disc"><li>added @parentPid evaluated to parent process pid</li> <li>added @pid evaluated to current process pid</li> <li>added @dcopid evaluated to current process DCOP id</li> <li>significantly improved Kommander Text editor usability</li> diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index a9437ad7..7207da73 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -72,14 +72,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 ) ); } @@ -118,8 +118,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 ) { } @@ -216,8 +216,8 @@ void QDesignerToolBar::addAction( TQAction *a ) static void fixObject( TQObject *&o ) { - while ( o && o->tqparent() && !o->tqparent()->inherits( "QDesignerToolBar" ) ) - o = o->tqparent(); + while ( o && o->parent() && !o->parent()->inherits( "QDesignerToolBar" ) ) + o = o->parent(); } bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) @@ -664,7 +664,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/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h index c041f9db..a47992cd 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -40,8 +40,8 @@ class QDesignerActionGroup : public TQActionGroup TQ_OBJECT public: - QDesignerActionGroup( TQObject *tqparent ) - : TQActionGroup( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ) {} + QDesignerActionGroup( TQObject *parent ) + : TQActionGroup( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} TQWidget *widget() const { return wid; } TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } @@ -71,10 +71,10 @@ class QDesignerAction : public TQAction TQ_OBJECT public: - QDesignerAction( TQObject *tqparent ) - : TQAction( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} - QDesignerAction( TQWidget *w, TQObject *tqparent ) - : TQAction( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} + QDesignerAction( TQObject *parent ) + : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} + QDesignerAction( TQWidget *w, TQObject *parent ) + : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} TQWidget *widget() const { return wid; } int index() const { return idx; } @@ -106,7 +106,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; } @@ -126,7 +126,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/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp index 0e4d2a8f..ededd8a7 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -37,8 +37,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 ) { listActions->addColumn( i18n("Actions" ) ); setEnabled( false ); @@ -119,7 +119,7 @@ void ActionEditor::newAction() if ( actionParent ) { if ( !actionParent->actionGroup() || !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -151,7 +151,7 @@ void ActionEditor::newActionGroup() if ( actionParent ) { if ( !actionParent->actionGroup() || !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -193,7 +193,7 @@ void ActionEditor::setFormWindow( FormWindow *fw ) setEnabled( true ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( a->tqparent() && a->tqparent()->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( a->parent() && a->parent()->inherits( TQACTION_OBJECT_NAME_STRING ) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); diff --git a/kommander/editor/actioneditorimpl.h b/kommander/editor/actioneditorimpl.h index 40ed78ac..177b5af8 100644 --- a/kommander/editor/actioneditorimpl.h +++ b/kommander/editor/actioneditorimpl.h @@ -33,7 +33,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/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp index 70b9edbe..3193d24c 100644 --- a/kommander/editor/actionlistview.cpp +++ b/kommander/editor/actionlistview.cpp @@ -24,8 +24,8 @@ #include <klocale.h> -ActionListView::ActionListView( TQWidget *tqparent, const char *name ) - : TQListView( tqparent, name ) +ActionListView::ActionListView( TQWidget *parent, const char *name ) + : TQListView( parent, name ) { header()->setStretchEnabled( true ); setRootIsDecorated( true ); diff --git a/kommander/editor/actionlistview.h b/kommander/editor/actionlistview.h index 3b9deca7..9559c262 100644 --- a/kommander/editor/actionlistview.h +++ b/kommander/editor/actionlistview.h @@ -33,10 +33,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; } @@ -56,7 +56,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/kommander/editor/asciivalidator.cpp b/kommander/editor/asciivalidator.cpp index 33381e0b..eb1dd4f1 100644 --- a/kommander/editor/asciivalidator.cpp +++ b/kommander/editor/asciivalidator.cpp @@ -22,18 +22,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/kommander/editor/asciivalidator.h b/kommander/editor/asciivalidator.h index 1c1d6c2c..d0b388a8 100644 --- a/kommander/editor/asciivalidator.h +++ b/kommander/editor/asciivalidator.h @@ -30,9 +30,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/kommander/editor/assistproc.cpp b/kommander/editor/assistproc.cpp index bfe67544..c13f8b86 100644 --- a/kommander/editor/assistproc.cpp +++ b/kommander/editor/assistproc.cpp @@ -19,8 +19,8 @@ **********************************************************************/ #include "assistproc.h" -AssistProc::AssistProc( TQObject *tqparent, const char *name, const TQString &path ) - : TQProcess( tqparent, name ) +AssistProc::AssistProc( TQObject *parent, const char *name, const TQString &path ) + : TQProcess( parent, name ) { assistantPath = path; connect( this, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(processOutput()) ); diff --git a/kommander/editor/assistproc.h b/kommander/editor/assistproc.h index 93986cef..fabc71cf 100644 --- a/kommander/editor/assistproc.h +++ b/kommander/editor/assistproc.h @@ -30,7 +30,7 @@ class AssistProc : public TQProcess Q_OBJECT TQ_OBJECT public: - AssistProc( TQObject *tqparent=0, const char * name = 0, const TQString &path = TQString() ); + AssistProc( TQObject *parent=0, const char * name = 0, const TQString &path = TQString() ); ~AssistProc(); bool run( const TQString &path = TQString() ); diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index 40a1c088..c1b8db31 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -516,7 +516,7 @@ bool SetPropertyCommand::checkProperty() return false; } - if ( widget->tqparent() && widget->tqparent()->inherits( "FormWindow" ) ) + if ( widget->parent() && widget->parent()->inherits( "FormWindow" ) ) formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->parentWidget() ); } return true; @@ -628,9 +628,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ // ------------------------------------------------------------ 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 ) { } @@ -651,9 +651,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 ) { } @@ -674,9 +674,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 ) { } @@ -697,9 +697,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 ) { } @@ -720,9 +720,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) ) ) { } @@ -1417,7 +1417,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 ) @@ -1434,7 +1434,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 ); @@ -1454,7 +1454,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/kommander/editor/command.h b/kommander/editor/command.h index d288564e..4d1a3aa5 100644 --- a/kommander/editor/command.h +++ b/kommander/editor/command.h @@ -255,7 +255,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(); @@ -271,7 +271,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(); @@ -287,7 +287,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(); @@ -303,7 +303,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(); @@ -319,7 +319,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/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 62110d73..c87b9d51 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -89,8 +89,8 @@ static const char *const ignore_signals[] = { }; -ConnectionEditor::ConnectionEditor(TQWidget* tqparent, TQObject* sndr, TQObject* rcvr, FormWindow* fw) - : ConnectionEditorBase(tqparent, 0, true), m_formWindow(fw) +ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* rcvr, FormWindow* fw) + : ConnectionEditorBase(parent, 0, true), m_formWindow(fw) { if (!rcvr || TQT_BASE_OBJECT(rcvr) == TQT_BASE_OBJECT(m_formWindow)) rcvr = TQT_TQOBJECT(m_formWindow->mainContainer()); diff --git a/kommander/editor/connectioneditorimpl.h b/kommander/editor/connectioneditorimpl.h index 35e3f2e0..7887fa0d 100644 --- a/kommander/editor/connectioneditorimpl.h +++ b/kommander/editor/connectioneditorimpl.h @@ -34,7 +34,7 @@ class ConnectionEditor : public ConnectionEditorBase Q_OBJECT TQ_OBJECT public: - ConnectionEditor(TQWidget* tqparent, TQObject* sender, TQObject* receiver, FormWindow* fw); + ConnectionEditor(TQWidget* parent, TQObject* sender, TQObject* receiver, FormWindow* fw); ~ConnectionEditor(); protected slots: diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp index 0133974a..39b3d9ca 100644 --- a/kommander/editor/filechooser.cpp +++ b/kommander/editor/filechooser.cpp @@ -4,8 +4,8 @@ #include <kfiledialog.h> #include <tqlayout.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/kommander/editor/filechooser.h b/kommander/editor/filechooser.h index df518db6..4ce2fe40 100644 --- a/kommander/editor/filechooser.h +++ b/kommander/editor/filechooser.h @@ -16,7 +16,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/kommander/editor/formsettingsimpl.cpp b/kommander/editor/formsettingsimpl.cpp index dc292102..ddfa8345 100644 --- a/kommander/editor/formsettingsimpl.cpp +++ b/kommander/editor/formsettingsimpl.cpp @@ -27,8 +27,8 @@ #include <klineedit.h> #include <tqspinbox.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 ) { MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(TQT_TQOBJECT(fw)); editAuthor->setText(info.author); diff --git a/kommander/editor/formsettingsimpl.h b/kommander/editor/formsettingsimpl.h index e8940b9d..d94a59ba 100644 --- a/kommander/editor/formsettingsimpl.h +++ b/kommander/editor/formsettingsimpl.h @@ -31,7 +31,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/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 55c1b142..7e9a3b39 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -110,8 +110,8 @@ static void restoreCursors(TQWidget *start, FormWindow *fw) 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) { ff = f; @@ -119,8 +119,8 @@ FormWindow::FormWindow(FormFile *f, MainWindow *mw, TQWidget *tqparent, const ch 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; @@ -213,14 +213,14 @@ 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); @@ -381,7 +381,7 @@ void FormWindow::insertWidget() pos -= r.topLeft(); np.append(pos); } - MoveCommand *mv = new MoveCommand(i18n("Retqparent Widgets"), this, lst, op, np, insertParent, pw); + MoveCommand *mv = new MoveCommand(i18n("Reparent Widgets"), this, lst, op, np, insertParent, pw); if (!toolFixed) mainwindow->resetTool(); else @@ -628,9 +628,9 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) if (e->button() == Qt::LeftButton) { insertParent = WidgetFactory::containerOfWidget(mainContainer()); - // default tqparent for new widget is the formwindow + // default parent for new widget is the formwindow if (!isMainContainer(TQT_TQOBJECT(w))) - { // press was not on formwindow, check if we can find another tqparent + { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { @@ -638,7 +638,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) if ((WidgetDatabase::isContainer(id) || wid == mainContainer()) && !wid->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !wid->inherits(TQSPLITTER_OBJECT_NAME_STRING)) { - insertParent = WidgetFactory::containerOfWidget(wid); // found another tqparent, store it + insertParent = WidgetFactory::containerOfWidget(wid); // found another parent, store it break; } else @@ -733,7 +733,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 + // highlight the possible new parent container TQMapConstIterator<ulong, TQPoint> it = moving.begin(); TQWidget* wa = containerAt(e->globalPos(), ((TQWidget*)it.key())); if (wa && !isMainContainer(TQT_TQOBJECT(wa)) && !isCentralWidget(TQT_TQOBJECT(wa))) @@ -1553,7 +1553,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; } @@ -1872,11 +1872,11 @@ void FormWindow::raiseWidgets() commandHistory()->addCommand(cmd); } -void FormWindow::paste(const TQString & cb, TQWidget * tqparent) +void FormWindow::paste(const TQString & cb, TQWidget * parent) { Resource resource(mainWindow()); resource.setWidget(this); - resource.paste(cb, tqparent); + resource.paste(cb, parent); } void FormWindow::selectAll() diff --git a/kommander/editor/formwindow.h b/kommander/editor/formwindow.h index 5674c46d..71fc8280 100644 --- a/kommander/editor/formwindow.h +++ b/kommander/editor/formwindow.h @@ -62,8 +62,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(); @@ -80,7 +80,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/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index ee5c6642..9ec77020 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -74,15 +74,15 @@ static const char * const folder_xpm[]={ TQListViewItem *newItem = 0; -HierarchyItem::HierarchyItem( Type type, TQListViewItem *tqparent, +HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, txt1, txt2, txt3 ), typ( type ) { } -HierarchyItem::HierarchyItem( Type type, TQListView *tqparent, +HierarchyItem::HierarchyItem( Type type, TQListView *parent, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, txt1, txt2, txt3 ), typ( type ) { } @@ -177,8 +177,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 ) { init_colors(); @@ -255,15 +255,15 @@ void HierarchyList::objectClicked( TQListViewItem *i ) } if ( !formWindow->widgets()->find( w ) ) { - if ( w->tqparent() && w->tqparent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && - w->tqparent()->tqparent() && - ( w->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || - w->tqparent()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) { - if ( w->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) - ( (TQTabWidget*)w->tqparent()->tqparent() )->showPage( w ); + if ( w->parent() && w->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && + w->parent()->parent() && + ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || + w->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) { + if ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + ( (TQTabWidget*)w->parent()->parent() )->showPage( w ); else - ( (QDesignerWizard*)w->tqparent()->tqparent() )->setCurrentPage( ( (QDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) ); - w = (TQWidget*)w->tqparent()->tqparent(); + ( (QDesignerWizard*)w->parent()->parent() )->setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); + w = (TQWidget*)w->parent()->parent(); formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); } else { return; @@ -353,7 +353,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 ) { bool fakeMainWindow = false; if ( o && o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { @@ -387,30 +387,30 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) #endif TQString name = o->name(); - if ( o->tqparent() && o->tqparent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && - o->tqparent()->tqparent() ) { - if ( o->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) - name = ( (TQTabWidget*)o->tqparent()->tqparent() )->tabLabel( (TQWidget*)o ); - else if ( o->tqparent()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) - name = ( (TQWizard*)o->tqparent()->tqparent() )->title( (TQWidget*)o ); + if ( o->parent() && o->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && + o->parent()->parent() ) { + if ( o->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); + else if ( o->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + 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, name, className, dbInfo ); else - item = new HierarchyItem( HierarchyItem::Widget, tqparent, name, className, dbInfo ); - if ( !tqparent ) + item = new HierarchyItem( HierarchyItem::Widget, parent, name, className, dbInfo ); + if ( !parent ) item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) ); else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) item->setPixmap( 0, PixmapChooser::loadPixmap( "tqlayout.xpm", PixmapChooser::Small ) ); @@ -428,18 +428,18 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) if ( !it.current()->isWidgetType() || ( (TQWidget*)it.current() )->isHidden() ) continue; if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { - if ( it.current()->tqparent() && - ( it.current()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || - it.current()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) && + if ( it.current()->parent() && + ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || + it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) && it.current()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { TQObject *obj = it.current(); TQObjectList *l2 = obj->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, true, false ); QDesignerTabWidget *tw = 0; QDesignerWizard *dw = 0; - if ( it.current()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) - tw = (QDesignerTabWidget*)it.current()->tqparent(); - if ( it.current()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) - dw = (QDesignerWizard*)it.current()->tqparent(); + if ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + tw = (QDesignerTabWidget*)it.current()->parent(); + if ( it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + dw = (QDesignerWizard*)it.current()->parent(); TQWidgetStack *stack = (TQWidgetStack*)obj; for ( obj = l2->last(); obj; obj = l2->prev() ) { if ( qstrcmp( obj->className(), "TQWidgetStackPrivate::Invisible" ) == 0 || @@ -449,10 +449,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 ); } @@ -598,8 +598,8 @@ void HierarchyList::insertEntry( TQListViewItem *i, const TQPixmap &pix, const T item->startRename( 0 ); } -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/kommander/editor/hierarchyview.h b/kommander/editor/hierarchyview.h index 68215bda..007f2d38 100644 --- a/kommander/editor/hierarchyview.h +++ b/kommander/editor/hierarchyview.h @@ -52,9 +52,9 @@ public: EventFunction }; - HierarchyItem(Type type, TQListViewItem * tqparent, + HierarchyItem(Type type, TQListViewItem * parent, const TQString & txt1, const TQString & txt2, const TQString & txt3); - HierarchyItem(Type type, TQListView * tqparent, + HierarchyItem(Type type, TQListView * parent, const TQString & txt1, const TQString & txt2, const TQString & txt3); void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align); @@ -82,7 +82,7 @@ class HierarchyList:public TQListView Q_OBJECT 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(TQWidget * w); @@ -107,7 +107,7 @@ public slots: void removeTabPage(); private: - void insertObject(TQObject * o, TQListViewItem * tqparent); + void insertObject(TQObject * o, TQListViewItem * parent); TQWidget *findWidget(TQListViewItem * i); TQListViewItem *findItem(TQWidget * w); TQWidget *current() const; @@ -127,7 +127,7 @@ class HierarchyView : public TQTabWidget TQ_OBJECT public: - HierarchyView( TQWidget *tqparent ); + HierarchyView( TQWidget *parent ); ~HierarchyView(); void setFormWindow( FormWindow *fw, TQWidget *w ); diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp index 549e5c96..911f6ec8 100644 --- a/kommander/editor/iconvieweditorimpl.cpp +++ b/kommander/editor/iconvieweditorimpl.cpp @@ -31,8 +31,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/kommander/editor/iconvieweditorimpl.h b/kommander/editor/iconvieweditorimpl.h index 4e3972ff..2b145c8f 100644 --- a/kommander/editor/iconvieweditorimpl.h +++ b/kommander/editor/iconvieweditorimpl.h @@ -31,7 +31,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/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 152548b2..dca00c38 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -44,17 +44,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; @@ -77,8 +77,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 @@ -127,8 +127,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 @@ -152,21 +152,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 || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); + needReparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); 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 ); } @@ -203,12 +203,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 && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + if ( parent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); @@ -231,14 +231,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 ) { @@ -249,14 +249,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()) ); @@ -299,14 +299,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 ) @@ -363,14 +363,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 ) @@ -729,8 +729,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 ); @@ -742,7 +742,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, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 ); @@ -801,8 +801,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/kommander/editor/layout.h b/kommander/editor/layout.h index cd89ba41..14104bf7 100644 --- a/kommander/editor/layout.h +++ b/kommander/editor/layout.h @@ -43,12 +43,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; @@ -133,7 +133,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; @@ -159,7 +159,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/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp index 80382c95..b9ec7fee 100644 --- a/kommander/editor/listboxeditorimpl.cpp +++ b/kommander/editor/listboxeditorimpl.cpp @@ -32,8 +32,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; diff --git a/kommander/editor/listboxeditorimpl.h b/kommander/editor/listboxeditorimpl.h index 07e18f1f..1872646e 100644 --- a/kommander/editor/listboxeditorimpl.h +++ b/kommander/editor/listboxeditorimpl.h @@ -32,7 +32,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/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp index abed8458..d7baba57 100644 --- a/kommander/editor/listvieweditorimpl.cpp +++ b/kommander/editor/listvieweditorimpl.cpp @@ -37,8 +37,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 ); @@ -321,10 +321,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++; } @@ -346,11 +346,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 ); } @@ -405,10 +405,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; } @@ -427,13 +427,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++; } @@ -467,13 +467,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/kommander/editor/listvieweditorimpl.h b/kommander/editor/listvieweditorimpl.h index 9a7d7457..f5efe0cd 100644 --- a/kommander/editor/listvieweditorimpl.h +++ b/kommander/editor/listvieweditorimpl.h @@ -35,7 +35,7 @@ class ListViewEditor : public ListViewEditorBase TQ_OBJECT public: - ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw ); + ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ); protected slots: void applyClicked(); diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 8290fbda..601d98a8 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -631,7 +631,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") || o->inherits("QDesignerToolBar") || (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) && - o->tqparent() && o->tqparent()->inherits("QDesignerToolBar"))) { + o->parent() && o->parent()->inherits("QDesignerToolBar"))) { TQWidget *w = (TQWidget*)o; if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator")) w = w->parentWidget(); @@ -719,7 +719,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonDblClick: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) { if (o && o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() && - o->tqparent() && o->tqparent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) + o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) formWindow()->setToolFixed(); break; } @@ -752,7 +752,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Move: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) 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); @@ -808,12 +808,12 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const { - if (o->tqparent() && o->tqparent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (o->parent() && o->parent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) return 0; while (o) { if (o->inherits("FormWindow")) return (TQWidget*)o; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -825,7 +825,7 @@ TQWidget *MainWindow::isAToolBarChild(TQObject *o) const return (TQWidget*)o; if (o->inherits("FormWindow")) return 0; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -1541,9 +1541,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->plug(menu); actionEditCopy->plug(menu); @@ -1553,12 +1553,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->plug(menu); actionEditCopy->plug(menu); diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h index 1e0d3b79..a670ea00 100644 --- a/kommander/editor/mainwindow.h +++ b/kommander/editor/mainwindow.h @@ -94,8 +94,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 ); diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index 356b4804..efb7d166 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -798,7 +798,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/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index aeddb1e1..0968eafd 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -28,7 +28,7 @@ #include <tqfile.h> #include <tqtextstream.h> -MessageLog::MessageLog(TQWidget* tqparent, const char* name) : TQTabWidget(tqparent, name) +MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name) { m_popupMenu = new KPopupMenu(this); m_popupMenu->insertItem(SmallIconSet("editcopy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine())); diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h index bf1508b6..634c7c7b 100644 --- a/kommander/editor/messagelog.h +++ b/kommander/editor/messagelog.h @@ -32,7 +32,7 @@ class MessageLog : public TQTabWidget TQ_OBJECT public: enum InfoType {Stdout, Stderr, All}; - MessageLog(TQWidget* tqparent = 0, const char* name = 0); + MessageLog(TQWidget* parent = 0, const char* name = 0); ~MessageLog(); virtual void insertItem(InfoType i, TQString text); virtual void clear(InfoType i = All); diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp index 98ad65d6..074a8471 100644 --- a/kommander/editor/multilineeditorimpl.cpp +++ b/kommander/editor/multilineeditorimpl.cpp @@ -28,8 +28,8 @@ #include <klocale.h> -MultiLineEditor::MultiLineEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) - : MultiLineEditorBase( tqparent, 0, true ), formwindow( fw ) +MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) + : MultiLineEditorBase( parent, 0, true ), formwindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); mlined = (TQMultiLineEdit*)editWidget; @@ -61,8 +61,8 @@ void MultiLineEditor::applyClicked() } -TextEditor::TextEditor( TQWidget *tqparent, const TQString &text ) - : MultiLineEditorBase( tqparent, 0, true ) +TextEditor::TextEditor( TQWidget *parent, const TQString &text ) + : MultiLineEditorBase( parent, 0, true ) { buttonApply->hide(); setCaption( i18n("Text" ) ); @@ -71,9 +71,9 @@ TextEditor::TextEditor( TQWidget *tqparent, const TQString &text ) preview->selectAll(); } -TQString TextEditor::getText( TQWidget *tqparent, const TQString &text ) +TQString TextEditor::getText( TQWidget *parent, const TQString &text ) { - TextEditor dlg( tqparent, text ); + TextEditor dlg( parent, text ); if ( dlg.exec() == TQDialog::Accepted ) { TQString txt = dlg.preview->text(); int i = txt.length() - 1; diff --git a/kommander/editor/multilineeditorimpl.h b/kommander/editor/multilineeditorimpl.h index a5d48479..6881283c 100644 --- a/kommander/editor/multilineeditorimpl.h +++ b/kommander/editor/multilineeditorimpl.h @@ -32,7 +32,7 @@ class MultiLineEditor : public MultiLineEditorBase TQ_OBJECT public: - MultiLineEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected slots: void okClicked(); @@ -50,9 +50,9 @@ class TextEditor : public MultiLineEditorBase TQ_OBJECT public: - TextEditor( TQWidget *tqparent, const TQString &text ); + TextEditor( TQWidget *parent, const TQString &text ); - static TQString getText( TQWidget *tqparent, const TQString &text ); + static TQString getText( TQWidget *parent, const TQString &text ); protected slots: void okClicked(); diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index 37e47e6a..ca029d48 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.cpp @@ -135,8 +135,8 @@ void CustomFormItem::insert() } -NewForm::NewForm(TQWidget *tqparent, const TQString &templatePath) - : NewFormBase(tqparent, 0, true) +NewForm::NewForm(TQWidget *parent, const TQString &templatePath) + : NewFormBase(parent, 0, true) { connect(helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); diff --git a/kommander/editor/newformimpl.h b/kommander/editor/newformimpl.h index 6b28a631..5f51648c 100644 --- a/kommander/editor/newformimpl.h +++ b/kommander/editor/newformimpl.h @@ -63,7 +63,7 @@ class NewForm : public NewFormBase Q_OBJECT TQ_OBJECT public: - NewForm( TQWidget *tqparent, const TQString &templatePath ); + NewForm( TQWidget *parent, const TQString &templatePath ); void accept(); protected slots: void itemChanged(TQIconViewItem *item); diff --git a/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp index 243576c2..e5480379 100644 --- a/kommander/editor/paletteeditoradvancedimpl.cpp +++ b/kommander/editor/paletteeditoradvancedimpl.cpp @@ -59,9 +59,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() ) ); @@ -613,10 +613,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/kommander/editor/paletteeditoradvancedimpl.h b/kommander/editor/paletteeditoradvancedimpl.h index ed0bcc39..a9e28c9a 100644 --- a/kommander/editor/paletteeditoradvancedimpl.h +++ b/kommander/editor/paletteeditoradvancedimpl.h @@ -30,12 +30,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/kommander/editor/paletteeditorimpl.cpp b/kommander/editor/paletteeditorimpl.cpp index 89d1f624..bf68fe16 100644 --- a/kommander/editor/paletteeditorimpl.cpp +++ b/kommander/editor/paletteeditorimpl.cpp @@ -30,8 +30,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() ) ); @@ -275,9 +275,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/kommander/editor/paletteeditorimpl.h b/kommander/editor/paletteeditorimpl.h index 54e45612..07a3dd85 100644 --- a/kommander/editor/paletteeditorimpl.h +++ b/kommander/editor/paletteeditorimpl.h @@ -31,11 +31,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/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index c94bf065..e536242a 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -876,8 +876,8 @@ static ImageIconProvider *imageIconProvider = 0; static PixmapChooser *pixmapChooser = 0; #endif -PixmapView::PixmapView( TQWidget *tqparent ) - : TQScrollView( tqparent ) +PixmapView::PixmapView( TQWidget *parent ) + : TQScrollView( parent ) { viewport()->setBackgroundMode( PaletteBase ); } @@ -907,7 +907,7 @@ void PixmapView::previewUrl( const TQUrl &u ) } } -TQStringList qChoosePixmaps( TQWidget *tqparent ) +TQStringList qChoosePixmaps( TQWidget *parent ) { if ( !imageIconProvider && !TQFileDialog::iconProvider() ) TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) ); @@ -923,7 +923,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent ) filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) ); filter += tqApp->translate( "qChoosePixmap", "All Files (*)" ); - 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 ); @@ -936,7 +936,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() ) { @@ -955,7 +955,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, filter.prepend( all + ")\n" ); filter += i18n( "All Files (*)" ); - 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 ); @@ -972,7 +972,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, } #ifndef KOMMANDER 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( fw, old.serialNumber() ) ); @@ -984,7 +984,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, } #endif 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() ) ); @@ -996,15 +996,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( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) ) +ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) + : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) ) { fmts = TQImage::inputFormats(); } diff --git a/kommander/editor/pixmapchooser.h b/kommander/editor/pixmapchooser.h index 48c947a7..fe7bfa7b 100644 --- a/kommander/editor/pixmapchooser.h +++ b/kommander/editor/pixmapchooser.h @@ -35,7 +35,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 ); @@ -51,7 +51,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 ); @@ -62,8 +62,8 @@ 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 ); class PixmapChooser diff --git a/kommander/editor/previewframe.cpp b/kommander/editor/previewframe.cpp index 53f35670..b3afb58b 100644 --- a/kommander/editor/previewframe.cpp +++ b/kommander/editor/previewframe.cpp @@ -23,8 +23,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/kommander/editor/previewframe.h b/kommander/editor/previewframe.h index 6447f005..fa87a90b 100644 --- a/kommander/editor/previewframe.h +++ b/kommander/editor/previewframe.h @@ -31,8 +31,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: @@ -45,7 +45,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/kommander/editor/previewwidgetimpl.cpp b/kommander/editor/previewwidgetimpl.cpp index 1c6ab9cd..98cfd39c 100644 --- a/kommander/editor/previewwidgetimpl.cpp +++ b/kommander/editor/previewwidgetimpl.cpp @@ -21,8 +21,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/kommander/editor/previewwidgetimpl.h b/kommander/editor/previewwidgetimpl.h index a2b0ef7a..a0f08043 100644 --- a/kommander/editor/previewwidgetimpl.h +++ b/kommander/editor/previewwidgetimpl.h @@ -29,7 +29,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/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 9d72fe02..f99c9594 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -155,7 +155,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 ) @@ -296,7 +296,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. */ @@ -2634,8 +2634,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() || - !editor->widget()->tqparent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + !editor->widget()->parent() || + !editor->widget()->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) continue; } @@ -3278,8 +3278,8 @@ void PropertyList::readPropertyDocs() // ------------------------------------------------------------ #ifndef KOMMANDER -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 ); @@ -3354,7 +3354,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; #ifndef KOMMANDER @@ -3380,7 +3380,7 @@ void EventList::setCurrent( TQWidget * ) void EventList::objectClicked( TQListViewItem *i ) { - if ( !i || !i->tqparent() ) + if ( !i || !i->parent() ) return; formWindow->mainWindow()->editFunction( i->text( 0 ) ); } @@ -3402,29 +3402,29 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) #else if ( MetaDataBase::hasEvents( "C++" ) ) { #endif - 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, PixmapChooser::loadPixmap( "editslots.xpm" ), s ); - } else if ( res == DEL_ITEM && i->tqparent() ) { + insertEntry( i->parent() ? i->parent() : i, PixmapChooser::loadPixmap( "editslots.xpm" ), s ); + } else if ( res == DEL_ITEM && i->parent() ) { #ifndef KOMMANDER if ( MetaDataBase::hasEvents( formWindow->project()->language() ) ) { #else if ( MetaDataBase::hasEvents( "C++" ) ) { #endif - TQListViewItem *p = i->tqparent(); + TQListViewItem *p = i->parent(); delete i; save( p ); } else { MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = 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" ), @@ -3443,9 +3443,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 ) ) { @@ -3464,7 +3464,7 @@ void EventList::renamed( TQListViewItem *i ) if ( MetaDataBase::hasEvents( "C++" ) ) { #endif - save( i->tqparent() ); + save( i->parent() ); editor->formWindow()->mainWindow()-> #ifndef KOMMANDER editFunction( i->text( 0 ), editor->formWindow()->project()->language(), true ); @@ -3475,7 +3475,7 @@ void EventList::renamed( TQListViewItem *i ) MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = 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, @@ -3535,8 +3535,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/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h index 262f0376..61d4e4dc 100644 --- a/kommander/editor/propertyeditor.h +++ b/kommander/editor/propertyeditor.h @@ -570,7 +570,7 @@ class PropertyEditor : public TQTabWidget TQ_OBJECT public: - PropertyEditor( TQWidget *tqparent ); + PropertyEditor( TQWidget *parent ); TQObject *widget() const; diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp index 537216c5..78523a95 100644 --- a/kommander/editor/qcompletionedit.cpp +++ b/kommander/editor/qcompletionedit.cpp @@ -4,8 +4,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/kommander/editor/qcompletionedit.h b/kommander/editor/qcompletionedit.h index 4dee6ba5..ceef1692 100644 --- a/kommander/editor/qcompletionedit.h +++ b/kommander/editor/qcompletionedit.h @@ -15,7 +15,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/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index c2ece48b..93f6cc9b 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -495,7 +495,7 @@ TQString Resource::copy() } -void Resource::paste( const TQString &cb, TQWidget *tqparent ) +void Resource::paste( const TQString &cb, TQWidget *parent ) { if ( !formwindow ) return; @@ -533,30 +533,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) ); @@ -1316,7 +1316,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(); @@ -1335,7 +1335,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ); 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 ) return 0; if ( !mainContainerSet ) { @@ -1368,9 +1368,9 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL tqlayout = 0; if ( w && formwindow ) { - if ( !tqparent || ( !tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) formwindow->insertWidget( w, pasting ); - else if ( tqparent && ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + else if ( parent && ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) MetaDataBase::addEntry( TQT_TQOBJECT(w) ); if (w->inherits("Dialog")) dynamic_cast<Dialog*>(w)->setUseInternalParser(false); @@ -1402,16 +1402,16 @@ 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 ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() ); + ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); } else - if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + 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, v.toString() ); + ( (TQWizard*)parent )->addPage( w, v.toString() ); } } else if ( n.tagName() == "item" ) { createItem( n, w ); @@ -1605,7 +1605,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(); @@ -1618,7 +1618,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() ) { @@ -2429,12 +2429,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(); while ( !n2.isNull() ) { @@ -2450,10 +2450,10 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) 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(); while ( !n2.isNull() ) { @@ -2472,7 +2472,7 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) formwindow->actionList().append( a ); } } diff --git a/kommander/editor/resource.h b/kommander/editor/resource.h index 75dd6387..e35bd6b2 100644 --- a/kommander/editor/resource.h +++ b/kommander/editor/resource.h @@ -71,7 +71,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 ); @@ -103,8 +103,8 @@ private: // void saveFormCode(); #endif - 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); @@ -117,7 +117,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 ); TQColorGroup loadColorGroup( const TQDomElement &e ); diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp index 9a29cb31..72f7c38c 100644 --- a/kommander/editor/sizehandle.cpp +++ b/kommander/editor/sizehandle.cpp @@ -30,8 +30,8 @@ #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 ); @@ -39,7 +39,7 @@ SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ) widget = 0; dir =d ; setMouseTracking( false ); - formWindow = tqparent; + formWindow = parent; sel = s; updateCursor(); } @@ -261,10 +261,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/kommander/editor/sizehandle.h b/kommander/editor/sizehandle.h index 4def5429..ac7c68a2 100644 --- a/kommander/editor/sizehandle.h +++ b/kommander/editor/sizehandle.h @@ -38,7 +38,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(); @@ -69,7 +69,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/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp index e09fd1e8..37a28911 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -32,8 +32,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 ); @@ -43,8 +43,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/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h index a8daca52..883c95ad 100644 --- a/kommander/editor/styledbutton.h +++ b/kommander/editor/styledbutton.h @@ -43,8 +43,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/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index 777fd874..5fc56f41 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -21,8 +21,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/kommander/editor/tableeditorimpl.h b/kommander/editor/tableeditorimpl.h index c0b8ce85..167f8bb7 100644 --- a/kommander/editor/tableeditorimpl.h +++ b/kommander/editor/tableeditorimpl.h @@ -14,7 +14,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/kommander/editor/timestamp.cpp b/kommander/editor/timestamp.cpp index 62cac72d..850e7eb2 100644 --- a/kommander/editor/timestamp.cpp +++ b/kommander/editor/timestamp.cpp @@ -24,8 +24,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/kommander/editor/timestamp.h b/kommander/editor/timestamp.h index 1df9f916..f4483e8f 100644 --- a/kommander/editor/timestamp.h +++ b/kommander/editor/timestamp.h @@ -31,7 +31,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/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index f33d27b3..9f619c79 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -137,8 +137,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 ); @@ -417,8 +417,8 @@ static void saveChangedProperties( TQWidget *w, int id ) changedProperties->insert( id, l ); } -EditorTabWidget::EditorTabWidget( TQWidget *tqparent, const char *name ) - : TabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( false ) +EditorTabWidget::EditorTabWidget( TQWidget *parent, const char *name ) + : TabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( false ) { tabBar()->setAcceptDrops( true ); tabBar()->installEventFilter( this ); @@ -584,8 +584,8 @@ bool EditorTabWidget::eventFilter( TQObject *o, TQEvent *e ) } -EditorToolBox::EditorToolBox( TQWidget *tqparent, const char *name ) - : ToolBox( tqparent, name ) +EditorToolBox::EditorToolBox( TQWidget *parent, const char *name ) + : ToolBox( parent, name ) { setAcceptDrops( true ); } @@ -631,12 +631,12 @@ int EditorToolBox::count() const /*! 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); //qDebug("Trying to create '%s'", n.latin1()); @@ -652,10 +652,10 @@ 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); //qDebug("Trying to create '%s', widget (id=%d) - %s", s, id, w ? "successful" : "failure"); 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)); @@ -823,13 +823,13 @@ 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) @@ -837,11 +837,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa 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 && ((FormWindow *) w)->mainContainer()->inherits(TQDIALOG_OBJECT_NAME_STRING)); @@ -850,43 +850,43 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa { if (init) { - QDesignerToolButton *tb = new QDesignerToolButton(tqparent, name); + QDesignerToolButton *tb = new QDesignerToolButton(parent, name); tb->setText("..."); 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; @@ -897,28 +897,28 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa { #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")); @@ -927,7 +927,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa 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) { @@ -936,18 +936,18 @@ 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) { - QDesignerLabel *l = new QDesignerLabel(tqparent, name); + QDesignerLabel *l = new QDesignerLabel(parent, name); if (init) { l->setText(TQString::tqfromLatin1(name)); @@ -956,13 +956,13 @@ 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)); @@ -974,42 +974,42 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return tw; } 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 && - (tqparent->inherits("FormWindow") || tqparent->inherits(TQWIZARD_OBJECT_NAME_STRING) - || tqparent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || tqparent->inherits(TQTOOLBOX_OBJECT_NAME_STRING) || tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))) + if (parent && + (parent->inherits("FormWindow") || parent->inherits(TQWIZARD_OBJECT_NAME_STRING) + || parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || parent->inherits(TQTOOLBOX_OBJECT_NAME_STRING) || parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))) { - FormWindow *fw = find_formwindow(tqparent); + 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 (tqparent && tqparent->inherits("FormWindow")) - dia = new QDesignerDialog((FormWindow *) tqparent, tqparent, name); + if (parent && parent->inherits("FormWindow")) + dia = new QDesignerDialog((FormWindow *) parent, parent, name); else - dia = new TQDialog(tqparent, name); - if (tqparent && !tqparent->inherits("MainWindow")) - dia->reparent(tqparent, TQPoint(0, 0), true); + dia = new TQDialog(parent, name); + if (parent && !parent->inherits("MainWindow")) + dia->reparent(parent, TQPoint(0, 0), true); return dia; } else if (className == TQWIZARD_OBJECT_NAME_STRING) { - TQWizard *wiz = new QDesignerWizard(tqparent, name); - if (tqparent && !tqparent->inherits("MainWindow")) + TQWizard *wiz = new QDesignerWizard(parent, name); + if (parent && !parent->inherits("MainWindow")) { - wiz->reparent(tqparent, TQPoint(0, 0), true); + wiz->reparent(parent, TQPoint(0, 0), true); } - if (init && tqparent && tqparent->inherits("FormWindow")) + if (init && parent && parent->inherits("FormWindow")) { - QDesignerWidget *dw = new QDesignerWidget((FormWindow *) tqparent, wiz, "page"); + QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); MetaDataBase::addEntry(TQT_TQOBJECT(dw)); wiz->addPage(dw, i18n("Page")); TQTimer::singleShot(0, wiz, TQT_SLOT(next())); @@ -1017,7 +1017,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa 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); @@ -1031,18 +1031,18 @@ 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) @@ -1054,7 +1054,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa 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) @@ -1067,13 +1067,13 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } 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); @@ -1087,9 +1087,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return l; } else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) { - TQMainWindow *mw = new KmdrMainWindow(tqparent, name, 0); + TQMainWindow *mw = new KmdrMainWindow(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); @@ -1100,25 +1100,25 @@ 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 #ifdef KOMMANDER if (className == "LineEdit") - return new LineEdit(tqparent, name); + return new LineEdit(parent, name); else if (className == "ListView") { - TQListView *lv = new TQListView(tqparent, name); + TQListView *lv = new TQListView(parent, name); lv->setSorting(-1); if (init) { @@ -1130,28 +1130,28 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa else if (className == "Dialog") { TQDialog *dia = 0; - if (tqparent && tqparent->inherits("FormWindow")) - dia = new EditorDialog((FormWindow *) tqparent, tqparent, name); + if (parent && parent->inherits("FormWindow")) + dia = new EditorDialog((FormWindow *) parent, parent, name); else - dia = new Dialog(tqparent, name, false); + dia = new Dialog(parent, name, false); - if (tqparent) - dia->reparent(tqparent, TQPoint(0, 0), true); + if (parent) + dia->reparent(parent, TQPoint(0, 0), true); return dia; } else if (className == "Wizard") { //qDebug("Creating Wizard..."); TQWizard *wiz; - if (tqparent && tqparent->inherits("FormWindow")) - wiz = new QDesignerWizard(tqparent, name); + if (parent && parent->inherits("FormWindow")) + wiz = new QDesignerWizard(parent, name); else - wiz = new Wizard(tqparent, name); - if (tqparent) - wiz->reparent(tqparent, TQPoint(0, 0), true); - if (init && tqparent && tqparent->inherits("FormWindow")) + wiz = new Wizard(parent, name); + if (parent) + wiz->reparent(parent, TQPoint(0, 0), true); + if (init && parent && parent->inherits("FormWindow")) { - QDesignerWidget *dw = new QDesignerWidget((FormWindow *) tqparent, wiz, "page"); + QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); MetaDataBase::addEntry(TQT_TQOBJECT(dw)); wiz->addPage(dw, i18n("Page 1")); wiz->addPage(dw, i18n("Page 2")); @@ -1161,10 +1161,10 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if (className == "TabWidget") { - TQTabWidget *tw = new EditorTabWidget(tqparent, name); + TQTabWidget *tw = new EditorTabWidget(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)); @@ -1176,10 +1176,10 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return tw; } else if (className == "ToolBox") { - TQToolBox *tw = new EditorToolBox(tqparent, name); + TQToolBox *tw = new EditorToolBox(parent, name); if (init) { - FormWindow *fw = find_formwindow(tqparent); + FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox"); tw->addItem(w, i18n("Page 1")); MetaDataBase::addEntry(TQT_TQOBJECT(w)); @@ -1191,44 +1191,44 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return tw; } else if (className == "ExecButton") - return new ExecButton(tqparent, name); + return new ExecButton(parent, name); else if (className == "CloseButton") - return new CloseButton(tqparent, name); + return new CloseButton(parent, name); else if (className == "SubDialog") - return new SubDialog(tqparent, name); + return new SubDialog(parent, name); else if (className == "FileSelector") - return new FileSelector(tqparent, name); + return new FileSelector(parent, name); else if (className == "TextEdit") - return new TextEdit(tqparent, name); + return new TextEdit(parent, name); else if (className == "RadioButton") - return new RadioButton(tqparent, name); + return new RadioButton(parent, name); else if (className == "ButtonGroup") - return new ButtonGroup(tqparent, name); + return new ButtonGroup(parent, name); else if (className == "GroupBox") - return new GroupBox(tqparent, name); + return new GroupBox(parent, name); else if (className == "CheckBox") - return new CheckBox(tqparent, name); + return new CheckBox(parent, name); else if (className == "ComboBox") - return new ComboBox(tqparent, name); + return new ComboBox(parent, name); else if (className == "SpinBoxInt") - return new SpinBoxInt(tqparent, name); + return new SpinBoxInt(parent, name); else if (className == "ListBox") - return new ListBox(tqparent, name); + return new ListBox(parent, name); else if (className == "ScriptObject") - return new ScriptObject(tqparent, name); + return new ScriptObject(parent, name); else if (className == "RichTextEditor") - return new RichTextEditor(tqparent, name); + return new RichTextEditor(parent, name); else if (className == "DatePicker") - return new DatePicker(tqparent, name); + return new DatePicker(parent, name); else if (className == "PopupMenu") - return new PopupMenu(tqparent, name); + return new PopupMenu(parent, name); else if (className == "FontDialog") - return new FontDialog(tqparent, name); + return new FontDialog(parent, name); else if (className == "AboutDialog") - return new AboutDialog(tqparent, name); + return new AboutDialog(parent, name); else if (className == "TreeWidget") { - TQListView *lv = new TreeWidget(tqparent, name); + TQListView *lv = new TreeWidget(parent, name); lv->setSorting(-1); if (init) { @@ -1238,7 +1238,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return lv; } else if (className == "Slider") { - Slider *s = new Slider(tqparent, name); + Slider *s = new Slider(parent, name); if (!r) return s; if (!r->isValid() || r->width() < 2 && r->height() < 2) @@ -1251,7 +1251,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } #endif - TQWidget *w = KommanderFactory::createWidget(className, tqparent, name); + TQWidget *w = KommanderFactory::createWidget(className, parent, name); return w; } @@ -1331,7 +1331,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -1363,10 +1363,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.) */ @@ -1391,15 +1391,15 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things return true; - if ( o->inherits( TQTABBAR_OBJECT_NAME_STRING ) || ::tqqt_cast<TQToolBox*>(o->tqparent()) ) + if ( o->inherits( TQTABBAR_OBJECT_NAME_STRING ) || ::tqqt_cast<TQToolBox*>(o->parent()) ) return true; else if ( o->inherits( TQSIZEGRIP_OBJECT_NAME_STRING ) ) return true; - else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->tqparent() && o->tqparent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) ) + else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->parent() && o->parent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) ) return true; - else if ( o->tqparent() && o->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) ) return true; - else if ( o->tqparent() && o->tqparent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) return true; else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) ) return true; @@ -1471,7 +1471,7 @@ void WidgetFactory::initChangedProperties( TQObject *o ) if ( o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || o->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || o->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) || o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) ) MetaDataBase::setPropertyChanged( o, "text", true ); - else if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->tqparent()))) { + else 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 ); @@ -1550,7 +1550,7 @@ bool WidgetFactory::hasItems( int id ) 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); @@ -1562,7 +1562,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget TQComboBox *cb = (TQComboBox *) editWidget; - ListBoxEditor *e = new ListBoxEditor(tqparent, cb->listBox(), fw); + ListBoxEditor *e = new ListBoxEditor(parent, cb->listBox(), fw); e->exec(); delete e; @@ -1572,7 +1572,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget } if (className == "TextEdit" || className == "TextBrowser") { - MultiLineEditor *e = new MultiLineEditor(tqparent, editWidget, fw); + MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1582,7 +1582,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) return; TQListView *lv = (TQListView *) editWidget; - ListViewEditor *e = new ListViewEditor(tqparent, lv, fw); + ListViewEditor *e = new ListViewEditor(parent, lv, fw); e->exec(); delete e; return; @@ -1591,7 +1591,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) return; - ListBoxEditor *e = new ListBoxEditor(tqparent, editWidget, fw); + ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1601,7 +1601,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) return; - ListBoxEditor *e = new ListBoxEditor(tqparent, editWidget, fw); + ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1612,7 +1612,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if (!editWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) 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(); @@ -1624,7 +1624,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) return; TQListView *lv = (TQListView *) editWidget; - ListViewEditor *e = new ListViewEditor(tqparent, lv, fw); + ListViewEditor *e = new ListViewEditor(parent, lv, fw); e->exec(); delete e; return; @@ -1634,7 +1634,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { if (!editWidget->inherits(TQICONVIEW_OBJECT_NAME_STRING)) return; - IconViewEditor *e = new IconViewEditor(tqparent, editWidget, fw); + IconViewEditor *e = new IconViewEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1642,7 +1642,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING) { - MultiLineEditor *e = new MultiLineEditor(tqparent, editWidget, fw); + MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1650,7 +1650,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget #ifndef TQT_NO_TABLE if (className.contains("Table")) { - TableEditor *e = new TableEditor(tqparent, editWidget, fw); + TableEditor *e = new TableEditor(parent, editWidget, fw); e->exec(); delete e; return; @@ -1730,11 +1730,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 ) @@ -1793,7 +1793,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() @@ -1819,12 +1819,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 && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) parentLayout = 0; } diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index 178c3172..9ebce67c 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -70,7 +70,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 ); @@ -90,7 +90,7 @@ public: static bool hasSpecialEditor( int id ); static bool hasItems( int id ); - 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 ); @@ -101,9 +101,9 @@ public: static void saveDefaultProperties( TQWidget *w, int id ); 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 ); }; @@ -116,7 +116,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 ); @@ -146,7 +146,7 @@ class EditorTabWidget : public TabWidget 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: - EditorTabWidget( TQWidget *tqparent, const char *name ); + EditorTabWidget( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -176,7 +176,7 @@ class EditorToolBox : public ToolBox 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: - EditorToolBox( TQWidget *tqparent, const char *name ); + EditorToolBox( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -196,7 +196,7 @@ class QDesignerWizard : public TQWizard 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: - QDesignerWizard( TQWidget *tqparent, const char *name ) : TQWizard( tqparent, name ) {} + QDesignerWizard( TQWidget *parent, const char *name ) : TQWizard( parent, name ) {} int currentPageNum() const; void setCurrentPage( int i ); @@ -230,7 +230,7 @@ class TQLayoutWidget : public TQWidget TQ_OBJECT public: - TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::tqsizePolicy() ) {} + TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::tqsizePolicy() ) {} TQSizePolicy sizePolicy() const; void updateSizePolicy(); @@ -249,8 +249,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 ) @@ -287,8 +287,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 ); } @@ -311,8 +311,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; @@ -342,8 +342,8 @@ class QDesignerWidget : public TQWidget TQ_OBJECT public: - QDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WResizeNoErase ), formwindow( fw ) {} + QDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WResizeNoErase ), formwindow( fw ) {} protected: void paintEvent( TQPaintEvent *e ); @@ -359,8 +359,8 @@ class QDesignerDialog : public TQDialog TQ_OBJECT public: - QDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQDialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ) {} + QDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name ) + : TQDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ) {} protected: void paintEvent( TQPaintEvent *e ); @@ -377,8 +377,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 ); @@ -401,8 +401,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 ); @@ -426,8 +426,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 ); @@ -451,8 +451,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 ); @@ -475,8 +475,8 @@ class EditorDialog : public Dialog TQ_OBJECT public: - EditorDialog( FormWindow *fw, TQWidget *tqparent, const char *name ) - : Dialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ) { } + EditorDialog( FormWindow *fw, TQWidget *parent, const char *name ) + : Dialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ) { } protected: void paintEvent( TQPaintEvent *e ); diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp index 602f8376..56ff0028 100644 --- a/kommander/editor/wizardeditorimpl.cpp +++ b/kommander/editor/wizardeditorimpl.cpp @@ -31,8 +31,8 @@ #include <klocale.h> -WizardEditor::WizardEditor( TQWidget *tqparent, TQWizard *w, FormWindow *fw ) - : WizardEditorBase( tqparent, 0 ), formwindow( fw ), wizard( w ) +WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) + : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); fillListBox(); diff --git a/kommander/editor/wizardeditorimpl.h b/kommander/editor/wizardeditorimpl.h index bc5f68bf..6222c545 100644 --- a/kommander/editor/wizardeditorimpl.h +++ b/kommander/editor/wizardeditorimpl.h @@ -35,7 +35,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/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index 971add70..99fcf474 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -102,11 +102,11 @@ static TQPixmap *filePixmap = 0; static TQPixmap* formPixmap = 0; #ifndef KOMMANDER -WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p ) +WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) #else -WorkspaceItem::WorkspaceItem( TQListView *tqparent ) +WorkspaceItem::WorkspaceItem( TQListView *parent ) #endif - : TQListViewItem( tqparent ) + : TQListViewItem( parent ) { init(); #ifndef KOMMANDER @@ -118,8 +118,8 @@ WorkspaceItem::WorkspaceItem( TQListView *tqparent ) } #ifndef KOMMANDER -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf ) + : TQListViewItem( parent ) { init(); sourceFile = sf; @@ -128,8 +128,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) } #endif -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) + : TQListViewItem( parent ) { init(); formFile = ff; @@ -146,8 +146,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type } } -WorkspaceItem::WorkspaceItem( TQListView *tqparent, FormFile* ff, Type type ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListView *parent, FormFile* ff, Type type ) + : TQListViewItem( parent ) { init(); formFile = ff; @@ -310,8 +310,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; } @@ -328,8 +328,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 ), #ifndef KOMMANDER project( 0 ), completionDirty( false ) @@ -559,7 +559,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/kommander/editor/workspace.h b/kommander/editor/workspace.h index 99470207..de5c8ccc 100644 --- a/kommander/editor/workspace.h +++ b/kommander/editor/workspace.h @@ -46,15 +46,15 @@ public: enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType }; #ifndef KOMMANDER - //WorkspaceItem( TQListView *tqparent, Project* p ); + //WorkspaceItem( TQListView *parent, Project* p ); #else - WorkspaceItem(TQListView *tqparent); + WorkspaceItem(TQListView *parent); #endif #ifndef KOMMANDER -// WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ); +// WorkspaceItem( TQListViewItem *parent, SourceFile* sf ); #endif - WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type t = FormFileType ); - WorkspaceItem( TQListView *tqparent, FormFile* ff, Type t = FormFileType ); + WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType ); + WorkspaceItem( TQListView *parent, FormFile* ff, Type t = FormFileType ); void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -97,7 +97,7 @@ class Workspace : public TQListView TQ_OBJECT public: - Workspace( TQWidget *tqparent , MainWindow *mw ); + Workspace( TQWidget *parent , MainWindow *mw ); #ifndef KOMMANDER void setCurrentProject( Project *pro ); diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr index cdd17f53..7d15aecf 100755 --- a/kommander/examples/current/kpartmwframe.kmdr +++ b/kommander/examples/current/kpartmwframe.kmdr @@ -95,7 +95,7 @@ _loadup = 2 <stringlist> <string>#!kommander if widgetExists("ScriptObject13") then - TextBrowser1.setText("This text was written by a script on the tqparent frame window. It could have been a dialog, but we chose to illustrate with a MainWindow for this demo.") + TextBrowser1.setText("This text was written by a script on the parent frame window. It could have been a dialog, but we chose to illustrate with a MainWindow for this demo.") ScriptObject13.execute else message_error("You do not have the KPart child dialog loaded") diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr index 11b6a806..26e4171c 100755 --- a/kommander/examples/current/kpartpart.kmdr +++ b/kommander/examples/current/kpartpart.kmdr @@ -42,11 +42,11 @@ </property> <property name="text"> <string>You can click the test button to insert text -If you are loaded in the tqparent frame you can click the rocket icon on the toolbar or use the function menu to select "Talk to KPart". +If you are loaded in the parent frame you can click the rocket icon on the toolbar or use the function menu to select "Talk to KPart". -Any Kommander program can be run as a KPart. You need the KPart plugin to load KParts. Note that running Kommander programs as KParts is not without risks. For one thing you loose DCOP in the tqparent and the old parser ceases to work. Additionally since all widgets are accecssible from the tqparent and duplicate widget name can cause a Kommander lock up. +Any Kommander program can be run as a KPart. You need the KPart plugin to load KParts. Note that running Kommander programs as KParts is not without risks. For one thing you loose DCOP in the parent and the old parser ceases to work. Additionally since all widgets are accecssible from the parent and duplicate widget name can cause a Kommander lock up. -Because of all this and the fact that the Actions on the unsupported MainWindow are incompatible it is impossible for the child to talk with the tqparent. On this dialog we use a timer on the tqparent polling the child for requests every 100 ms. It's a crude hack but it does yield acceptable behavior. +Because of all this and the fact that the Actions on the unsupported MainWindow are incompatible it is impossible for the child to talk with the parent. On this dialog we use a timer on the parent polling the child for requests every 100 ms. It's a crude hack but it does yield acceptable behavior. This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string> </property> @@ -97,7 +97,7 @@ endif if _LOADED == true then kpmessage.setText("You have mail") else - message_info("this only works when loaded as a KPart in it's tqparent window") + message_info("this only works when loaded as a KPart in it's parent window") endif </string> </stringlist> @@ -122,7 +122,7 @@ endif </property> <property name="associations" stdset="0"> <stringlist> - <string>message_info("We just got a message from our tqparent frame!", "Parent called Child")</string> + <string>message_info("We just got a message from our parent frame!", "Parent called Child")</string> </stringlist> </property> </widget> diff --git a/kommander/executor/dcopkommanderif.h b/kommander/executor/dcopkommanderif.h index c756b059..3158fa6e 100644 --- a/kommander/executor/dcopkommanderif.h +++ b/kommander/executor/dcopkommanderif.h @@ -58,7 +58,7 @@ virtual void setChecked(const TQString &widgetName, bool checked) = 0; virtual void setAssociatedText(const TQString &widgetName, const TQString &text) = 0; virtual TQStringList associatedText(const TQString &widgetName) = 0; virtual TQString type(const TQString& widget) = 0; -virtual TQStringList tqchildren(const TQString& tqparent, bool recursive) = 0; +virtual TQStringList tqchildren(const TQString& parent, bool recursive) = 0; virtual TQString global(const TQString& variableName) = 0; virtual void setGlobal(const TQString& variableName, const TQString& value) = 0; virtual void setMaximum(const TQString &widgetName, int value) = 0; diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index 88d7d7ec..44e56c21 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -101,7 +101,7 @@ bool Instance::build(const KURL& fname) KommanderFactory::loadPlugins(); if (fname.isValid()) - m_instance = KommanderFactory::create(fname.path(), 0L, dynamic_cast<TQWidget*>(tqparent())); + m_instance = KommanderFactory::create(fname.path(), 0L, dynamic_cast<TQWidget*>(parent())); else { TQFile inputFile; @@ -431,10 +431,10 @@ TQString Instance::type(const TQString& widget) return TQString(); } -TQStringList Instance::tqchildren(const TQString& tqparent, bool recursive) +TQStringList Instance::tqchildren(const TQString& parent, bool recursive) { TQStringList matching; - TQObject* child = stringToWidget(tqparent); + TQObject* child = stringToWidget(parent); TQObjectList* widgets; if (!child) child = TQT_TQOBJECT(m_instance); diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h index 469d7202..c61f0c03 100644 --- a/kommander/executor/instance.h +++ b/kommander/executor/instance.h @@ -90,7 +90,7 @@ public: virtual void setAssociatedText(const TQString &widgetName, const TQString &text); virtual TQStringList associatedText(const TQString &widgetName); virtual TQString type(const TQString& widget); - virtual TQStringList tqchildren(const TQString& tqparent, bool recursive); + virtual TQStringList tqchildren(const TQString& parent, bool recursive); virtual TQString global(const TQString& variableName); virtual void setGlobal(const TQString& variableName, const TQString& value); virtual void setMaximum(const TQString &widgetName, int value); @@ -112,7 +112,7 @@ public: TQWidget *widget() { return m_instance;} public slots: - /** Sets the instance's tqparent */ + /** Sets the instance's parent */ void setParent(TQWidget*); /** Returns whether the instance is built */ bool isBuilt() const; @@ -127,7 +127,7 @@ private: TQGuardedPtr<TQWidget> m_instance; /* Associated Text Instance */ KommanderWidget *m_textInstance; - /** The tqparent widget */ + /** The parent widget */ TQWidget *m_parent; /* Get object by name */ TQObject* stringToWidget(const TQString& name); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 5b1e12bc..0247a814 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -126,7 +126,7 @@ KommanderFactory::~KommanderFactory() qwf_currFileName = 0L; } -TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, TQWidget *tqparent, const char *name ) +TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, TQWidget *parent, const char *name ) { TQFile f( uiFile ); if ( !f.open( IO_ReadOnly ) ) @@ -135,14 +135,14 @@ TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, if (!qwf_currFileName) qwf_currFileName = new TQString(); *qwf_currFileName = uiFile; - TQWidget *w = KommanderFactory::create( TQT_TQIODEVICE(&f), connector, tqparent, name ); + TQWidget *w = KommanderFactory::create( TQT_TQIODEVICE(&f), connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms->insert( w, uiFile ); return w; } -TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *tqparent, const char *name ) +TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *parent, const char *name ) { TQDomDocument doc; TQString errMsg; @@ -217,7 +217,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg if ( !imageCollection.isNull() ) widgetFactory->loadImageCollection( imageCollection ); - widgetFactory->createWidgetInternal( widget, tqparent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); + widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); TQWidget *w = widgetFactory->toplevel; if ( !w ) { delete widgetFactory; @@ -310,110 +310,110 @@ void KommanderFactory::addPlugin( KommanderPlugin *plugin ) widgetPlugins.append( plugin ); } -TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWidget *tqparent, const char *name ) +TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWidget *parent, const char *name ) { TQString className = literalClassName; // 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) - 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 == TQMAINWINDOW_OBJECT_NAME_STRING) { TQMainWindow *mw = 0; if (!qwf_stays_on_top) - mw = new KmdrMainWindow(tqparent, name); + mw = new KmdrMainWindow(parent, name); else - mw = new KmdrMainWindow(tqparent, name, TQt::WType_TopLevel | TQt::WStyle_StaysOnTop); + mw = new KmdrMainWindow(parent, name, TQt::WType_TopLevel | TQt::WStyle_StaysOnTop); mw->setCentralWidget(new TQWidget(mw, "qt_central_widget")); mw->centralWidget()->show(); (void) mw->statusBar(); @@ -421,18 +421,18 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi } #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 // try to create it using the loaded kommander widget plugins //find the widget plugin which can create className for (KommanderPlugin * p = widgetPlugins.first(); p; p = widgetPlugins.next()) { - TQWidget *w = p->create(className, tqparent, name); + TQWidget *w = p->create(className, parent, name); if (w) return w; } @@ -497,7 +497,7 @@ FeatureList KommanderFactory::featureList() //iterate through widgetPlugins, appending KommanderPlugin::widgets() to features } -TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg ) +TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ) { lastItem = 0; TQDomElement n = e.firstChild().toElement(); @@ -519,9 +519,9 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge className = TQWIDGET_OBJECT_NAME_STRING; if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { // hide tqlayout widgets - w = tqparent; + w = parent; } else { - obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, tqparent, 0 )); + obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, parent, 0 )); if ( !obj ) { return 0; @@ -599,16 +599,16 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, translate(v.toString()) ); + ( (TQTabWidget*)parent )->insertTab( w, translate(v.toString()) ); } else - if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { if ( attrib == "label" ) - ( (TQToolBox*)tqparent )->addItem( w, translate(v.toString()) ); - }else if ( tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + ( (TQToolBox*)parent )->addItem( w, translate(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()) ); } } else if ( n.tagName() == "item" ) { createItem( n, w ); @@ -792,8 +792,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T noDatabaseWidgets << obj->name(); } } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->tqparent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) - ( (TQButtonGroup*)obj->tqparent() )->insert( (TQButton*)obj, v.toInt() ); + if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, v.toInt() ); } return; @@ -1344,13 +1344,13 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi -void KommanderFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e ) +void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) { TQDomElement n = e; TQAction *a = 0; EventFunction ef; if ( n.tagName() == "action" ) { - a = new TQAction( tqparent ); + a = new TQAction( parent ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { @@ -1361,10 +1361,10 @@ void KommanderFactory::loadChildAction( TQObject *tqparent, const TQDomElement & } 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" ) { @@ -1378,7 +1378,7 @@ void KommanderFactory::loadChildAction( TQObject *tqparent, const TQDomElement & } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) actionList.append( a ); } if ( a ) diff --git a/kommander/factory/kommanderfactory.h b/kommander/factory/kommanderfactory.h index 8098f877..9b38ae9e 100644 --- a/kommander/factory/kommanderfactory.h +++ b/kommander/factory/kommanderfactory.h @@ -60,13 +60,13 @@ public: KommanderFactory(); virtual ~KommanderFactory(); - 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 int loadPlugins( bool force = FALSE ); static void addPlugin( KommanderPlugin *plugin ); static void loadImages( const TQString &dir ); - static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ); + static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ); static FeatureList featureList(); private: @@ -74,7 +74,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 ); LayoutType layoutType( TQLayout *l ) const; void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e ); @@ -85,7 +85,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 ); diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr index a5c2f55e..21a13ae7 100755 --- a/kommander/kmdrtools/dcoptool-oldparser.kmdr +++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr @@ -796,7 +796,7 @@ fi @setGlobal(PARM3,"") @setGlobal(PARM4,"") @setGlobal(short,tqchildren) - @setGlobal(DESC,"Returns the list of child widgets contained in the tqparent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets.") + @setGlobal(DESC,"Returns the list of child widgets contained in the parent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets.") @case(DCOP::clear(QString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @@ -1124,7 +1124,7 @@ fi @setGlobal(PARM3,"") @setGlobal(PARM4,"") @setGlobal(short,parentPid) - @setGlobal(DESC,"Returns the pid of the tqparent Kommander window.") + @setGlobal(DESC,"Returns the pid of the parent Kommander window.") @case(Kommander::debug(QString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @@ -1276,7 +1276,7 @@ fi @setGlobal(PARM3,"function") @setGlobal(PARM4,"args") @setGlobal(short,dcop) - @setGlobal(DESC,"Creates a new widget with the specified type and as the child of tqparent.") + @setGlobal(DESC,"Creates a new widget with the specified type and as the child of parent.") @case(Kommander::dcop(QString,QString,QString,QString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp index 1d9a1393..d8645bc9 100644 --- a/kommander/part/kommander_part.cpp +++ b/kommander/part/kommander_part.cpp @@ -34,8 +34,8 @@ typedef KParts::GenericFactory<KommanderPart> KommanderPartFactory; K_EXPORT_COMPONENT_FACTORY( libkommander_part, KommanderPartFactory ) KommanderPart::KommanderPart( TQWidget *parentWidget, const char * /*widgetName*/, - TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) - : KParts::ReadOnlyPart(tqparent, name) + TQObject *parent, const char *name, const TQStringList & /*args*/ ) + : KParts::ReadOnlyPart(parent, name) { setInstance( KommanderPartFactory::instance() ); m_instance = 0L; @@ -79,7 +79,7 @@ void KommanderPart::slotRun() { w->reparent(m_widget, 0, TQPoint(0,0)); m_layout->addWidget(w, 0, 0); - w->show(); //show, not execute, so it doesn't block the tqparent + w->show(); //show, not execute, so it doesn't block the parent } } diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h index 9000195c..b3bad9d7 100644 --- a/kommander/part/kommander_part.h +++ b/kommander/part/kommander_part.h @@ -27,7 +27,7 @@ class KommanderPart : public KParts::ReadOnlyPart TQ_OBJECT public: KommanderPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &args); + TQObject *parent, const char *name, const TQStringList &args); virtual ~KommanderPart(); diff --git a/kommander/plugin/kommanderplugin.h b/kommander/plugin/kommanderplugin.h index ae06fdc0..16846013 100644 --- a/kommander/plugin/kommanderplugin.h +++ b/kommander/plugin/kommanderplugin.h @@ -54,7 +54,7 @@ class KOMMANDER_EXPORT KommanderPlugin : public TQObject virtual void removeWidget( const TQString &name ); virtual TQStringList widgets() const; - virtual TQWidget *create( const TQString &key, TQWidget *tqparent = 0, const char *name = 0 ) = 0; + virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 ) = 0; virtual TQString group( const TQString &key ) const; virtual TQString toolTip( const TQString &key ) const; virtual TQString whatsThis( const TQString &key ) const; diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp index a653dfd6..bb248dda 100644 --- a/kommander/plugin/specialinformation.cpp +++ b/kommander/plugin/specialinformation.cpp @@ -292,7 +292,7 @@ void SpecialInformation::registerSpecials() insert(DCOP::checked, "checked(TQString widget)", i18n("Returns 1 for checked boxes, 0 for unchecked."), 1); insert(DCOP::tqchildren, "tqchildren(TQString widget, bool recursive)", - i18n("Returns the list of child widgets contained in the tqparent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets."), 2); + i18n("Returns the list of child widgets contained in the parent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets."), 2); insert(DCOP::clear, "clear(TQString widget)", i18n("Removes all content from the widget."), 1); insertAlias(DCOP::clear, "clearList"); @@ -401,7 +401,7 @@ void SpecialInformation::registerSpecials() i18n("Returns DCOP identifier of current process. This is shorthand for <i>kmdr-executor-@pid</i>."), 0); insert(Kommander::parentPid, "parentPid", - i18n("Returns the pid of the tqparent Kommander window."), 0); + i18n("Returns the pid of the parent Kommander window."), 0); insert(Kommander::debug, "debug(TQString text)", i18n("Writes <i>text</i> on stderr."), 1); insert(Kommander::echo, "echo(TQString text)", @@ -440,8 +440,8 @@ void SpecialInformation::registerSpecials() i18n("Executes an external DCOP call."), 3, 9); insertMacro(Kommander::comment, "#", i18n("Adds a comment to EOL that Kommander will not parse"), 0); - insertInternal(Kommander::createWidget, "createWidget(TQString widgetName, TQString widgetType, TQString tqparent)", - i18n("Creates a new widget with the specified type and as the child of tqparent."), 3); + insertInternal(Kommander::createWidget, "createWidget(TQString widgetName, TQString widgetType, TQString parent)", + i18n("Creates a new widget with the specified type and as the child of parent."), 3); insertInternal(Kommander::widgetExists, "widgetExists(TQString widgetName)", i18n("Returns true if there is a widget with the passed name, false otherwise."), 1); insertInternal(Kommander::connect, "connect(TQString sender, TQString signal, TQString receiver, TQString slot)", diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp index c2947c5b..6148296b 100644 --- a/kommander/pluginmanager/mainwindow.cpp +++ b/kommander/pluginmanager/mainwindow.cpp @@ -28,8 +28,8 @@ #include <kglobal.h> #include <kstandarddirs.h> -MainWindow::MainWindow( TQWidget* tqparent, const char *name, WFlags f ) - : KMainWindow( tqparent, name, f ) +MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) + : KMainWindow( parent, name, f ) { KToolBar *toolBar = new KToolBar( this ); toolBar->insertButton("fileopen", Add, true, i18n("Add") ); diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h index ffc59ace..51c02a5e 100644 --- a/kommander/pluginmanager/mainwindow.h +++ b/kommander/pluginmanager/mainwindow.h @@ -28,7 +28,7 @@ class MainWindow : public KMainWindow Q_OBJECT TQ_OBJECT public: - MainWindow( TQWidget* tqparent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); + MainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); ~MainWindow(); protected slots: diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index da699bd2..8886acab 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -411,8 +411,8 @@ static ParseNode f_createWidget(Parser* p, const ParameterList& params) KommanderWidget *widget = p->currentWidget()->widgetByName(parentName); if (!widget) return ParseNode::error("unknown widget"); - TQWidget *tqparent = dynamic_cast<TQWidget*>(widget->object()); - TQWidget *w = KommanderFactory::createWidget(widgetType, tqparent, widgetName.latin1()); + TQWidget *parent = dynamic_cast<TQWidget*>(widget->object()); + TQWidget *w = KommanderFactory::createWidget(widgetType, parent, widgetName.latin1()); if (w) w->adjustSize(); return ParseNode(); diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp index a82a5305..ec360d69 100644 --- a/kommander/widget/invokeclass.cpp +++ b/kommander/widget/invokeclass.cpp @@ -15,7 +15,7 @@ #include <tqcolor.h> #include <tqregexp.h> -InvokeClass::InvokeClass(TQObject *tqparent):TQObject(tqparent) +InvokeClass::InvokeClass(TQObject *parent):TQObject(parent) { m_acceptedSlots = acceptedSlots(); } diff --git a/kommander/widget/invokeclass.h b/kommander/widget/invokeclass.h index 043ba73b..19001f9e 100644 --- a/kommander/widget/invokeclass.h +++ b/kommander/widget/invokeclass.h @@ -20,7 +20,7 @@ class InvokeClass : public TQObject { Q_OBJECT TQ_OBJECT public: - InvokeClass(TQObject *tqparent); + InvokeClass(TQObject *parent); void invokeSlot(TQObject *object, const TQString& slot, TQStringList args); static TQStringList acceptedSlots() diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp index 603c1326..e123a035 100644 --- a/kommander/widget/kmdrmainwindow.cpp +++ b/kommander/widget/kmdrmainwindow.cpp @@ -13,8 +13,8 @@ #include <tqtimer.h> -KmdrMainWindow::KmdrMainWindow(TQWidget *tqparent, const char *name, WFlags f) - : KMainWindow(tqparent, name, f) +KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f) + : KMainWindow(parent, name, f) { TQTimer::singleShot(10, this, TQT_SIGNAL(initialize())); } diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h index 4896db2b..0d1a415b 100644 --- a/kommander/widget/kmdrmainwindow.h +++ b/kommander/widget/kmdrmainwindow.h @@ -22,7 +22,7 @@ class KmdrMainWindow : public KMainWindow Q_OBJECT TQ_OBJECT public: - KmdrMainWindow(TQWidget *tqparent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose); + KmdrMainWindow(TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose); ~KmdrMainWindow(); diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 793be627..d0f9e885 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -652,9 +652,9 @@ TQString KommanderWidget::substituteVariable(TQString text, TQString variable, T TQWidget* KommanderWidget::parentDialog() const { TQObject *superParent = m_thisObject; - while (superParent->tqparent()) + while (superParent->parent()) { - superParent = superParent->tqparent(); + superParent = superParent->parent(); if (superParent->inherits(TQDIALOG_OBJECT_NAME_STRING) || superParent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) break; } diff --git a/kommander/widget/kommanderwidget.h b/kommander/widget/kommanderwidget.h index bb223f3d..d3116c80 100644 --- a/kommander/widget/kommanderwidget.h +++ b/kommander/widget/kommanderwidget.h @@ -140,7 +140,7 @@ protected: // Parse given identifier as widget name KommanderWidget* parseWidget(const TQString& name) const; - // Return tqparent dialog of this widget + // Return parent dialog of this widget TQWidget* parentDialog() const; TQString substituteVariable(TQString text, TQString variable, TQString value) const; diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index 4425412c..287302c8 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -36,8 +36,8 @@ enum Functions { LastFunction }; -AboutDialog::AboutDialog(TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this)) +AboutDialog::AboutDialog(TQWidget *parent, const char *name) + : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h index 5837f355..0afa9fc4 100644 --- a/kommander/widgets/aboutdialog.h +++ b/kommander/widgets/aboutdialog.h @@ -29,7 +29,7 @@ class AboutDialog : public TQLabel, public KommanderWidget TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) public: - AboutDialog(TQWidget *tqparent = 0, const char *name = 0); + AboutDialog(TQWidget *parent = 0, const char *name = 0); ~AboutDialog(); diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index a8892d13..af6c5561 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -41,14 +41,14 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); - TQObject *tqparent = TQT_TQOBJECT(this); - while (tqparent->tqparent() != 0) + TQObject *parent = TQT_TQOBJECT(this); + while (parent->parent() != 0) { - tqparent = tqparent->tqparent(); - if (tqparent->inherits(TQDIALOG_OBJECT_NAME_STRING)) + parent = parent->parent(); + if (parent->inherits(TQDIALOG_OBJECT_NAME_STRING)) break; } - connect(this, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(reject())); + connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); } CloseButton::~CloseButton() diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index 3efde0f4..b2f0fdba 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -28,8 +28,8 @@ enum Functions { LastFunction }; -FontDialog::FontDialog(TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this)) +FontDialog::FontDialog(TQWidget *parent, const char *name) + : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h index 46c828e2..d81f15fa 100644 --- a/kommander/widgets/fontdialog.h +++ b/kommander/widgets/fontdialog.h @@ -28,7 +28,7 @@ class FontDialog : public TQLabel, public KommanderWidget TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - FontDialog(TQWidget *tqparent = 0, const char *name = 0); + FontDialog(TQWidget *parent = 0, const char *name = 0); ~FontDialog(); diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp index 009da398..020ae6da 100644 --- a/kommander/widgets/plugin.cpp +++ b/kommander/widgets/plugin.cpp @@ -57,7 +57,7 @@ class KomStdPlugin : public KommanderPlugin { public: KomStdPlugin(); - virtual TQWidget *create( const TQString &key, TQWidget *tqparent = 0, const char *name = 0 ); + virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 ); }; KomStdPlugin::KomStdPlugin() @@ -97,41 +97,41 @@ KomStdPlugin::KomStdPlugin() addWidget("AboutDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium))); } -TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *tqparent, const char *name ) +TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name ) { - if (key == "ButtonGroup") return new ButtonGroup(tqparent, name); - else if (key == "CheckBox") return new CheckBox(tqparent, name); - else if (key == "CloseButton") return new CloseButton(tqparent, name); - else if (key == "ComboBox") return new ComboBox(tqparent, name); - else if (key == "Dialog") return new Dialog(tqparent, name); - else if (key == "ExecButton") return new ExecButton(tqparent, name); - else if (key == "FileSelector") return new FileSelector(tqparent, name); - else if (key == "GroupBox") return new GroupBox(tqparent, name); - else if (key == "Konsole") return new Konsole(tqparent, name); - else if (key == "Label") return new Label(tqparent, name); - else if (key == "LineEdit") return new LineEdit(tqparent, name); - else if (key == "ListBox") return new ListBox(tqparent, name); - else if (key == "PixmapLabel") return new PixmapLabel(tqparent, name); - else if (key == "ProgressBar") return new ProgressBar(tqparent, name); - else if (key == "RadioButton") return new RadioButton(tqparent, name); - else if (key == "RichTextEditor") return new RichTextEditor(tqparent, name); - else if (key == "ScriptObject") return new ScriptObject(tqparent, name); - else if (key == "Slider") return new Slider(tqparent, name); - else if (key == "SpinBoxInt") return new SpinBoxInt(tqparent, name); - else if (key == "StatusBar") return new StatusBar(tqparent, name); - else if (key == "SubDialog") return new SubDialog(tqparent, name); - else if (key == "Table") return new Table(tqparent, name); - else if (key == "TabWidget") return new TabWidget(tqparent, name); - else if (key == "ToolBox") return new ToolBox(tqparent, name); - else if (key == "TextBrowser") return new TextBrowser(tqparent, name); - else if (key == "TextEdit") return new TextEdit(tqparent, name); - else if (key == "Timer") return new Timer(tqparent, name); - else if (key == "TreeWidget") return new TreeWidget(tqparent, name); - else if (key == "Wizard") return new Wizard(tqparent, name); - else if (key == "DatePicker") return new DatePicker(tqparent, name); - else if (key == "PopupMenu") return new PopupMenu(tqparent, name); - else if (key == "FontDialog") return new FontDialog(tqparent, name); - else if (key == "AboutDialog") return new AboutDialog(tqparent, name); + if (key == "ButtonGroup") return new ButtonGroup(parent, name); + else if (key == "CheckBox") return new CheckBox(parent, name); + else if (key == "CloseButton") return new CloseButton(parent, name); + else if (key == "ComboBox") return new ComboBox(parent, name); + else if (key == "Dialog") return new Dialog(parent, name); + else if (key == "ExecButton") return new ExecButton(parent, name); + else if (key == "FileSelector") return new FileSelector(parent, name); + else if (key == "GroupBox") return new GroupBox(parent, name); + else if (key == "Konsole") return new Konsole(parent, name); + else if (key == "Label") return new Label(parent, name); + else if (key == "LineEdit") return new LineEdit(parent, name); + else if (key == "ListBox") return new ListBox(parent, name); + else if (key == "PixmapLabel") return new PixmapLabel(parent, name); + else if (key == "ProgressBar") return new ProgressBar(parent, name); + else if (key == "RadioButton") return new RadioButton(parent, name); + else if (key == "RichTextEditor") return new RichTextEditor(parent, name); + else if (key == "ScriptObject") return new ScriptObject(parent, name); + else if (key == "Slider") return new Slider(parent, name); + else if (key == "SpinBoxInt") return new SpinBoxInt(parent, name); + else if (key == "StatusBar") return new StatusBar(parent, name); + else if (key == "SubDialog") return new SubDialog(parent, name); + else if (key == "Table") return new Table(parent, name); + else if (key == "TabWidget") return new TabWidget(parent, name); + else if (key == "ToolBox") return new ToolBox(parent, name); + else if (key == "TextBrowser") return new TextBrowser(parent, name); + else if (key == "TextEdit") return new TextEdit(parent, name); + else if (key == "Timer") return new Timer(parent, name); + else if (key == "TreeWidget") return new TreeWidget(parent, name); + else if (key == "Wizard") return new Wizard(parent, name); + else if (key == "DatePicker") return new DatePicker(parent, name); + else if (key == "PopupMenu") return new PopupMenu(parent, name); + else if (key == "FontDialog") return new FontDialog(parent, name); + else if (key == "AboutDialog") return new AboutDialog(parent, name); else return 0; } diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index e00ee485..7bf77c27 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -32,8 +32,8 @@ #define INSERTSUBMENU 109 #define LAST_FUNCTION INSERTSUBMENU -PopupMenu::PopupMenu(TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this)) +PopupMenu::PopupMenu(TQWidget *parent, const char *name) + : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h index 9a0dc925..e9e6c638 100644 --- a/kommander/widgets/popupmenu.h +++ b/kommander/widgets/popupmenu.h @@ -30,7 +30,7 @@ class PopupMenu : public TQLabel, public KommanderWidget TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - PopupMenu(TQWidget *tqparent = 0, const char *name = 0); + PopupMenu(TQWidget *parent = 0, const char *name = 0); ~PopupMenu(); virtual bool isKommanderWidget() const; diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp index b2b57748..fad8ca38 100644 --- a/kommander/widgets/toolbox.cpp +++ b/kommander/widgets/toolbox.cpp @@ -27,8 +27,8 @@ #define FIRST_FUNCTION ADDWIDGET #define LAST_FUNCTION INDEXOF -ToolBox::ToolBox(TQWidget *tqparent, const char *name) - : TQToolBox(tqparent, name), KommanderWidget(TQT_TQOBJECT(this)) +ToolBox::ToolBox(TQWidget *parent, const char *name) + : TQToolBox(parent, name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h index ab5375b0..a7245889 100644 --- a/kommander/widgets/toolbox.h +++ b/kommander/widgets/toolbox.h @@ -26,7 +26,7 @@ class ToolBox : public TQToolBox, public KommanderWidget TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - ToolBox(TQWidget *tqparent = 0, const char *name = 0); + ToolBox(TQWidget *parent = 0, const char *name = 0); ~ToolBox(); diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index d9f6b0c8..9a19d2b0 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -95,7 +95,7 @@ void TreeWidget::addItemFromString(const TQString& s) TQStringList elements = TQStringList::split(m_pathSeparator, s, true); if (elements.count() > 1) setRootIsDecorated(true); - TQListViewItem* tqparent = 0; + TQListViewItem* parent = 0; if (m_lastPath.size() < elements.count()) m_lastPath.resize(elements.count()); uint i = 0; @@ -103,13 +103,13 @@ void TreeWidget::addItemFromString(const TQString& s) { if (m_lastPath[i] && m_lastPath[i]->text(0) == elements[i]) { - tqparent = m_lastPath[i]; + parent = m_lastPath[i]; i++; continue; } else { - TQListViewItem* item = (i>0) ? tqparent->firstChild() : firstChild(); + TQListViewItem* item = (i>0) ? parent->firstChild() : firstChild(); while (item) { if (item->text(0) == *it) @@ -117,16 +117,16 @@ void TreeWidget::addItemFromString(const TQString& s) item = item->nextSibling(); } if (item) - tqparent = item; + parent = item; else - tqparent = itemFromString(tqparent, *it); - m_lastPath.insert(i, tqparent); + parent = itemFromString(parent, *it); + m_lastPath.insert(i, parent); i++; } } } -TQListViewItem* TreeWidget::itemFromString(TQListViewItem* tqparent, const TQString& s) +TQListViewItem* TreeWidget::itemFromString(TQListViewItem* parent, const TQString& s) { TQStringList elements; if (s.contains("\t")) @@ -137,8 +137,8 @@ TQListViewItem* TreeWidget::itemFromString(TQListViewItem* tqparent, const TQStr if (cols >= columns()) cols = columns(); TQListViewItem* item; - if (tqparent) - item = new TQListViewItem(tqparent); + if (parent) + item = new TQListViewItem(parent); else item = new TQListViewItem(this); int i = 0; @@ -219,14 +219,14 @@ TQString TreeWidget::itemPath(TQListViewItem* item) const { if (!item) return TQString(); - item = item->tqparent(); + item = item->parent(); if (!item) return TQString(); TQStringList path; while (item) { path.prepend(item->text(0)); - item = item->tqparent(); + item = item->parent(); } return path.join(m_pathSeparator); } diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h index df7440b1..8cdbeb10 100644 --- a/kommander/widgets/treewidget.h +++ b/kommander/widgets/treewidget.h @@ -76,7 +76,7 @@ protected: TQString itemPath(TQListViewItem* item) const; private: void addItemFromString(const TQString& s); - TQListViewItem* itemFromString(TQListViewItem* tqparent, const TQString& s); + TQListViewItem* itemFromString(TQListViewItem* parent, const TQString& s); TQPtrVector<TQListViewItem> m_lastPath; TQString m_pathSeparator; int addColumnTree(const TQString & label, int width = -1 ); diff --git a/kommander/working/plugintemplate/plugin.cpp b/kommander/working/plugintemplate/plugin.cpp index bad414aa..b6e1a0a0 100644 --- a/kommander/working/plugintemplate/plugin.cpp +++ b/kommander/working/plugintemplate/plugin.cpp @@ -11,7 +11,7 @@ class %{APPNAME}Plugin : public KommanderPlugin { public: %{APPNAME}Plugin(); - virtual TQWidget *create( const TQString &className, TQWidget *tqparent = 0, const char *name = 0); + virtual TQWidget *create( const TQString &className, TQWidget *parent = 0, const char *name = 0); }; %{APPNAME}Plugin::%{APPNAME}Plugin() @@ -19,10 +19,10 @@ public: addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)) ); } -TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *tqparent, const char *name) +TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *parent, const char *name) { if (className == "%{APPNAME}") - return new %{APPNAME}(tqparent, name); + return new %{APPNAME}(parent, name); return 0; } diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp index 7efd8526..0b768911 100644 --- a/kommander/working/plugintemplate/widget.cpp +++ b/kommander/working/plugintemplate/widget.cpp @@ -16,8 +16,8 @@ enum Functions { LastFunction }; -%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), KommanderWidget(this) +%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name) + : TQWidget(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/working/plugintemplate/widget.h b/kommander/working/plugintemplate/widget.h index ab6f042f..2d88f61b 100644 --- a/kommander/working/plugintemplate/widget.h +++ b/kommander/working/plugintemplate/widget.h @@ -22,7 +22,7 @@ class %{APPNAME}: public TQWidget, public KommanderWidget TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - %{APPNAME}(TQWidget *tqparent, const char* name); + %{APPNAME}(TQWidget *parent, const char* name); ~%{APPNAME}(); virtual bool isKommanderWidget() const; |