diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/tools')
212 files changed, 1158 insertions, 1158 deletions
diff --git a/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h b/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h index 9204cd799..c95c41379 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h +++ b/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui.h @@ -90,7 +90,7 @@ void FindDialog::doFind(bool forward) MainWindow* FindDialog::mainWindow() { - return (MainWindow*) tqparent(); + return (MainWindow*) parent(); } bool FindDialog::hasFindExpression() @@ -103,6 +103,6 @@ void FindDialog::statusMessage(const TQString &message) if (isVisible()) sb->message(message); else - ((MainWindow*) tqparent())->statusBar()->message(message, 2000); + ((MainWindow*) parent())->statusBar()->message(message, 2000); } diff --git a/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp b/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp index 8c2e0df4b..db7b0af42 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp @@ -172,8 +172,8 @@ TQString HelpNavigationContentsItem::link() const -HelpDialog::HelpDialog( TQWidget *tqparent, MainWindow *h ) - : HelpDialogBase( tqparent, 0, FALSE ), lwClosed( FALSE ), help( h ) +HelpDialog::HelpDialog( TQWidget *parent, MainWindow *h ) + : HelpDialogBase( parent, 0, FALSE ), lwClosed( FALSE ), help( h ) { } diff --git a/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.h b/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.h index 13b4c518a..6dd5c6234 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.h +++ b/experimental/tqtinterface/qt4/tools/assistant/helpdialogimpl.h @@ -69,8 +69,8 @@ class SearchValidator : public TQValidator Q_OBJECT TQ_OBJECT public: - SearchValidator( TQObject *tqparent, const char *name = 0 ) - : TQValidator( tqparent, name ) {} + SearchValidator( TQObject *parent, const char *name = 0 ) + : TQValidator( parent, name ) {} ~SearchValidator() {} TQValidator::State validate( TQString &str, int & ) const; }; @@ -94,7 +94,7 @@ class HelpDialog : public HelpDialogBase TQ_OBJECT public: - HelpDialog( TQWidget *tqparent, MainWindow *h ); + HelpDialog( TQWidget *parent, MainWindow *h ); TQString titleOfLink( const TQString &link ); bool eventFilter( TQObject *, TQEvent * ); diff --git a/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp b/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp index 25d774dc6..bf338a987 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/helpwindow.cpp @@ -55,8 +55,8 @@ #include <windows.h> #endif -HelpWindow::HelpWindow( MainWindow *w, TQWidget *tqparent, const char *name ) - : TQTextBrowser( tqparent, name ), mw( w ), blockScroll( FALSE ), +HelpWindow::HelpWindow( MainWindow *w, TQWidget *parent, const char *name ) + : TQTextBrowser( parent, name ), mw( w ), blockScroll( FALSE ), shiftPressed( FALSE ), newWindow( FALSE ) { connect(this, TQT_SIGNAL(forwardAvailable(bool)), this, TQT_SLOT(updateForward(bool))); diff --git a/experimental/tqtinterface/qt4/tools/assistant/helpwindow.h b/experimental/tqtinterface/qt4/tools/assistant/helpwindow.h index a00774ffc..5ae2d5edf 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpwindow.h +++ b/experimental/tqtinterface/qt4/tools/assistant/helpwindow.h @@ -46,7 +46,7 @@ class HelpWindow : public TQTextBrowser Q_OBJECT TQ_OBJECT public: - HelpWindow( MainWindow *m, TQWidget *tqparent = 0, const char *name = 0 ); + HelpWindow( MainWindow *m, TQWidget *parent = 0, const char *name = 0 ); void setSource( const TQString &name ); TQPopupMenu *createPopupMenu( const TQPoint& pos ); void blockScrolling( bool b ); diff --git a/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.cpp b/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.cpp index 4478642d6..b642bc3f0 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.cpp @@ -128,11 +128,11 @@ static TQAssistantClientPrivate *data( const TQAssistantClient *client, bool cre path to the TQt Assistant executable. If \a path is an empty string the system path (\c{%PATH%} or \c $PATH) is used. - The assistant client object is a child of \a tqparent and is called + The assistant client object is a child of \a parent and is called \a name. */ -TQAssistantClient::TQAssistantClient( const TQString &path, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), host ( "localhost" ) +TQAssistantClient::TQAssistantClient( const TQString &path, TQObject *parent, const char *name ) + : TQObject( parent, name ), host ( "localhost" ) { if ( path.isEmpty() ) assistantCommand = "assistant"; diff --git a/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.h b/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.h index 64b95d99c..faf335171 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.h +++ b/experimental/tqtinterface/qt4/tools/assistant/lib/tqassistantclient.h @@ -46,7 +46,7 @@ class TQAssistantClient : public TQObject Q_PROPERTY( bool open READ isOpen ) public: - TQAssistantClient( const TQString &path, TQObject *tqparent = 0, const char *name = 0 ); + TQAssistantClient( const TQString &path, TQObject *parent = 0, const char *name = 0 ); ~TQAssistantClient(); bool isOpen() const; diff --git a/experimental/tqtinterface/qt4/tools/assistant/main.cpp b/experimental/tqtinterface/qt4/tools/assistant/main.cpp index 8b60a9e79..2c861c88f 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/main.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/main.cpp @@ -61,7 +61,7 @@ class AssistantSocket : public TQSocket Q_OBJECT TQ_OBJECT public: - AssistantSocket( int sock, TQObject *tqparent = 0 ); + AssistantSocket( int sock, TQObject *parent = 0 ); ~AssistantSocket() {} Q_SIGNALS: @@ -78,7 +78,7 @@ class AssistantServer : public TQServerSocket Q_OBJECT TQ_OBJECT public: - AssistantServer( TQObject* tqparent = 0 ); + AssistantServer( TQObject* parent = 0 ); void newConnection( int socket ); TQ_UINT16 getPort() const; @@ -91,8 +91,8 @@ private: }; -AssistantSocket::AssistantSocket( int sock, TQObject *tqparent ) - : TQSocket( tqparent, 0 ) +AssistantSocket::AssistantSocket( int sock, TQObject *parent ) + : TQSocket( parent, 0 ) { connect( this, TQT_SIGNAL( readyRead() ), TQT_SLOT( readClient() ) ); @@ -118,8 +118,8 @@ void AssistantSocket::connectionClosed() delete this; } -AssistantServer::AssistantServer( TQObject *tqparent ) - : TQServerSocket( 0x7f000001, 0, 1, tqparent ) +AssistantServer::AssistantServer( TQObject *parent ) + : TQServerSocket( 0x7f000001, 0, 1, parent ) { if ( !ok() ) { TQMessageBox::critical( 0, tr( "TQt Assistant" ), diff --git a/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.cpp b/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.cpp index 39abaa7b0..287bb374c 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.cpp @@ -54,8 +54,8 @@ #include <tqmap.h> -SettingsDialog::SettingsDialog( TQWidget *tqparent, const char* name ) - : SettingsDialogBase( tqparent, name ) +SettingsDialog::SettingsDialog( TQWidget *parent, const char* name ) + : SettingsDialogBase( parent, name ) { init(); } diff --git a/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.h b/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.h index 3865630da..2e07a48ff 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.h +++ b/experimental/tqtinterface/qt4/tools/assistant/settingsdialogimpl.h @@ -46,7 +46,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog( TQWidget *tqparent, const char* name = 0 ); + SettingsDialog( TQWidget *parent, const char* name = 0 ); protected Q_SLOTS: void selectColor(); diff --git a/experimental/tqtinterface/qt4/tools/assistant/tabbedbrowser.ui.h b/experimental/tqtinterface/qt4/tools/assistant/tabbedbrowser.ui.h index b059b544a..5f16dd1ea 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/tabbedbrowser.ui.h +++ b/experimental/tqtinterface/qt4/tools/assistant/tabbedbrowser.ui.h @@ -200,7 +200,7 @@ void TabbedBrowser::updateTitle( const TQString &title ) MainWindow* TabbedBrowser::mainWindow() { - return (MainWindow*) tqparent(); + return (MainWindow*) parent(); } void TabbedBrowser::newTab() diff --git a/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp b/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp index daeedc5ea..d6048d229 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp @@ -37,9 +37,9 @@ #include <tqlistbox.h> #include <tqpushbutton.h> -TopicChooser::TopicChooser( TQWidget *tqparent, const TQStringList &lnkNames, +TopicChooser::TopicChooser( TQWidget *parent, const TQStringList &lnkNames, const TQStringList &lnks, const TQString &title ) - : TopicChooserBase( tqparent, 0, TRUE ), links( lnks ), linkNames( lnkNames ) + : TopicChooserBase( parent, 0, TRUE ), links( lnks ), linkNames( lnkNames ) { label->setText( tr( "Choose a topic for <b>%1</b>" ).arg( title ) ); listbox->insertStringList( linkNames ); @@ -58,10 +58,10 @@ TQString TopicChooser::link() const return links[ i ]; } -TQString TopicChooser::getLink( TQWidget *tqparent, const TQStringList &lnkNames, +TQString TopicChooser::getLink( TQWidget *parent, const TQStringList &lnkNames, const TQStringList &lnks, const TQString &title ) { - TopicChooser *dlg = new TopicChooser( tqparent, lnkNames, lnks, title ); + TopicChooser *dlg = new TopicChooser( parent, lnkNames, lnks, title ); TQString lnk; if ( dlg->exec() == TQDialog::Accepted ) lnk = dlg->link(); diff --git a/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.h b/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.h index 1bfd10b47..8b3af6d5a 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.h +++ b/experimental/tqtinterface/qt4/tools/assistant/topicchooserimpl.h @@ -43,12 +43,12 @@ class TopicChooser : public TopicChooserBase TQ_OBJECT public: - TopicChooser( TQWidget *tqparent, const TQStringList &lnkNames, + TopicChooser( TQWidget *parent, const TQStringList &lnkNames, const TQStringList &lnks, const TQString &title ); TQString link() const; - static TQString getLink( TQWidget *tqparent, const TQStringList &lnkNames, + static TQString getLink( TQWidget *parent, const TQStringList &lnkNames, const TQStringList &lnks, const TQString &title ); private: diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp index 605a264f6..d60a15607 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp @@ -148,14 +148,14 @@ public: }; -TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent, +TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(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 ) ); } @@ -194,8 +194,8 @@ void TQDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) -TQSeparatorAction::TQSeparatorAction( TQObject *tqparent ) - : TQAction( tqparent, "qt_designer_separator" ), wid( 0 ) +TQSeparatorAction::TQSeparatorAction( TQObject *parent ) + : TQAction( parent, "qt_designer_separator" ), wid( 0 ) { } @@ -292,8 +292,8 @@ void TQDesignerToolBar::addAction( TQAction *a ) static void fixObject( TQObject *&o ) { - while ( o && o->tqparent() && !::tqqt_cast<TQDesignerToolBar*>(o->tqparent()) ) - o = o->tqparent(); + while ( o && o->parent() && !::tqqt_cast<TQDesignerToolBar*>(o->parent()) ) + o = o->parent(); } bool TQDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) @@ -707,7 +707,7 @@ void TQDesignerToolBar::doInsertWidget( const TQPoint &p ) TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE ); installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, TRUE ); - TQDesignerAction *a = new TQDesignerAction( w, tqparent() ); + TQDesignerAction *a = new TQDesignerAction( w, parent() ); int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h index e6ec52836..104544908 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h @@ -79,8 +79,8 @@ class TQDesignerActionGroup : public TQActionGroup TQ_OBJECT public: - TQDesignerActionGroup( TQObject *tqparent ) - : TQActionGroup( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ) { init(); } + TQDesignerActionGroup( TQObject *parent ) + : TQActionGroup( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); } void init(); @@ -115,10 +115,10 @@ class TQDesignerAction : public TQAction TQ_OBJECT public: - TQDesignerAction( TQObject *tqparent ) - : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } - TQDesignerAction( TQWidget *w, TQObject *tqparent ) - : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } + TQDesignerAction( TQObject *parent ) + : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } + TQDesignerAction( TQWidget *w, TQObject *parent ) + : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } void init(); @@ -152,7 +152,7 @@ class TQDesignerToolBarSeparator : public TQWidget TQ_OBJECT public: - TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); + TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } @@ -172,7 +172,7 @@ class TQSeparatorAction : public TQAction TQ_OBJECT public: - TQSeparatorAction( TQObject *tqparent ); + TQSeparatorAction( TQObject *parent ); bool addTo( TQWidget *w ); bool removeFrom( TQWidget *w ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.cpp index 8f4851cb2..c1302b10e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.cpp @@ -50,8 +50,8 @@ #include <tqpopupmenu.h> #include <tqobjectlist.h> -ActionEditor::ActionEditor( TQWidget* tqparent, const char* name, WFlags fl ) - : ActionEditorBase( tqparent, name, fl ), currentAction( 0 ), formWindow( 0 ), +ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) + : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ), explicitlyClosed(false) { listActions->addColumn( tr( "Actions" ) ); @@ -155,7 +155,7 @@ void ActionEditor::newAction() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -191,7 +191,7 @@ void ActionEditor::newActionGroup() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -236,7 +236,7 @@ void ActionEditor::setFormWindow( FormWindow *fw ) setEnabled( TRUE ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( ::tqqt_cast<TQAction*>(a->tqparent()) ) + if ( ::tqqt_cast<TQAction*>(a->parent()) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.h index 791bfae4a..40419bdba 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditorimpl.h @@ -47,7 +47,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/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.cpp index b3fb0d038..0103608ab 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.cpp @@ -35,8 +35,8 @@ #include "actionlistview.h" #include <tqheader.h> -ActionListView::ActionListView( TQWidget *tqparent, const char *name ) - : TQListView( tqparent, name ) +ActionListView::ActionListView( TQWidget *parent, const char *name ) + : TQListView( parent, name ) { setShowSortIndicator( TRUE ); setResizeMode( LastColumn ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.h b/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.h index 253761b57..5f2e8bf35 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actionlistview.h @@ -46,10 +46,10 @@ public: g( group ? new TQDesignerActionGroup( 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 TQDesignerAction( tqparent->actionGroup() ) ), - g( group ? new TQDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } + ActionItem( ActionItem *parent, bool group = FALSE ) + : TQListViewItem( parent ), + a( group ? 0 : new TQDesignerAction( parent->actionGroup() ) ), + g( group ? new TQDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } TQDesignerAction *action() const { return a; } TQDesignerActionGroup *actionGroup() const { return g; } @@ -69,7 +69,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/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp index 9c91def4c..b8126cf22 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp @@ -35,18 +35,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/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.h b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.h index 7b9275164..9201fc9c0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.h @@ -42,9 +42,9 @@ class AsciiValidator: public TQValidator { 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/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp index 10bf2919c..df5c8b8df 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp @@ -548,7 +548,7 @@ bool SetPropertyCommand::checkProperty() return FALSE; } - if ( ::tqqt_cast<FormWindow*>(widget->tqparent()) ) + if ( ::tqqt_cast<FormWindow*>(widget->parent()) ) formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() ); } return TRUE; @@ -675,9 +675,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 ) { } @@ -698,9 +698,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 ) { } @@ -721,9 +721,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 ) { } @@ -744,9 +744,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 ) { } @@ -767,9 +767,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) ) ) { } @@ -1618,7 +1618,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 ) @@ -1635,7 +1635,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 ); @@ -1655,7 +1655,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/experimental/tqtinterface/qt4/tools/designer/designer/command.h b/experimental/tqtinterface/qt4/tools/designer/designer/command.h index 33af7e4b1..36e5041e1 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/command.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/command.h @@ -289,7 +289,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(); @@ -305,7 +305,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(); @@ -321,7 +321,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(); @@ -337,7 +337,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(); @@ -353,7 +353,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/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h b/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h index 2778f8bb1..47f8d929b 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h @@ -58,14 +58,14 @@ void ConfigToolboxDialog::init() a; a = MainWindow::self->toolActions.prev() ) { TQString grp = ( (WidgetAction*)a )->group(); - TQListViewItem *tqparent = groups.find( grp ); - if ( !tqparent ) { - tqparent = new TQListViewItem( listViewTools ); - tqparent->setText( 0, grp ); - tqparent->setOpen( TRUE ); - groups.insert( grp, tqparent ); + TQListViewItem *parent = groups.find( grp ); + if ( !parent ) { + parent = new TQListViewItem( listViewTools ); + parent->setText( 0, grp ); + parent->setOpen( TRUE ); + groups.insert( grp, parent ); } - TQListViewItem *i = new TQListViewItem( tqparent ); + TQListViewItem *i = new TQListViewItem( parent ); i->setText( 0, a->text() ); i->setPixmap( 0, a->iconSet().pixmap() ); } @@ -106,10 +106,10 @@ void ConfigToolboxDialog::addTool() // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); - nextParent = (*it)->tqparent(); + nextParent = (*it)->parent(); while ( nextParent && !nextSibling ) { nextSibling = nextParent->nextSibling(); - nextParent = nextParent->tqparent(); + nextParent = nextParent->parent(); } } } else if ( ((*it)->childCount() == 0) && addKids ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.h b/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.h index 7cbb883fb..10a0e43a7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.h @@ -175,9 +175,9 @@ class ConnectionContainer : public TQObject TQ_OBJECT public: - ConnectionContainer( TQObject *tqparent, SenderItem *i1, SignalItem *i2, + ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2, ReceiverItem *i3, SlotItem *i4, int r ) - : TQObject( tqparent ), mod( FALSE ), se( i1 ), si( i2 ), + : TQObject( parent ), mod( FALSE ), se( i1 ), si( i2 ), re( i3 ), sl( i4 ), rw ( r ) { i1->setConnection( this ); i2->setConnection( this ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.cpp index 529ff6793..13bd4e7e8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.cpp @@ -33,8 +33,8 @@ #include "connectiontable.h" -ConnectionTable::ConnectionTable( TQWidget *tqparent, const char *name ) - : TQTable( 0, 4, tqparent, name ) +ConnectionTable::ConnectionTable( TQWidget *parent, const char *name ) + : TQTable( 0, 4, parent, name ) { setSorting( TRUE ); setShowGrid( FALSE ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.h b/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.h index 50f2731c8..e10648059 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/connectiontable.h @@ -42,7 +42,7 @@ class ConnectionTable : public TQTable TQ_OBJECT public: - ConnectionTable( TQWidget *tqparent, const char *name ); + ConnectionTable( TQWidget *parent, const char *name ); void sortColumn( int col, bool ascending, bool wholeRows ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp index 7d364c5da..dbe112997 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp @@ -58,8 +58,8 @@ #include <tqtextcodec.h> #include <tqcheckbox.h> -CustomWidgetEditor::CustomWidgetEditor( TQWidget *tqparent, MainWindow *mw ) - : CustomWidgetEditorBase( tqparent, 0, TRUE ), mainWindow( mw ) +CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) + : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); checkTimer = new TQTimer( this ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h index ed0caf94e..cad285b0f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h @@ -50,7 +50,7 @@ class CustomWidgetEditor : public CustomWidgetEditorBase TQ_OBJECT public: - CustomWidgetEditor( TQWidget *tqparent , MainWindow *mw); + CustomWidgetEditor( TQWidget *parent , MainWindow *mw); protected Q_SLOTS: void addWidgetClicked(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/database.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/database.cpp index 926528ff4..3c1c8a2c8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/database.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/database.cpp @@ -53,7 +53,7 @@ DatabaseSupport::DatabaseSupport() { con = 0; frm = 0; - tqparent = 0; + parent = 0; } void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o, @@ -61,7 +61,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t { tbl = table; dbControls = databaseControls; - tqparent = o; + parent = o; if ( connection != "(default)" ) con = TQSqlDatabase::database( connection ); @@ -69,15 +69,15 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t con = TQSqlDatabase::database(); frm = new TQSqlForm( o, table ); for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { - TQObject *chld = tqparent->child( it.key(), "TQWidget" ); + TQObject *chld = parent->child( it.key(), "TQWidget" ); if ( !chld ) continue; frm->insert( (TQWidget*)chld, *it ); } } -TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *tqparent, const char *name ) - : TQDataBrowser( tqparent, name ) +TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *parent, const char *name ) + : TQDataBrowser( parent, name ) { } @@ -103,8 +103,8 @@ bool TQDesignerDataBrowser::event( TQEvent* e ) return b; } -TQDesignerDataView::TQDesignerDataView( TQWidget *tqparent, const char *name ) - : TQDataView( tqparent, name ) +TQDesignerDataView::TQDesignerDataView( TQWidget *parent, const char *name ) + : TQDataView( parent, name ) { } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/database.h b/experimental/tqtinterface/qt4/tools/designer/designer/database.h index 35423a3d1..324691748 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/database.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/database.h @@ -59,7 +59,7 @@ protected: TQSqlForm* frm; TQString tbl; TQMap<TQString, TQString> dbControls; - TQObject *tqparent; + TQObject *parent; }; @@ -69,7 +69,7 @@ class TQDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport TQ_OBJECT public: - TQDesignerDataBrowser( TQWidget *tqparent, const char *name ); + TQDesignerDataBrowser( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); @@ -81,7 +81,7 @@ class TQDesignerDataView : public TQDataView, public DatabaseSupport TQ_OBJECT public: - TQDesignerDataView( TQWidget *tqparent, const char *name ); + TQDesignerDataView( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/database2.h b/experimental/tqtinterface/qt4/tools/designer/designer/database2.h index 3beae9edc..df91b3e63 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/database2.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/database2.h @@ -59,7 +59,7 @@ protected: TQSqlForm* frm; TQString tbl; TQMap<TQString, TQString> dbControls; - TQObject *tqparent; + TQObject *parent; }; @@ -68,7 +68,7 @@ class TQDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2 TQ_OBJECT public: - TQDesignerDataBrowser2( TQWidget *tqparent, const char *name ); + TQDesignerDataBrowser2( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); @@ -79,7 +79,7 @@ class TQDesignerDataView2 : public TQDataView, public DatabaseSupport2 TQ_OBJECT public: - TQDesignerDataView2( TQWidget *tqparent, const char *name ); + TQDesignerDataView2( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.cpp index c6d7d986d..e9969e859 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.cpp @@ -42,9 +42,9 @@ #include <tqlayout.h> #include <tqsqldatabase.h> -DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent, +DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : DatabaseConnectionEditorBase( tqparent, name, modal, fl ), conn( connection ) + : DatabaseConnectionEditorBase( parent, name, modal, fl ), conn( connection ) { connectionWidget = new DatabaseConnectionWidget( grp ); grpLayout->addWidget( connectionWidget, 0, 0 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.h index 3eecd0190..11bdb3db2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionimpl.h @@ -46,7 +46,7 @@ class DatabaseConnectionEditor : public DatabaseConnectionEditorBase TQ_OBJECT public: - DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent = 0, + DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~DatabaseConnectionEditor(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.cpp index 0ee44bc64..6170a2b47 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.cpp @@ -50,14 +50,14 @@ static bool blockChanges = FALSE; /* - * Constructs a DatabaseConnectionsEditor which is a child of 'tqparent', with the + * Constructs a DatabaseConnectionsEditor which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : DatabaseConnectionBase( tqparent, name, modal, fl ), project( pro ) +DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : DatabaseConnectionBase( parent, name, modal, fl ), project( pro ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); connectionWidget = new DatabaseConnectionWidget( grp ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.h index aec40470d..2a91923fb 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectionsimpl.h @@ -45,7 +45,7 @@ class DatabaseConnectionsEditor : public DatabaseConnectionBase TQ_OBJECT public: - DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent = 0, + DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~DatabaseConnectionsEditor(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts b/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts index ec81eced4..5345c5b69 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts @@ -1445,7 +1445,7 @@ The name has been changed back to '%1'.</source> <translation type="unfinished"></translation> </message> <message> - <source>Retqparent Widgets</source> + <source>Reparent Widgets</source> <translation type="unfinished"></translation> </message> <message> @@ -2086,7 +2086,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Move the selected item one level up.</b><p>This will also change the level of the tqparent item.</p></source> + <source><b>Move the selected item one level up.</b><p>This will also change the level of the parent item.</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -2094,7 +2094,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Move the selected item one level down.</b><p>This will also change the level of the tqparent item.</p></source> + <source><b>Move the selected item one level down.</b><p>This will also change the level of the parent item.</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts b/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts index ec81eced4..5345c5b69 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts @@ -1445,7 +1445,7 @@ The name has been changed back to '%1'.</source> <translation type="unfinished"></translation> </message> <message> - <source>Retqparent Widgets</source> + <source>Reparent Widgets</source> <translation type="unfinished"></translation> </message> <message> @@ -2086,7 +2086,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Move the selected item one level up.</b><p>This will also change the level of the tqparent item.</p></source> + <source><b>Move the selected item one level up.</b><p>This will also change the level of the parent item.</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -2094,7 +2094,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Move the selected item one level down.</b><p>This will also change the level of the tqparent item.</p></source> + <source><b>Move the selected item one level down.</b><p>This will also change the level of the parent item.</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp index a959d42d4..ce660a021 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp @@ -197,7 +197,7 @@ TQPtrList<DesignerFormWindow> DesignerProjectImpl::formList() const while ( it.current() ) { TQObject *obj = it.current(); ++it; - TQWidget *par = ::tqqt_cast<FormWindow*>(obj->tqparent()); + TQWidget *par = ::tqqt_cast<FormWindow*>(obj->parent()); if ( !obj->isWidgetType() || !par ) continue; @@ -589,9 +589,9 @@ void DesignerFormWindowImpl::insertWidget( TQWidget * ) { } -TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *tqparent, const char *name ) +TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *parent, const char *name ) { - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, name ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name ); formWindow->insertWidget( w, TRUE ); formWindow->killAccels( formWindow->mainContainer() ); return w; @@ -724,9 +724,9 @@ TQPtrList<TQAction> DesignerFormWindowImpl::actionList() const } TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* tqparent, const char* name, bool toggle ) + TQObject* parent, const char* name, bool toggle ) { - TQDesignerAction *a = new TQDesignerAction( tqparent ); + TQDesignerAction *a = new TQDesignerAction( parent ); a->setName( name ); a->setText( text ); if ( !icon.isNull() && !icon.pixmap().isNull() ) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.h b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.h index 7a58e237e..96b7d5df2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.h @@ -182,7 +182,7 @@ public: void save() const; bool isModified() const; void insertWidget( TQWidget * ); - TQWidget *create( const char *className, TQWidget *tqparent, const char *name ); + TQWidget *create( const char *className, TQWidget *parent, const char *name ); void removeWidget( TQWidget * ); TQWidgetList widgets() const; void undo(); @@ -212,7 +212,7 @@ public: void setCurrentWidget( TQWidget * ); TQPtrList<TQAction> actionList() const; TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* tqparent, const char* name = 0, bool toggle = FALSE ); + TQObject* parent, const char* name = 0, bool toggle = FALSE ); void addAction( TQAction * ); void removeAction( TQAction * ); void preview() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp index a8ee282be..975402a98 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp @@ -51,8 +51,8 @@ #include <tqheader.h> #include <tqcheckbox.h> -EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots ) - : EditFunctionsBase( tqparent, 0, TRUE ), formWindow( fw ) +EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) + : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -118,7 +118,7 @@ EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "functionName" - TQObjectList *l = tqparent->queryList( "TQLineEdit", "functionName" ); + TQObjectList *l = parent->queryList( "TQLineEdit", "functionName" ); TQObject *obj; TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.h index 8d42af3f0..51fcfc517 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.h @@ -48,7 +48,7 @@ class EditFunctions : public EditFunctionsBase TQ_OBJECT public: - EditFunctions( TQWidget *tqparent, FormWindow *fw, bool showOnlySlots = FALSE ); + EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE ); void setCurrentFunction( const TQString &function ); void functionAdd( const TQString &access = TQString(), diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.cpp index 7fb6144ae..8d895b044 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.cpp @@ -47,8 +47,8 @@ #include <tqspinbox.h> #include <tqcheckbox.h> -FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw ) - : FormSettingsBase( tqparent, 0, TRUE ), formwindow( fw ) +FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) + : FormSettingsBase( parent, 0, TRUE ), formwindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.h index a936aab55..3d4322248 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formsettingsimpl.h @@ -44,7 +44,7 @@ class FormSettings : public FormSettingsBase TQ_OBJECT public: - FormSettings( TQWidget *tqparent, FormWindow *fw ); + FormSettings( TQWidget *parent, FormWindow *fw ); protected Q_SLOTS: void okClicked(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp index f3155eef3..8c5bc46b9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp @@ -135,8 +135,8 @@ static void flickerfree_update( TQWidget *w ) event filter which is implemented in MainWindow::eventFilter(). */ -FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WDestructiveClose ), mainwindow( mw ), +FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WDestructiveClose ), mainwindow( mw ), commands( 100 ), pixInline( TRUE ), pixProject( FALSE ) { ff = f; @@ -144,8 +144,8 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const c initSlots(); } -FormWindow::FormWindow( FormFile *f, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WDestructiveClose ), mainwindow( 0 ), +FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WDestructiveClose ), mainwindow( 0 ), commands( 100 ), pixInline( TRUE ) { ff = f; @@ -259,16 +259,16 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) if( !TQPixmapCache::find( grid_name, grid ) ) { grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); - TQBitmap tqmask( grid.width(), grid.height() ); - tqmask.fill( Qt::color0 ); - TQPainter p( &tqmask ); + TQBitmap mask( grid.width(), grid.height() ); + mask.fill( Qt::color0 ); + TQPainter p( &mask ); p.setPen( Qt::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 ); @@ -452,7 +452,7 @@ void FormWindow::insertWidget() np.append( pos ); } - MoveCommand *mv = new MoveCommand( tr( "Retqparent Widgets" ), this, + MoveCommand *mv = new MoveCommand( tr( "Reparent Widgets" ), this, lst, op, np, insertParent, pw ); if ( !toolFixed ) @@ -689,14 +689,14 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) break; default: // any insert widget tool if ( e->button() == Qt::LeftButton ) { - insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow - if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another tqparent + insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow + if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) ); if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) && !::tqqt_cast<TQLayoutWidget*>(wid) && !::tqqt_cast<TQSplitter*>(wid) ) { - insertParent = WidgetFactory::containerOfWidget( wid ); // found another tqparent, store it + insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it break; } else { wid = wid->parentWidget(); @@ -804,7 +804,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) checkSelectionsForMove( w ); } - // check whether we would have to reparent the selection and highlight the possible new tqparent container + // check whether we would have to reparent the selection and highlight the possible new parent container TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin(); TQWidget* wa = containerAt( e->globalPos(), it.key() ); if ( wa && !isMainContainer( wa ) && !isCentralWidget( wa ) ) { @@ -1630,7 +1630,7 @@ TQWidget *FormWindow::designerWidget( TQT_BASE_OBJECT_NAME *o ) const return 0; TQWidget *w = (TQWidget*)o; while ( (w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ]) || isCentralWidget( w ) ) - w = (TQWidget*)w->tqparent(); + w = (TQWidget*)w->parent(); return w; } @@ -1962,12 +1962,12 @@ void FormWindow::raiseWidgets() commandHistory()->addCommand( cmd ); } -void FormWindow::paste( const TQString &cb, TQWidget *tqparent ) +void FormWindow::paste( const TQString &cb, TQWidget *parent ) { CHECK_MAINWINDOW; Resource resource( mainWindow() ); resource.setWidget( this ); - resource.paste( cb, tqparent ); + resource.paste( cb, parent ); } void FormWindow::selectAll() diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h index a4dd567a3..359522ba5 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h @@ -76,8 +76,8 @@ class FormWindow : public TQWidget Q_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(); @@ -94,7 +94,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/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp index 11f6523a0..fddf30437 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp @@ -71,15 +71,15 @@ TQListViewItem *newItem = 0; static TQPluginManager<ClassBrowserInterface> *classBrowserInterfaceManager = 0; -HierarchyItem::HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after, +HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) { } -HierarchyItem::HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after, +HierarchyItem::HierarchyItem( Type type, TQListView *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) { } @@ -175,8 +175,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(); @@ -256,20 +256,20 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) if ( o->isWidgetType() ) { TQWidget *w = (TQWidget*)o; if ( !formWindow->widgets()->find( w ) ) { - if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) { - if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) { - ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w ); - o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent()); + if ( ::tqqt_cast<TQWidgetStack*>(w->parent()) ) { + if (::tqqt_cast<TQTabWidget*>(w->parent()->parent()) ) { + ((TQTabWidget*)w->parent()->parent())->showPage( w ); + o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); formWindow->emitUpdateProperties( formWindow->currentWidget() ); - } else if ( ::tqqt_cast<TQWizard*>(w->tqparent()->tqparent()) ) { - ((TQDesignerWizard*)w->tqparent()->tqparent())-> - setCurrentPage( ( (TQDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) ); - o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent()); + } else if ( ::tqqt_cast<TQWizard*>(w->parent()->parent()) ) { + ((TQDesignerWizard*)w->parent()->parent())-> + setCurrentPage( ( (TQDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); + o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); formWindow->emitUpdateProperties( formWindow->currentWidget() ); } else { - ( (TQWidgetStack*)w->tqparent() )->raiseWidget( w ); - if ( (TQWidgetStack*)w->tqparent()->isA( "TQDesignerWidgetStack" ) ) - ( (TQDesignerWidgetStack*)w->tqparent() )->updateButtons(); + ( (TQWidgetStack*)w->parent() )->raiseWidget( w ); + if ( (TQWidgetStack*)w->parent()->isA( "TQDesignerWidgetStack" ) ) + ( (TQDesignerWidgetStack*)w->parent() )->updateButtons(); } } else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) { formWindow->setActiveObject( w ); @@ -395,7 +395,7 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b ) TQListView::setOpen( i, b ); } -void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tqparent ) +void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *parent ) { TQObject* o = TQT_TQOBJECT(tqbo); if ( TQString( o->name() ).startsWith( "qt_dead_widget_" ) ) @@ -432,29 +432,29 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq #endif TQString name = o->name(); - if ( ::tqqt_cast<TQWidgetStack*>(o->tqparent()) ) { - if ( ::tqqt_cast<TQTabWidget*>(o->tqparent()->tqparent()) ) - name = ( (TQTabWidget*)o->tqparent()->tqparent() )->tabLabel( (TQWidget*)o ); - else if ( ::tqqt_cast<TQWizard*>(o->tqparent()->tqparent()) ) - name = ( (TQWizard*)o->tqparent()->tqparent() )->title( (TQWidget*)o ); + if ( ::tqqt_cast<TQWidgetStack*>(o->parent()) ) { + if ( ::tqqt_cast<TQTabWidget*>(o->parent()->parent()) ) + name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); + else if ( ::tqqt_cast<TQWizard*>(o->parent()->parent()) ) + name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o ); } TQToolBox *tb; - if ( o->tqparent() && o->tqparent()->tqparent() && - (tb = ::tqqt_cast<TQToolBox*>(o->tqparent()->tqparent()->tqparent())) ) + if ( o->parent() && o->parent()->parent() && + (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) name = tb->itemLabel( tb->indexOf((TQWidget*)o) ); if ( fakeMainWindow ) { - name = o->tqparent()->name(); + name = o->parent()->name(); className = "TQMainWindow"; } - if ( !tqparent ) + if ( !parent ) item = new HierarchyItem( HierarchyItem::Widget, this, 0, name, className, dbInfo ); else - item = new HierarchyItem( HierarchyItem::Widget, tqparent, 0, name, className, dbInfo ); + item = new HierarchyItem( HierarchyItem::Widget, parent, 0, name, className, dbInfo ); item->setOpen( TRUE ); - if ( !tqparent ) + if ( !parent ) item->setPixmap( 0, TQPixmap::fromMimeSource( "designer_form.png" ) ); else if ( ::tqqt_cast<TQLayoutWidget*>(o) ) item->setPixmap( 0, TQPixmap::fromMimeSource( "designer_layout.png" )); @@ -475,16 +475,16 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq ( (TQWidget*)it.current() )->isHidden() ) continue; if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { - if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) || + if ( ::tqqt_cast<TQWidgetStack*>(it.current()->parent()) || ::tqqt_cast<TQWidgetStack*>(it.current()) ) { TQObject *obj = it.current(); - TQDesignerTabWidget *tw = ::tqqt_cast<TQDesignerTabWidget*>(it.current()->tqparent()); - TQDesignerWizard *dw = ::tqqt_cast<TQDesignerWizard*>(it.current()->tqparent()); + TQDesignerTabWidget *tw = ::tqqt_cast<TQDesignerTabWidget*>(it.current()->parent()); + TQDesignerWizard *dw = ::tqqt_cast<TQDesignerWizard*>(it.current()->parent()); TQWidgetStack *stack = 0; if ( dw || tw || ::tqqt_cast<TQWidgetStack*>(obj) ) stack = (TQWidgetStack*)obj; else - stack = (TQWidgetStack*)obj->tqparent(); + stack = (TQWidgetStack*)obj->parent(); if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); @@ -502,10 +502,10 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq 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( tb->item( i ), item ); } @@ -516,12 +516,12 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq } if ( fakeMainWindow ) { - TQObjectList *l = o->tqparent()->queryList( "TQDesignerToolBar" ); + TQObjectList *l = o->parent()->queryList( "TQDesignerToolBar" ); TQObject *obj; for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); delete l; - l = o->tqparent()->queryList( "MenuBarEditor" ); + l = o->parent()->queryList( "MenuBarEditor" ); for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); delete l; @@ -672,8 +672,8 @@ void HierarchyList::removeTabPage() // ------------------------------------------------------------ -FormDefinitionView::FormDefinitionView( TQWidget *tqparent, FormWindow *fw ) - : HierarchyList( tqparent, fw, TRUE ) +FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw ) + : HierarchyList( parent, fw, TRUE ) { header()->hide(); removeColumn( 1 ); @@ -968,7 +968,7 @@ void FormDefinitionView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) HierarchyItem::Type t = getChildType( i->rtti() ); if ( (int)t == i->rtti() ) - i = i->tqparent(); + i = i->parent(); if ( formWindow->project()->isCpp() ) switch( i->rtti() ) { @@ -1092,7 +1092,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( !lIface ) return; if ( i->rtti() == HierarchyItem::Definition ) - i = i->tqparent(); + i = i->parent(); ListEditor dia( this, 0, TRUE ); dia.setCaption( tqtr( "Edit %1" ).arg( i->text( 0 ) ) ); TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() ); @@ -1106,7 +1106,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) } else if ( res == NEW ) { HierarchyItem::Type t = getChildType( i->rtti() ); if ( (int)t == i->rtti() ) - i = i->tqparent(); + i = i->parent(); switch( i->rtti() ) { case HierarchyItem::SlotPublic: execFunctionDialog( "public", "slot", TRUE ); @@ -1145,7 +1145,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } else { - TQListViewItem *p = i->tqparent(); + TQListViewItem *p = i->parent(); delete i; save( p, 0 ); } @@ -1168,9 +1168,9 @@ void FormDefinitionView::renamed( TQListViewItem *i ) { if ( newItem == i ) newItem = 0; - if ( !i->tqparent() ) + if ( !i->parent() ) return; - save( i->tqparent(), i ); + save( i->parent(), i ); } @@ -1225,8 +1225,8 @@ void FormDefinitionView::addVariable( const TQString &varName, const TQString &a // ------------------------------------------------------------ -HierarchyView::HierarchyView( TQWidget *tqparent ) - : TQTabWidget( tqparent, 0, (WFlags)(WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | +HierarchyView::HierarchyView( TQWidget *parent ) + : TQTabWidget( parent, 0, (WFlags)(WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | TQt::WStyle_Tool | TQt::WStyle_MinMax | TQt::WStyle_SysMenu )) { formwindow = 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h index a9f2fae15..a7f2889eb 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h @@ -75,9 +75,9 @@ public: Variable }; - HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after, + HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ); - HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after, + HierarchyItem( Type type, TQListView *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ); void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -108,7 +108,7 @@ class HierarchyList : public TQListView TQ_OBJECT public: - HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects = TRUE ); + HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE ); virtual void setup(); virtual void setCurrent( TQT_BASE_OBJECT_NAME *o ); @@ -137,7 +137,7 @@ public Q_SLOTS: void removeTabPage(); private: - void insertObject( TQT_BASE_OBJECT_NAME *o, TQListViewItem *tqparent ); + void insertObject( TQT_BASE_OBJECT_NAME *o, TQListViewItem *parent ); TQObject *findObject( TQListViewItem *i ); TQListViewItem *findItem( TQT_BASE_OBJECT_NAME *o ); TQObject *current() const; @@ -161,7 +161,7 @@ class FormDefinitionView : public HierarchyList TQ_OBJECT public: - FormDefinitionView( TQWidget *tqparent, FormWindow *fw ); + FormDefinitionView( TQWidget *parent, FormWindow *fw ); void setup(); void setupVariables(); @@ -195,7 +195,7 @@ class HierarchyView : public TQTabWidget TQ_OBJECT public: - HierarchyView( TQWidget *tqparent ); + HierarchyView( TQWidget *parent ); ~HierarchyView(); void setFormWindow( FormWindow *fw, TQObject *o ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.cpp index 5d5619f6e..fa89c37e6 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.cpp @@ -42,8 +42,8 @@ #include <tqpushbutton.h> #include <tqcheckbox.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/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.h index 2fc644110..2f1aeb677 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditorimpl.h @@ -44,7 +44,7 @@ class IconViewEditor : public IconViewEditorBase TQ_OBJECT public: - IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected Q_SLOTS: void insertNewItem(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp index e6e34e1c0..db5c19594 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp @@ -59,17 +59,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; @@ -92,8 +92,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 @@ -142,8 +142,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() Q_SIGNALS of the // widgets to get informed if one gets deleted to be able to @@ -167,21 +167,21 @@ void Layout::widgetDestroyed() widgets.removeRef( (TQWidget*)sender() ); } -bool Layout::prepareLayout( bool &needMove, bool &needRetqparent ) +bool Layout::prepareLayout( bool &needMove, bool &needReparent ) { if ( !widgets.count() ) return FALSE; for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; - needRetqparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase); + needReparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase); if ( !layoutBase ) { if ( !useSplitter ) layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLayoutWidget" ), - WidgetFactory::containerOfWidget( tqparent ) ); + WidgetFactory::containerOfWidget( parent ) ); else layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ), - WidgetFactory::containerOfWidget( tqparent ) ); + WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); } @@ -218,12 +218,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( layoutBase, FALSE ); WidgetFactory::deleteLayout( layoutBase ); - if ( tqparent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) { + if ( parent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); @@ -246,14 +246,14 @@ void Layout::breakLayout() rects.insert( w, w->tqgeometry() ); } WidgetFactory::deleteLayout( layoutBase ); - bool needRetqparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || + bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ); bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 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 ) { @@ -264,14 +264,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( widgets.first() ); @@ -314,14 +314,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 && w->tqparent() != TQT_TQOBJECT(layoutBase) ) + if ( needReparent && w->parent() != TQT_TQOBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -378,14 +378,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 && w->tqparent() != TQT_TQOBJECT(layoutBase) ) + if ( needReparent && w->parent() != TQT_TQOBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -750,8 +750,8 @@ GridLayout::~GridLayout() void GridLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; TQDesignerGridLayout *tqlayout = (TQDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); @@ -763,7 +763,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 && w->tqparent() != TQT_TQOBJECT(layoutBase) ) + if ( needReparent && w->parent() != TQT_TQOBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( rs * cs == 1 ) { tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 ); @@ -870,8 +870,8 @@ void GridLayout::buildGrid() -Spacer::Spacer( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WMouseNoMask ), +Spacer::Spacer( TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WMouseNoMask ), orient( Qt::Vertical ), interactive(TRUE), sh( TQSize(20,20) ) { setSizeType( Expanding ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/layout.h b/experimental/tqtinterface/qt4/tools/designer/designer/layout.h index 3b07fcc4b..34ca08319 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/layout.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/layout.h @@ -57,12 +57,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; @@ -147,7 +147,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; @@ -173,7 +173,7 @@ class TQDesignerGridLayout : public TQGridLayout Q_OBJECT TQ_OBJECT public: - TQDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){}; + TQDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){}; TQDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){}; void addWidget( TQWidget *, int row, int col, int align = 0 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp index 83f02b5fd..c0ecd6d93 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp @@ -42,10 +42,10 @@ class ListBoxItemDrag : public TQStoredDrag { public: - ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * tqparent = 0, const char * name = 0 ); + ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * parent = 0, const char * name = 0 ); ~ListBoxItemDrag() {}; static bool canDecode( TQDragMoveEvent * event ); - static bool decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * insertPoint ); + static bool decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * insertPoint ); enum ItemType { ListBoxText = 1, ListBoxPixmap = 2 }; }; // ------------------------------------------------------------------ @@ -191,8 +191,8 @@ bool ListBoxDnd::canDecode( TQDragEnterEvent * event ) // The Dragobject Implementation ------------------------------------ // ------------------------------------------------------------------ -ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * tqparent, const char * name ) - : TQStoredDrag( "qt/listboxitem", tqparent, name ) +ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * parent, const char * name ) + : TQStoredDrag( "qt/listboxitem", parent, name ) { // ### FIX! TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListBoxItem ) * items.count() ); @@ -245,7 +245,7 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event ) return event->provides( "qt/listboxitem" ); } -bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * after ) +bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after ) { TQByteArray data = event->tqencodedData( "qt/listboxitem" ); @@ -269,7 +269,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB stream >> p; item = (TQListBoxItem *) p; - tqparent->insertItem( item, after ); + parent->insertItem( item, after ); } @@ -295,9 +295,9 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB stream >> isSelectable; if ( hasPixmap ) { - item = new TQListBoxPixmap( tqparent, pixmap, text, after ); + item = new TQListBoxPixmap( parent, pixmap, text, after ); } else { - item = new TQListBoxText( tqparent, text, after ); + item = new TQListBoxText( parent, text, after ); } item->setSelectable( isSelectable ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.cpp index b88ca1856..f80e66b93 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.cpp @@ -45,8 +45,8 @@ #include <tqpushbutton.h> #include <tqcheckbox.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; @@ -75,7 +75,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWind ListBoxRename *editorRename = new ListBoxRename( preview ); - TQObjectList *l = tqparent->queryList( "TQLineEdit", "itemText" ); + TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); TQObjectListIt it( *l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.h index 69a5ec132..e06aff5a7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditorimpl.h @@ -45,7 +45,7 @@ class ListBoxEditor : public ListBoxEditorBase TQ_OBJECT public: - ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected Q_SLOTS: void insertNewItem(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp index 6de076519..99f1510dc 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp @@ -43,10 +43,10 @@ class ListViewItemDrag : public TQStoredDrag { public: enum DropRelation { Sibling, Child }; - ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent = 0, const char * name = 0 ); + ListViewItemDrag( ListViewItemList & items, TQWidget * parent = 0, const char * name = 0 ); ~ListViewItemDrag() {}; static bool canDecode( TQDragMoveEvent * event ); - static bool decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr ); + static bool decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr ); }; // ------------------------------------------------------------------ @@ -81,7 +81,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event ) } else if ( dpos < item->depth() ) { // Parent(s) Sibling while ( item && (item->depth() > dpos) ) - item = item->tqparent(); + item = item->parent(); } } @@ -157,10 +157,10 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); - nextParent = (*it)->tqparent(); + nextParent = (*it)->parent(); while ( nextParent && !nextSibling ) { nextSibling = nextParent->nextSibling(); - nextParent = nextParent->tqparent(); + nextParent = nextParent->parent(); } } } else if ( ((*it)->childCount() == 0) && addKids ) { @@ -216,13 +216,13 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos ) if ( result && ( pos.ry() < (src->itemPos(result) + result->height()/2) ) ) result = result->itemAbove(); - // Wind back if has tqparent, and we're in flat mode - while ( result && result->tqparent() && (dMode & Flat) ) - result = result->tqparent(); + // Wind back if has parent, and we're in flat mode + while ( result && result->parent() && (dMode & Flat) ) + result = result->parent(); - // Wind back if has tqparent, and we're in flat mode - while ( result && !result->isVisible() && result->tqparent() ) - result = result->tqparent(); + // Wind back if has parent, and we're in flat mode + while ( result && !result->isVisible() && result->parent() ) + result = result->parent(); if ( !result && src->firstChild() && (pos.y() > src->tqitemRect(src->firstChild()).bottom()) ) { result = src->lastItem(); @@ -266,8 +266,8 @@ bool ListViewDnd::canDecode( TQDragEnterEvent * event ) TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item ); TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item ); -ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent, const char * name ) - : TQStoredDrag( "qt/listviewitem", tqparent, name ) +ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * parent, const char * name ) + : TQStoredDrag( "qt/listviewitem", parent, name ) { // ### FIX! TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListViewItem ) * items.count() ); @@ -289,10 +289,10 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event ) return event->provides( "qt/listviewitem" ); } -bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr ) +bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr ) { TQByteArray data = event->tqencodedData( "qt/listviewitem" ); - TQListViewItem* itemParent = insertPoint ? insertPoint->tqparent() : 0; + TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0; // Change from sibling (default) to child creation if ( insertPoint && dr == Child ) { @@ -311,8 +311,8 @@ bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQLis if ( itemParent ) { insertPoint = new TQListViewItem( itemParent, insertPoint ); itemParent->setOpen( TRUE ); - } else { // No tqparent for insertPoint, use TQListView - insertPoint = new TQListViewItem( tqparent, insertPoint ); + } else { // No parent for insertPoint, use TQListView + insertPoint = new TQListViewItem( parent, insertPoint ); } stream >> *insertPoint; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp index 9d86a9f12..0f4cf2645 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp @@ -51,8 +51,8 @@ #include <tqpushbutton.h> #include <tqptrstack.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 ); @@ -91,7 +91,7 @@ ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow * TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "itemText" - TQObjectList *l = tqparent->queryList( "TQLineEdit", "itemText" ); + TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); TQObject *obj; TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { @@ -117,7 +117,7 @@ ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow * TQT_SLOT( columnTextChanged( const TQString & ) ) ); // Find TQLineEdit "colText" and connect - l = tqparent->queryList( "TQLineEdit", "colText" ); + l = parent->queryList( "TQLineEdit", "colText" ); TQObjectListIt columnsLineEditIt( *l ); while ( (obj = columnsLineEditIt.current()) != 0 ) { ++columnsLineEditIt; @@ -383,10 +383,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++; } @@ -411,11 +411,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 ); } @@ -471,10 +471,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; } @@ -493,13 +493,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++; } @@ -533,13 +533,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/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h index 24367cd07..8adf12435 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h @@ -48,7 +48,7 @@ class ListViewEditor : public ListViewEditorBase TQ_OBJECT public: - ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw ); + ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ); Q_SIGNALS: void itemRenamed(const TQString &); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp index c5c74851c..7629b2191 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp @@ -930,8 +930,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) { if ( ::tqqt_cast<MenuBarEditor*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) || ( o && - ( ::tqqt_cast<MenuBarEditor*>(o->tqparent()) || - ::tqqt_cast<PopupMenuEditor*>(o->tqparent()) ) ) ) { + ( ::tqqt_cast<MenuBarEditor*>(o->parent()) || + ::tqqt_cast<PopupMenuEditor*>(o->parent()) ) ) ) { if ( e->type() == TQEvent::Accel && ::tqqt_cast<PopupMenuEditor*>(o) ) { return TRUE; // consume accel events @@ -992,9 +992,9 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ( ::tqqt_cast<TQComboBox*>(o) || ::tqqt_cast<TQToolButton*>(o) || ::tqqt_cast<TQDesignerToolBarSeparator*>(o) ) && - o->tqparent() - && ( ::tqqt_cast<TQDesignerToolBar*>(o->tqparent()) - || ::tqqt_cast<TQDesignerWidgetStack*>(o->tqparent())) ) ) { + o->parent() + && ( ::tqqt_cast<TQDesignerToolBar*>(o->parent()) + || ::tqqt_cast<TQDesignerWidgetStack*>(o->parent())) ) ) { TQWidget *w = (TQWidget*)o; if ( ::tqqt_cast<TQToolButton*>(w) || ::tqqt_cast<TQComboBox*>(w) || @@ -1107,7 +1107,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ::tqqt_cast<SizeHandle*>(o) || ::tqqt_cast<OrderIndicator*>(o) ) { if ( ::tqqt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() && - o->tqparent() && ::tqqt_cast<TQToolBar*>(o->tqparent()) && formWindow() ) + o->parent() && ::tqqt_cast<TQToolBar*>(o->parent()) && formWindow() ) formWindow()->setToolFixed(); break; } @@ -1150,7 +1150,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ::tqqt_cast<SizeHandle*>(o) || ::tqqt_cast<OrderIndicator*>(o) ) break; - if ( WidgetFactory::layoutType( (TQWidget*)o->tqparent() ) != WidgetFactory::NoLayout ) { + if ( WidgetFactory::layoutType( (TQWidget*)o->parent() ) != WidgetFactory::NoLayout ) { ( (FormWindow*)w )->updateSelection( (TQWidget*)o ); if ( e->type() != TQEvent::Resize ) ( (FormWindow*)w )->updateChildSelections( (TQWidget*)o ); @@ -1232,12 +1232,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) TQWidget *MainWindow::isAFormWindowChild( TQT_BASE_OBJECT_NAME *o ) const { - if ( ::tqqt_cast<TQWizard*>(TQT_TQOBJECT(o)->tqparent()) && !::tqqt_cast<TQPushButton*>(o) ) + if ( ::tqqt_cast<TQWizard*>(TQT_TQOBJECT(o)->parent()) && !::tqqt_cast<TQPushButton*>(o) ) return 0; while ( o ) { if ( ::tqqt_cast<FormWindow*>(o) ) return (TQWidget*)o; - o = TQT_TQOBJECT(o)->tqparent(); + o = TQT_TQOBJECT(o)->parent(); } return 0; } @@ -1249,7 +1249,7 @@ TQWidget *MainWindow::isAToolBarChild( TQT_BASE_OBJECT_NAME *o ) const return (TQWidget*)o; if ( ::tqqt_cast<FormWindow*>(o) ) return 0; - o = TQT_TQOBJECT(o)->tqparent(); + o = TQT_TQOBJECT(o)->parent(); } return 0; } @@ -2266,7 +2266,7 @@ void MainWindow::readConfig() if ( !ok ) { if ( oWindow ) { oWindow->shuttingDown(); - ( (TQDockWindow*)oWindow->tqparent() )->hide(); + ( (TQDockWindow*)oWindow->parent() )->hide(); } TQPixmap pix; pix.load( backPixName ); @@ -2423,7 +2423,7 @@ void MainWindow::readConfig() } if ( readPreviousConfig && oWindow ) { oWindow->shuttingDown(); - ( (TQDockWindow*)oWindow->tqparent() )->hide(); + ( (TQDockWindow*)oWindow->parent() )->hide(); } rebuildCustomWidgetGUI(); @@ -2454,9 +2454,9 @@ HierarchyView *MainWindow::objectHierarchy() const return hierarchyView; } -TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent ) +TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent ) { - TQPopupMenu *menu = new TQPopupMenu( tqparent ); + TQPopupMenu *menu = new TQPopupMenu( parent ); actionEditCut->addTo( menu ); actionEditCopy->addTo( menu ); @@ -2466,12 +2466,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( tr( "Add Page" ), tqparent, addSlot ); - menu->insertItem( tr( "Delete Page" ), tqparent, removeSlot ); + menu->insertItem( tr( "Add Page" ), parent, addSlot ); + menu->insertItem( tr( "Delete Page" ), parent, removeSlot ); menu->insertSeparator(); actionEditCut->addTo( menu ); actionEditCopy->addTo( menu ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h index 901f6e0ee..06cd0ee27 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h @@ -113,8 +113,8 @@ public: void popupFormWindowMenu( const TQPoint &gp, FormWindow *fw ); void popupWidgetMenu( const TQPoint &gp, FormWindow *fw, TQWidget *w ); - TQPopupMenu *setupNormalHierarchyMenu( TQWidget *tqparent ); - TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot ); + TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent ); + TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot ); FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 ); bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp index 04fe15e97..93c66f4c5 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp @@ -1438,7 +1438,7 @@ void MainWindow::fileCreateTemplate() void MainWindow::createNewTemplate() { - CreateTemplate *dia = (CreateTemplate*)(TQT_TQOBJECT(sender())->tqparent()); + CreateTemplate *dia = (CreateTemplate*)(TQT_TQOBJECT(sender())->parent()); TQString fn = dia->editName->text(); TQString cn = dia->listClass->currentText(); if ( fn.isEmpty() || cn.isEmpty() ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp index 429dfb81e..b827f5c1a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp @@ -52,7 +52,7 @@ class MenuBarEditorItemPtrDrag : public TQStoredDrag { public: MenuBarEditorItemPtrDrag( MenuBarEditorItem * item, - TQWidget * tqparent = 0, + TQWidget * parent = 0, const char * name = 0 ); ~MenuBarEditorItemPtrDrag() {}; static bool canDecode( TQDragMoveEvent * e ); @@ -62,9 +62,9 @@ public: // Drag Object Implementation --------------------------------------- MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : TQStoredDrag( "qt/menubareditoritemptr", tqparent, name ) + : TQStoredDrag( "qt/menubareditoritemptr", parent, name ) { TQByteArray data( sizeof( TQ_LONG ) ); TQDataStream stream( data, IO_WriteOnly ); @@ -94,8 +94,8 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i ) // MenuBarEditorItem --------------------------------------------------- -MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), visible( TRUE ), @@ -104,8 +104,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, { } MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( menu ), visible( TRUE ), @@ -116,8 +116,8 @@ MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * ba } MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), visible( TRUE ), @@ -129,8 +129,8 @@ MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor popupMenu->insert( actionGroup ); } -MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( item->menuBar ), popupMenu( 0 ), text( item->text ), @@ -146,8 +146,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqpar int MenuBarEditor::clipboardOperation = 0; MenuBarEditorItem * MenuBarEditor::clipboardItem = 0; -MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * tqparent, const char * name ) - : TQMenuBar( tqparent, name ), +MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * name ) + : TQMenuBar( parent, name ), formWnd( fw ), draggedItem( 0 ), currentIndex( 0 ), @@ -190,7 +190,7 @@ FormWindow * MenuBarEditor::formWindow() MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack ) { MenuBarEditorItem * i = - new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) tqparent() ), this ); + new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) parent() ), this ); if ( addToCmdStack ) { AddMenuCommand * cmd = new AddMenuCommand( "Add Menu", formWnd, this, i, index ); formWnd->commandHistory()->addCommand( cmd ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h index 7ce2c35d3..8d6620786 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h @@ -48,15 +48,15 @@ class MenuBarEditorItem : public TQObject friend class MenuBarEditor; - MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * tqparent = 0, const char * name = 0 ); + MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * parent = 0, const char * name = 0 ); public: MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, - TQObject * tqparent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar, - TQObject * tqparent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); MenuBarEditorItem( MenuBarEditorItem * item, - TQObject * tqparent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); ~MenuBarEditorItem() { }; PopupMenuEditor * menu() { return popupMenu; } @@ -92,7 +92,7 @@ class MenuBarEditor : public TQMenuBar TQ_OBJECT public: - MenuBarEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 ); + MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); ~MenuBarEditor(); FormWindow * formWindow(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp index 819712b92..b1a1422ac 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp @@ -48,10 +48,10 @@ #include <tqaction.h> #include <tqmetaobject.h> -ToolBarItem::ToolBarItem( TQWidget *tqparent, TQWidget *toolBar, +ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, const TQString &label, const TQString &tagstr, const TQIconSet &icon, const TQKeySequence &key ) - : TQAction( tqparent ) + : TQAction( parent ) { setIconSet( icon ); setText( label ); @@ -71,8 +71,8 @@ void ToolBarItem::wasActivated() emit clicked( tag ); } -TextEdit::TextEdit( TQWidget *tqparent, const char *name ) - : TQTextEdit( tqparent, name ) +TextEdit::TextEdit( TQWidget *parent, const char *name ) + : TQTextEdit( parent, name ) { setTextFormat( TQt::PlainText ); } @@ -84,9 +84,9 @@ TQTextParagraph* TextEdit::paragraph() } -MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget, +MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, FormWindow *fw, const TQString &text ) - : MultiLineEditorBase( tqparent, 0, (WFlags)(TQt::WType_Dialog | TQt::WShowModal) ), formwindow( fw ), doWrap( FALSE ) + : MultiLineEditorBase( parent, 0, (WFlags)(TQt::WType_Dialog | TQt::WShowModal) ), formwindow( fw ), doWrap( FALSE ) { callStatic = call_static; @@ -380,9 +380,9 @@ TQString MultiLineEditor::getStaticText() return staticText.stripWhiteSpace(); } -TQString MultiLineEditor::getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap ) +TQString MultiLineEditor::getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap ) { - MultiLineEditor medit( TRUE, richtextMode, tqparent, 0, 0, text ); + MultiLineEditor medit( TRUE, richtextMode, parent, 0, 0, text ); if ( richtextMode ) medit.setUseWrapping( *useWrap ); if ( medit.exec() == TQDialog::Accepted ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.h index 1af968075..c82c18264 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.h @@ -49,7 +49,7 @@ class TextEdit : public TQTextEdit TQ_OBJECT public: - TextEdit( TQWidget *tqparent = 0, const char *name = 0 ); + TextEdit( TQWidget *parent = 0, const char *name = 0 ); TQTextDocument *document() const { return TQTextEdit::document(); } TQTextParagraph *paragraph(); @@ -61,7 +61,7 @@ class ToolBarItem : public TQAction TQ_OBJECT public: - ToolBarItem( TQWidget *tqparent, TQWidget *toolBar, + ToolBarItem( TQWidget *parent, TQWidget *toolBar, const TQString &label, const TQString &tagstr, const TQIconSet &icon, const TQKeySequence &key = 0 ); ~ToolBarItem(); @@ -81,11 +81,11 @@ class MultiLineEditor : public MultiLineEditorBase TQ_OBJECT public: - MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget, + MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, FormWindow *fw, const TQString &text = TQString() ); bool useWrapping() const; void setUseWrapping( bool ); - static TQString getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap ); + static TQString getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap ); int exec(); protected Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp index 92a9b8725..d3d6b2b41 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp @@ -368,9 +368,9 @@ NewForm::NewForm( TQIconView *templateView, const TQString &templatePath ) projectChanged( tr( "<No Project>" ) ); } -NewForm::NewForm( TQWidget *tqparent, const TQStringList& projects, +NewForm::NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ) - : NewFormBase( tqparent, 0, TRUE ) + : NewFormBase( parent, 0, TRUE ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.h index 89fbe11f8..bcb19e087 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.h @@ -154,7 +154,7 @@ class NewForm : public NewFormBase public: NewForm( TQIconView *templateView, const TQString &templatePath ); - NewForm( TQWidget *tqparent, const TQStringList& projects, + NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ); void insertTemplates( TQIconView*, const TQString& ); void accept(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp index 8bc6ac30a..7ffb54182 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp @@ -49,8 +49,8 @@ bool debugToStderr = FALSE; TQtMsgHandler OutputWindow::oldMsgHandler = 0; -OutputWindow::OutputWindow( TQWidget *tqparent ) - : TQTabWidget( tqparent, "output_window" ), debugView( 0 ), errorView( 0 ) +OutputWindow::OutputWindow( TQWidget *parent ) + : TQTabWidget( parent, "output_window" ), debugView( 0 ), errorView( 0 ) { setupDebug(); setupError(); @@ -180,9 +180,9 @@ void OutputWindow::currentErrorChanged( TQListViewItem *i ) -ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line, +ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line, const TQString &locationString, TQObject *locationObject ) - : TQListViewItem( tqparent, after ) + : TQListViewItem( parent, after ) { setMultiLinesEnabled( TRUE ); TQString m( message ); @@ -195,8 +195,8 @@ ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQStrin object = locationObject; read = !after; if ( !after ) { - tqparent->setSelected( this, TRUE ); - tqparent->setCurrentItem( this ); + parent->setSelected( this, TRUE ); + parent->setCurrentItem( this ); } } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.h b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.h index 8c34f9292..a054875be 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.h @@ -48,7 +48,7 @@ class ErrorItem : public TQListViewItem public: enum Type { Error, Warning }; - ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line, + ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line, const TQString &locationString, TQObject *locationObject ); void paintCell( TQPainter *, const TQColorGroup & cg, @@ -72,7 +72,7 @@ class OutputWindow : public TQTabWidget TQ_OBJECT public: - OutputWindow( TQWidget *tqparent ); + OutputWindow( TQWidget *parent ); ~OutputWindow(); void setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines, diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.cpp index 4d36ed99b..e8c29de97 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.cpp @@ -72,9 +72,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() ) ); @@ -626,10 +626,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( TQt::BackgroundMode mode ) } TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, - TQt::BackgroundMode mode, TQWidget* tqparent, + TQt::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/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.h index d345abb73..78993af77 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvancedimpl.h @@ -43,12 +43,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, TQt::BackgroundMode mode = TQt::PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 ); + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected Q_SLOTS: void paletteSelected(int); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.cpp index 879f6f915..ef9f8eb79 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.cpp @@ -43,8 +43,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() ) ); @@ -288,9 +288,9 @@ TQPalette PaletteEditor::pal() const } TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, TQt::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/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.h index c2eaeb3f0..55bdb08da 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditorimpl.h @@ -44,11 +44,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, TQt::BackgroundMode mode = TQt::PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 ); + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected Q_SLOTS: void onChooseMainColor(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp index 8d0f41e06..1854e4ec5 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp @@ -56,8 +56,8 @@ static ImageIconProvider *imageIconProvider = 0; #endif -PixmapView::PixmapView( TQWidget *tqparent ) - : TQScrollView( tqparent ) +PixmapView::PixmapView( TQWidget *parent ) + : TQScrollView( parent ) { viewport()->setBackgroundMode( TQt::PaletteBase ); } @@ -105,7 +105,7 @@ static void buildImageFormatList( TQString &filter, TQString &all ) filter += tqApp->translate( "qChoosePixmap", "All Files (*)" ); } -TQStringList qChoosePixmaps( TQWidget *tqparent ) +TQStringList qChoosePixmaps( TQWidget *parent ) { if ( !imageIconProvider && !TQFileDialog::iconProvider() ) TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) ); @@ -114,7 +114,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent ) TQString all; buildImageFormatList( filter, all ); - TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE ); + TQFileDialog fd( TQString(), filter, parent, 0, TRUE ); fd.setMode( TQFileDialog::ExistingFiles ); fd.setContentsPreviewEnabled( TRUE ); PixmapView *pw = new PixmapView( &fd ); @@ -127,7 +127,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() ) { @@ -138,7 +138,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString all; buildImageFormatList( filter, all ); - TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE ); + TQFileDialog fd( TQString(), filter, parent, 0, TRUE ); fd.setContentsPreviewEnabled( TRUE ); PixmapView *pw = new PixmapView( &fd ); fd.setContentsPreview( pw, pw ); @@ -153,7 +153,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, return pix; } } else if ( fw && fw->savePixmapInProject() ) { - PixmapCollectionEditor dia( tqparent, 0, TRUE ); + PixmapCollectionEditor dia( parent, 0, TRUE ); dia.setProject( fw->project() ); dia.setChooserMode( TRUE ); dia.setCurrentItem( MetaDataBase::pixmapKey( fw, old.serialNumber() ) ); @@ -163,7 +163,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, return pix; } } else { - PixmapFunction dia( tqparent, 0, TRUE ); + PixmapFunction dia( parent, 0, TRUE ); TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); @@ -178,15 +178,15 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, } } #else - TQ_UNUSED( tqparent ); + TQ_UNUSED( parent ); TQ_UNUSED( fw ); TQ_UNUSED( old ); #endif return TQPixmap(); } -ImageIconProvider::ImageIconProvider( TQWidget *tqparent, const char *name ) - : TQFileIconProvider( TQT_TQOBJECT(tqparent), name ), imagepm( TQPixmap::fromMimeSource( "designer_image.png" ) ) +ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) + : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( TQPixmap::fromMimeSource( "designer_image.png" ) ) { fmts = TQImage::inputFormats(); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.h b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.h index d2b988211..a8bc94cf2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.h @@ -47,7 +47,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 ); @@ -62,7 +62,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 ); @@ -73,7 +73,7 @@ private: }; -TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 ); -TQStringList qChoosePixmaps( TQWidget *tqparent ); +TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 ); +TQStringList qChoosePixmaps( TQWidget *parent ); #endif diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp index ee2eadcac..11954664d 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp @@ -59,7 +59,7 @@ class PopupMenuEditorItemPtrDrag : public TQStoredDrag { public: - PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * tqparent = 0, + PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * parent = 0, const char * name = 0 ); ~PopupMenuEditorItemPtrDrag() {}; static bool canDecode( TQDragMoveEvent * e ); @@ -69,8 +69,8 @@ public: // Drag Object Implementation --------------------------------------- PopupMenuEditorItemPtrDrag::PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, - TQWidget * tqparent, const char * name ) - : TQStoredDrag( "qt/popupmenueditoritemptr", tqparent, name ) + TQWidget * parent, const char * name ) + : TQStoredDrag( "qt/popupmenueditoritemptr", parent, name ) { TQByteArray data( sizeof( TQ_LONG ) ); TQDataStream stream( data, IO_WriteOnly ); @@ -100,8 +100,8 @@ bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** // PopupMenuEditorItem Implementation ----------------------------------- -PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * parent, const char * name ) + : TQObject( parent, name ), a( 0 ), s( 0 ), m( menu ), @@ -115,8 +115,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqp PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), a( action ), s( 0 ), m( menu ), @@ -131,8 +131,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * m } PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), a( item->a ), s( 0 ), m( menu ), @@ -259,10 +259,10 @@ PopupMenuEditorItem * PopupMenuEditor::draggedItem = 0; int PopupMenuEditor::clipboardOperation = 0; PopupMenuEditorItem * PopupMenuEditor::clipboardItem = 0; -PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const char * name ) +PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * parent, const char * name ) : TQWidget( 0, name, (WFlags)(WStyle_Customize | TQt::WStyle_NoBorder | WRepaintNoErase | TQt::WResizeNoErase) ), formWnd( fw ), - parentMenu( tqparent ), + parentMenu( parent ), iconWidth( 0 ), textWidth( 0 ), accelWidth( 0 ), @@ -275,10 +275,10 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const ch } PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, - TQWidget * tqparent, const char * name ) + TQWidget * parent, const char * name ) : TQWidget( 0, name, (WFlags)(WStyle_Customize | TQt::WStyle_NoBorder | WRepaintNoErase) ), formWnd( fw ), - parentMenu( tqparent ), + parentMenu( parent ), iconWidth( menu->iconWidth ), textWidth( menu->textWidth ), accelWidth( menu->accelWidth ), @@ -343,7 +343,7 @@ void PopupMenuEditor::insert( PopupMenuEditorItem * item, int index ) item->s->parentMenu = this; resizeToContents(); if ( isVisible() && parentMenu ) - parentMenu->update(); // draw arrow in tqparent menu + parentMenu->update(); // draw arrow in parent menu emit inserted( item->action() ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h index 1015b093c..c52124984 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h @@ -48,7 +48,7 @@ class PopupMenuEditorItem : public TQObject friend class PopupMenuEditor; - PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * tqparent = 0, const char * name = 0 ); + PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * parent = 0, const char * name = 0 ); public: enum ItemType { @@ -58,9 +58,9 @@ public: }; PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu, - TQObject * tqparent = 0, const char * name = 0 ); + TQObject * parent = 0, const char * name = 0 ); PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu, - TQObject * tqparent = 0, const char * name = 0 ); + TQObject * parent = 0, const char * name = 0 ); ~PopupMenuEditorItem(); void init(); @@ -115,8 +115,8 @@ class PopupMenuEditor : public TQWidget friend class Resource; public: - PopupMenuEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 ); - PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * tqparent, const char * name = 0 ); + PopupMenuEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); + PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * parent, const char * name = 0 ); ~PopupMenuEditor(); void init(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.cpp index 338a65f3e..676112c98 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.cpp @@ -36,8 +36,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/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.h b/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.h index 929d3b63d..9f79f4540 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/previewframe.h @@ -43,8 +43,8 @@ class PreviewWorkspace : public TQWorkspace { 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: @@ -56,7 +56,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/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.cpp index c13622385..9f6d16206 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.cpp @@ -34,8 +34,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"); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.h index 5efe4abb0..0ac020346 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidgetimpl.h @@ -42,7 +42,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/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp index 5e0ec5371..79f2d481a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp @@ -1340,8 +1340,8 @@ void Project::addObject( TQObject *o ) fakeFormFiles.insert( (void*)o, ff ); MetaDataBase::addEntry( o ); if ( hasGUI() ) { - TQWidget *tqparent = MainWindow::self ? MainWindow::self->qWorkspace() : 0; - FormWindow *fw = new FormWindow( ff, MainWindow::self, tqparent, "qt_fakewindow" ); + TQWidget *parent = MainWindow::self ? MainWindow::self->qWorkspace() : 0; + FormWindow *fw = new FormWindow( ff, MainWindow::self, parent, "qt_fakewindow" ); fw->setProject( this ); if ( TQFile::exists( ff->absFileName() ) ) Resource::loadExtraSource( ff, ff->absFileName(), @@ -1500,12 +1500,12 @@ bool Project::hasParentObject( TQObject *o ) TQString Project::qualifiedName( TQObject *o ) { TQString name = o->name(); - TQObject *p = o->tqparent(); + TQObject *p = o->parent(); while ( p ) { name.prepend( TQString( p->name() ) + "." ); if ( objs.findRef( p ) != -1 ) break; - p = p->tqparent(); + p = p->parent(); } return name; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.cpp index 3c7f81399..3fe682c40 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.cpp @@ -52,14 +52,14 @@ #include <tqlabel.h> /* - * Constructs a ProjectSettings which is a child of 'tqparent', with the + * Constructs a ProjectSettings which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -ProjectSettings::ProjectSettings( Project *pro, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : ProjectSettingsBase( tqparent, name, modal, fl ), project( pro ) +ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : ProjectSettingsBase( parent, name, modal, fl ), project( pro ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.h index 9bc743c53..b63607e81 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettingsimpl.h @@ -47,7 +47,7 @@ class ProjectSettings : public ProjectSettingsBase TQ_OBJECT public: - ProjectSettings( Project *pro, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ProjectSettings(); protected Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp index c93201d15..6507ab8b7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp @@ -168,7 +168,7 @@ bool PropertyWhatsThis::clicked( const TQString& href ) */ /*! If this item should be a child of another property item, specify - \a prop as the tqparent item. + \a prop as the parent item. */ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) @@ -308,7 +308,7 @@ bool PropertyItem::hasSubItems() const return FALSE; } -/*! Returns the tqparent property item here if this is a child or 0 +/*! Returns the parent property item here if this is a child or 0 otherwise. */ @@ -2581,8 +2581,8 @@ void PropertyKeysequenceItem::setValue( const TQVariant &v ) // -------------------------------------------------------------- -EnumPopup::EnumPopup( TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f ) +EnumPopup::EnumPopup( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { setLineWidth( 1 ); setFrameStyle( Panel | Plain ); @@ -2643,8 +2643,8 @@ TQValueList<EnumItem> EnumPopup::enumList() const return itemList; } -EnumBox::EnumBox( TQWidget *tqparent, const char *name ) - : TQComboBox( tqparent, name ) +EnumBox::EnumBox( TQWidget *parent, const char *name ) + : TQComboBox( parent, name ) { pop = new EnumPopup( this, "popup", (WFlags)WType_Popup ); connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) ); @@ -2719,7 +2719,7 @@ void EnumBox::popup() popupShown = FALSE; return; } - pop->move( ((TQWidget*)tqparent())->mapToGlobal( tqgeometry().bottomLeft() ) ); + pop->move( ((TQWidget*)parent())->mapToGlobal( tqgeometry().bottomLeft() ) ); pop->setMinimumWidth( width() ); emit aboutToShowPopup(); pop->show(); @@ -3142,8 +3142,8 @@ void PropertyList::setupProperties() continue; if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in Q_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || - !editor->widget()->tqparent() || - !::tqqt_cast<TQButtonGroup*>(editor->widget()->tqparent()) ) + !editor->widget()->parent() || + !::tqqt_cast<TQButtonGroup*>(editor->widget()->parent()) ) continue; } @@ -3905,8 +3905,8 @@ PropertyList::LastEventType PropertyList::lastEvent() } // ------------------------------------------------------------ -EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ) - : HierarchyList( tqparent, fw, TRUE ), editor( e ) +EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) + : HierarchyList( parent, fw, TRUE ), editor( e ) { header()->hide(); removeColumn( 1 ); @@ -3977,7 +3977,7 @@ extern TQListViewItem *newItem; void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); - if ( !i || i->tqparent() ) + if ( !i || i->parent() ) return; TQString s; if ( !formWindow->project()->isCpp() ) { @@ -3999,7 +3999,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 ) ); } @@ -4017,20 +4017,20 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( res == NEW_ITEM ) { TQString s; if ( !formWindow->project()->isCpp() ) { - TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 ); + TQString s1 = ( i->parent() ? i->parent() : i )->text( 0 ); int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; } else { - s = TQString( editor->widget()->name() ) + "_" + ( i->tqparent() ? i->tqparent() : i )->text( 0 ); + s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 ); } - insertEntry( i->tqparent() ? i->tqparent() : i, TQPixmap::fromMimeSource( "designer_editTslots.png" ), s ); - } else if ( res == DEL_ITEM && i->tqparent() ) { + insertEntry( i->parent() ? i->parent() : i, TQPixmap::fromMimeSource( "designer_editTslots.png" ), s ); + } else if ( res == DEL_ITEM && i->parent() ) { MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); - conn.signal = i->tqparent()->text( 0 ); + conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); delete i; RemoveConnectionCommand *cmd = new RemoveConnectionCommand( tr( "Remove connection" ), @@ -4046,9 +4046,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 ) ) { @@ -4064,7 +4064,7 @@ void EventList::renamed( TQListViewItem *i ) MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); - conn.signal = i->tqparent()->text( 0 ); + conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); AddConnectionCommand *cmd = new AddConnectionCommand( tr( "Add connection" ), formWindow, @@ -4074,7 +4074,7 @@ void EventList::renamed( TQListViewItem *i ) // exists and if we can connect to this one TQString funcname = i->text( 0 ).latin1(); if ( funcname.find( '(' ) == -1 ) { // try to create a signature - TQString sig = i->tqparent()->text( 0 ); + TQString sig = i->parent()->text( 0 ); sig = sig.mid( sig.find( '(' ) + 1 ); sig.remove( (int)sig.length() - 1, 1 ); LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); @@ -4112,8 +4112,8 @@ void EventList::save( TQListViewItem *p ) listview for editing properties. */ -PropertyEditor::PropertyEditor( TQWidget *tqparent ) - : TQTabWidget( tqparent, 0, (WFlags)( WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | +PropertyEditor::PropertyEditor( TQWidget *parent ) + : TQTabWidget( parent, 0, (WFlags)( WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | TQt::WStyle_StaysOnTop | TQt::WStyle_Tool | TQt::WStyle_MinMax | TQt::WStyle_SysMenu )) { setCaption( tr( "Property Editor" ) ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.h index 2e9aee4be..0ba81407a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.h @@ -600,7 +600,7 @@ class EnumPopup : public TQFrame TQ_OBJECT public: - EnumPopup( TQWidget *tqparent, const char *name, WFlags f=0 ); + EnumPopup( TQWidget *parent, const char *name, WFlags f=0 ); ~EnumPopup(); void insertEnums( TQValueList<EnumItem> lst ); TQValueList<EnumItem> enumList() const; @@ -625,7 +625,7 @@ class EnumBox : public TQComboBox TQ_OBJECT public: - EnumBox( TQWidget *tqparent, const char *name = 0 ); + EnumBox( TQWidget *parent, const char *name = 0 ); ~EnumBox() {} void setText( const TQString &text ); void insertEnums( TQValueList<EnumItem> lst ); @@ -750,7 +750,7 @@ class EventList : public HierarchyList TQ_OBJECT public: - EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ); + EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ); void setup(); void setCurrent( TQWidget *w ); @@ -778,7 +778,7 @@ class PropertyEditor : public TQTabWidget TQ_OBJECT public: - PropertyEditor( TQWidget *tqparent ); + PropertyEditor( TQWidget *parent ); TQObject *widget() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp index 0439dcb7e..f295c875c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp @@ -37,8 +37,8 @@ #include <tqapplication.h> #include <tqvbox.h> -TQCompletionEdit::TQCompletionEdit( TQWidget *tqparent, const char *name ) - : TQLineEdit( tqparent, name ), aAdd( FALSE ), caseSensitive( FALSE ) +TQCompletionEdit::TQCompletionEdit( TQWidget *parent, const char *name ) + : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE ) { popup = new TQVBox( 0, 0, (WFlags)WType_Popup ); popup->setFrameStyle( TQFrame::Box | TQFrame::Plain ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.h b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.h index f6e7f501a..33b9900c3 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.h @@ -48,7 +48,7 @@ class TQCompletionEdit : public TQLineEdit Q_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) public: - TQCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 ); + TQCompletionEdit( TQWidget *parent = 0, const char *name = 0 ); bool autoAdd() const; TQStringList completionList() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp index 8ceca3728..e4943d746 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp @@ -762,7 +762,7 @@ TQString Resource::copy() } -void Resource::paste( const TQString &cb, TQWidget *tqparent ) +void Resource::paste( const TQString &cb, TQWidget *parent ) { if ( !formwindow ) return; @@ -796,30 +796,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( 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( w ); @@ -1787,7 +1787,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(); @@ -1805,7 +1805,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL TQString className = e.attribute( "class", "TQWidget" ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS - TQString parentClassName = WidgetFactory::classNameOf( tqparent ); + TQString parentClassName = WidgetFactory::classNameOf( parent ); bool isPlugin = WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) ); if ( isPlugin ) @@ -1813,7 +1813,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL // ### TODO loading for custom container widgets without pages #endif if ( !className.isNull() ) { - obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, 0, FALSE )); + obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE )); if ( !obj ) { TQMessageBox::critical( MainWindow::self, MainWindow::tr( "Loading File" ), MainWindow::tr( "Error loading %1.\n" @@ -1852,21 +1852,21 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL tqlayout = 0; if ( w && formwindow ) { - if ( !tqparent || - ( !::tqqt_cast<TQTabWidget*>(tqparent) && - !::tqqt_cast<TQWidgetStack*>(tqparent) && - !::tqqt_cast<TQToolBox*>(tqparent) && - !::tqqt_cast<TQWizard*>(tqparent) + if ( !parent || + ( !::tqqt_cast<TQTabWidget*>(parent) && + !::tqqt_cast<TQWidgetStack*>(parent) && + !::tqqt_cast<TQToolBox*>(parent) && + !::tqqt_cast<TQWizard*>(parent) #ifdef TQT_CONTAINER_CUSTOM_WIDGETS && !isPlugin #endif ) ) formwindow->insertWidget( w, pasting ); - else if ( tqparent && - ( ::tqqt_cast<TQTabWidget*>(tqparent) || - ::tqqt_cast<TQWidgetStack*>(tqparent) || - ::tqqt_cast<TQToolBox*>(tqparent) || - ::tqqt_cast<TQWizard*>(tqparent) + else if ( parent && + ( ::tqqt_cast<TQTabWidget*>(parent) || + ::tqqt_cast<TQWidgetStack*>(parent) || + ::tqqt_cast<TQToolBox*>(parent) || + ::tqqt_cast<TQWizard*>(parent) #ifdef TQT_CONTAINER_CUSTOM_WIDGETS || isPlugin #endif @@ -1909,18 +1909,18 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( ::tqqt_cast<TQTabWidget*>(tqparent) ) { + if ( ::tqqt_cast<TQTabWidget*>(parent) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() ); - } else if ( ::tqqt_cast<TQWidgetStack*>(tqparent) ) { + ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); + } else if ( ::tqqt_cast<TQWidgetStack*>(parent) ) { if ( attrib == "id" ) - ( (TQDesignerWidgetStack*)tqparent )->insertPage( w, v.toInt() ); - } else if ( ::tqqt_cast<TQToolBox*>(tqparent) ) { + ( (TQDesignerWidgetStack*)parent )->insertPage( w, v.toInt() ); + } else if ( ::tqqt_cast<TQToolBox*>(parent) ) { if ( attrib == "label" ) - ( (TQToolBox*)tqparent )->addItem( w, v.toString() ); - } else if ( ::tqqt_cast<TQWizard*>(tqparent) ) { + ( (TQToolBox*)parent )->addItem( w, v.toString() ); + } else if ( ::tqqt_cast<TQWizard*>(parent) ) { if ( attrib == "title" ) - ( (TQWizard*)tqparent )->addPage( w, v.toString() ); + ( (TQWizard*)parent )->addPage( w, v.toString() ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( isPlugin ) { if ( attrib == "label" ) { @@ -1931,7 +1931,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 ); if ( iface2 ) { iface2->insertPage( parentClassName, - (TQWidget*)tqparent, v.toString(), -1, w ); + (TQWidget*)parent, v.toString(), -1, w ); iface2->release(); } iface->release(); @@ -2142,7 +2142,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(); @@ -2155,7 +2155,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() ) { @@ -3040,11 +3040,11 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts void Resource::loadChildAction( TQT_BASE_OBJECT_NAME *bobj, const TQDomElement &e ) { - TQObject* tqparent = TQT_TQOBJECT(bobj); + TQObject* parent = TQT_TQOBJECT(bobj); TQDomElement n = e; TQAction *a = 0; if ( n.tagName() == "action" ) { - a = new TQDesignerAction( tqparent ); + a = new TQDesignerAction( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; @@ -3061,10 +3061,10 @@ void Resource::loadChildAction( TQT_BASE_OBJECT_NAME *bobj, const TQDomElement & } n2 = n2.nextSibling().toElement(); } - if ( !::tqqt_cast<TQAction*>(tqparent) ) + if ( !::tqqt_cast<TQAction*>(parent) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new TQDesignerActionGroup( tqparent ); + a = new TQDesignerActionGroup( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; @@ -3084,7 +3084,7 @@ void Resource::loadChildAction( TQT_BASE_OBJECT_NAME *bobj, const TQDomElement & } n2 = n2.nextSibling().toElement(); } - if ( !::tqqt_cast<TQAction*>(tqparent) ) + if ( !::tqqt_cast<TQAction*>(parent) ) formwindow->actionList().append( a ); } } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/resource.h b/experimental/tqtinterface/qt4/tools/designer/designer/resource.h index e506fe765..fa2057d60 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/resource.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/resource.h @@ -84,7 +84,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 ); @@ -118,8 +118,8 @@ private: void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ); void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent ); - TQObject *createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout = 0 ); - TQWidget *createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o ); + TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createColumn( const TQDomElement &e, TQWidget *widget ); void setObjectProperty( TQT_BASE_OBJECT_NAME* widget, const TQString &prop, const TQDomElement &e); @@ -132,7 +132,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( TQT_BASE_OBJECT_NAME *tqparent, const TQDomElement &e ); + void loadChildAction( TQT_BASE_OBJECT_NAME *parent, const TQDomElement &e ); void loadToolBars( const TQDomElement &n ); void loadMenuBar( const TQDomElement &n ); void loadPopupMenu( PopupMenuEditor *pm, const TQDomElement &e ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp index f0c6ef32a..5b66758a2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp @@ -41,8 +41,8 @@ #include <tqapplication.h> #include <tqlabel.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 ? TQt::PaletteText : TQt::PaletteDark ); @@ -50,7 +50,7 @@ SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ) widget = 0; dir =d ; setMouseTracking( FALSE ); - formWindow = tqparent; + formWindow = parent; sel = s; updateCursor(); } @@ -272,10 +272,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/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.h b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.h index 2f3ce9f50..ccc70760b 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.h @@ -51,7 +51,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(); @@ -82,7 +82,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/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.cpp index 1f147ab0c..87c84de06 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.cpp @@ -45,8 +45,8 @@ #include <tqmessagebox.h> #include <tqtextstream.h> -SourceEditor::SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface ) - : TQVBox( tqparent, 0, (WFlags)TQt::WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) +SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ) + : TQVBox( parent, 0, (WFlags)TQt::WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) { iFace->addRef(); lIface->addRef(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.h index cd54cba2d..ae6f9644f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sourceeditor.h @@ -50,7 +50,7 @@ class SourceEditor : public TQVBox TQ_OBJECT public: - SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface ); + SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ); ~SourceEditor(); void setObject( TQObject *fw, Project *p ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp index 79a73537d..3dd8f7ac9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp @@ -145,9 +145,9 @@ bool SourceFile::saveAs( bool ignoreModified ) ed->setCaption( tr( "Edit %1" ).arg( filename ) ); setModified( TRUE ); if ( pro->isDummy() ) { - TQObject *o = ed->tqparent(); + TQObject *o = ed->parent(); while ( o && !o->isA( "MainWindow" ) ) - o = o->tqparent(); + o = o->parent(); if ( o ) ((MainWindow *)o)->addRecentlyOpenedFile( fn ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp index f736f78b2..a517da239 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp @@ -21,8 +21,8 @@ #include "startdialogimpl.h" #include "designerapp.h" -FileDialog::FileDialog( const TQString &dir, TQWidget *tqparent ) - : TQFileDialog( dir, TQString(), tqparent ) +FileDialog::FileDialog( const TQString &dir, TQWidget *parent ) + : TQFileDialog( dir, TQString(), parent ) { } @@ -32,8 +32,8 @@ void FileDialog::accept() } -StartDialog::StartDialog( TQWidget *tqparent, const TQString &templatePath ) - : StartDialogBase( tqparent, 0 ) +StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath ) + : StartDialogBase( parent, 0 ) { newForm = new NewForm( templateView, templatePath ); recentFiles.clear(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.h index 757a1b40b..dc43fae32 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.h @@ -50,7 +50,7 @@ class FileDialog : public TQFileDialog TQ_OBJECT public: - FileDialog( const TQString &dir, TQWidget *tqparent ); + FileDialog( const TQString &dir, TQWidget *parent ); protected Q_SLOTS: void accept(); @@ -66,7 +66,7 @@ class StartDialog : public StartDialogBase TQ_OBJECT public: - StartDialog( TQWidget *tqparent, const TQString &templatePath ); + StartDialog( TQWidget *parent, const TQString &templatePath ); void setRecentlyFiles( TQStringList& ); void setRecentlyProjects( TQStringList& ); bool showDialogInFuture() const { return showInFuture; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp index c2419c379..c9dbdfb97 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp @@ -45,8 +45,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 ); @@ -56,8 +56,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/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h index 68a4adcb9..17f65fce3 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h @@ -56,8 +56,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/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp index af20d200f..d3b2513aa 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp @@ -51,8 +51,8 @@ #include "metadatabase.h" #include "mainwindow.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/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.h index 9d32ec2ce..a5496d66a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.h @@ -47,7 +47,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/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.cpp index 61f554da9..4acf25f0a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.cpp @@ -37,8 +37,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/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.h b/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.h index aa1468e99..dbcb64d8c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/timestamp.h @@ -44,7 +44,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/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp index 312fcb758..1c2d0a9ef 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp @@ -45,8 +45,8 @@ #include "variabledialogimpl.h" -VariableDialog::VariableDialog( FormWindow *fw, TQWidget *tqparent ) - : VariableDialogBase( tqparent ), formWindow( fw ) +VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent ) + : VariableDialogBase( parent ), formWindow( fw ) { varView->setSorting( -1 ); TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formWindow ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.h index 0ce9f8ee6..60f39e372 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.h @@ -44,7 +44,7 @@ class VariableDialog : public VariableDialogBase Q_OBJECT TQ_OBJECT public: - VariableDialog( FormWindow *fw, TQWidget* tqparent = 0 ); + VariableDialog( FormWindow *fw, TQWidget* parent = 0 ); ~VariableDialog(); void setCurrentItem( TQString text ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.cpp index 3435e4457..243fe9b2c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.cpp @@ -42,7 +42,7 @@ static TQStyle *windowsStyle = 0; void WidgetAction::addedTo( TQWidget *w, TQWidget *container ) { - if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->tqparent()->tqparent()) ) { + if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->parent()->parent()) ) { if ( !windowsStyle ) windowsStyle = TQStyleFactory::create( "windows" ); w->setStyle( windowsStyle ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.h b/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.h index b1658f57f..a6ac037d2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetaction.h @@ -41,17 +41,17 @@ class WidgetAction : public TQAction TQ_OBJECT public: - WidgetAction( const TQString &grp, TQObject* tqparent, + WidgetAction( const TQString &grp, TQObject* parent, const char* name = 0, bool toggle = FALSE ) - : TQAction( tqparent, name, toggle ) { init( grp ); } + : TQAction( parent, name, toggle ) { init( grp ); } WidgetAction( const TQString &grp, const TQString& text, const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, - TQObject* tqparent, const char* name = 0, bool toggle = FALSE ) - : TQAction( text, icon, menuText, accel, tqparent, name, toggle ) { init( grp ); } + TQObject* parent, const char* name = 0, bool toggle = FALSE ) + : TQAction( text, icon, menuText, accel, parent, name, toggle ) { init( grp ); } WidgetAction( const TQString &grp, const TQString& text, - const TQString& menuText, TQKeySequence accel, TQObject* tqparent, + const TQString& menuText, TQKeySequence accel, TQObject* parent, const char* name = 0, bool toggle = FALSE ) - : TQAction( text, menuText, accel, tqparent, name, toggle ) { init( grp ); } + : TQAction( text, menuText, accel, parent, name, toggle ) { init( grp ); } ~WidgetAction(); #if !defined(TQ_NO_USING_KEYWORD) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp index edd455fb7..c3fef53c8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp @@ -124,8 +124,8 @@ void TQLayoutWidget::paintEvent( TQPaintEvent* ) } -TQDesignerTabWidget::TQDesignerTabWidget( TQWidget *tqparent, const char *name ) - : TQTabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) +TQDesignerTabWidget::TQDesignerTabWidget( TQWidget *parent, const char *name ) + : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) { tabBar()->setAcceptDrops( TRUE ); tabBar()->installEventFilter( this ); @@ -291,8 +291,8 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) } -TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *tqparent, const char *name ) - : TQWidgetStack( tqparent, name ) +TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *parent, const char *name ) + : TQWidgetStack( parent, name ) { prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" ); prev->setAutoRaise( TRUE ); @@ -519,12 +519,12 @@ void WidgetFactory::saveChangedProperties( TQT_BASE_OBJECT_NAME *w, int id ) } /*! Creates a widget of the type which is registered as \a id as - child of \a tqparent. The \a name is optional. If \a init is TRUE, the + child of \a parent. The \a name is optional. If \a init is TRUE, the widget is initialized with some defaults, else the plain widget is created. */ -TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { TQString n = WidgetDatabase::className( id ); if ( n.isEmpty() ) @@ -538,11 +538,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b TQWidget *w = 0; TQString str = WidgetDatabase::createWidgetName( id ); const char *s = str.latin1(); - w = createWidget( n, tqparent, name ? name : s, init, r, orient ); + w = createWidget( n, parent, name ? name : s, init, r, orient ); if ( ::tqqt_cast<TQScrollView*>(w) ) ( (TQScrollView*)w )->disableSizeHintCaching(); if ( !w && WidgetDatabase::isCustomWidget( id ) ) - w = createCustomWidget( tqparent, name ? name : s, MetaDataBase::customWidget( id ) ); + w = createCustomWidget( parent, name ? name : s, MetaDataBase::customWidget( id ) ); if ( !w ) return 0; MetaDataBase::addEntry( w ); @@ -679,30 +679,30 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) } /*! Factory functions for creating a widget of the type \a className - as child of \a tqparent with the name \a name. + as child of \a parent with the name \a name. If \a init is TRUE, some initial default properties are set. This has to be in sync with the initChangedProperties() function! */ -TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init, +TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { if ( className == "TQPushButton" ) { TQPushButton *b = 0; if ( init ) { - b = new TQDesignerPushButton( tqparent, name ); + b = new TQDesignerPushButton( parent, name ); b->setText( TQString::tqfromLatin1( name ) ); } else { - b = new TQDesignerPushButton( tqparent, name ); + b = new TQDesignerPushButton( parent, name ); } TQWidget *w = find_formwindow( b ); b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) ); return b; } else if ( className == "TQToolButton" ) { if ( init ) { - TQDesignerToolButton *tb = new TQDesignerToolButton( tqparent, name ); - if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(tqparent))) { + TQDesignerToolButton *tb = new TQDesignerToolButton( parent, name ); + if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(parent))) { tb->setUsesTextLabel(TRUE); tb->setTextLabel("..."); tb->setAutoRaise(TRUE); @@ -712,32 +712,32 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return tb; } - return new TQDesignerToolButton( tqparent, name ); + return new TQDesignerToolButton( parent, name ); } else if ( className == "TQCheckBox" ) { if ( init ) { - TQDesignerCheckBox *cb = new TQDesignerCheckBox( tqparent, name ); + TQDesignerCheckBox *cb = new TQDesignerCheckBox( parent, name ); cb->setText( TQString::tqfromLatin1( name ) ); return cb; } - return new TQDesignerCheckBox( tqparent, name ); + return new TQDesignerCheckBox( parent, name ); } else if ( className == "TQRadioButton" ) { if ( init ) { - TQDesignerRadioButton *rb = new TQDesignerRadioButton( tqparent, name ); + TQDesignerRadioButton *rb = new TQDesignerRadioButton( parent, name ); rb->setText( TQString::tqfromLatin1( name ) ); return rb; } - return new TQDesignerRadioButton( tqparent, name ); + return new TQDesignerRadioButton( parent, name ); } else if ( className == "TQGroupBox" ) { 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" ) { 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" ) { #if !defined(TQT_NO_ICONVIEW) - TQIconView* iv = new TQIconView( tqparent, name ); + TQIconView* iv = new TQIconView( parent, name ); if ( init ) (void) new TQIconViewItem( iv, MainWindow::tr( "New Item" ) ); return iv; @@ -747,31 +747,31 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if ( className == "TQTable" ) { #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" ) { - return new TQDataTable( tqparent, name ); + return new TQDataTable( parent, name ); #endif //TQT_NO_SQL } else if ( className == "TQDateEdit" ) { - return new TQDateEdit( tqparent, name ); + return new TQDateEdit( parent, name ); } else if ( className == "TQTimeEdit" ) { - return new TQTimeEdit( tqparent, name ); + return new TQTimeEdit( parent, name ); } else if ( className == "TQDateTimeEdit" ) { - return new TQDateTimeEdit( tqparent, name ); + return new TQDateTimeEdit( parent, name ); } else if ( className == "TQListBox" ) { - TQListBox* lb = new TQListBox( tqparent, name ); + TQListBox* lb = new TQListBox( parent, name ); if ( init ) { lb->insertItem( MainWindow::tqtr( "New Item" ) ); lb->setCurrentItem( 0 ); } return lb; } else if ( className == "TQListView" ) { - TQListView *lv = new TQListView( tqparent, name ); + TQListView *lv = new TQListView( parent, name ); lv->setSorting( -1 ); if ( init ) { lv->addColumn( MainWindow::tr( "Column 1" ) ); @@ -779,17 +779,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return lv; } else if ( className == "TQLineEdit" ) - return new TQLineEdit( tqparent, name ); + return new TQLineEdit( parent, name ); else if ( className == "TQSpinBox" ) - return new TQSpinBox( tqparent, name ); + return new TQSpinBox( parent, name ); else if ( className == "TQSplitter" ) - return new TQSplitter( tqparent, name ); + return new TQSplitter( parent, name ); else if ( className == "TQMultiLineEdit" ) - return new TQMultiLineEdit( tqparent, name ); + return new TQMultiLineEdit( parent, name ); else if ( className == "TQTextEdit" ) - return new TQTextEdit( tqparent, name ); + return new TQTextEdit( parent, name ); else if ( className == "TQLabel" || className == "TextLabel" ) { - TQDesignerLabel *l = new TQDesignerLabel( tqparent, name ); + TQDesignerLabel *l = new TQDesignerLabel( parent, name ); if ( init ) { l->setText( TQString::tqfromLatin1( name ) ); MetaDataBase::addEntry( l ); @@ -797,7 +797,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return l; } else if ( className == "PixmapLabel" ) { - TQDesignerLabel *l = new TQDesignerLabel( tqparent, name ); + TQDesignerLabel *l = new TQDesignerLabel( parent, name ); if ( init ) { l->setPixmap( TQPixmap::fromMimeSource( "designer_qtlogo.png" ) ); l->setScaledContents( TRUE ); @@ -807,11 +807,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return l; } else if ( className == "TQLayoutWidget" ) - return new TQLayoutWidget( tqparent, name ); + return new TQLayoutWidget( parent, name ); else if ( className == "TQTabWidget" ) { - TQTabWidget *tw = new TQDesignerTabWidget( tqparent, name ); + TQTabWidget *tw = new TQDesignerTabWidget( parent, name ); if ( init ) { - FormWindow *fw = find_formwindow( tqparent ); + FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, MainWindow::tr("Tab 1") ); MetaDataBase::addEntry( w ); @@ -822,9 +822,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return tw; } else if ( className == "TQWidgetStack" ) { - TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( tqparent, name ); + TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( parent, name ); if ( init ) { - FormWindow *fw = find_formwindow( tqparent ); + FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new TQDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); MetaDataBase::addEntry( w ); @@ -832,53 +832,53 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return ws; } else if ( className == "TQComboBox" ) { - return new TQComboBox( FALSE, tqparent, name ); + return new TQComboBox( FALSE, parent, name ); } else if ( className == "TQWidget" ) { - if ( tqparent && - ( ::tqqt_cast<FormWindow*>(tqparent) || - ::tqqt_cast<TQWizard*>(tqparent) || - ::tqqt_cast<TQTabWidget*>(tqparent) || - ::tqqt_cast<TQWidgetStack*>(tqparent) || - ::tqqt_cast<TQToolBox*>(tqparent) || - ::tqqt_cast<TQMainWindow*>(tqparent) ) ) { - FormWindow *fw = find_formwindow( tqparent ); + if ( parent && + ( ::tqqt_cast<FormWindow*>(parent) || + ::tqqt_cast<TQWizard*>(parent) || + ::tqqt_cast<TQTabWidget*>(parent) || + ::tqqt_cast<TQWidgetStack*>(parent) || + ::tqqt_cast<TQToolBox*>(parent) || + ::tqqt_cast<TQMainWindow*>(parent) ) ) { + FormWindow *fw = find_formwindow( parent ); if ( fw ) { - TQDesignerWidget *dw = new TQDesignerWidget( fw, tqparent, name ); + TQDesignerWidget *dw = new TQDesignerWidget( fw, parent, name ); MetaDataBase::addEntry( dw ); return dw; } } - return new TQWidget( tqparent, name ); + return new TQWidget( parent, name ); } else if ( className == "TQDialog" ) { TQDialog *dia = 0; - if ( ::tqqt_cast<FormWindow*>(tqparent) ) - dia = new TQDesignerDialog( (FormWindow*)tqparent, tqparent, name ); + if ( ::tqqt_cast<FormWindow*>(parent) ) + dia = new TQDesignerDialog( (FormWindow*)parent, parent, name ); else - dia = new TQDialog( tqparent, name ); + dia = new TQDialog( parent, name ); #if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(tqparent) ) + if ( ::tqqt_cast<MainWindow*>(parent) ) #else - if ( tqparent ) + if ( parent ) #endif - dia->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); + dia->reparent( parent, TQPoint( 0, 0 ), TRUE ); return dia; } else if ( className == "TQWizard" ) { - TQWizard *wiz = new TQDesignerWizard( tqparent, name ); + TQWizard *wiz = new TQDesignerWizard( parent, name ); #if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(tqparent) ) + if ( ::tqqt_cast<MainWindow*>(parent) ) #else - if ( tqparent ) + if ( parent ) #endif - wiz->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); - if ( init && ::tqqt_cast<FormWindow*>(tqparent) ) { - TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" ); + wiz->reparent( parent, TQPoint( 0, 0 ), TRUE ); + if ( init && ::tqqt_cast<FormWindow*>(parent) ) { + TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); MetaDataBase::addEntry( dw ); wiz->addPage( dw, FormWindow::tr( "Page" ) ); TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) ); } return wiz; } else if ( className == "Spacer" ) { - Spacer *s = new Spacer( tqparent, name ); + Spacer *s = new Spacer( parent, name ); MetaDataBase::addEntry( s ); MetaDataBase::setPropertyChanged( s, "orientation", TRUE ); MetaDataBase::setPropertyChanged( s, "sizeType", TRUE ); @@ -892,17 +892,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa s->setOrientation( Qt::Horizontal ); return s; } else if ( className == "TQLCDNumber" ) - return new TQLCDNumber( tqparent, name ); + return new TQLCDNumber( parent, name ); else if ( className == "TQProgressBar" ) - return new TQProgressBar( tqparent, name ); + return new TQProgressBar( parent, name ); else if ( className == "TQTextView" ) - return new TQTextView( tqparent, name ); + return new TQTextView( parent, name ); else if ( className == "TQTextBrowser" ) - return new TQTextBrowser( tqparent, name ); + return new TQTextBrowser( parent, name ); else if ( className == "TQDial" ) - return new TQDial( tqparent, name ); + return new TQDial( parent, name ); else if ( className == "TQSlider" ) { - 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 ) @@ -913,7 +913,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa MetaDataBase::setPropertyChanged( s, "orientation", TRUE ); return s; } else if ( className == "TQScrollBar" ) { - 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 ) @@ -925,12 +925,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return s; } else if ( className == "TQFrame" ) { 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( l ); MetaDataBase::setPropertyChanged( l, "orientation", TRUE ); MetaDataBase::setPropertyChanged( l, "frameShadow", TRUE ); @@ -943,9 +943,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa l->setOrientation( Qt::Vertical ); return l; } else if ( className == "TQMainWindow" ) { - TQMainWindow *mw = new TQMainWindow( tqparent, name, 0 ); + TQMainWindow *mw = new TQMainWindow( parent, name, 0 ); mw->setDockEnabled( TQt::TQt::DockMinimized, FALSE ); - TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, mw, "central widget" ); + TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)parent, mw, "central widget" ); mw->setDockMenuEnabled( FALSE ); MetaDataBase::addEntry( dw ); mw->setCentralWidget( dw ); @@ -954,9 +954,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return mw; } else if ( className == "TQToolBox" ) { if ( !init ) - return new TQDesignerToolBox( tqparent, name ); - TQToolBox *tb = new TQDesignerToolBox( tqparent, name ); - FormWindow *fw = find_formwindow( tqparent ); + return new TQDesignerToolBox( parent, name ); + TQToolBox *tb = new TQDesignerToolBox( parent, name ); + FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tb, "page1" ) : new TQWidget( tb, "page1" ); tb->addItem( w, MainWindow::tr("Page 1") ); @@ -969,14 +969,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } #ifndef TQT_NO_SQL else if ( className == "TQDataBrowser" ) { - TQWidget *w = new TQDesignerDataBrowser( tqparent, name ); - if ( tqparent ) - w->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); + TQWidget *w = new TQDesignerDataBrowser( parent, name ); + if ( parent ) + w->reparent( parent, TQPoint( 0, 0 ), TRUE ); return w; } else if ( className == "TQDataView" ) { - TQWidget *w = new TQDesignerDataView( tqparent, name ); - if ( tqparent ) - w->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); + TQWidget *w = new TQDesignerDataView( parent, name ); + if ( parent ) + w->reparent( parent, TQPoint( 0, 0 ), TRUE ); return w; } #endif @@ -986,7 +986,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa if ( !iface ) return 0; - TQWidget *w = iface->create( className, tqparent, name ); + TQWidget *w = iface->create( className, parent, name ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS if ( init && WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( className ) ) ) { TQWidgetContainerInterfacePrivate *iface2 = 0; @@ -1077,7 +1077,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -1126,10 +1126,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.) */ @@ -1173,11 +1173,11 @@ bool WidgetFactory::isPassiveInteractor( TQT_BASE_OBJECT_NAME* tqbo ) else if ( ::tqqt_cast<TQSizeGrip*>(o) ) return ( lastWasAPassiveInteractor = TRUE ); else if ( ::tqqt_cast<TQButton*>(o) && - ( ::tqqt_cast<TQTabBar*>(o->tqparent()) || ::tqqt_cast<TQToolBox*>(o->tqparent()) ) ) + ( ::tqqt_cast<TQTabBar*>(o->parent()) || ::tqqt_cast<TQToolBox*>(o->parent()) ) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->tqparent()) ) + else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->tqparent()) ) + else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); // else if ( ::tqqt_cast<TQDockWindowHandle*>(o) ) else if ( o->inherits( "TQDockWindowHandle" ) ) @@ -1320,7 +1320,7 @@ void WidgetFactory::initChangedProperties( TQT_BASE_OBJECT_NAME *tqbo ) ::tqqt_cast<TQRadioButton*>(o) || ::tqqt_cast<TQCheckBox*>(o) || ::tqqt_cast<TQToolButton*>(o) ) { - if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->tqparent()))) { + if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); @@ -1406,14 +1406,14 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) return FALSE; } -void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) +void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) { TQString className = WidgetDatabase::className( id ); if ( className.contains( "ListBox" ) ) { if ( !::tqqt_cast<TQListBox*>(editWidget) ) return; - ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw ); + ListBoxEditor *e = new ListBoxEditor( parent, editWidget, fw ); e->exec(); delete e; return; @@ -1428,7 +1428,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget lb = new TQListBox(cb); cb->setListBox(lb); } - ListBoxEditor *e = new ListBoxEditor( tqparent, lb, fw ); + ListBoxEditor *e = new ListBoxEditor( parent, lb, fw ); e->exec(); delete e; cb->update(); @@ -1439,7 +1439,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if ( !::tqqt_cast<TQListView*>(editWidget) ) return; TQListView *lv = (TQListView*)editWidget; - ListViewEditor *e = new ListViewEditor( tqparent, lv, fw ); + ListViewEditor *e = new ListViewEditor( parent, lv, fw ); e->exec(); delete e; return; @@ -1448,21 +1448,21 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if ( className.contains( "IconView" ) ) { if ( !::tqqt_cast<TQIconView*>(editWidget) ) return; - IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw ); + IconViewEditor *e = new IconViewEditor( parent, editWidget, fw ); e->exec(); delete e; return; } if ( className == "TQMultiLineEdit" || className == "TQTextEdit" ) { - MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, tqparent, editWidget, fw ); + MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw ); e->exec(); delete e; return; } #ifndef TQT_NO_TABLE if (::tqqt_cast<TQTable*>(editWidget) != 0) { - TableEditor *e = new TableEditor( tqparent, editWidget, fw ); + TableEditor *e = new TableEditor( parent, editWidget, fw ); e->exec(); delete e; return; @@ -1540,11 +1540,11 @@ TQString WidgetFactory::defaultCurrentItem( TQT_BASE_OBJECT_NAME *tqbo, const TQ 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( TQT_BASE_OBJECT_NAME *tqbo, const char *name ) @@ -1615,7 +1615,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() @@ -1640,12 +1640,12 @@ void TQLayoutWidget::updateSizePolicy() if ( tqlayout() ) { /* - parentLayout is set to the tqparent tqlayout if there is one and if it is + parentLayout is set to the parent tqlayout if there is one and if it is top level, in which case layouting is illogical. */ TQLayout *parentLayout = 0; - if ( tqparent() && tqparent()->isWidgetType() ) { - parentLayout = ((TQWidget *)tqparent())->tqlayout(); + if ( parent() && parent()->isWidgetType() ) { + parentLayout = ((TQWidget *)parent())->tqlayout(); if ( parentLayout && ::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) ) parentLayout = 0; @@ -1754,12 +1754,12 @@ CustomWidgetFactory::CustomWidgetFactory() { } -TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const +TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const { MetaDataBase::CustomWidget *w = MetaDataBase::customWidget( WidgetDatabase::idFromClassName( className ) ); if ( !w ) return 0; - return WidgetFactory::createCustomWidget( tqparent, name, w ); + return WidgetFactory::createCustomWidget( parent, name, w ); } void TQDesignerRadioButton::setFocusPolicy( Qt::FocusPolicy policy ) @@ -1781,8 +1781,8 @@ void TQDesignerRadioButton::setFocusPolicy( Qt::FocusPolicy policy ) TQRadioButton::setFocusPolicy( Qt::NoFocus ); } -TQDesignerToolBox::TQDesignerToolBox( TQWidget *tqparent, const char *name ) - : TQToolBox( tqparent, name ) +TQDesignerToolBox::TQDesignerToolBox( TQWidget *parent, const char *name ) + : TQToolBox( parent, name ) { } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h index 9a672da0d..76b8f4aa0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h @@ -67,7 +67,7 @@ class CustomWidgetFactory : public TQWidgetFactory { public: CustomWidgetFactory(); - TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const; + TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const; }; @@ -83,7 +83,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 ); @@ -103,7 +103,7 @@ public: static bool hasSpecialEditor( int id, TQObject *editorWidget ); static bool hasItems( int id, TQObject *editorWidget ); - static void editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + static void editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); static bool canResetProperty( TQT_BASE_OBJECT_NAME *w, const TQString &propName ); static bool resetProperty( TQT_BASE_OBJECT_NAME *w, const TQString &propName ); @@ -117,9 +117,9 @@ public: static TQString defaultSignal( TQT_BASE_OBJECT_NAME *w ); private: - static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init, + static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r = 0, Qt::Orientation orient = Qt::Horizontal ); - static TQWidget *createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w ); + static TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ); static TQGuardedPtr<TQObject> *lastPassiveInteractor; static bool lastWasAPassiveInteractor; @@ -134,7 +134,7 @@ class TQDesignerTabWidget : public TQTabWidget Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - TQDesignerTabWidget( TQWidget *tqparent, const char *name ); + TQDesignerTabWidget( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -163,7 +163,7 @@ class TQDesignerWidgetStack : public TQWidgetStack Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - TQDesignerWidgetStack( TQWidget *tqparent, const char *name ); + TQDesignerWidgetStack( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -210,8 +210,8 @@ class TQDesignerWizard : public TQWizard TQ_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - TQDesignerWizard( TQWidget *tqparent, const char *name ) - : TQWizard( tqparent, name ), modal(FALSE) {} + TQDesignerWizard( TQWidget *parent, const char *name ) + : TQWizard( parent, name ), modal(FALSE) {} int currentPageNum() const; void setCurrentPage( int i ); @@ -249,7 +249,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(); @@ -268,8 +268,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 ) @@ -306,8 +306,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, TQt::WMouseNoMask ) { + Line( TQWidget *parent, const char *name ) + : TQFrame( parent, name, TQt::WMouseNoMask ) { setFrameStyle( HLine | Sunken ); } @@ -330,8 +330,8 @@ class TQDesignerLabel : public TQLabel Q_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) public: - TQDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 ) - : TQLabel( tqparent, name ) { myBuddy = 0; } + TQDesignerLabel( TQWidget *parent = 0, const char *name = 0 ) + : TQLabel( parent, name ) { myBuddy = 0; } void setBuddyWidget( const TQCString &b ) { myBuddy = b; @@ -361,9 +361,9 @@ class TQDesignerWidget : public TQWidget TQ_OBJECT public: - TQDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WResizeNoErase ), formwindow( fw ) { - need_frame = tqparent && tqparent->inherits("TQDesignerWidgetStack" ); + TQDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WResizeNoErase ), formwindow( fw ) { + need_frame = parent && parent->inherits("TQDesignerWidgetStack" ); } protected: @@ -383,8 +383,8 @@ class TQDesignerDialog : public TQDialog TQ_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - TQDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQDialog( tqparent, name, FALSE, (WFlags)TQt::WResizeNoErase ), formwindow( fw ), modal(FALSE) {} + TQDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name ) + : TQDialog( parent, name, FALSE, (WFlags)TQt::WResizeNoErase ), formwindow( fw ), modal(FALSE) {} bool isModal() const { return modal; } void setModal(bool b) { modal = b; } @@ -405,8 +405,8 @@ class TQDesignerToolButton : public TQToolButton Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerToolButton( TQWidget *tqparent, const char *name ) - : TQToolButton( tqparent, name ) {} + TQDesignerToolButton( TQWidget *parent, const char *name ) + : TQToolButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); @@ -429,8 +429,8 @@ class TQDesignerRadioButton : public TQRadioButton Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerRadioButton( TQWidget *tqparent, const char *name ) - : TQRadioButton( tqparent, name ) {} + TQDesignerRadioButton( TQWidget *parent, const char *name ) + : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); @@ -455,8 +455,8 @@ class TQDesignerPushButton : public TQPushButton Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerPushButton( TQWidget *tqparent, const char *name ) - : TQPushButton( tqparent, name ) {} + TQDesignerPushButton( TQWidget *parent, const char *name ) + : TQPushButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); @@ -480,8 +480,8 @@ class TQDesignerCheckBox : public TQCheckBox Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - TQDesignerCheckBox( TQWidget *tqparent, const char *name ) - : TQCheckBox( tqparent, name ) {} + TQDesignerCheckBox( TQWidget *parent, const char *name ) + : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); @@ -507,7 +507,7 @@ class TQDesignerToolBox : public TQToolBox Q_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true ) public: - TQDesignerToolBox( TQWidget *tqparent, const char *name ); + TQDesignerToolBox( TQWidget *parent, const char *name ); TQString itemLabel() const; void setItemLabel( const TQString &l ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.cpp index 594a2777a..0265b50a7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.cpp @@ -43,8 +43,8 @@ #include <tqpushbutton.h> #include <tqinputdialog.h> -WizardEditor::WizardEditor( TQWidget *tqparent, TQWizard *w, FormWindow *fw ) - : WizardEditorBase( tqparent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) +WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) + : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); fillListBox(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.h index 8a08e617d..16eb4a6c1 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditorimpl.h @@ -48,7 +48,7 @@ class WizardEditor : public WizardEditorBase TQ_OBJECT public: - WizardEditor( TQWidget *tqparent, TQWizard *wizard, FormWindow *fw ); + WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw ); ~WizardEditor(); protected Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp index d22a0867c..4725b9a45 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp @@ -55,8 +55,8 @@ #include <tqtextstream.h> #include "qcompletionedit.h" -WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) + : TQListViewItem( parent ) { init(); project = p; @@ -65,8 +65,8 @@ WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p ) setExpandable( FALSE ); } -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf ) + : TQListViewItem( parent ) { init(); sourceFile = sf; @@ -74,8 +74,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) setPixmap( 0, TQPixmap::fromMimeSource( "designer_filenew.png" ) ); } -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) + : TQListViewItem( parent ) { init(); object = o; @@ -86,8 +86,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p listView(), TQT_SLOT( update() ) ); } -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) + : TQListViewItem( parent ) { init(); formFile = ff; @@ -121,8 +121,8 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, if ( type() == FormSourceType && ( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) && - tqparent() && tqparent()->tqparent() && ( (WorkspaceItem*)tqparent()->tqparent() )->project && - ( (WorkspaceItem*)tqparent()->tqparent() )->project->isCpp() ) { + parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project && + ( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) { g.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().color( TQColorGroup::Text) ); g.setColor( TQColorGroup::HighlightedText, listView()->tqpalette().disabled().color( TQColorGroup::Text) ); } else { @@ -254,8 +254,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; } @@ -272,8 +272,8 @@ void WorkspaceItem::setAutoOpen( bool b ) autoOpen = b; } -Workspace::Workspace( TQWidget *tqparent, MainWindow *mw ) - : TQListView( tqparent, 0, (WFlags)(WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | +Workspace::Workspace( TQWidget *parent, MainWindow *mw ) + : TQListView( parent, 0, (WFlags)(WStyle_Customize | TQt::WStyle_NormalBorder | TQt::WStyle_Title | TQt::WStyle_Tool | TQt::WStyle_MinMax | TQt::WStyle_SysMenu) ), mainWindow( mw ), project( 0 ), completionDirty( FALSE ) { @@ -501,7 +501,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/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h index de96e9601..b2cf3bfb8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h @@ -54,10 +54,10 @@ class WorkspaceItem : public TQListViewItem public: enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType, ObjectType }; - WorkspaceItem( TQListView *tqparent, Project* p ); - WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ); - WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type t = FormFileType ); - WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p ); + WorkspaceItem( TQListView *parent, Project* p ); + WorkspaceItem( TQListViewItem *parent, SourceFile* sf ); + WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType ); + WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ); void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -97,7 +97,7 @@ class Workspace : public TQListView TQ_OBJECT public: - Workspace( TQWidget *tqparent , MainWindow *mw ); + Workspace( TQWidget *parent , MainWindow *mw ); void setCurrentProject( Project *pro ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp index 34e1ff610..1f5a7c9e2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp @@ -133,7 +133,7 @@ class ArrowButton : public TQButton public: enum Dir { Left, Right }; - ArrowButton( TQWidget *tqparent, const char *name, Dir d ); + ArrowButton( TQWidget *parent, const char *name, Dir d ); void drawButton( TQPainter *p ); private: @@ -141,8 +141,8 @@ private: }; -ArrowButton::ArrowButton( TQWidget *tqparent, const char *name, Dir d ) - : TQButton( tqparent, name ) +ArrowButton::ArrowButton( TQWidget *parent, const char *name, Dir d ) + : TQButton( parent, name ) { setFixedSize( 16, 16 ); if ( d == Left ) { @@ -167,8 +167,8 @@ void ArrowButton::drawButton( TQPainter *p ) } -ArgHintWidget::ArgHintWidget( TQWidget *tqparent, const char*name ) - : TQFrame( tqparent, name, WType_Popup ), curFunc( 0 ), numFuncs( 0 ) +ArgHintWidget::ArgHintWidget( TQWidget *parent, const char*name ) + : TQFrame( parent, name, WType_Popup ), curFunc( 0 ), numFuncs( 0 ) { setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth( 1 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.h b/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.h index 0986c556c..d5c6d4359 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.h +++ b/experimental/tqtinterface/qt4/tools/designer/editor/arghintwidget.h @@ -44,7 +44,7 @@ class ArgHintWidget : public TQFrame TQ_OBJECT public: - ArgHintWidget( TQWidget *tqparent, const char*name ); + ArgHintWidget( TQWidget *parent, const char*name ); void setFunctionText( int func, const TQString &text ); void setNumFunctions( int num ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/browser.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/browser.cpp index 129d463b0..32eba0cac 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/browser.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/browser.cpp @@ -57,7 +57,7 @@ EditorBrowser::~EditorBrowser() bool EditorBrowser::eventFilter( TQObject *o, TQEvent *e ) { - if ( ::tqqt_cast<Editor*>(o->tqparent()) || ::tqqt_cast<Editor*>(o) ) { + if ( ::tqqt_cast<Editor*>(o->parent()) || ::tqqt_cast<Editor*>(o) ) { TQMouseEvent *me; TQKeyEvent *ke; switch ( e->type() ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/editor.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/editor.cpp index 626df22eb..9a1ee42b4 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/editor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/editor.cpp @@ -40,8 +40,8 @@ #include <tqpopupmenu.h> #include <tqaccel.h> -Editor::Editor( const TQString &fn, TQWidget *tqparent, const char *name ) - : TQTextEdit( tqparent, name ), hasError( FALSE ) +Editor::Editor( const TQString &fn, TQWidget *parent, const char *name ) + : TQTextEdit( parent, name ), hasError( FALSE ) { document()->setFormatter( new TQTextFormatterBreakInWords ); if ( !fn.isEmpty() ) diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/editor.h b/experimental/tqtinterface/qt4/tools/designer/editor/editor.h index 782ea9799..8926c25d1 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/editor.h +++ b/experimental/tqtinterface/qt4/tools/designer/editor/editor.h @@ -52,7 +52,7 @@ public: Step = 4 }; - Editor( const TQString &fn, TQWidget *tqparent, const char *name ); + Editor( const TQString &fn, TQWidget *parent, const char *name ); ~Editor(); virtual void load( const TQString &fn ); virtual void save( const TQString &fn ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.cpp index 1164d8b90..a6d82ae99 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.cpp @@ -286,8 +286,8 @@ static TQPixmap *breakpointPixmap = 0; static TQPixmap *stepPixmap = 0; static TQPixmap *stackFrame = 0; -MarkerWidget::MarkerWidget( ViewManager *tqparent, const char*name ) - : TQWidget( tqparent, name, WRepaintNoErase | WStaticContents | WResizeNoErase ), viewManager( tqparent ) +MarkerWidget::MarkerWidget( ViewManager *parent, const char*name ) + : TQWidget( parent, name, WRepaintNoErase | WStaticContents | WResizeNoErase ), viewManager( parent ) { if ( !errorPixmap ) { errorPixmap = new TQPixmap( error_xpm ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.h b/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.h index 6e124c1c8..431f0d393 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.h +++ b/experimental/tqtinterface/qt4/tools/designer/editor/markerwidget.h @@ -45,7 +45,7 @@ class MarkerWidget : public TQWidget TQ_OBJECT public: - MarkerWidget( ViewManager *tqparent, const char*name ); + MarkerWidget( ViewManager *parent, const char*name ); Q_SIGNALS: void markersChanged(); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp index b0b0186fc..50760d422 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp @@ -41,8 +41,8 @@ #include <tqlabel.h> #include <tqtimer.h> -ViewManager::ViewManager( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), curView( 0 ) +ViewManager::ViewManager( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), curView( 0 ) { TQHBoxLayout *l = new TQHBoxLayout( this ); markerWidget = new MarkerWidget( this, "editor_markerwidget" ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.h b/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.h index 2677fb993..c6402db1e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.h +++ b/experimental/tqtinterface/qt4/tools/designer/editor/viewmanager.h @@ -50,7 +50,7 @@ class ViewManager : public TQWidget TQ_OBJECT public: - ViewManager( TQWidget *tqparent, const char *name ); + ViewManager( TQWidget *parent, const char *name ); void addView( TQWidget *view ); TQWidget *currentView() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.cpp index 2a0b52ea1..3a2afa342 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.cpp @@ -2,9 +2,9 @@ #include <tqspinbox.h> #include "creditform.h" -CreditForm::CreditForm( TQWidget* tqparent, const char* name, +CreditForm::CreditForm( TQWidget* parent, const char* name, bool modal, WFlags fl ) - : CreditFormBase( tqparent, name, modal, fl ) + : CreditFormBase( parent, name, modal, fl ) { setAmount(); } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.h b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.h index b8998a287..fb5b07121 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditform.h @@ -4,7 +4,7 @@ class CreditForm : public CreditFormBase { TQ_OBJECT public: - CreditForm( TQWidget* tqparent = 0, const char* name = 0, + CreditForm( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreditForm(); public Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.cpp index 07543beac..ab81bcb9c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.cpp @@ -32,14 +32,14 @@ static TQPixmap uic_load_pixmap_CreditFormBase( const TQString &name ) return pix; } /* - * Constructs a CreditFormBase which is a child of 'tqparent', with the + * Constructs a CreditFormBase which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -CreditFormBase::CreditFormBase( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ) +CreditFormBase::CreditFormBase( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "CreditFormBase" ); diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.h b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.h index 87c32d484..4c9ed5176 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.h @@ -24,7 +24,7 @@ class CreditFormBase : public TQDialog TQ_OBJECT public: - CreditFormBase( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreditFormBase( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreditFormBase(); TQButtonGroup* creditButtonGroup; diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.cpp index f256dc927..97334372e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.cpp @@ -46,10 +46,10 @@ TQStringList CustomWidgetPlugin::keys() const return list; } -TQWidget* CustomWidgetPlugin::create( const TQString &key, TQWidget* tqparent, const char* name ) +TQWidget* CustomWidgetPlugin::create( const TQString &key, TQWidget* parent, const char* name ) { if ( key == "FileChooser" ) - return new FileChooser( tqparent, name ); + return new FileChooser( parent, name ); return 0; } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.h b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.h index e2bd12fda..929cba207 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/plugin/plugin.h @@ -6,7 +6,7 @@ public: CustomWidgetPlugin(); TQStringList keys() const; - TQWidget* create( const TQString &classname, TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* create( const TQString &classname, TQWidget* parent = 0, const char* name = 0 ); TQString group( const TQString& ) const; TQIconSet iconSet( const TQString& ) const; TQString includeFile( const TQString& ) const; diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.cpp index f3f986b5f..ba39dc73e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.cpp @@ -4,8 +4,8 @@ #include <tqfiledialog.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/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.h b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.h index 0062e5b30..58d68cecc 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/filechooser/widget/filechooser.h @@ -21,7 +21,7 @@ class TQT_WIDGET_PLUGIN_EXPORT FileChooser : public TQWidget Q_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/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.cpp index 1109807c9..7cd1105c0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.cpp @@ -38,8 +38,8 @@ Create a GLWidget widget */ -GLWidget::GLWidget( TQWidget* tqparent, const char* name ) - : TQGLWidget( tqparent, name ) +GLWidget::GLWidget( TQWidget* parent, const char* name ) + : TQGLWidget( parent, name ) { xrot = yrot = zrot = 25; // default object rotation scale_ = 1.25; // default object scale diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.h b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.h index 7efe6587b..53e62a45a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/glwidget.h @@ -46,7 +46,7 @@ class GLWidget : public TQGLWidget Q_PROPERTY( double scale READ scale WRITE setScale ) public: - GLWidget( TQWidget* tqparent, const char* name ); + GLWidget( TQWidget* parent, const char* name ); ~GLWidget(); double xRot() const { return xrot; } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/main.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/main.cpp index ec2ebbd1c..593e23ba8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/opengl/main.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/opengl/main.cpp @@ -206,7 +206,7 @@ public: TQStringList featureList() const; - TQWidget* create( const TQString &classname, TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* create( const TQString &classname, TQWidget* parent = 0, const char* name = 0 ); TQString group( const TQString& ) const; TQIconSet iconSet( const TQString& ) const; TQString includeFile( const TQString& ) const; @@ -231,12 +231,12 @@ TQStringList OpenGLWidgetInterface::featureList() const return list; } -TQWidget* OpenGLWidgetInterface::create( const TQString &description, TQWidget* tqparent, const char* name ) +TQWidget* OpenGLWidgetInterface::create( const TQString &description, TQWidget* parent, const char* name ) { TQWidget* w = 0; if ( description == "GLWidget" ) - w = new GLWidget( tqparent, name ); + w = new GLWidget( parent, name ); objects.add( w ); return w; diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.cpp index dd40459f5..2f6f1153a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.cpp @@ -2,9 +2,9 @@ #include <tqspinbox.h> #include "receiver.h" -void Receiver::setParent( TQDialog *tqparent ) +void Receiver::setParent( TQDialog *parent ) { - p = tqparent; + p = parent; setAmount(); } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.h b/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.h index 5d0867f5a..31572c2ca 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/receiver2/receiver.h @@ -5,7 +5,7 @@ class Receiver : public TQObject { TQ_OBJECT public: - void setParent( TQDialog *tqparent ); + void setParent( TQDialog *parent ); public Q_SLOTS: void setAmount(); private: diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.cpp index 45c568e09..1fe02528c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.cpp @@ -2,8 +2,8 @@ #include <tqsettings.h> -SizeAware::SizeAware( TQDialog *tqparent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal ) +SizeAware::SizeAware( TQDialog *parent, const char *name, bool modal ) + : TQDialog( parent, name, modal ) { if ( company().isEmpty() ) setCompany( "UnknownCompany" ); diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.h b/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.h index 7cdca8fea..9e943dc02 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/sizeaware/sizeaware.h @@ -8,7 +8,7 @@ class SizeAware : public TQDialog Q_PROPERTY( TQString company READ company WRITE setCompany ) Q_PROPERTY( TQString settingsFile READ settingsFile WRITE setSettingsFile ) public: - SizeAware( TQDialog *tqparent = 0, const char *name = 0, bool modal = FALSE ); + SizeAware( TQDialog *parent = 0, const char *name = 0, bool modal = FALSE ); ~SizeAware(); void setCompany( TQString company ) { m_company = company; } TQString company() const { return m_company; } diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.cpp b/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.cpp index c22fb1d33..da943679c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.cpp @@ -91,8 +91,8 @@ static const char * stop_xpm[] = { "................"}; -Vcr::Vcr( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +Vcr::Vcr( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); tqlayout->setMargin( 0 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.h b/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.h index 1dccc8cf0..d3f6459f7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.h +++ b/experimental/tqtinterface/qt4/tools/designer/examples/vcr/vcr.h @@ -6,7 +6,7 @@ class Vcr : public TQWidget { TQ_OBJECT public: - Vcr( TQWidget *tqparent = 0, const char *name = 0 ); + Vcr( TQWidget *parent = 0, const char *name = 0 ); ~Vcr() {} Q_SIGNALS: void rewind(); diff --git a/experimental/tqtinterface/qt4/tools/designer/interfaces/actioninterface.h b/experimental/tqtinterface/qt4/tools/designer/interfaces/actioninterface.h index 14fa5b1fd..bf77e59d9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/interfaces/actioninterface.h +++ b/experimental/tqtinterface/qt4/tools/designer/interfaces/actioninterface.h @@ -62,12 +62,12 @@ public: }; /*! This functions is called to create the action with the name \a - name. \a tqparent should be used as tqparent of the action. + name. \a parent should be used as parent of the action. In the implementation return the TQAction object for the action \a name. */ - virtual TQAction* create( const TQString &name, TQObject* tqparent = 0 ) = 0; + virtual TQAction* create( const TQString &name, TQObject* parent = 0 ) = 0; /*! In the implementation of the interface return the name of the group of the action \a name. diff --git a/experimental/tqtinterface/qt4/tools/designer/interfaces/classbrowserinterface.h b/experimental/tqtinterface/qt4/tools/designer/interfaces/classbrowserinterface.h index 7e86ca898..6af8755f0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/interfaces/classbrowserinterface.h +++ b/experimental/tqtinterface/qt4/tools/designer/interfaces/classbrowserinterface.h @@ -60,7 +60,7 @@ struct ClassBrowserInterface : public TQUnknownInterface { enum Type { Class, Function }; - virtual TQListView *createClassBrowser( TQWidget *tqparent ) const = 0; + virtual TQListView *createClassBrowser( TQWidget *parent ) const = 0; virtual void update( const TQString &code ) const = 0; virtual void clear() const = 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/interfaces/designerinterface.h b/experimental/tqtinterface/qt4/tools/designer/interfaces/designerinterface.h index 279d7faae..222045144 100644 --- a/experimental/tqtinterface/qt4/tools/designer/interfaces/designerinterface.h +++ b/experimental/tqtinterface/qt4/tools/designer/interfaces/designerinterface.h @@ -187,7 +187,7 @@ struct DesignerFormWindow virtual bool isModified() const = 0; virtual void insertWidget( TQWidget * ) = 0; virtual void removeWidget( TQWidget * ) = 0; - virtual TQWidget *create( const char *className, TQWidget *tqparent, const char *name ) = 0; + virtual TQWidget *create( const char *className, TQWidget *parent, const char *name ) = 0; virtual TQWidgetList widgets() const = 0; virtual void undo() = 0; virtual void redo() = 0; @@ -216,7 +216,7 @@ struct DesignerFormWindow virtual void setCurrentWidget( TQWidget * ) = 0; virtual TQPtrList<TQAction> actionList() const = 0; virtual TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* tqparent, const char* name = 0, bool toggle = FALSE ) = 0; + TQObject* parent, const char* name = 0, bool toggle = FALSE ) = 0; virtual void addAction( TQAction * ) = 0; virtual void removeAction( TQAction * ) = 0; virtual void preview() const = 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h b/experimental/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h index 9e273cb94..2349cc058 100644 --- a/experimental/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h +++ b/experimental/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h @@ -69,7 +69,7 @@ struct EditorInterface : public TQUnknownInterface }; virtual TQWidget *editor( bool readOnly, - TQWidget *tqparent, + TQWidget *parent, TQUnknownInterface *designerIface ) = 0; virtual void setText( const TQString &txt ) = 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp index b82495973..8b5d7870a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp @@ -43,8 +43,8 @@ #include <tqinputdialog.h> #include <designerinterface.h> -CppEditor::CppEditor( const TQString &fn, TQWidget *tqparent, const char *name, DesignerInterface *i ) - : Editor( fn, tqparent, name ), dIface( i ) +CppEditor::CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i ) + : Editor( fn, parent, name ), dIface( i ) { if ( dIface ) dIface->addRef(); diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h index 1b4aa62fe..eb72bbd28 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h @@ -47,7 +47,7 @@ class CppEditor : public Editor TQ_OBJECT public: - CppEditor( const TQString &fn, TQWidget *tqparent, const char *name, DesignerInterface *i ); + CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i ); ~CppEditor(); virtual EditorCompletion *completionManager() { return completion; } diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp index 9d34421aa..d7969ce22 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp @@ -72,10 +72,10 @@ TQRESULT EditorInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInter } TQWidget *EditorInterfaceImpl::editor( bool readonly, - TQWidget *tqparent, TQUnknownInterface *iface ) + TQWidget *parent, TQUnknownInterface *iface ) { if ( !viewManager ) { - ( (EditorInterfaceImpl*)this )->viewManager = new ViewManager( tqparent, 0 ); + ( (EditorInterfaceImpl*)this )->viewManager = new ViewManager( parent, 0 ); ( (EditorInterfaceImpl*)this )->viewManager->showMarkerWidget( FALSE ); if ( iface ) iface->queryInterface( IID_Designer, (TQUnknownInterface**) &dIface ); diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h index 5bae76495..23d4e6ead 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h @@ -54,7 +54,7 @@ public: TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); TQ_REFCOUNT; - TQWidget *editor( bool readonly, TQWidget *tqparent, TQUnknownInterface *designerIface ); + TQWidget *editor( bool readonly, TQWidget *parent, TQUnknownInterface *designerIface ); void setText( const TQString &txt ); TQString text() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp index da857b540..a053b81c5 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp @@ -40,19 +40,19 @@ #include <tqmetaobject.h> LanguageInterfaceImpl::LanguageInterfaceImpl( TQUnknownInterface *outer ) - : tqparent( outer ), ref( 0 ) + : parent( outer ), ref( 0 ) { } ulong LanguageInterfaceImpl::addRef() { - return tqparent ? tqparent->addRef() : ref++; + return parent ? parent->addRef() : ref++; } ulong LanguageInterfaceImpl::release() { - if ( tqparent ) - return tqparent->release(); + if ( parent ) + return parent->release(); if ( !--ref ) { delete this; return 0; @@ -62,8 +62,8 @@ ulong LanguageInterfaceImpl::release() TQRESULT LanguageInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface ) { - if ( tqparent ) - return tqparent->queryInterface( uuid, iface ); + if ( parent ) + return parent->queryInterface( uuid, iface ); *iface = 0; if ( uuid == IID_TQUnknown ) diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h index a998dc629..e60cf3bcf 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h @@ -82,7 +82,7 @@ public: TQStrList signalNames( TQObject *obj ) const; private: - TQUnknownInterface *tqparent; + TQUnknownInterface *parent; ulong ref; }; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp index a9d38e860..ff285e084 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp @@ -36,7 +36,7 @@ #include <preferences.h> PreferenceInterfaceImpl::PreferenceInterfaceImpl( TQUnknownInterface *outer ) - : tqparent( outer ), + : parent( outer ), ref( 0 ), cppEditorSyntax( 0 ) { @@ -48,13 +48,13 @@ PreferenceInterfaceImpl::~PreferenceInterfaceImpl() ulong PreferenceInterfaceImpl::addRef() { - return tqparent ? tqparent->addRef() : ref++; + return parent ? parent->addRef() : ref++; } ulong PreferenceInterfaceImpl::release() { - if ( tqparent ) - return tqparent->release(); + if ( parent ) + return parent->release(); if ( !--ref ) { delete this; return 0; @@ -64,8 +64,8 @@ ulong PreferenceInterfaceImpl::release() TQRESULT PreferenceInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface ) { - if ( tqparent ) - return tqparent->queryInterface( uuid, iface ); + if ( parent ) + return parent->queryInterface( uuid, iface ); *iface = 0; if ( uuid == IID_TQUnknown ) diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h index af2c8389c..aacc9f607 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h @@ -54,7 +54,7 @@ public: void deletePreferenceObject( Preference * ); private: - TQUnknownInterface *tqparent; + TQUnknownInterface *parent; int ref; TQWidget *cppEditorSyntax; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp index 279a35047..372dd0532 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp @@ -36,7 +36,7 @@ #include "projectsettings.h" ProjectSettingsInterfaceImpl::ProjectSettingsInterfaceImpl( TQUnknownInterface *outer ) - : tqparent( outer ), + : parent( outer ), ref( 0 ), settingsTab( 0 ) { @@ -44,13 +44,13 @@ ProjectSettingsInterfaceImpl::ProjectSettingsInterfaceImpl( TQUnknownInterface * ulong ProjectSettingsInterfaceImpl::addRef() { - return tqparent ? tqparent->addRef() : ref++; + return parent ? parent->addRef() : ref++; } ulong ProjectSettingsInterfaceImpl::release() { - if ( tqparent ) - return tqparent->release(); + if ( parent ) + return parent->release(); if ( !--ref ) { delete this; return 0; @@ -90,8 +90,8 @@ void ProjectSettingsInterfaceImpl::deleteProjectSettingsObject( ProjectSettings TQRESULT ProjectSettingsInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { - if ( tqparent ) - return tqparent->queryInterface( uuid, iface ); + if ( parent ) + return parent->queryInterface( uuid, iface ); *iface = 0; if ( uuid == IID_TQUnknown ) diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h index 5dd062542..1b4009e06 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h @@ -54,7 +54,7 @@ public: TQRESULT queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ); private: - TQUnknownInterface *tqparent; + TQUnknownInterface *parent; int ref; CppProjectSettings *settingsTab; }; diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index f8f2dd3b5..aa763cf13 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -60,8 +60,8 @@ #endif SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, - TQWidget* tqparent, DesignerFormWindow *fw, const char* name, bool modal, WFlags fl ) - : SqlFormWizardBase( tqparent, name, modal, fl ), widget( w ), appIface( aIface ), + TQWidget* parent, DesignerFormWindow *fw, const char* name, bool modal, WFlags fl ) + : SqlFormWizardBase( parent, name, modal, fl ), widget( w ), appIface( aIface ), mode( None ) { appIface->addRef(); @@ -307,10 +307,10 @@ void SqlFormWizard::setupPage1() setNextEnabled( databasePage, FALSE ); } -static TQPushButton *create_widget( TQWidget *tqparent, const char *name, +static TQPushButton *create_widget( TQWidget *parent, const char *name, const TQString &txt, const TQRect &r, DesignerFormWindow *fw ) { - TQPushButton *pb = (TQPushButton*)fw->create( "TQPushButton", tqparent, name ); + TQPushButton *pb = (TQPushButton*)fw->create( "TQPushButton", parent, name ); pb->setText( txt ); pb->setGeometry( r ); fw->setPropertyChanged( pb, "text", TRUE ); diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h index eb6558c14..9093a1b7f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h @@ -44,7 +44,7 @@ class SqlFormWizard : public SqlFormWizardBase TQ_OBJECT public: - SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, TQWidget* tqparent = 0, DesignerFormWindow *fw = 0, + SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, TQWidget* parent = 0, DesignerFormWindow *fw = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SqlFormWizard(); diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/form.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/form.cpp index 728a1fdf7..30b56af0f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/form.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/form.cpp @@ -381,14 +381,14 @@ void Uic::createFormDecl( const TQDomElement &e ) // constructor if ( objClass == "TQDialog" || objClass == "TQWizard" ) { - out << " " << bareNameOfClass << "( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );" << endl; + out << " " << bareNameOfClass << "( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );" << endl; } else if ( objClass == "TQWidget" ) { - out << " " << bareNameOfClass << "( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );" << endl; + out << " " << bareNameOfClass << "( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );" << endl; } else if ( objClass == "TQMainWindow" ) { - out << " " << bareNameOfClass << "( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = (WFlags)TQt::WType_TopLevel );" << endl; + out << " " << bareNameOfClass << "( TQWidget* parent = 0, const char* name = 0, WFlags fl = (WFlags)TQt::WType_TopLevel );" << endl; isMainWindow = TRUE; } else { - out << " " << bareNameOfClass << "( TQWidget* tqparent = 0, const char* name = 0 );" << endl; + out << " " << bareNameOfClass << "( TQWidget* parent = 0, const char* name = 0 );" << endl; } // destructor @@ -945,37 +945,37 @@ void Uic::createFormImpl( const TQDomElement &e ) // constructor if ( objClass == "TQDialog" || objClass == "TQWizard" ) { out << "/*" << endl; - out << " * Constructs a " << nameOfClass << " as a child of 'tqparent', with the" << endl; + out << " * Constructs a " << nameOfClass << " as a child of 'parent', with the" << endl; out << " * name 'name' and widget flags set to 'f'." << endl; out << " *" << endl; out << " * The " << objClass.mid(2).lower() << " will by default be modeless, unless you set 'modal' to" << endl; out << " * TRUE to construct a modal " << objClass.mid(2).lower() << "." << endl; out << " */" << endl; - out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* tqparent, const char* name, bool modal, WFlags fl )" << endl; - out << " : " << objClass << "( tqparent, name, modal, fl )"; + out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* parent, const char* name, bool modal, WFlags fl )" << endl; + out << " : " << objClass << "( parent, name, modal, fl )"; } else if ( objClass == "TQWidget" ) { out << "/*" << endl; - out << " * Constructs a " << nameOfClass << " as a child of 'tqparent', with the" << endl; + out << " * Constructs a " << nameOfClass << " as a child of 'parent', with the" << endl; out << " * name 'name' and widget flags set to 'f'." << endl; out << " */" << endl; - out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* tqparent, const char* name, WFlags fl )" << endl; - out << " : " << objClass << "( tqparent, name, fl )"; + out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* parent, const char* name, WFlags fl )" << endl; + out << " : " << objClass << "( parent, name, fl )"; } else if ( objClass == "TQMainWindow" ) { out << "/*" << endl; - out << " * Constructs a " << nameOfClass << " as a child of 'tqparent', with the" << endl; + out << " * Constructs a " << nameOfClass << " as a child of 'parent', with the" << endl; out << " * name 'name' and widget flags set to 'f'." << endl; out << " *" << endl; out << " */" << endl; - out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* tqparent, const char* name, WFlags fl )" << endl; - out << " : " << objClass << "( tqparent, name, fl )"; + out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* parent, const char* name, WFlags fl )" << endl; + out << " : " << objClass << "( parent, name, fl )"; isMainWindow = TRUE; } else { out << "/*" << endl; - out << " * Constructs a " << nameOfClass << " which is a child of 'tqparent', with the" << endl; + out << " * Constructs a " << nameOfClass << " which is a child of 'parent', with the" << endl; out << " * name 'name'.' " << endl; out << " */" << endl; - out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* tqparent, const char* name )" << endl; - out << " : " << objClass << "( tqparent, name )"; + out << nameOfClass << "::" << bareNameOfClass << "( TQWidget* parent, const char* name )" << endl; + out << " : " << objClass << "( parent, name )"; } // create pixmaps for all images diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp index 77ca635d9..1a7ed9c6a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp @@ -92,12 +92,12 @@ static bool createdCentralWidget = FALSE; TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& par, const TQString& tqlayout ) { - TQString tqparent( par ); - if ( tqparent == "this" && isMainWindow ) { + TQString parent( par ); + if ( parent == "this" && isMainWindow ) { if ( !createdCentralWidget ) out << indent << "setCentralWidget( new TQWidget( this, \"qt_central_widget\" ) );" << endl; createdCentralWidget = TRUE; - tqparent = "centralWidget()"; + parent = "centralWidget()"; } TQDomElement n; TQString objClass, objName; @@ -106,7 +106,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla int numRows = 0; if ( layouts.contains( e.tagName() ) ) - return createLayoutImpl( e, parentClass, tqparent, tqlayout ); + return createLayoutImpl( e, parentClass, parent, tqlayout ); objClass = getClassName( e ); if ( objClass.isEmpty() ) @@ -132,13 +132,13 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla if ( tqlayout.isEmpty() ) { // register the object and unify its name objName = registerObject( objName ); - out << " TQWidget* " << objName << " = new TQWidget( " << tqparent << ", \"" << definedName << "\" );" << endl; + out << " TQWidget* " << objName << " = new TQWidget( " << parent << ", \"" << definedName << "\" );" << endl; } else { - // the tqlayout widget is not necessary, hide it by creating its child in the tqparent + // the tqlayout widget is not necessary, hide it by creating its child in the parent TQString result; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if (tags.contains( n.tagName() ) ) - result = createObjectImpl( n, parentClass, tqparent, tqlayout ); + result = createObjectImpl( n, parentClass, parent, tqlayout ); } return result; } @@ -148,7 +148,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla out << " "; if ( isTmpObject ) out << objClass << "* "; - out << objName << " = new " << createObjectInstance( objClass, tqparent, objName ) << ";" << endl; + out << objName << " = new " << createObjectInstance( objClass, parent, objName ) << ";" << endl; } if ( objClass == "TQAxWidget" ) { @@ -197,7 +197,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } if ( prop == "buttonGroupId" ) { if ( parentClass == "TQButtonGroup" ) - out << indent << tqparent << "->insert( " << objName << ", " << value << " );" << endl; + out << indent << parent << "->insert( " << objName << ", " << value << " );" << endl; continue; } if ( prop == "frameworkCode" ) diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/subclassing.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/subclassing.cpp index 3677b7800..aaabee661 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/subclassing.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/subclassing.cpp @@ -71,9 +71,9 @@ void Uic::createSubDecl( const TQDomElement &e, const TQString& subClass ) // constructor if ( objClass == "TQDialog" || objClass == "TQWizard" ) { - out << " " << subClass << "( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );" << endl; + out << " " << subClass << "( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );" << endl; } else { // standard TQWidget - out << " " << subClass << "( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );" << endl; + out << " " << subClass << "( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );" << endl; } // destructor @@ -212,21 +212,21 @@ void Uic::createSubImpl( const TQDomElement &e, const TQString& subClass ) // constructor if ( objClass == "TQDialog" || objClass == "TQWizard" ) { out << "/* " << endl; - out << " * Constructs a " << subClass << " which is a child of 'tqparent', with the " << endl; + out << " * Constructs a " << subClass << " which is a child of 'parent', with the " << endl; out << " * name 'name' and widget flags set to 'f' " << endl; out << " *" << endl; out << " * The " << objClass.mid(2).lower() << " will by default be modeless, unless you set 'modal' to" << endl; out << " * TRUE to construct a modal " << objClass.mid(2).lower() << "." << endl; out << " */" << endl; - out << subClass << "::" << subClass << "( TQWidget* tqparent, const char* name, bool modal, WFlags fl )" << endl; - out << " : " << nameOfClass << "( tqparent, name, modal, fl )" << endl; + out << subClass << "::" << subClass << "( TQWidget* parent, const char* name, bool modal, WFlags fl )" << endl; + out << " : " << nameOfClass << "( parent, name, modal, fl )" << endl; } else { // standard TQWidget out << "/* " << endl; - out << " * Constructs a " << subClass << " which is a child of 'tqparent', with the " << endl; + out << " * Constructs a " << subClass << " which is a child of 'parent', with the " << endl; out << " * name 'name' and widget flags set to 'f' " << endl; out << " */" << endl; - out << subClass << "::" << subClass << "( TQWidget* tqparent, const char* name, WFlags fl )" << endl; - out << " : " << nameOfClass << "( tqparent, name, fl )" << endl; + out << subClass << "::" << subClass << "( TQWidget* parent, const char* name, WFlags fl )" << endl; + out << " : " << nameOfClass << "( parent, name, fl )" << endl; } out << "{" << endl; out << "}" << endl; diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp index 7a71eaf62..ea1bc1417 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp @@ -397,14 +397,14 @@ void Uic::createPopupMenuDecl( const TQDomElement &e ) } } -void Uic::createActionImpl( const TQDomElement &n, const TQString &tqparent ) +void Uic::createActionImpl( const TQDomElement &n, const TQString &parent ) { for ( TQDomElement ae = n; !ae.isNull(); ae = ae.nextSibling().toElement() ) { TQString objName = registerObject( getObjectName( ae ) ); if ( ae.tagName() == "action" ) - out << indent << objName << " = new TQAction( " << tqparent << ", \"" << objName << "\" );" << endl; + out << indent << objName << " = new TQAction( " << parent << ", \"" << objName << "\" );" << endl; else if ( ae.tagName() == "actiongroup" ) - out << indent << objName << " = new TQActionGroup( " << tqparent << ", \"" << objName << "\" );" << endl; + out << indent << objName << " = new TQActionGroup( " << parent << ", \"" << objName << "\" );" << endl; else continue; bool subActionsDone = FALSE; @@ -470,7 +470,7 @@ TQString get_dock( const TQString &d ) return ""; } -void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &tqparent ) +void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &parent ) { TQDomNodeList nl = n.elementsByTagName( "toolbar" ); for ( int i = 0; i < (int) nl.length(); i++ ) { @@ -478,7 +478,7 @@ void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, TQString dock = get_dock( ae.attribute( "dock" ) ); TQString objName = getObjectName( ae ); out << indent << objName << " = new TQToolBar( TQString(\"\"), this, " << dock << " ); " << endl; - createObjectImpl( ae, parentClass, tqparent ); + createObjectImpl( ae, parentClass, parent ); for ( TQDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "action" ) { out << indent << n2.attribute( "name" ) << "->addTo( " << objName << " );" << endl; @@ -488,7 +488,7 @@ void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, if ( n2.attribute( "class" ) != "Spacer" ) { createObjectImpl( n2, "TQToolBar", objName ); } else { - TQString child = createSpacerImpl( n2, parentClass, tqparent, objName ); + TQString child = createSpacerImpl( n2, parentClass, parent, objName ); out << indent << "TQApplication::sendPostedEvents( " << objName << ", TQEvent::ChildInserted );" << endl; out << indent << objName << "->boxLayout()->addItem( " << child << " );" << endl; @@ -498,11 +498,11 @@ void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, } } -void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &tqparent ) +void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &parent ) { TQString objName = getObjectName( n ); out << indent << objName << " = new TQMenuBar( this, \"" << objName << "\" );" << endl; - createObjectImpl( n, parentClass, tqparent ); + createObjectImpl( n, parentClass, parent ); int i = 0; TQDomElement c = n.firstChild().toElement(); while ( !c.isNull() ) { @@ -525,7 +525,7 @@ void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, } } -void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &tqparent ) +void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ) { int i = 0; for ( TQDomElement n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { @@ -535,17 +535,17 @@ void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClas TQString itemName = n2.attribute( "name" ); TQString itemText = n2.attribute( "text" ); out << indent << itemName << " = new TQPopupMenu( this );" << endl; - out << indent << tqparent << "->insertItem( " << n.attribute( "name" ) << "->iconSet(), "; + out << indent << parent << "->insertItem( " << n.attribute( "name" ) << "->iconSet(), "; out << trcall( itemText ) << ", " << itemName << " );" << endl; - trout << indent << tqparent << "->changeItem( " << tqparent << "->idAt( " << i << " ), "; + trout << indent << parent << "->changeItem( " << parent << "->idAt( " << i << " ), "; trout << trcall( itemText ) << " );" << endl; createPopupMenuImpl( n2, parentClass, itemName ); n = n2; } else { - out << indent << n.attribute( "name" ) << "->addTo( " << tqparent << " );" << endl; + out << indent << n.attribute( "name" ) << "->addTo( " << parent << " );" << endl; } } else if ( n.tagName() == "separator" ) { - out << indent << tqparent << "->insertSeparator();" << endl; + out << indent << parent << "->insertSeparator();" << endl; } ++i; } @@ -555,7 +555,7 @@ void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClas Creates implementation of an listbox item tag. */ -TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &tqparent, +TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &parent, TQString *value ) { TQDomElement n = e.firstChild().toElement(); @@ -584,9 +584,9 @@ TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &tqpa *value = trcall( txt, com ); if ( pix.isEmpty() ) { - return tqparent + "->insertItem( " + trcall( txt, com ) + " );"; + return parent + "->insertItem( " + trcall( txt, com ) + " );"; } else { - return tqparent + "->insertItem( " + pix + ", " + trcall( txt, com ) + " );"; + return parent + "->insertItem( " + pix + ", " + trcall( txt, com ) + " );"; } } @@ -594,7 +594,7 @@ TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &tqpa Creates implementation of an iconview item tag. */ -TQString Uic::createIconViewItemImpl( const TQDomElement &e, const TQString &tqparent ) +TQString Uic::createIconViewItemImpl( const TQDomElement &e, const TQString &parent ) { TQDomElement n = e.firstChild().toElement(); TQString txt; @@ -619,16 +619,16 @@ TQString Uic::createIconViewItemImpl( const TQDomElement &e, const TQString &tqp } if ( pix.isEmpty() ) - return "(void) new TQIconViewItem( " + tqparent + ", " + trcall( txt, com ) + " );"; + return "(void) new TQIconViewItem( " + parent + ", " + trcall( txt, com ) + " );"; else - return "(void) new TQIconViewItem( " + tqparent + ", " + trcall( txt, com ) + ", " + pix + " );"; + return "(void) new TQIconViewItem( " + parent + ", " + trcall( txt, com ) + ", " + pix + " );"; } /*! Creates implementation of an listview item tag. */ -TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &tqparent, +TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &parent, const TQString &parentItem ) { TQString s; @@ -653,7 +653,7 @@ TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &tqp if ( !parentItem.isEmpty() ) s += "new TQListViewItem( " + parentItem + ", " + lastItem + " );\n"; else - s += "new TQListViewItem( " + tqparent + ", " + lastItem + " );\n"; + s += "new TQListViewItem( " + parent + ", " + lastItem + " );\n"; TQStringList texts; TQStringList pixmaps; @@ -673,7 +673,7 @@ TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &tqp } } else if ( n.tagName() == "item" ) { s += indent + item + "->setOpen( TRUE );\n"; - s += createListViewItemImpl( n, tqparent, item ); + s += createListViewItemImpl( n, parent, item ); } n = n.nextSibling().toElement(); } @@ -693,7 +693,7 @@ TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &tqp Creates implementation of an listview column tag. */ -TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &tqparent, +TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value ) { TQDomElement n = e.firstChild().toElement(); @@ -726,17 +726,17 @@ TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &t *value = trcall( txt, com ); TQString s; - s = indent + tqparent + "->addColumn( " + trcall( txt, com ) + " );\n"; + s = indent + parent + "->addColumn( " + trcall( txt, com ) + " );\n"; if ( !pix.isEmpty() ) - s += indent + tqparent + "->header()->setLabel( " + tqparent + "->header()->count() - 1, " + pix + ", " + trcall( txt, com ) + " );\n"; + s += indent + parent + "->header()->setLabel( " + parent + "->header()->count() - 1, " + pix + ", " + trcall( txt, com ) + " );\n"; if ( !clickable ) - s += indent + tqparent + "->header()->setClickEnabled( FALSE, " + tqparent + "->header()->count() - 1 );\n"; + s += indent + parent + "->header()->setClickEnabled( FALSE, " + parent + "->header()->count() - 1 );\n"; if ( !resizable ) - s += indent + tqparent + "->header()->setResizeEnabled( FALSE, " + tqparent + "->header()->count() - 1 );\n"; + s += indent + parent + "->header()->setResizeEnabled( FALSE, " + parent + "->header()->count() - 1 );\n"; return s; } -TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &tqparent, +TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value ) { TQString objClass = getClassName( e.parentNode().toElement() ); @@ -774,28 +774,28 @@ TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &t TQString s; if ( isRow ) { - s = indent + tqparent + "->setNumRows( " + tqparent + "->numRows() + 1 );\n"; + s = indent + parent + "->setNumRows( " + parent + "->numRows() + 1 );\n"; if ( pix.isEmpty() ) - s += indent + tqparent + "->verticalHeader()->setLabel( " + tqparent + "->numRows() - 1, " + s += indent + parent + "->verticalHeader()->setLabel( " + parent + "->numRows() - 1, " + trcall( txt, com ) + " );\n"; else - s += indent + tqparent + "->verticalHeader()->setLabel( " + tqparent + "->numRows() - 1, " + s += indent + parent + "->verticalHeader()->setLabel( " + parent + "->numRows() - 1, " + pix + ", " + trcall( txt, com ) + " );\n"; } else { if ( objClass == "TQTable" ) { - s = indent + tqparent + "->setNumCols( " + tqparent + "->numCols() + 1 );\n"; + s = indent + parent + "->setNumCols( " + parent + "->numCols() + 1 );\n"; if ( pix.isEmpty() ) - s += indent + tqparent + "->horizontalHeader()->setLabel( " + tqparent + "->numCols() - 1, " + s += indent + parent + "->horizontalHeader()->setLabel( " + parent + "->numCols() - 1, " + trcall( txt, com ) + " );\n"; else - s += indent + tqparent + "->horizontalHeader()->setLabel( " + tqparent + "->numCols() - 1, " + s += indent + parent + "->horizontalHeader()->setLabel( " + parent + "->numCols() - 1, " + pix + ", " + trcall( txt, com ) + " );\n"; } else if ( objClass == "TQDataTable" ) { if ( !txt.isEmpty() && !field.isEmpty() ) { if ( pix.isEmpty() ) - out << indent << tqparent << "->addColumn( " << fixString( field ) << ", " << trcall( txt, com ) << " );" << endl; + out << indent << parent << "->addColumn( " << fixString( field ) << ", " << trcall( txt, com ) << " );" << endl; else - out << indent << tqparent << "->addColumn( " << fixString( field ) << ", " << trcall( txt, com ) << ", " << pix << " );" << endl; + out << indent << parent << "->addColumn( " << fixString( field ) << ", " << trcall( txt, com ) << ", " << pix << " );" << endl; } } } @@ -805,7 +805,7 @@ TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &t /*! Creates the implementation of a tqlayout tag. Called from createObjectImpl(). */ -TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& tqparent, const TQString& tqlayout ) +TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& tqlayout ) { TQDomElement n; TQString objClass, objName; @@ -830,15 +830,15 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla optcells = "1, 1, "; if ( (parentClass == "TQGroupBox" || parentClass == "TQButtonGroup") && tqlayout.isEmpty() ) { // special case for group box - out << indent << tqparent << "->setColumnLayout(0, Qt::Vertical );" << endl; - out << indent << tqparent << "->tqlayout()->setSpacing( " << spacing << " );" << endl; - out << indent << tqparent << "->tqlayout()->setMargin( " << margin << " );" << endl; - out << indent << objName << " = new " << qtqlayout << "( " << tqparent << "->tqlayout() );" << endl; + out << indent << parent << "->setColumnLayout(0, Qt::Vertical );" << endl; + out << indent << parent << "->tqlayout()->setSpacing( " << spacing << " );" << endl; + out << indent << parent << "->tqlayout()->setMargin( " << margin << " );" << endl; + out << indent << objName << " = new " << qtqlayout << "( " << parent << "->tqlayout() );" << endl; out << indent << objName << "->tqsetAlignment( TQt::AlignTop );" << endl; } else { out << indent << objName << " = new " << qtqlayout << "( "; if ( tqlayout.isEmpty() ) - out << tqparent; + out << parent; else { out << "0"; if ( !DomTool::hasProperty( e, "margin" ) ) @@ -852,10 +852,10 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla if ( !isGrid ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "spacer" ) { - TQString child = createSpacerImpl( n, parentClass, tqparent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); out << indent << objName << "->addItem( static_cast<TQLayoutItem*>(static_cast<QLayoutItem*>( " << child << " )) );" << endl; } else if ( tags.contains( n.tagName() ) ) { - TQString child = createObjectImpl( n, parentClass, tqparent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); if ( isLayout( child ) ) out << indent << objName << "->addLayout( static_cast<TQLayout*>(static_cast<QLayout*>( " << child << " )) );" << endl; else @@ -874,7 +874,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla if ( colspan < 1 ) colspan = 1; if ( n.tagName() == "spacer" ) { - TQString child = createSpacerImpl( n, parentClass, tqparent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); if ( rowspan * colspan != 1 ) out << indent << objName << "->addMultiCell( " << child << ", " << row << ", " << ( row + rowspan - 1 ) << ", " << col << ", " << ( col + colspan - 1 ) << " );" << endl; @@ -882,7 +882,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla out << indent << objName << "->addItem( " << child << ", " << row << ", " << col << " );" << endl; } else if ( tags.contains( n.tagName() ) ) { - TQString child = createObjectImpl( n, parentClass, tqparent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); out << endl; TQString o = "Widget"; if ( isLayout( child ) ) @@ -902,7 +902,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla -TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentClass*/, const TQString& /*tqparent*/, const TQString& /*tqlayout*/) +TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentClass*/, const TQString& /*parent*/, const TQString& /*tqlayout*/) { TQDomElement n; TQString objClass, objName; @@ -1109,15 +1109,15 @@ TQStringList Uic::unique( const TQStringList& list ) /*! - Creates an instance of class \a objClass, with tqparent \a tqparent and name \a objName + Creates an instance of class \a objClass, with parent \a parent and name \a objName */ -TQString Uic::createObjectInstance( const TQString& objClass, const TQString& tqparent, const TQString& objName ) +TQString Uic::createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ) { if ( objClass.mid( 2 ) == "ComboBox" ) { - return objClass + "( FALSE, " + tqparent + ", \"" + objName + "\" )"; + return objClass + "( FALSE, " + parent + ", \"" + objName + "\" )"; } - return objClass + "( " + tqparent + ", \"" + objName + "\" )"; + return objClass + "( " + parent + ", \"" + objName + "\" )"; } bool Uic::isLayout( const TQString& name ) const diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/uic.h b/experimental/tqtinterface/qt4/tools/designer/uic/uic.h index 00af1d845..6f240fd1e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/uic.h +++ b/experimental/tqtinterface/qt4/tools/designer/uic/uic.h @@ -60,20 +60,20 @@ public: void createToolbarDecl( const TQDomElement &e ); void createMenuBarDecl( const TQDomElement &e ); void createPopupMenuDecl( const TQDomElement &e ); - void createActionImpl( const TQDomElement &e, const TQString &tqparent ); - void createToolbarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &tqparent ); - void createMenuBarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &tqparent ); - void createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &tqparent ); - TQString createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& tqparent, const TQString& tqlayout = TQString() ); - TQString createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& tqparent, const TQString& tqlayout = TQString() ); - TQString createObjectInstance( const TQString& objClass, const TQString& tqparent, const TQString& objName ); - TQString createSpacerImpl( const TQDomElement &e, const TQString& parentClass, const TQString& tqparent, const TQString& tqlayout = TQString() ); + void createActionImpl( const TQDomElement &e, const TQString &parent ); + void createToolbarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + void createMenuBarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + void createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + TQString createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& tqlayout = TQString() ); + TQString createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& tqlayout = TQString() ); + TQString createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ); + TQString createSpacerImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& tqlayout = TQString() ); void createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp ); - TQString createListBoxItemImpl( const TQDomElement &e, const TQString &tqparent, TQString *value = 0 ); - TQString createIconViewItemImpl( const TQDomElement &e, const TQString &tqparent ); - TQString createListViewColumnImpl( const TQDomElement &e, const TQString &tqparent, TQString *value = 0 ); - TQString createTableRowColumnImpl( const TQDomElement &e, const TQString &tqparent, TQString *value = 0 ); - TQString createListViewItemImpl( const TQDomElement &e, const TQString &tqparent, + TQString createListBoxItemImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createIconViewItemImpl( const TQDomElement &e, const TQString &parent ); + TQString createListViewColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createTableRowColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createListViewItemImpl( const TQDomElement &e, const TQString &parent, const TQString &parentItem ); void createColorGroupImpl( const TQString& cg, const TQDomElement& e ); TQColorGroup loadColorGroup( const TQDomElement &e ); diff --git a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp index ef46eea9d..b8bd67421 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp @@ -271,7 +271,7 @@ TQWidgetFactory::~TQWidgetFactory() /*! Loads the \e{TQt Designer} user interface description file \a uiFile - and returns the top-level widget in that description. \a tqparent and + and returns the top-level widget in that description. \a parent and \a name are passed to the constructor of the top-level widget. This function also performs signal and slot connections, tab @@ -289,7 +289,7 @@ TQWidgetFactory::~TQWidgetFactory() */ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) { setupPluginDir(); TQFile f( uiFile ); @@ -306,7 +306,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, return 0; qwf_currFileName = uiFile; - TQWidget *w = TQWidgetFactory::create( &f, connector, tqparent, name ); + TQWidget *w = TQWidgetFactory::create( &f, connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms->insert( w, uiFile ); @@ -319,7 +319,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, Loads the user interface description from tqdevice \a dev. */ -TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *tqparent, const char *name ) +TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *parent, const char *name ) { setupPluginDir(); TQWidget *w = 0; @@ -337,12 +337,12 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge TQDataStream in( dev ); in >> magic; if ( magic == UibMagic ) { - w = widgetFactory->createFromUibFile( in, connector, tqparent, name ); + w = widgetFactory->createFromUibFile( in, connector, parent, name ); } else { in.unsetDevice(); dev->at( start ); if ( doc.setContent( dev, &errMsg, &errLine ) ) { - w = widgetFactory->createFromUiFile( doc, connector, tqparent, name ); + w = widgetFactory->createFromUiFile( doc, connector, parent, name ); } else { // qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); } @@ -416,7 +416,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge } TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connector, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) { DomTool::fixDocument( doc ); @@ -477,7 +477,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec if ( !imageCollection.isNull() ) loadImageCollection( imageCollection ); - createWidgetInternal( widget, tqparent, 0, widget.attribute("class", "TQWidget") ); + createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") ); TQWidget *w = toplevel; if ( !w ) return 0; @@ -663,7 +663,7 @@ void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& i } void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, - TQLayout *tqparent ) + TQLayout *parent ) { TQCString name; TQVariant value; @@ -706,7 +706,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, in >> objectTag; } - if ( tqparent != 0 ) { + if ( parent != 0 ) { TQSpacerItem *spacer; if ( vertical ) { spacer = new TQSpacerItem( w, h, TQSizePolicy::Minimum, sizeType ); @@ -714,18 +714,18 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, spacer = new TQSpacerItem( w, h, sizeType, TQSizePolicy::Minimum ); } - if ( tqparent->inherits("TQGridLayout") ) { - ((TQGridLayout *) tqparent)->addMultiCell( spacer, row, + if ( parent->inherits("TQGridLayout") ) { + ((TQGridLayout *) parent)->addMultiCell( spacer, row, row + rowspan - 1, column, column + colspan - 1, vertical ? Qt::AlignHCenter : Qt::AlignVCenter ); } else { - tqparent->addItem( spacer ); + parent->addItem( spacer ); } } } void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, - TQDataStream& in, TQObject *tqparent, + TQDataStream& in, TQObject *parent, bool isRow ) { TQString text; @@ -773,13 +773,13 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, in >> objectTag; } - if ( tqparent != 0 ) { - if ( tqparent->inherits("TQListView") ) { - createListViewColumn( (TQListView *) tqparent, text, pixmap, clickable, + if ( parent != 0 ) { + if ( parent->inherits("TQListView") ) { + createListViewColumn( (TQListView *) parent, text, pixmap, clickable, resizable ); #ifndef TQT_NO_TABLE - } else if ( tqparent->inherits("TQTable") ) { - createTableColumnOrRow( (TQTable *) tqparent, text, pixmap, field, + } else if ( parent->inherits("TQTable") ) { + createTableColumnOrRow( (TQTable *) parent, text, pixmap, field, isRow ); #endif } @@ -787,7 +787,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, } void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, - TQObject *tqparent, TQListViewItem *parentItem ) + TQObject *parent, TQListViewItem *parentItem ) { TQStringList texts; TQValueList<TQPixmap> pixmaps; @@ -797,8 +797,8 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQ_UINT8 objectTag; TQListView *listView = 0; - if ( tqparent != 0 && tqparent->inherits("TQListView") ) - tqparent = TQT_TQOBJECT((TQListView *) tqparent); + if ( parent != 0 && parent->inherits("TQListView") ) + parent = TQT_TQOBJECT((TQListView *) parent); TQListViewItem *item = 0; if ( listView != 0 ) { if ( parentItem == 0 ) { @@ -815,7 +815,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, case Object_Item: if ( listView != 0 ) d->lastItem->setOpen( TRUE ); - inputItem( strings, in, tqparent, item ); + inputItem( strings, in, parent, item ); break; case Object_TextProperty: unpackCString( strings, in, name ); @@ -858,12 +858,12 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQString text = texts.last(); TQPixmap pixmap = pixmaps.last(); - if ( tqparent != 0 ) { - if ( tqparent->inherits("TQComboBox") || - tqparent->inherits("TQListBox") ) { - TQListBox *listBox = (TQListBox *) tqparent->tqqt_cast( "TQListBox" ); + if ( parent != 0 ) { + if ( parent->inherits("TQComboBox") || + parent->inherits("TQListBox") ) { + TQListBox *listBox = (TQListBox *) parent->tqqt_cast( "TQListBox" ); if ( listBox == 0 ) - listBox = ((TQComboBox *) tqparent)->listBox(); + listBox = ((TQComboBox *) parent)->listBox(); if ( pixmap.isNull() ) { (void) new TQListBoxText( listBox, text ); @@ -871,8 +871,8 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, (void) new TQListBoxPixmap( listBox, pixmap, text ); } #ifndef TQT_NO_ICONVIEW - } else if ( tqparent->inherits("TQIconView") ) { - (void) new TQIconViewItem( (TQIconView *) tqparent, text, pixmap ); + } else if ( parent->inherits("TQIconView") ) { + (void) new TQIconViewItem( (TQIconView *) parent, text, pixmap ); #endif } } @@ -914,7 +914,7 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects, TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, const UibStrTable& strings, TQDataStream& in, TQWidget *ancestorWidget, - TQObject *tqparent, TQCString className ) + TQObject *parent, TQCString className ) { TQObject *obj = 0; TQWidget *widget = 0; @@ -924,15 +924,15 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, bool isTQObject = !className.isEmpty(); if ( isTQObject ) { - if ( tqparent != 0 ) { - if ( tqparent->isWidgetType() ) { - if ( tqparent->inherits("TQMainWindow") ) { - parentWidget = ((TQMainWindow *) tqparent)->centralWidget(); + if ( parent != 0 ) { + if ( parent->isWidgetType() ) { + if ( parent->inherits("TQMainWindow") ) { + parentWidget = ((TQMainWindow *) parent)->centralWidget(); } else { - parentWidget = (TQWidget *) tqparent; + parentWidget = (TQWidget *) parent; } - } else if ( tqparent->inherits("TQLayout") ) { - parentLayout = (TQLayout *) tqparent; + } else if ( parent->inherits("TQLayout") ) { + parentLayout = (TQLayout *) parent; parentWidget = ancestorWidget; } } @@ -940,9 +940,9 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( className == "TQAction" ) { unpackCString( strings, in, className ); if ( className == "TQActionGroup" ) { - obj = TQT_TQOBJECT(new TQActionGroup( tqparent )); + obj = TQT_TQOBJECT(new TQActionGroup( parent )); } else { - obj = TQT_TQOBJECT(new TQAction( tqparent )); + obj = TQT_TQOBJECT(new TQAction( parent )); } } else if ( className == "TQLayout" ) { unpackCString( strings, in, className ); @@ -960,13 +960,13 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, obj = TQT_TQOBJECT(tqlayout); } else if ( className == "TQMenuBar" ) { unpackCString( strings, in, className ); - widget = ((TQMainWindow *) tqparent)->menuBar(); + widget = ((TQMainWindow *) parent)->menuBar(); obj = TQT_TQOBJECT(widget); } else if ( className == "TQToolBar" ) { TQ_UINT8 dock; in >> dock; unpackCString( strings, in, className ); - widget = new TQToolBar( TQString(), (TQMainWindow *) tqparent, + widget = new TQToolBar( TQString(), (TQMainWindow *) parent, (TQt::TQt::Dock) dock ); obj = TQT_TQOBJECT(widget); } else if ( className == "TQWidget" ) { @@ -1110,7 +1110,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, break; case Object_SubAction: inputObject( objects, numObjects, strings, in, parentWidget, - obj != 0 ? obj : tqparent, "TQAction" ); + obj != 0 ? obj : parent, "TQAction" ); break; case Object_SubLayout: inputObject( objects, numObjects, strings, in, parentWidget, obj, @@ -1128,11 +1128,11 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "title" ) { - if ( tqparent != 0 ) { - if ( tqparent->inherits("TQTabWidget") ) { - ((TQTabWidget *) tqparent)->insertTab( widget, str ); - } else if ( tqparent->inherits("TQWizard") ) { - ((TQWizard *) tqparent)->addPage( widget, str ); + if ( parent != 0 ) { + if ( parent->inherits("TQTabWidget") ) { + ((TQTabWidget *) parent)->insertTab( widget, str ); + } else if ( parent->inherits("TQWizard") ) { + ((TQWizard *) parent)->addPage( widget, str ); } } } @@ -1147,8 +1147,8 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "id" ) { - if ( tqparent != 0 && tqparent->inherits("TQWidgetStack") ) - ((TQWidgetStack *) tqparent)->addWidget( widget, value.toInt() ); + if ( parent != 0 && parent->inherits("TQWidgetStack") ) + ((TQWidgetStack *) parent)->addWidget( widget, value.toInt() ); } } else { if ( obj != 0 ) @@ -1183,7 +1183,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, } TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, - TQObject * /* connector */ , TQWidget *tqparent, const char *name ) + TQObject * /* connector */ , TQWidget *parent, const char *name ) { #define END_OF_BLOCK() \ ( in.atEnd() || in.tqdevice()->at() >= nextBlock ) @@ -1355,7 +1355,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Widget: toplevel = (TQWidget *) - inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(tqparent), + inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(parent), "TQWidget" ); if ( toplevel != 0 ) toplevel->setName( name ); @@ -1381,7 +1381,7 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory ) } /*! - Creates a widget of the type \a className passing \a tqparent and \a + Creates a widget of the type \a className passing \a parent and \a name to its constructor. If \a className is a widget in the TQt library, it is directly @@ -1417,106 +1417,106 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory ) \endlist */ -TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, +TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const { // create widgets we know if ( className == "TQPushButton" ) { - return new TQPushButton( tqparent, name ); + return new TQPushButton( parent, name ); } else if ( className == "TQToolButton" ) { - return new TQToolButton( tqparent, name ); + return new TQToolButton( parent, name ); } else if ( className == "TQCheckBox" ) { - return new TQCheckBox( tqparent, name ); + return new TQCheckBox( parent, name ); } else if ( className == "TQRadioButton" ) { - return new TQRadioButton( tqparent, name ); + return new TQRadioButton( parent, name ); } else if ( className == "TQGroupBox" ) { - return new TQGroupBox( tqparent, name ); + return new TQGroupBox( parent, name ); } else if ( className == "TQButtonGroup" ) { - return new TQButtonGroup( tqparent, name ); + return new TQButtonGroup( parent, name ); } else if ( className == "TQIconView" ) { #if !defined(TQT_NO_ICONVIEW) - return new TQIconView( tqparent, name ); + return new TQIconView( parent, name ); #endif } else if ( className == "TQTable" ) { #if !defined(TQT_NO_TABLE) - return new TQTable( tqparent, name ); + return new TQTable( parent, name ); #endif } else if ( className == "TQListBox" ) { - return new TQListBox( tqparent, name ); + return new TQListBox( parent, name ); } else if ( className == "TQListView" ) { - return new TQListView( tqparent, name ); + return new TQListView( parent, name ); } else if ( className == "TQLineEdit" ) { - return new TQLineEdit( tqparent, name ); + return new TQLineEdit( parent, name ); } else if ( className == "TQSpinBox" ) { - return new TQSpinBox( tqparent, name ); + return new TQSpinBox( parent, name ); } else if ( className == "TQMultiLineEdit" ) { - return new TQMultiLineEdit( tqparent, name ); + return new TQMultiLineEdit( parent, name ); } else if ( className == "TQLabel" || className == "TextLabel" || className == "PixmapLabel" ) { - return new TQLabel( tqparent, name ); + return new TQLabel( parent, name ); } else if ( className == "TQLayoutWidget" ) { - return new TQWidget( tqparent, name ); + return new TQWidget( parent, name ); } else if ( className == "TQTabWidget" ) { - return new TQTabWidget( tqparent, name ); + return new TQTabWidget( parent, name ); } else if ( className == "TQComboBox" ) { - return new TQComboBox( FALSE, tqparent, name ); + return new TQComboBox( FALSE, parent, name ); } else if ( className == "TQWidget" ) { 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" ) { if ( !qwf_stays_on_top ) - return new TQDialog( tqparent, name ); - return new TQDialog( tqparent, name, FALSE, (WFlags)TQt::WStyle_StaysOnTop ); + return new TQDialog( parent, name ); + return new TQDialog( parent, name, FALSE, (WFlags)TQt::WStyle_StaysOnTop ); } else if ( className == "TQWizard" ) { - return new TQWizard( tqparent, name ); + return new TQWizard( parent, name ); } else if ( className == "TQLCDNumber" ) { - return new TQLCDNumber( tqparent, name ); + return new TQLCDNumber( parent, name ); } else if ( className == "TQProgressBar" ) { - return new TQProgressBar( tqparent, name ); + return new TQProgressBar( parent, name ); } else if ( className == "TQTextView" ) { - return new TQTextView( tqparent, name ); + return new TQTextView( parent, name ); } else if ( className == "TQTextBrowser" ) { - return new TQTextBrowser( tqparent, name ); + return new TQTextBrowser( parent, name ); } else if ( className == "TQDial" ) { - return new TQDial( tqparent, name ); + return new TQDial( parent, name ); } else if ( className == "TQSlider" ) { - return new TQSlider( tqparent, name ); + return new TQSlider( parent, name ); } else if ( className == "TQFrame" ) { - return new TQFrame( tqparent, name ); + return new TQFrame( parent, name ); } else if ( className == "TQSplitter" ) { - 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" ) { - return new TQTextEdit( tqparent, name ); + return new TQTextEdit( parent, name ); } else if ( className == "TQDateEdit" ) { - return new TQDateEdit( tqparent, name ); + return new TQDateEdit( parent, name ); } else if ( className == "TQTimeEdit" ) { - return new TQTimeEdit( tqparent, name ); + return new TQTimeEdit( parent, name ); } else if ( className == "TQDateTimeEdit" ) { - return new TQDateTimeEdit( tqparent, name ); + return new TQDateTimeEdit( parent, name ); } else if ( className == "TQScrollBar" ) { - return new TQScrollBar( tqparent, name ); + return new TQScrollBar( parent, name ); } else if ( className == "TQPopupMenu" ) { - return new TQPopupMenu( tqparent, name ); + return new TQPopupMenu( parent, name ); } else if ( className == "TQWidgetStack" ) { - return new TQWidgetStack( tqparent, name ); + return new TQWidgetStack( parent, name ); } else if ( className == "TQToolBox" ) { - return new TQToolBox( tqparent, name ); + return new TQToolBox( parent, name ); } else if ( className == "TQVBox" ) { - return new TQVBox( tqparent, name ); + return new TQVBox( parent, name ); } else if ( className == "TQHBox" ) { - return new TQHBox( tqparent, name ); + return new TQHBox( parent, name ); } else if ( className == "TQGrid" ) { - return new TQGrid( 4, tqparent, name ); + return new TQGrid( 4, parent, name ); } else if ( className == "TQMainWindow" ) { TQMainWindow *mw = 0; if ( !qwf_stays_on_top ) - mw = new TQMainWindow( tqparent, name ); + mw = new TQMainWindow( parent, name ); else - mw = new TQMainWindow( tqparent, name, (WFlags)(TQt::WType_TopLevel | TQt::WStyle_StaysOnTop) ); + mw = new TQMainWindow( parent, name, (WFlags)(TQt::WType_TopLevel | TQt::WStyle_StaysOnTop) ); mw->setCentralWidget( new TQWidget( mw, "qt_central_widget" ) ); mw->centralWidget()->show(); (void)mw->statusBar(); @@ -1525,11 +1525,11 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq } #if !defined(TQT_NO_SQL) else if ( className == "TQDataTable" ) { - return new TQDataTable( tqparent, name ); + return new TQDataTable( parent, name ); } else if ( className == "TQDataBrowser" ) { - return new TQDesignerDataBrowser2( tqparent, name ); + return new TQDesignerDataBrowser2( parent, name ); } else if ( className == "TQDataView" ) { - return new TQDesignerDataView2( tqparent, name ); + return new TQDesignerDataView2( parent, name ); } #endif @@ -1543,7 +1543,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq TQInterfacePtr<WidgetInterface> iface = 0; widgetInterfaceManager->queryInterface( className, &iface ); if ( iface ) { - TQWidget *w = iface->create( className, tqparent, name ); + TQWidget *w = iface->create( className, parent, name ); if ( w ) { d->customWidgets.replace( className.latin1(), new bool(TRUE) ); return w; @@ -1552,7 +1552,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq // hope we have a factory which can do it for ( TQWidgetFactory* f = widgetFactories.first(); f; f = widgetFactories.next() ) { - TQWidget *w = f->createWidget( className, tqparent, name ); + TQWidget *w = f->createWidget( className, parent, name ); if ( w ) return w; } @@ -1578,7 +1578,7 @@ bool TQWidgetFactory::supportsWidget( const TQString &widget ) return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() ); } -TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, +TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ) { d->lastItem = 0; @@ -1606,9 +1606,9 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } if ( tqlayout && className == "TQLayoutWidget" ) { // hide tqlayout widgets - w = tqparent; + w = parent; } else { - obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, tqparent, 0 )); + obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 )); if ( !obj ) return 0; w = (TQWidget*)obj; @@ -1637,8 +1637,8 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS - TQString parentClassName = tqparent ? tqparent->className() : 0; - bool isPlugin = tqparent ? !!d->customWidgets.find( tqparent->className() ) : FALSE; + TQString parentClassName = parent ? parent->className() : 0; + bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE; if ( isPlugin ) qWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages @@ -1693,19 +1693,19 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( tqparent ) { - if ( tqparent->inherits( "TQTabWidget" ) ) { + if ( parent ) { + if ( parent->inherits( "TQTabWidget" ) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, translate( v.toString() ) ); - } else if ( tqparent->inherits( "TQWidgetStack" ) ) { + ( (TQTabWidget*)parent )->insertTab( w, translate( v.toString() ) ); + } else if ( parent->inherits( "TQWidgetStack" ) ) { if ( attrib == "id" ) - ( (TQWidgetStack*)tqparent )->addWidget( w, v.toInt() ); - } else if ( tqparent->inherits( "TQToolBox" ) ) { + ( (TQWidgetStack*)parent )->addWidget( w, v.toInt() ); + } else if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) - ( (TQToolBox*)tqparent )->addItem( w, v.toString() ); - } else if ( tqparent->inherits( "TQWizard" ) ) { + ( (TQToolBox*)parent )->addItem( w, v.toString() ); + } else if ( parent->inherits( "TQWizard" ) ) { if ( attrib == "title" ) - ( (TQWizard*)tqparent )->addPage( w, translate( v.toString() ) ); + ( (TQWizard*)parent )->addPage( w, translate( v.toString() ) ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( isPlugin ) { if ( attrib == "label" ) { @@ -1717,7 +1717,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget (TQUnknownInterface**)&iface2 ); if ( iface2 ) { iface2->insertPage( parentClassName, - (TQWidget*)tqparent, translate( v.toString() ), -1, w ); + (TQWidget*)parent, translate( v.toString() ), -1, w ); iface2->release(); } iface->release(); @@ -1861,8 +1861,8 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, } else if ( prop == "buddy" ) { buddies.insert( obj->name(), value.toCString() ); } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( "TQButton" ) && obj->tqparent()->inherits( "TQButtonGroup" ) ) - ( (TQButtonGroup*)obj->tqparent() )->insert( (TQButton*)obj, value.toInt() ); + if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) ) + ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, value.toInt() ); #ifndef TQT_NO_SQL } else if ( prop == "database" && !obj->inherits( "TQDataView" ) && !obj->inherits( "TQDataBrowser" ) ) { @@ -2416,13 +2416,13 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis -void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e ) +void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) { TQDomElement n = e; TQAction *a = 0; bool hasMenuText = FALSE; if ( n.tagName() == "action" ) { - a = new TQAction( tqparent ); + a = new TQAction( parent ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { @@ -2434,10 +2434,10 @@ void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( "TQAction" ) ) + if ( !parent->inherits( "TQAction" ) ) 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" ) { @@ -2452,7 +2452,7 @@ void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( "TQAction" ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h index 0ce05e9b7..bc4bd7cff 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h +++ b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h @@ -61,13 +61,13 @@ public: TQWidgetFactory(); virtual ~TQWidgetFactory(); - static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ); - static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ); - inline static TQWidget *create( TQFile *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ) { return create(TQT_TQIODEVICE(dev), connector, tqparent, name); } + 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 ); + inline static TQWidget *create( TQFile *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ) { return create(TQT_TQIODEVICE(dev), connector, parent, name); } static void addWidgetFactory( TQWidgetFactory *factory ); static void loadImages( const TQString &dir ); - virtual TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const; + virtual TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const; static TQStringList widgets(); static bool supportsWidget( const TQString &widget ); @@ -76,7 +76,7 @@ private: void loadImageCollection( const TQDomElement &e ); void loadConnections( const TQDomElement &e, TQObject *connector ); void loadTabOrder( const TQDomElement &e ); - TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg ); + TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ); TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE ); LayoutType layoutType( TQLayout *l ) const; void setProperty( TQObject* widget, const TQString &prop, TQVariant value ); @@ -97,7 +97,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 ); @@ -120,21 +120,21 @@ private: void unpackVariant( const UibStrTable& strings, TQDataStream& in, TQVariant& value ); void inputSpacer( const UibStrTable& strings, TQDataStream& in, - TQLayout *tqparent ); + TQLayout *parent ); void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in, - TQObject *tqparent, bool isRow ); + TQObject *parent, bool isRow ); void inputItem( const UibStrTable& strings, TQDataStream& in, - TQObject *tqparent, TQListViewItem *parentItem = 0 ); + TQObject *parent, TQListViewItem *parentItem = 0 ); void inputMenuItem( TQObject **objects, const UibStrTable& strings, TQDataStream& in, TQMenuBar *menuBar ); TQObject *inputObject( TQObject **objects, int& numObjects, const UibStrTable& strings, TQDataStream& in, - TQWidget *ancestorWidget, TQObject *tqparent, + TQWidget *ancestorWidget, TQObject *parent, TQCString className = "" ); TQWidget *createFromUiFile( TQDomDocument doc, TQObject *connector, - TQWidget *tqparent, const char *name ); + TQWidget *parent, const char *name ); TQWidget *createFromUibFile( TQDataStream& in, TQObject *connector, - TQWidget *tqparent, const char *name ); + TQWidget *parent, const char *name ); private: struct Image { diff --git a/experimental/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf b/experimental/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf index 7cec63194..b20c2cd9a 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf +++ b/experimental/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf @@ -343,7 +343,7 @@ Objects of this class provide translations for user-visible text. \skipto QTranslator \printuntil tor -Creates a \l QTranslator object without a tqparent. +Creates a \l QTranslator object without a parent. \printline load diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp index fe8129a16..0e13762c2 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp @@ -46,9 +46,9 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> -FindDialog::FindDialog( bool replace, TQWidget *tqparent, const char *name, +FindDialog::FindDialog( bool replace, TQWidget *parent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal ) + : TQDialog( parent, name, modal ) { sourceText = 0; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.h index 47d0ec53c..f2c534d59 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/finddialog.h @@ -46,7 +46,7 @@ class FindDialog : public TQDialog public: enum { SourceText = 0x1, Translations = 0x2, Comments = 0x4 }; - FindDialog( bool replace, TQWidget *tqparent = 0, const char *name = 0, bool modal = FALSE ); + FindDialog( bool replace, TQWidget *parent = 0, const char *name = 0, bool modal = FALSE ); Q_SIGNALS: void findNext( const TQString& text, int where, bool matchCase ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp index 5c3c747b8..66484e3c2 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp @@ -51,14 +51,14 @@ static TQString rho( int n ) int LVI::count = 0; -LVI::LVI( TQListView * tqparent, TQString text ) - : TQListViewItem( tqparent, text ) +LVI::LVI( TQListView * parent, TQString text ) + : TQListViewItem( parent, text ) { setText( 0, rho(count++) ); } -LVI::LVI( TQListViewItem * tqparent, TQString text ) - : TQListViewItem( tqparent, text ) +LVI::LVI( TQListViewItem * parent, TQString text ) + : TQListViewItem( parent, text ) { setText( 0, rho(count++) ); } @@ -137,11 +137,11 @@ static TQString fixEllipsis( const TQString & str, int len ) /* MessageLVI implementation */ -MessageLVI::MessageLVI( TQListView *tqparent, +MessageLVI::MessageLVI( TQListView *parent, const MetaTranslatorMessage & message, const TQString& text, const TQString& comment, ContextLVI * c ) - : LVI( tqparent ), m( message ), tx( text ), com( comment ), ctxt( c ) + : LVI( parent ), m( message ), tx( text ), com( comment ), ctxt( c ) { if ( m.translation().isEmpty() ) { TQString t = ""; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.h index de37b6658..ba2104fdb 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/listviews.h @@ -44,8 +44,8 @@ class LVI : public TQListViewItem { public: - LVI( TQListView *tqparent, TQString text = TQString() ); - LVI( TQListViewItem *tqparent, TQString text = TQString() ); + LVI( TQListView *parent, TQString text = TQString() ); + LVI( TQListViewItem *parent, TQString text = TQString() ); virtual int compare( TQListViewItem *other, int column, bool ascending ) const; virtual bool danger() const { return FALSE; } @@ -101,7 +101,7 @@ private: class MessageLVI : public LVI { public: - MessageLVI( TQListView *tqparent, const MetaTranslatorMessage & message, + MessageLVI( TQListView *parent, const MetaTranslatorMessage & message, const TQString& text, const TQString& comment, ContextLVI * c ); virtual bool danger() const { return d; } diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp index 5e2987550..75733c32a 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp @@ -70,8 +70,8 @@ static const int MaxCandidates = 5; class MED : public TQTextEdit { public: - MED( TQWidget *tqparent, const char *name = 0 ) - : TQTextEdit( tqparent, name ) {} + MED( TQWidget *parent, const char *name = 0 ) + : TQTextEdit( parent, name ) {} int cursorX() const { return textCursor()->x(); } int cursorY() const { return textCursor()->paragraph()->rect().y() + @@ -133,14 +133,14 @@ TQString richText( const TQString& text ) Used to create a shadow like effect for a widget */ -ShadowWidget::ShadowWidget( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ), sWidth( 10 ), wMargin( 3 ), childWgt( 0 ) +ShadowWidget::ShadowWidget( TQWidget * parent, const char * name ) + : TQWidget( parent, name ), sWidth( 10 ), wMargin( 3 ), childWgt( 0 ) { } -ShadowWidget::ShadowWidget( TQWidget * child, TQWidget * tqparent, +ShadowWidget::ShadowWidget( TQWidget * child, TQWidget * parent, const char * name ) - : TQWidget( tqparent, name ), sWidth( 10 ), wMargin( 3 ), childWgt( 0 ) + : TQWidget( parent, name ), sWidth( 10 ), wMargin( 3 ), childWgt( 0 ) { setWidget( child ); } @@ -148,7 +148,7 @@ ShadowWidget::ShadowWidget( TQWidget * child, TQWidget * tqparent, void ShadowWidget::setWidget( TQWidget * child ) { childWgt = child; - if ( childWgt && TQT_BASE_OBJECT(childWgt->tqparent()) != TQT_BASE_OBJECT(this) ) { + if ( childWgt && TQT_BASE_OBJECT(childWgt->parent()) != TQT_BASE_OBJECT(this) ) { childWgt->reparent( this, TQPoint( 0, 0 ), TRUE ); } } @@ -198,8 +198,8 @@ void ShadowWidget::paintEvent( TQPaintEvent * e ) A frame that contains the source text, translated text and any source code comments and hints. */ -EditorPage::EditorPage( TQWidget * tqparent, const char * name ) - : TQFrame( tqparent, name ) +EditorPage::EditorPage( TQWidget * parent, const char * name ) + : TQFrame( parent, name ) { setLineWidth( 1 ); setFrameStyle( TQFrame::Box | TQFrame::Plain ); @@ -396,9 +396,9 @@ void EditorPage::fontChange( const TQFont & ) Handle tqlayout of dock windows and the editor page. */ -MessageEditor::MessageEditor( MetaTranslator * t, TQWidget * tqparent, +MessageEditor::MessageEditor( MetaTranslator * t, TQWidget * parent, const char * name ) - : TQWidget( tqparent, name ), + : TQWidget( parent, name ), tor( t ) { doGuesses = TRUE; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.h index 21e6710e3..40749bc98 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/msgedit.h @@ -66,13 +66,13 @@ class PageCurl : public TQWidget Q_OBJECT TQ_OBJECT public: - PageCurl( TQWidget * tqparent = 0, const char * name = 0, + PageCurl( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) - : TQWidget( tqparent, name, f ) + : TQWidget( parent, name, f ) { TQPixmap px = TrWindow::pageCurl(); - if ( px.tqmask() ) { - setMask( *px.tqmask() ); + if ( px.mask() ) { + setMask( *px.mask() ); } setBackgroundPixmap( px ); setFixedSize( px.size() ); @@ -105,8 +105,8 @@ Q_SIGNALS: class ShadowWidget : public TQWidget { public: - ShadowWidget( TQWidget * tqparent = 0, const char * name = 0 ); - ShadowWidget( TQWidget * child, TQWidget * tqparent = 0, const char * name = 0 ); + ShadowWidget( TQWidget * parent = 0, const char * name = 0 ); + ShadowWidget( TQWidget * child, TQWidget * parent = 0, const char * name = 0 ); void setShadowWidth( int width ) { sWidth = width; } int shadowWidth() const { return sWidth; } @@ -129,7 +129,7 @@ class EditorPage : public TQFrame Q_OBJECT TQ_OBJECT public: - EditorPage( TQWidget * tqparent = 0, const char * name = 0 ); + EditorPage( TQWidget * parent = 0, const char * name = 0 ); protected: void resizeEvent( TQResizeEvent * ); @@ -162,7 +162,7 @@ class MessageEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - MessageEditor( MetaTranslator * t, TQWidget * tqparent = 0, + MessageEditor( MetaTranslator * t, TQWidget * parent = 0, const char * name = 0 ); TQListView * sourceTextList() const; TQListView * phraseList() const; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.cpp index 2c0c6404c..51b02cba0 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.cpp @@ -49,9 +49,9 @@ #include <tqwhatsthis.h> PhraseBookBox::PhraseBookBox( const TQString& filename, - const PhraseBook& phraseBook, TQWidget *tqparent, + const PhraseBook& phraseBook, TQWidget *parent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal ), fn( filename ), pb( phraseBook ) + : TQDialog( parent, name, modal ), fn( filename ), pb( phraseBook ) { TQGridLayout *gl = new TQGridLayout( this, 4, 3, 11, 11, "phrase book outer tqlayout" ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.h index bf3261b45..847006e18 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phrasebookbox.h @@ -51,7 +51,7 @@ class PhraseBookBox : public TQDialog TQ_OBJECT public: PhraseBookBox( const TQString& filename, const PhraseBook& phraseBook, - TQWidget *tqparent = 0, const char *name = 0, + TQWidget *parent = 0, const char *name = 0, bool modal = FALSE ); const PhraseBook& phraseBook() const { return pb; } diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp index 15177c06e..6aab76dce 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp @@ -51,18 +51,18 @@ public: virtual TQString text( const TQPoint& p ); private: - PhraseLV *tqparent; + PhraseLV *parent; }; WhatPhrase::WhatPhrase( PhraseLV *w ) : TQWhatsThis( w ) { - tqparent = w; + parent = w; } TQString WhatPhrase::text( const TQPoint& p ) { - TQListViewItem *item = tqparent->itemAt( p ); + TQListViewItem *item = parent->itemAt( p ); if ( item == 0 ) return PhraseLV::tr( "This is a list of phrase entries relevant to the" " source text. Each phrase is supplemented with a suggested" @@ -71,16 +71,16 @@ TQString WhatPhrase::text( const TQPoint& p ) return TQString( PhraseLV::tr("<p><u>%1:</u> %2</p>" "<p><u>%3:</u> %4</p>" "<p><u>%5:</u> %6</p>") ) - .arg( tqparent->columnText(PhraseLVI::SourceTextShown) ) + .arg( parent->columnText(PhraseLVI::SourceTextShown) ) .arg( item->text(PhraseLVI::SourceTextShown) ) - .arg( tqparent->columnText(PhraseLVI::TargetTextShown) ) + .arg( parent->columnText(PhraseLVI::TargetTextShown) ) .arg( item->text(PhraseLVI::TargetTextShown) ) - .arg( tqparent->columnText(PhraseLVI::DefinitionText) ) + .arg( parent->columnText(PhraseLVI::DefinitionText) ) .arg( item->text(PhraseLVI::DefinitionText) ); } -PhraseLVI::PhraseLVI( PhraseLV *tqparent, const Phrase& phrase, int accelKey ) - : TQListViewItem( tqparent ), +PhraseLVI::PhraseLVI( PhraseLV *parent, const Phrase& phrase, int accelKey ) + : TQListViewItem( parent ), akey( accelKey ) { setPhrase( phrase ); @@ -146,8 +146,8 @@ TQString PhraseLVI::makeKey( const TQString& text ) const return key; } -PhraseLV::PhraseLV( TQWidget *tqparent, const char *name ) - : TQListView( tqparent, name ) +PhraseLV::PhraseLV( TQWidget *parent, const char *name ) + : TQListView( parent, name ) { setAllColumnsShowFocus( TRUE ); setShowSortIndicator( TRUE ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h index e6fedd622..3c9bad140 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h @@ -50,7 +50,7 @@ public: enum { SourceTextShown, TargetTextShown, DefinitionText, SourceTextOriginal, TargetTextOriginal }; - PhraseLVI( PhraseLV *tqparent, const Phrase& phrase, int accelKey = 0 ); + PhraseLVI( PhraseLV *parent, const Phrase& phrase, int accelKey = 0 ); virtual void setText( int column, const TQString& text ); virtual TQString key( int column, bool ascending ) const; @@ -71,7 +71,7 @@ class PhraseLV : public TQListView { TQ_OBJECT public: - PhraseLV( TQWidget *tqparent, const char *name ); + PhraseLV( TQWidget *parent, const char *name ); ~PhraseLV(); virtual TQSize tqsizeHint() const; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp index 564845f1d..a198f64ec 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp @@ -176,7 +176,7 @@ public: Action::Action( TQPopupMenu *pop, const TQString& menuText, TQObject *receiver, const char *member, const TQString &imageName, int accel, bool toggle ) - : TQAction( pop->tqparent(), (const char *) 0, toggle ) + : TQAction( pop->parent(), (const char *) 0, toggle ) { setMenuText( menuText ); setAccel( accel ); @@ -196,7 +196,7 @@ Action::Action( TQPopupMenu *pop, const TQString& menuText, TQObject *receiver, Action::Action( TQPopupMenu *pop, const TQString& menuText, int accel, bool toggle ) - : TQAction( pop->tqparent(), (const char *) 0, toggle ) + : TQAction( pop->parent(), (const char *) 0, toggle ) { TQAction::addTo( pop ); setMenuText( menuText ); @@ -1871,7 +1871,7 @@ void TrWindow::readConfig() } TQDockWindow * dw; - dw = (TQDockWindow *) lv->tqparent(); + dw = (TQDockWindow *) lv->parent(); int place; place = config.readNumEntry( keybase + "Geometry/ContextwindowInTQt::Dock" ); r.setX( config.readNumEntry( keybase + "Geometry/ContextwindowX" ) ); @@ -1886,7 +1886,7 @@ void TrWindow::readConfig() } dw->setGeometry( r ); - dw = (TQDockWindow *) slv->tqparent(); + dw = (TQDockWindow *) slv->parent(); place = config.readNumEntry( keybase + "Geometry/SourcewindowInTQt::Dock" ); r.setX( config.readNumEntry( keybase + "Geometry/SourcewindowX" ) ); r.setY( config.readNumEntry( keybase + "Geometry/SourcewindowY" ) ); @@ -1900,7 +1900,7 @@ void TrWindow::readConfig() } dw->setGeometry( r ); - dw = (TQDockWindow *) plv->tqparent()->tqparent(); + dw = (TQDockWindow *) plv->parent()->parent(); place = config.readNumEntry( keybase + "Geometry/PhrasewindowInTQt::Dock" ); r.setX( config.readNumEntry( keybase + "Geometry/PhrasewindowX" ) ); r.setY( config.readNumEntry( keybase + "Geometry/PhrasewindowY" ) ); @@ -1931,14 +1931,14 @@ void TrWindow::writeConfig() config.writeEntry( keybase + "Geometry/MainwindowWidth", width() ); config.writeEntry( keybase + "Geometry/MainwindowHeight", height() ); - TQDockWindow * dw =(TQDockWindow *) lv->tqparent(); + TQDockWindow * dw =(TQDockWindow *) lv->parent(); config.writeEntry( keybase + "Geometry/ContextwindowInTQt::Dock", dw->place() ); config.writeEntry( keybase + "Geometry/ContextwindowX", dw->x() ); config.writeEntry( keybase + "Geometry/ContextwindowY", dw->y() ); config.writeEntry( keybase + "Geometry/ContextwindowWidth", dw->width() ); config.writeEntry( keybase + "Geometry/ContextwindowHeight", dw->height() ); - dw =(TQDockWindow *) slv->tqparent(); + dw =(TQDockWindow *) slv->parent(); config.writeEntry( keybase + "Geometry/SourcewindowInTQt::Dock", dw->place() ); config.writeEntry( keybase + "Geometry/SourcewindowX", dw->tqgeometry().x() ); @@ -1946,7 +1946,7 @@ void TrWindow::writeConfig() config.writeEntry( keybase + "Geometry/SourcewindowWidth", dw->width() ); config.writeEntry( keybase + "Geometry/SourcewindowHeight", dw->height() ); - dw =(TQDockWindow *) plv->tqparent()->tqparent(); + dw =(TQDockWindow *) plv->parent()->parent(); config.writeEntry( keybase + "Geometry/PhrasewindowInTQt::Dock", dw->place() ); config.writeEntry( keybase + "Geometry/PhrasewindowX", dw->tqgeometry().x() ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph index 906f5479e..c4926bd7e 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph @@ -579,7 +579,7 @@ <target>rude</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>overordnet vindue</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/dutch.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/dutch.qph index bd94682fd..0e9b5d689 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/dutch.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/dutch.qph @@ -599,7 +599,7 @@ <target>deelvenster</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>hoofdvenster</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/finnish.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/finnish.qph index 914c72274..0612c8275 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/finnish.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/finnish.qph @@ -598,7 +598,7 @@ <target>ruutu</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>ylemmän tason ikkuna</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/french.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/french.qph index 834f29b41..569f7bacf 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/french.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/french.qph @@ -657,8 +657,8 @@ <target>volet</target> </phrase> <phrase> - <source>tqparent window</source> - <target>fenêtre tqparent</target> + <source>parent window</source> + <target>fenêtre parent</target> </phrase> <phrase> <source>password</source> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/german.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/german.qph index be8d30d69..544138b04 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/german.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/german.qph @@ -634,7 +634,7 @@ <target>Fensterbereich</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>Übergeordnetes Fenster</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/italian.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/italian.qph index 534214d0e..2aa3d7a40 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/italian.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/italian.qph @@ -650,7 +650,7 @@ <target>riquadro</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>finestra principale</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/norwegian.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/norwegian.qph index ca16dbc42..d01187cfe 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/norwegian.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/norwegian.qph @@ -576,7 +576,7 @@ <target>rute</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>hovedvindu</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/russian.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/russian.qph index 5bb250315..ec64aae65 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/russian.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/russian.qph @@ -568,7 +568,7 @@ <target>панель</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>родительское окно</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/spanish.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/spanish.qph index 8c21be69f..978a43dcd 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/spanish.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/spanish.qph @@ -634,7 +634,7 @@ <target>panel</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>ventana principal</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/swedish.qph b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/swedish.qph index 409317500..9c44071e8 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/swedish.qph +++ b/experimental/tqtinterface/qt4/tools/linguist/phrasebooks/swedish.qph @@ -578,7 +578,7 @@ <target>fönsterruta</target> </phrase> <phrase> - <source>tqparent window</source> + <source>parent window</source> <target>moderfönster</target> </phrase> <phrase> diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.cpp b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.cpp index 722320d78..8c48018c6 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.cpp @@ -8,8 +8,8 @@ #include <tqpushbutton.h> -ArrowPad::ArrowPad( TQWidget *tqparent, const char *name ) - : TQGrid( 3, Qt::Horizontal, tqparent, name ) +ArrowPad::ArrowPad( TQWidget *parent, const char *name ) + : TQGrid( 3, Qt::Horizontal, parent, name ) { setMargin( 10 ); setSpacing( 10 ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.h b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.h index b27379129..13c061d5d 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.h +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/arrowpad.h @@ -13,7 +13,7 @@ class ArrowPad : public TQGrid { TQ_OBJECT public: - ArrowPad( TQWidget *tqparent = 0, const char *name = 0 ); + ArrowPad( TQWidget *parent = 0, const char *name = 0 ); private: void skip(); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.cpp b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.cpp index e91a4ce18..41dd7d19e 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.cpp @@ -12,8 +12,8 @@ #include <tqmenubar.h> #include <tqpopupmenu.h> -MainWindow::MainWindow( TQWidget *tqparent, const char *name ) - : TQMainWindow( tqparent, name ) +MainWindow::MainWindow( TQWidget *parent, const char *name ) + : TQMainWindow( parent, name ) { ArrowPad *ap = new ArrowPad( this, "arrow pad" ); setCentralWidget( ap ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.h b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.h index 46bdf50d0..38209c619 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.h +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt2/mainwindow.h @@ -13,7 +13,7 @@ class MainWindow : public TQMainWindow { TQ_OBJECT public: - MainWindow( TQWidget *tqparent = 0, const char *name = 0 ); + MainWindow( TQWidget *parent = 0, const char *name = 0 ); }; #endif diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.cpp b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.cpp index c5333444c..97adb8d10 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.cpp @@ -13,8 +13,8 @@ #include <tqmessagebox.h> #include <tqpopupmenu.h> -MainWindow::MainWindow( TQWidget *tqparent, const char *name ) - : TQMainWindow( tqparent, name ) +MainWindow::MainWindow( TQWidget *parent, const char *name ) + : TQMainWindow( parent, name ) { setCaption( tqtr("Troll Print 1.0") ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.h b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.h index 723072c5e..b1425666c 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.h +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/mainwindow.h @@ -14,7 +14,7 @@ class MainWindow : public TQMainWindow Q_OBJECT TQ_OBJECT public: - MainWindow( TQWidget *tqparent = 0, const char *name = 0 ); + MainWindow( TQWidget *parent = 0, const char *name = 0 ); private Q_SLOTS: void about(); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.cpp b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.cpp index 85c507b61..2eef0cbc3 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.cpp @@ -10,8 +10,8 @@ #include <tqradiobutton.h> #include <tqhbuttongroup.h> -PrintPanel::PrintPanel( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ) +PrintPanel::PrintPanel( TQWidget *parent, const char *name ) + : TQVBox( parent, name ) { setMargin( 10 ); setSpacing( 10 ); diff --git a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.h b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.h index 07bd83fcc..906e8994e 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.h +++ b/experimental/tqtinterface/qt4/tools/linguist/tutorial/tt3/printpanel.h @@ -13,7 +13,7 @@ class PrintPanel : public TQVBox { TQ_OBJECT public: - PrintPanel( TQWidget *tqparent = 0, const char *name = 0 ); + PrintPanel( TQWidget *parent = 0, const char *name = 0 ); }; #endif diff --git a/experimental/tqtinterface/qt4/tools/makeqpf/main.cpp b/experimental/tqtinterface/qt4/tools/makeqpf/main.cpp index 98f548eb6..4b4364e6f 100644 --- a/experimental/tqtinterface/qt4/tools/makeqpf/main.cpp +++ b/experimental/tqtinterface/qt4/tools/makeqpf/main.cpp @@ -58,8 +58,8 @@ class FontViewItem : public TQListViewItem { TQFont font; public: - FontViewItem(const TQString& f, int pt, int w, bool ital, TQListView* tqparent) : - TQListViewItem(tqparent), + FontViewItem(const TQString& f, int pt, int w, bool ital, TQListView* parent) : + TQListViewItem(parent), family(f), pointSize(pt), weight(w), italic(ital) { } diff --git a/experimental/tqtinterface/qt4/tools/qconfig/main.cpp b/experimental/tqtinterface/qt4/tools/qconfig/main.cpp index 39ee580d9..c304f3ec4 100644 --- a/experimental/tqtinterface/qt4/tools/qconfig/main.cpp +++ b/experimental/tqtinterface/qt4/tools/qconfig/main.cpp @@ -184,8 +184,8 @@ static const char*forward_xpm[]={ class ChoiceItem : public TQCheckListItem { public: TQString id; - ChoiceItem(const TQString& i, TQListViewItem* tqparent) : - TQCheckListItem(tqparent, + ChoiceItem(const TQString& i, TQListViewItem* parent) : + TQCheckListItem(parent, i.mid(6), // strip "TQT_NO_" as we reverse the logic CheckBox), id(i) @@ -542,19 +542,19 @@ void Main::createItem(const TQString& ch) if ( !item[ch] ) { TQStringList deps = dependencies[ch]; TQString sec = section[ch]; - TQListViewItem* tqparent = 0; + TQListViewItem* parent = 0; for (TQStringList::Iterator dp = deps.begin(); dp != deps.end(); ++dp) { TQString dsec = section[*dp]; if ( dsec.isEmpty() ) qDebug("No section for %s",(*dp).latin1()); - if ( !tqparent && dsec == sec ) { + if ( !parent && dsec == sec ) { createItem(*dp); - tqparent = item[*dp]; + parent = item[*dp]; } } - if ( !tqparent ) - tqparent = sectionitem[section[ch]]; - ChoiceItem* ci = new ChoiceItem(ch,tqparent); + if ( !parent ) + parent = sectionitem[section[ch]]; + ChoiceItem* ci = new ChoiceItem(ch,parent); item[ch] = ci; if ( !label[ch].isEmpty() ) ci->setInfo(label[ch],documentation[ch]); @@ -590,7 +590,7 @@ void Main::loadConfig(const TQString& filename) void Main::updateAvailability(TQListViewItem* i) { - if ( !i || !i->tqparent() ) { + if ( !i || !i->parent() ) { // section. do nothing for now } else { ChoiceItem* choice = (ChoiceItem*)i; @@ -624,7 +624,7 @@ void Main::showInfo(TQListViewItem* i) { if ( !i ) return; - if ( !i->tqparent() ) { + if ( !i->parent() ) { // section. do nothing for now } else { ChoiceItem* choice = (ChoiceItem*)i; @@ -671,8 +671,8 @@ void Main::selectId(const TQString& id) } } -Info::Info( TQWidget* tqparent, const char* name ) : - TQTextBrowser(tqparent, name) +Info::Info( TQWidget* parent, const char* name ) : + TQTextBrowser(parent, name) { } diff --git a/experimental/tqtinterface/qt4/tools/qconfig/main.h b/experimental/tqtinterface/qt4/tools/qconfig/main.h index c4e515030..7d8536bb4 100644 --- a/experimental/tqtinterface/qt4/tools/qconfig/main.h +++ b/experimental/tqtinterface/qt4/tools/qconfig/main.h @@ -44,7 +44,7 @@ class TQLabel; class Info : public TQTextBrowser { TQ_OBJECT public: - Info( TQWidget* tqparent, const char* name=0 ); + Info( TQWidget* parent, const char* name=0 ); Q_SIGNALS: void idClicked(const TQString& name); diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp index 4dd152f6e..bab9b9767 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp +++ b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp @@ -40,8 +40,8 @@ #include <tqstyle.h> -ColorButton::ColorButton(TQWidget *tqparent, const char *name) - : TQButton(tqparent, name), mousepressed(FALSE) +ColorButton::ColorButton(TQWidget *parent, const char *name) + : TQButton(parent, name), mousepressed(FALSE) { setAcceptDrops(TRUE); col = Qt::black; @@ -49,8 +49,8 @@ ColorButton::ColorButton(TQWidget *tqparent, const char *name) } -ColorButton::ColorButton(const TQColor &c, TQWidget *tqparent, const char *name) - : TQButton(tqparent, name) +ColorButton::ColorButton(const TQColor &c, TQWidget *parent, const char *name) + : TQButton(parent, name) { setAcceptDrops(TRUE); col = c; diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp index 6939ceffb..36a5927ba 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp +++ b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp @@ -70,9 +70,9 @@ void BoldListBoxText::paint( TQPainter* painter ) TQListBoxText::paint( painter ); } -PaletteEditorAdvanced::PaletteEditorAdvanced( TQWidget * tqparent, +PaletteEditorAdvanced::PaletteEditorAdvanced( TQWidget * parent, const char * name, bool modal, WFlags f ) - : PaletteEditorAdvancedBase( tqparent, name, modal, f ), selectedPalette(0) + : PaletteEditorAdvancedBase( parent, name, modal, f ), selectedPalette(0) { editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); @@ -591,10 +591,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( TQt::BackgroundMode mode ) } TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, - TQt::BackgroundMode mode, TQWidget* tqparent, + TQt::BackgroundMode mode, TQWidget* parent, const char* name ) { - PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( tqparent, name, TRUE ); + PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( parent, name, TRUE ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h index be78f5bf0..d78bc8561 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h +++ b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h @@ -41,12 +41,12 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase Q_OBJECT TQ_OBJECT public: - PaletteEditorAdvanced( TQWidget * tqparent=0, const char * name=0, + PaletteEditorAdvanced( TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditorAdvanced(); static TQPalette getPalette( bool *ok, const TQPalette &pal, TQt::BackgroundMode mode = TQt::PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); protected Q_SLOTS: void paletteSelected(int); diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp index 212978769..5f926cac3 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp +++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp @@ -36,8 +36,8 @@ #include <tqvbox.h> #include <tqpainter.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/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h index bbb03ac53..bb919aad4 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h +++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h @@ -45,8 +45,8 @@ class Workspace : public TQWorkspace TQ_OBJECT public: - Workspace( TQWidget* tqparent = 0, const char* name = 0 ) - : TQWorkspace( tqparent, name ) {} + Workspace( TQWidget* parent = 0, const char* name = 0 ) + : TQWorkspace( parent, name ) {} ~Workspace() {} protected: @@ -59,7 +59,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/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp index 9ab05547b..70f536c88 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp +++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp @@ -35,8 +35,8 @@ #include <tqobjectlist.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"); diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h index 8fb12d664..8533a4794 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h +++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h @@ -42,7 +42,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/experimental/tqtinterface/qt4/tools/qvfb/README b/experimental/tqtinterface/qt4/tools/qvfb/README index a4fac5895..c62704129 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/README +++ b/experimental/tqtinterface/qt4/tools/qvfb/README @@ -10,7 +10,7 @@ framebuffer consists of a shared memory region (the virtual frame buffer) and a utility to display the framebuffer in a window. The display is updated periodically, so you will see discrete snapshots of the framebuffer rather than each individual drawing operation. For this reason drawing problems -such as flickering may not be aptqparent until the program is run using a real +such as flickering may not be apparent until the program is run using a real framebuffer. To use the virtual framebuffer: diff --git a/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h b/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h index 2acd3dab5..b60ae357a 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/gammaview.h @@ -40,9 +40,9 @@ class GammaView: public TQWidget { TQ_OBJECT public: - GammaView( TQWidget *tqparent = 0, + GammaView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ) : - TQWidget(tqparent,name,f) + TQWidget(parent,name,f) { } }; diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp index 2c7712cc5..93d5e8e71 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp @@ -53,9 +53,9 @@ #include <tqdragobject.h> #include <tqcheckbox.h> -TQVFb::TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *tqparent, +TQVFb::TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent, const char *name, uint flags ) - : TQMainWindow( tqparent, name, flags ) + : TQMainWindow( parent, name, flags ) { const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( "logo.png" ); if ( m ) { diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h index 5906232c3..c36c385a3 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.h @@ -44,7 +44,7 @@ class TQVFb: public TQMainWindow { TQ_OBJECT public: - TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *tqparent = 0, + TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent = 0, const char *name = 0, uint wflags = 0 ); ~TQVFb(); diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp index 9a61c3749..23020f0ae 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.cpp @@ -38,9 +38,9 @@ #include <tqslider.h> #include <tqpushbutton.h> -TQVFbRateDialog::TQVFbRateDialog( int rate, TQWidget *tqparent, const char *name, +TQVFbRateDialog::TQVFbRateDialog( int rate, TQWidget *parent, const char *name, bool modal ) - : TQDialog( tqparent, name, modal ) + : TQDialog( parent, name, modal ) { oldRate = rate; diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h index 387c28bfc..9a2938441 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbratedlg.h @@ -40,7 +40,7 @@ class TQVFbRateDialog : public TQDialog { TQ_OBJECT public: - TQVFbRateDialog( int value, TQWidget *tqparent=0, const char *name=0, + TQVFbRateDialog( int value, TQWidget *parent=0, const char *name=0, bool modal=FALSE ); Q_SIGNALS: diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp index bc02db737..fe49df11e 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp @@ -65,9 +65,9 @@ //#define TQT_TQWS_EXPERIMENTAL_REVERSE_BIT_ENDIANNESS -TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *tqparent, +TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent, const char *name, uint flags ) - : TQScrollView( tqparent, name, flags ), emulateTouchscreen(FALSE), qwslock(NULL) + : TQScrollView( parent, name, flags ), emulateTouchscreen(FALSE), qwslock(NULL) { displayid = display_id; viewport()->setMouseTracking( TRUE ); diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h index df5adcc6c..5f0cb074a 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h @@ -43,7 +43,7 @@ class TQVFbView : public TQScrollView { TQ_OBJECT public: - TQVFbView( int display_id, int w, int h, int d, TQWidget *tqparent = 0, + TQVFbView( int display_id, int w, int h, int d, TQWidget *parent = 0, const char *name = 0, uint wflags = 0 ); ~TQVFbView(); diff --git a/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp b/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp index 795de3a58..2ef9ac385 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/skin.cpp @@ -73,16 +73,16 @@ Skin::Skin( TQVFb *p, const TQString &skinFile, int &viewW, int &viewH ) : TQWid // areas[i].keyCode, areas[i].x1, areas[i].y1, areas[i].x2, areas[i].y2 ); } - tqparent = p; + parent = p; skinImageUp = new TQPixmap( skinImageUpFileName ); skinImageDown = new TQPixmap( skinImageDownFileName ); // setPixmap( ipaq ); setFixedSize( skinImageUp->size() ); - TQBitmap tqmask = skinImageUp->createHeuristicMask(); + TQBitmap mask = skinImageUp->createHeuristicMask(); int wf = WStyle_Customize | WType_TopLevel | WStyle_NoBorder; - tqparent->reparent( 0, wf, pos(), TRUE ); - tqparent->setMask( tqmask ); - tqparent->setFixedSize( skinImageUp->size() ); + parent->reparent( 0, wf, pos(), TRUE ); + parent->setMask( mask ); + parent->setFixedSize( skinImageUp->size() ); buttonPressed = FALSE; buttonIndex = 0; } @@ -120,7 +120,7 @@ void Skin::paintEvent( TQPaintEvent * ) void Skin::mousePressEvent( TQMouseEvent *e ) { if (e->button() == RightButton) { - tqparent->popupMenu(); + parent->popupMenu(); } else { buttonPressed = FALSE; @@ -154,7 +154,7 @@ void Skin::mouseMoveEvent( TQMouseEvent *e ) { if ( buttonPressed == FALSE ) { TQPoint newpos = e->globalPos() - clickPos; - tqparent->move( newpos ); + parent->move( newpos ); } } diff --git a/experimental/tqtinterface/qt4/tools/qvfb/skin.h b/experimental/tqtinterface/qt4/tools/qvfb/skin.h index 5c5d112aa..d9dab3b89 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/skin.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/skin.h @@ -50,7 +50,7 @@ protected: virtual void mouseMoveEvent( TQMouseEvent *e ); virtual void mouseReleaseEvent( TQMouseEvent * ); private: - TQVFb *tqparent; + TQVFb *parent; TQVFbView *view; TQPoint clickPos; bool buttonPressed; |