diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-27 19:25:43 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-27 19:25:43 +0900 |
| commit | fb401a891f1b426e9419c0cb16403df407138611 (patch) | |
| tree | 045b51949b3140039e37d898d8b0513016a86bea /tools/designer | |
| parent | a9d178f1000475ba1727ffe123a2c54585488c01 (diff) | |
| download | tqt3-fb401a891f1b426e9419c0cb16403df407138611.tar.gz tqt3-fb401a891f1b426e9419c0cb16403df407138611.zip | |
Rename METHOD, SIGNAL, SLOT to TQ_METHOD, TQ_SIGNAL, TQ_SLOT
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tools/designer')
63 files changed, 511 insertions, 511 deletions
diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp index dbbc6d208..841ab00d6 100644 --- a/tools/designer/designer/actiondnd.cpp +++ b/tools/designer/designer/actiondnd.cpp @@ -152,8 +152,8 @@ TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Orientation o , TQToolBar const char* name ) : TQWidget( parent, name ) { - connect( parent, SIGNAL(orientationChanged(Orientation)), - this, SLOT(setOrientation(Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(Orientation)), + this, TQ_SLOT(setOrientation(Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -277,7 +277,7 @@ void TQDesignerToolBar::findFormWindow() void TQDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, SIGNAL( destroyed() ), this, SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) { ( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a ); diff --git a/tools/designer/designer/actioneditorimpl.cpp b/tools/designer/designer/actioneditorimpl.cpp index a7ab8d3c1..46d5bd4f4 100644 --- a/tools/designer/designer/actioneditorimpl.cpp +++ b/tools/designer/designer/actioneditorimpl.cpp @@ -59,17 +59,17 @@ ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) buttonConnect->setEnabled( FALSE ); TQPopupMenu *popup = new TQPopupMenu( this ); - popup->insertItem( tr( "New &Action" ), this, SLOT( newAction() ) ); - popup->insertItem( tr( "New Action &Group" ), this, SLOT( newActionGroup() ) ); - popup->insertItem( tr( "New &Dropdown Action Group" ), this, SLOT( newDropDownActionGroup() ) ); + popup->insertItem( tr( "New &Action" ), this, TQ_SLOT( newAction() ) ); + popup->insertItem( tr( "New Action &Group" ), this, TQ_SLOT( newActionGroup() ) ); + popup->insertItem( tr( "New &Dropdown Action Group" ), this, TQ_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, SIGNAL( insertAction() ), this, SLOT( newAction() ) ); - connect( listActions, SIGNAL( insertActionGroup() ), this, SLOT( newActionGroup() ) ); - connect( listActions, SIGNAL( insertDropDownActionGroup() ), this, SLOT( newDropDownActionGroup() ) ); - connect( listActions, SIGNAL( deleteAction() ), this, SLOT( deleteAction() ) ); - connect( listActions, SIGNAL( connectAction() ), this, SLOT( connectionsClicked() ) ); + connect( listActions, TQ_SIGNAL( insertAction() ), this, TQ_SLOT( newAction() ) ); + connect( listActions, TQ_SIGNAL( insertActionGroup() ), this, TQ_SLOT( newActionGroup() ) ); + connect( listActions, TQ_SIGNAL( insertDropDownActionGroup() ), this, TQ_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQ_SIGNAL( deleteAction() ), this, TQ_SLOT( deleteAction() ) ); + connect( listActions, TQ_SIGNAL( connectAction() ), this, TQ_SLOT( connectionsClicked() ) ); } void ActionEditor::closeEvent( TQCloseEvent *e ) @@ -108,8 +108,8 @@ TQAction *ActionEditor::newActionEx() { ActionItem *i = new ActionItem( listActions, (bool)FALSE ); TQAction *a = i->action(); - TQObject::connect( a, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); @@ -164,8 +164,8 @@ void ActionEditor::newAction() else i = new ActionItem( listActions, (bool)FALSE ); TQAction *a = i->action(); - TQObject::connect( a, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); @@ -200,8 +200,8 @@ void ActionEditor::newActionGroup() else i = new ActionItem( listActions, TRUE ); TQAction *ag = i->actionGroup(); - TQObject::connect( ag, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( ag, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->actionGroup() ); MetaDataBase::setPropertyChanged( i->actionGroup(), "usesDropDown", TRUE ); TQString n = "ActionGroup"; @@ -242,10 +242,10 @@ void ActionEditor::setFormWindow( FormWindow *fw ) i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( a, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( a, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject* ) ) ); + TQObject::disconnect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) { insertChildActions( i ); } @@ -273,10 +273,10 @@ void ActionEditor::insertChildActions( ActionItem *i ) i2->setText( 0, a->name() ); i2->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( o, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( o, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject * ) ) ); + TQObject::disconnect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) insertChildActions( i2 ); } diff --git a/tools/designer/designer/actionlistview.cpp b/tools/designer/designer/actionlistview.cpp index 0bccd671a..62366a774 100644 --- a/tools/designer/designer/actionlistview.cpp +++ b/tools/designer/designer/actionlistview.cpp @@ -41,8 +41,8 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) setShowSortIndicator( TRUE ); setResizeMode( LastColumn ); setRootIsDecorated( TRUE ); - connect( this, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } ActionItem::ActionItem( TQListView *lv, TQAction *ac ) diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp index 4858ec283..df24e8dfd 100644 --- a/tools/designer/designer/command.cpp +++ b/tools/designer/designer/command.cpp @@ -1809,7 +1809,7 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index, action ); toolBar->reInsert(); - TQObject::connect( action, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } else { if ( action->children() ) { TQObjectListIt it( *action->children() ); @@ -1829,11 +1829,11 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index + (i++), ac ); } - TQObject::connect( o, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } toolBar->reInsert(); - TQObject::connect( action, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -1848,7 +1848,7 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); - TQObject::disconnect( action, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); if ( !::tqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { @@ -1863,7 +1863,7 @@ void AddActionToToolBarCommand::unexecute() o->removeEventFilter( toolBar ); toolBar->removeAction( (TQAction*)o ); } - TQObject::disconnect( o, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::disconnect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } } diff --git a/tools/designer/designer/configtoolboxdialog.ui.h b/tools/designer/designer/configtoolboxdialog.ui.h index 7aa13de73..8a46e0d22 100644 --- a/tools/designer/designer/configtoolboxdialog.ui.h +++ b/tools/designer/designer/configtoolboxdialog.ui.h @@ -47,10 +47,10 @@ void ConfigToolboxDialog::init() ListViewDnd *commonDnd = new ListViewDnd( listViewCommon ); commonDnd->setDragMode( ListViewDnd::Both | ListViewDnd::Move | ListViewDnd::Flat ); - TQObject::connect( toolsDnd, SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, SLOT( confirmDrop( TQListViewItem * ) ) ); - TQObject::connect( commonDnd, SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( toolsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( commonDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); TQDict<TQListViewItem> groups; TQAction *a; diff --git a/tools/designer/designer/connectiondialog.ui.h b/tools/designer/designer/connectiondialog.ui.h index 7bd10bc46..010a5c193 100644 --- a/tools/designer/designer/connectiondialog.ui.h +++ b/tools/designer/designer/connectiondialog.ui.h @@ -69,10 +69,10 @@ static TQPixmap *validConnection = 0; void ConnectionDialog::init() { - connect( connectionsTable, SIGNAL( currentChanged( int, int ) ), - this, SLOT( updateEditSlotsButton() ) ); - connect( connectionsTable, SIGNAL( resorted() ), - this, SLOT( updateConnectionContainers() ) ); + connect( connectionsTable, TQ_SIGNAL( currentChanged( int, int ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); + connect( connectionsTable, TQ_SIGNAL( resorted() ), + this, TQ_SLOT( updateConnectionContainers() ) ); buttonEditSlots->setEnabled( FALSE ); if ( !invalidConnection ) { @@ -144,13 +144,13 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject re->setSlot( sl ); sl->setSlot( sl ); - connect( re, SIGNAL( currentReceiverChanged( TQObject * ) ), - this, SLOT( updateEditSlotsButton() ) ); + connect( re, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); ConnectionContainer *c = new ConnectionContainer( this, se, si, re, sl, row ); connections.append( c ); - connect( c, SIGNAL( changed( ConnectionContainer * ) ), - this, SLOT( updateConnectionState( ConnectionContainer * ) ) ); + connect( c, TQ_SIGNAL( changed( ConnectionContainer * ) ), + this, TQ_SLOT( updateConnectionState( ConnectionContainer * ) ) ); connectionsTable->setCurrentCell( row, 0 ); diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp index 24a478656..0c44135a7 100644 --- a/tools/designer/designer/connectionitems.cpp +++ b/tools/designer/designer/connectionitems.cpp @@ -129,26 +129,26 @@ void ConnectionItem::slotChanged( const TQString & ) void ConnectionItem::setSender( SenderItem *i ) { - connect( i, SIGNAL( currentSenderChanged( TQObject * ) ), - this, SLOT( senderChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentSenderChanged( TQObject * ) ), + this, TQ_SLOT( senderChanged( TQObject * ) ) ); } void ConnectionItem::setReceiver( ReceiverItem *i ) { - connect( i, SIGNAL( currentReceiverChanged( TQObject * ) ), - this, SLOT( receiverChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( receiverChanged( TQObject * ) ) ); } void ConnectionItem::setSignal( SignalItem *i ) { - connect( i, SIGNAL( currentSignalChanged( const TQString & ) ), - this, SLOT( signalChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSignalChanged( const TQString & ) ), + this, TQ_SLOT( signalChanged( const TQString & ) ) ); } void ConnectionItem::setSlot( SlotItem *i ) { - connect( i, SIGNAL( currentSlotChanged( const TQString & ) ), - this, SLOT( slotChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSlotChanged( const TQString & ) ), + this, TQ_SLOT( slotChanged( const TQString & ) ) ); } void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg, @@ -252,8 +252,8 @@ TQWidget *SenderItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const TQString & ) ), - this, SLOT( senderChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( senderChanged( const TQString & ) ) ); return cb; } @@ -309,8 +309,8 @@ TQWidget *ReceiverItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const TQString & ) ), - this, SLOT( receiverChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( receiverChanged( const TQString & ) ) ); return cb; } @@ -378,8 +378,8 @@ TQWidget *SignalItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const TQString & ) ), - this, SIGNAL( currentSignalChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSignalChanged( const TQString & ) ) ); return cb; } @@ -509,8 +509,8 @@ TQWidget *SlotItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const TQString & ) ), - this, SIGNAL( currentSlotChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSlotChanged( const TQString & ) ) ); return cb; } diff --git a/tools/designer/designer/connectionitems.h b/tools/designer/designer/connectionitems.h index 40878c442..e3db9790a 100644 --- a/tools/designer/designer/connectionitems.h +++ b/tools/designer/designer/connectionitems.h @@ -177,10 +177,10 @@ public: i2->setConnection( this ); i3->setConnection( this ); i4->setConnection( this ); - connect( i1, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); - connect( i2, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); - connect( i3, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); - connect( i4, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); + connect( i1, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i2, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i3, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i4, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); } bool isModified() const { return mod; } diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp index 955d0ba17..13524966c 100644 --- a/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/tools/designer/designer/customwidgeteditorimpl.cpp @@ -61,10 +61,10 @@ CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); checkTimer = new TQTimer( this ); - connect( checkTimer, SIGNAL( timeout() ), - this, SLOT( checkWidgetName() ) ); + connect( checkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( checkWidgetName() ) ); editClass->setEnabled( FALSE ); editHeader->setEnabled( FALSE ); diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp index 60ad7d345..29c216cd1 100644 --- a/tools/designer/designer/dbconnectionsimpl.cpp +++ b/tools/designer/designer/dbconnectionsimpl.cpp @@ -59,7 +59,7 @@ static bool blockChanges = FALSE; DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : DatabaseConnectionBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); connectionWidget = new DatabaseConnectionWidget( grp ); grpLayout->addWidget( connectionWidget, 0, 0 ); #ifndef TQT_NO_SQL diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp index e00cf67cd..c6ac96c70 100644 --- a/tools/designer/designer/designerappiface.cpp +++ b/tools/designer/designer/designerappiface.cpp @@ -140,13 +140,13 @@ void DesignerInterfaceImpl::updateFunctionList() void DesignerInterfaceImpl::onProjectChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, SIGNAL( projectChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( projectChanged() ), receiver, slot ); } void DesignerInterfaceImpl::onFormChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, SIGNAL( formWindowChanged() ), receiver, slot ); - TQObject::connect( mainWindow, SIGNAL( editorChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( formWindowChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( editorChanged() ), receiver, slot ); } bool DesignerInterfaceImpl::singleProjectMode() const @@ -963,7 +963,7 @@ void DesignerFormWindowImpl::setSignalList( const TQStringList &lst ) void DesignerFormWindowImpl::onModificationChange( TQObject *receiver, const char *slot ) { - TQObject::connect( formWindow, SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); + TQObject::connect( formWindow, TQ_SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); } void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name ) diff --git a/tools/designer/designer/editfunctionsimpl.cpp b/tools/designer/designer/editfunctionsimpl.cpp index 49f173285..dc2f625e0 100644 --- a/tools/designer/designer/editfunctionsimpl.cpp +++ b/tools/designer/designer/editfunctionsimpl.cpp @@ -54,7 +54,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); id = 0; functList.clear(); @@ -113,9 +113,9 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) // Connect listview signal to signal-relay TQObject::connect( functionListView, - SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "functionName" TQObjectList *l = parent->queryList( "TQLineEdit", "functionName" ); @@ -124,9 +124,9 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } diff --git a/tools/designer/designer/formfile.cpp b/tools/designer/designer/formfile.cpp index 4f88b29e5..de82ebc72 100644 --- a/tools/designer/designer/formfile.cpp +++ b/tools/designer/designer/formfile.cpp @@ -99,7 +99,7 @@ void FormFile::setFormWindow( FormWindow *f ) if ( fw ) fw->setFormFile( this ); parseCode( cod, FALSE ); - TQTimer::singleShot( 0, this, SLOT( notifyFormWindowChange() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( notifyFormWindowChange() ) ); } void FormFile::setEditor( SourceEditor *e ) diff --git a/tools/designer/designer/formsettingsimpl.cpp b/tools/designer/designer/formsettingsimpl.cpp index 684649182..88ddef415 100644 --- a/tools/designer/designer/formsettingsimpl.cpp +++ b/tools/designer/designer/formsettingsimpl.cpp @@ -50,7 +50,7 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) : FormSettingsBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw ); if ( info.classNameChanged && !info.className.isEmpty() ) editClassName->setText( info.className ); diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp index e529432ad..9e02b2b1d 100644 --- a/tools/designer/designer/formwindow.cpp +++ b/tools/designer/designer/formwindow.cpp @@ -173,29 +173,29 @@ void FormWindow::init() setFocusPolicy( ClickFocus ); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer( this, "checkSelectionsTimer" ); - connect( checkSelectionsTimer, SIGNAL( timeout() ), - this, SLOT( invalidCheckedSelections() ) ); + connect( checkSelectionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( invalidCheckedSelections() ) ); updatePropertiesTimer = new TQTimer( this ); - connect( updatePropertiesTimer, SIGNAL( timeout() ), - this, SLOT( updatePropertiesTimerDone() ) ); + connect( updatePropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updatePropertiesTimerDone() ) ); showPropertiesTimer = new TQTimer( this ); - connect( showPropertiesTimer, SIGNAL( timeout() ), - this, SLOT( showPropertiesTimerDone() ) ); + connect( showPropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( showPropertiesTimerDone() ) ); selectionChangedTimer = new TQTimer( this ); - connect( selectionChangedTimer, SIGNAL( timeout() ), - this, SLOT( selectionChangedTimerDone() ) ); + connect( selectionChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( selectionChangedTimerDone() ) ); windowsRepaintWorkaroundTimer = new TQTimer( this ); - connect( windowsRepaintWorkaroundTimer, SIGNAL( timeout() ), - this, SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); + connect( windowsRepaintWorkaroundTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); insertParent = 0; - connect( &commands, SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); + connect( &commands, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); propShowBlocked = FALSE; setIcon( TQPixmap::fromMimeSource( "designer_form.png" ) ); - connect( &commands, SIGNAL( modificationChanged( bool ) ), - this, SLOT( modificationChanged( bool ) ) ); + connect( &commands, TQ_SIGNAL( modificationChanged( bool ) ), + this, TQ_SLOT( modificationChanged( bool ) ) ); buffer = 0; TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this ); @@ -2221,7 +2221,7 @@ void FormWindow::editConnections() ConnectionDialog dlg( mainwindow ); mainWindow()->statusBar()->message( tr( "Edit connections...") ); dlg.addConnection( startWidget, endWidget, TQString::null, TQString::null ); - TQTimer::singleShot( 0, &dlg, SLOT(ensureConnectionVisible()) ); + TQTimer::singleShot( 0, &dlg, TQ_SLOT(ensureConnectionVisible()) ); dlg.exec(); } @@ -2752,7 +2752,7 @@ void FormWindow::setFormFile( FormFile *f ) { ff = f; if ( ff ) - connect( this, SIGNAL( modificationChanged(bool, const TQString&) ), ff, SLOT( formWindowChangedSomehow() ) ); + connect( this, TQ_SIGNAL( modificationChanged(bool, const TQString&) ), ff, TQ_SLOT( formWindowChangedSomehow() ) ); } bool FormWindow::canBeBuddy( const TQWidget *w ) const diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp index c365a4d3a..4e5c11276 100644 --- a/tools/designer/designer/hierarchyview.cpp +++ b/tools/designer/designer/hierarchyview.cpp @@ -191,20 +191,20 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), SIGNAL( sectionClicked( int ) ), - this, SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, SIGNAL( clicked( TQListViewItem * ) ), - this, SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem * ) ), - this, SLOT( objectDoubleClicked( TQListViewItem * ) ) ); - connect( this, SIGNAL( returnPressed( TQListViewItem * ) ), - this, SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), - this, SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( objectDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } deselect = TRUE; setColumnWidthMode( 1, Manual ); @@ -610,8 +610,8 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) if ( !tabWidgetMenu ) tabWidgetMenu = formWindow->mainWindow()->setupTabWidgetHierarchyMenu( - this, SLOT( addTabPage() ), - SLOT( removeTabPage() ) ); + this, TQ_SLOT( addTabPage() ), + TQ_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } @@ -679,8 +679,8 @@ FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw ) { header()->hide(); removeColumn( 1 ); - connect( this, SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); popupOpen = FALSE; } @@ -1260,7 +1260,7 @@ HierarchyView::HierarchyView( TQWidget *parent ) ClassBrowser cb( ciface->createClassBrowser( this ), ciface ); addTab( cb.lv, tr( "Class Declarations" ) ); setTabToolTip( cb.lv, tr( "List of all classes and its declarations of the current source file" ) ); - ciface->onClick( this, SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); + ciface->onClick( this, TQ_SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); classBrowsers->insert( *it, cb ); setTabEnabled( cb.lv, FALSE ); } @@ -1348,7 +1348,7 @@ void HierarchyView::showClasses( SourceEditor *se ) return; lastSourceEditor = se; - TQTimer::singleShot( 100, this, SLOT( showClassesTimeout() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( showClassesTimeout() ) ); } void HierarchyView::showClassesTimeout() diff --git a/tools/designer/designer/iconvieweditorimpl.cpp b/tools/designer/designer/iconvieweditorimpl.cpp index 73723e8f1..a98f7dd80 100644 --- a/tools/designer/designer/iconvieweditorimpl.cpp +++ b/tools/designer/designer/iconvieweditorimpl.cpp @@ -45,7 +45,7 @@ IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; itemText->setText( "" ); diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp index a0f6d1c41..c4f9aa819 100644 --- a/tools/designer/designer/layout.cpp +++ b/tools/designer/designer/layout.cpp @@ -149,8 +149,8 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, SIGNAL( destroyed() ), - this, SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ), TQMIN( startPoint.y(), w->y() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) ); diff --git a/tools/designer/designer/listboxeditorimpl.cpp b/tools/designer/designer/listboxeditorimpl.cpp index 08d4560ab..e1bfb45a8 100644 --- a/tools/designer/designer/listboxeditorimpl.cpp +++ b/tools/designer/designer/listboxeditorimpl.cpp @@ -48,7 +48,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; itemText->setText( "" ); @@ -70,8 +70,8 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow ListBoxDnd *editorDnd = new ListBoxDnd( preview ); editorDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( editorDnd, SIGNAL( dropped( TQListBoxItem * ) ), - editorDnd, SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( editorDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + editorDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); ListBoxRename *editorRename = new ListBoxRename( preview ); @@ -81,9 +81,9 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow while ( (obj = it.current()) != 0 ) { ++it; TQObject::connect( editorRename, - SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; diff --git a/tools/designer/designer/listboxrename.cpp b/tools/designer/designer/listboxrename.cpp index c78f64618..9cf1e4e38 100644 --- a/tools/designer/designer/listboxrename.cpp +++ b/tools/designer/designer/listboxrename.cpp @@ -55,8 +55,8 @@ ListBoxRename::ListBoxRename( TQListBox * eventSource, const char * name ) ed->hide(); ed->setFrame( FALSE ); - TQObject::connect( ed, SIGNAL( returnPressed() ), - this, SLOT( renameClickedItem() ) ); + TQObject::connect( ed, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( renameClickedItem() ) ); } bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) @@ -70,7 +70,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) if ( clickedItem && clickedItem->isSelected() && (clickedItem == src->itemAt( pos )) ) { - TQTimer::singleShot( 500, this, SLOT( showLineEdit() ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( showLineEdit() ) ); activity = FALSE; // no drags or clicks for 500 ms before we start the renaming } else { // new item clicked activity = TRUE; diff --git a/tools/designer/designer/listvieweditorimpl.cpp b/tools/designer/designer/listvieweditorimpl.cpp index c65ac833d..b8cef9064 100644 --- a/tools/designer/designer/listvieweditorimpl.cpp +++ b/tools/designer/designer/listvieweditorimpl.cpp @@ -54,7 +54,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); itemText->setEnabled( FALSE ); itemChoosePixmap->setEnabled( FALSE ); itemDeletePixmap->setEnabled( FALSE ); @@ -76,8 +76,8 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw // Clamp on drag and drop to TQListView ListViewDnd *itemsDnd = new ListViewDnd( itemsPreview ); itemsDnd->setDragMode( ListViewDnd::Internal | ListViewDnd::Move ); - TQObject::connect( itemsDnd, SIGNAL( dropped( TQListViewItem * ) ), - itemsDnd, SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( itemsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + itemsDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); // Enable rename for all TQListViewItems TQListViewItemIterator it = ((TQListView *)itemsPreview)->firstChild(); @@ -86,9 +86,9 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw // Connect listview signal to signal-relay TQObject::connect( itemsPreview, - SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "itemText" TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); @@ -97,24 +97,24 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; // Clamp on drag and drop to TQListBox ListBoxDnd *columnsDnd = new ListBoxDnd( colPreview ); columnsDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( columnsDnd, SIGNAL( dropped( TQListBoxItem * ) ), - columnsDnd, SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( columnsDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + columnsDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); // Clamp on rename to TQListBox ListBoxRename *columnsRename = new ListBoxRename( colPreview ); TQObject::connect( columnsRename, - SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), this, - SLOT( columnTextChanged( const TQString & ) ) ); + TQ_SLOT( columnTextChanged( const TQString & ) ) ); // Find TQLineEdit "colText" and connect l = parent->queryList( "TQLineEdit", "colText" ); @@ -122,9 +122,9 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw while ( (obj = columnsLineEditIt.current()) != 0 ) { ++columnsLineEditIt; TQObject::connect( columnsRename, - SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index cf72b728b..93d0eeac5 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -174,12 +174,12 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl savePluginPaths = FALSE; updateFunctionsTimer = new TQTimer( this ); - connect( updateFunctionsTimer, SIGNAL( timeout() ), - this, SLOT( doFunctionsChanged() ) ); + connect( updateFunctionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doFunctionsChanged() ) ); autoSaveTimer = new TQTimer( this ); - connect( autoSaveTimer, SIGNAL( timeout() ), - this, SLOT( fileSaveAll() ) ); + connect( autoSaveTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( fileSaveAll() ) ); set_splash_status( "Loading Plugins..." ); setupPluginManagers(); @@ -234,8 +234,8 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl setupRMBMenus(); - connect( this, SIGNAL( projectChanged() ), this, SLOT( emitProjectSignals() ) ); - connect( this, SIGNAL( hasActiveWindow(bool) ), this, SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( projectChanged() ), this, TQ_SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), this, TQ_SLOT( emitProjectSignals() ) ); emit hasActiveForm( FALSE ); emit hasActiveWindow( FALSE ); @@ -247,8 +247,8 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl as -= TQSize( 30, 30 ); resize( TQSize( 1200, 1000 ).boundedTo( as ) ); - connect( tqApp->clipboard(), SIGNAL( dataChanged() ), - this, SLOT( clipboardChanged() ) ); + connect( tqApp->clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardChanged() ) ); clipboardChanged(); layoutChilds = FALSE; layoutSelected = FALSE; @@ -276,7 +276,7 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl statusBar()->setSizeGripEnabled( TRUE ); set_splash_status( "Initialization Done." ); if ( shStartDialog ) - TQTimer::singleShot( 0, this, SLOT( showStartDialog() )); + TQTimer::singleShot( 0, this, TQ_SLOT( showStartDialog() )); if ( autoSaveEnabled ) autoSaveTimer->start( autoSaveInterval * 1000 ); @@ -331,8 +331,8 @@ void MainWindow::setupMDI() qworkspace = new TQWorkspace( vbox ); qworkspace->setPaletteBackgroundPixmap( TQPixmap::fromMimeSource( "designer_background.png" ) ); qworkspace->setScrollBarsEnabled( TRUE ); - connect( qworkspace, SIGNAL( windowActivated( TQWidget * ) ), - this, SLOT( activeWindowChanged( TQWidget * ) ) ); + connect( qworkspace, TQ_SIGNAL( windowActivated( TQWidget * ) ), + this, TQ_SLOT( activeWindowChanged( TQWidget * ) ) ); lastActiveFormWindow = 0; qworkspace->setAcceptDrops( TRUE ); } @@ -416,7 +416,7 @@ void MainWindow::setupWorkspace() TQCompletionEdit *edit = new TQCompletionEdit( vbox ); TQToolTip::add( edit, tr( "Start typing the buffer you want to switch to here (ALT+B)" ) ); TQAccel *a = new TQAccel( this ); - a->connectItem( a->insertItem( ALT + Key_B ), edit, SLOT( setFocus() ) ); + a->connectItem( a->insertItem( ALT + Key_B ), edit, TQ_SLOT( setFocus() ) ); wspace = new Workspace( vbox, this ); wspace->setBufferEdit( edit ); wspace->setCurrentProject( currentProject ); @@ -1034,7 +1034,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) } lastPressWidget = (TQWidget*)o; if ( passiveInteractor ) - TQTimer::singleShot( 0, formWindow(), SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); if ( currentTool() == CONNECT_TOOL || currentTool() == BUDDY_TOOL ) return TRUE; return !passiveInteractor; @@ -1053,8 +1053,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ( (FormWindow*)w )->handleMouseRelease( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( passiveInteractor ) { - TQTimer::singleShot( 0, this, SLOT( selectionChanged() ) ); - TQTimer::singleShot( 0, formWindow(), SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( selectionChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); } return !passiveInteractor; case TQEvent::MouseMove: @@ -1283,16 +1283,16 @@ void MainWindow::insertFormWindow( FormWindow *fw ) "<p>You can have several forms open, and all open forms are listed " "in the <b>Form List</b>.") ); - connect( fw, SIGNAL( showProperties( TQObject * ) ), - this, SLOT( showProperties( TQObject * ) ) ); - connect( fw, SIGNAL( updateProperties( TQObject * ) ), - this, SLOT( updateProperties( TQObject * ) ) ); - connect( this, SIGNAL( currentToolChanged() ), - fw, SLOT( currentToolChanged() ) ); - connect( fw, SIGNAL( selectionChanged() ), - this, SLOT( selectionChanged() ) ); - connect( fw, SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); + connect( fw, TQ_SIGNAL( showProperties( TQObject * ) ), + this, TQ_SLOT( showProperties( TQObject * ) ) ); + connect( fw, TQ_SIGNAL( updateProperties( TQObject * ) ), + this, TQ_SLOT( updateProperties( TQObject * ) ) ); + connect( this, TQ_SIGNAL( currentToolChanged() ), + fw, TQ_SLOT( currentToolChanged() ) ); + connect( fw, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( selectionChanged() ) ); + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); if ( !mblockNewForms ) { } else { @@ -3566,11 +3566,11 @@ bool MainWindow::openProjectSettings( Project *pro ) continue; dia.tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia.buttonOk, SIGNAL( clicked() ), senderObject, SLOT( emitAcceptSignal() ) ); - connect( senderObject, SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia.buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } @@ -3695,11 +3695,11 @@ void MainWindow::showGUIStuff( bool b ) menubar->removeItem( toolsMenuId ); menubar->removeItem( toolsMenuId + 1 ); menubar->removeItem( toolsMenuId + 2 ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditAccels, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditFunctions, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditConnections, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditSource, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( FALSE ); actionEditSource->setEnabled( FALSE ); actionEditConnections->setEnabled( FALSE ); @@ -3732,11 +3732,11 @@ void MainWindow::showGUIStuff( bool b ) menubar->insertItem( tr( "&Tools" ), toolsMenu, toolsMenuId, toolsMenuIndex ); menubar->insertItem( tr( "&Layout" ), layoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 ); menubar->insertItem( tr( "&Preview" ), previewMenu, toolsMenuId + 2, toolsMenuIndex + 2 ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditAccels, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFunctions, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditConnections, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditSource, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( TRUE ); actionEditSource->setEnabled( TRUE ); actionEditConnections->setEnabled( TRUE ); diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index bae9ed2ee..b9418913a 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -127,101 +127,101 @@ void MainWindow::setupEditActions() actionEditUndo = new TQAction( tr("Undo"), createIconSet( "designer_undo.png" ),tr("&Undo: Not Available"), CTRL + Key_Z, this, 0 ); actionEditUndo->setStatusTip( tr( "Undoes the last action" ) ); actionEditUndo->setWhatsThis( whatsThisFrom( "Edit|Undo" ) ); - connect( actionEditUndo, SIGNAL( activated() ), this, SLOT( editUndo() ) ); + connect( actionEditUndo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editUndo() ) ); actionEditUndo->setEnabled( FALSE ); actionEditRedo = new TQAction( tr( "Redo" ), createIconSet("designer_redo.png"), tr( "&Redo: Not Available" ), CTRL + Key_Y, this, 0 ); actionEditRedo->setStatusTip( tr( "Redoes the last undone operation") ); actionEditRedo->setWhatsThis( whatsThisFrom( "Edit|Redo" ) ); - connect( actionEditRedo, SIGNAL( activated() ), this, SLOT( editRedo() ) ); + connect( actionEditRedo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRedo() ) ); actionEditRedo->setEnabled( FALSE ); actionEditCut = new TQAction( tr( "Cut" ), createIconSet("designer_editcut.png"), tr( "Cu&t" ), CTRL + Key_X, this, 0 ); actionEditCut->setStatusTip( tr( "Cuts the selected widgets and puts them on the clipboard" ) ); actionEditCut->setWhatsThis( whatsThisFrom( "Edit|Cut" ) ); - connect( actionEditCut, SIGNAL( activated() ), this, SLOT( editCut() ) ); + connect( actionEditCut, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCut() ) ); actionEditCut->setEnabled( FALSE ); actionEditCopy = new TQAction( tr( "Copy" ), createIconSet("designer_editcopy.png"), tr( "&Copy" ), CTRL + Key_C, this, 0 ); actionEditCopy->setStatusTip( tr( "Copies the selected widgets to the clipboard" ) ); actionEditCopy->setWhatsThis( whatsThisFrom( "Edit|Copy" ) ); - connect( actionEditCopy, SIGNAL( activated() ), this, SLOT( editCopy() ) ); + connect( actionEditCopy, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCopy() ) ); actionEditCopy->setEnabled( FALSE ); actionEditPaste = new TQAction( tr( "Paste" ), createIconSet("designer_editpaste.png"), tr( "&Paste" ), CTRL + Key_V, this, 0 ); actionEditPaste->setStatusTip( tr( "Pastes the clipboard's contents" ) ); actionEditPaste->setWhatsThis( whatsThisFrom( "Edit|Paste" ) ); - connect( actionEditPaste, SIGNAL( activated() ), this, SLOT( editPaste() ) ); + connect( actionEditPaste, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPaste() ) ); actionEditPaste->setEnabled( FALSE ); actionEditDelete = new TQAction( tr( "Delete" ), TQPixmap(), tr( "&Delete" ), Key_Delete, this, 0 ); actionEditDelete->setStatusTip( tr( "Deletes the selected widgets" ) ); actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) ); - connect( actionEditDelete, SIGNAL( activated() ), this, SLOT( editDelete() ) ); + connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); actionEditDelete->setEnabled( FALSE ); #ifdef Q_WS_MAC TQAction *macDelete = new TQAction( tr( "Delete" ), TQPixmap(), tr( "&Delete" ), Key_Backspace, this, 0 ); - connect( macDelete, SIGNAL( activated() ), this, SLOT( editDelete() ) ); + connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); #endif actionEditSelectAll = new TQAction( tr( "Select All" ), TQPixmap(), tr( "Select &All" ), CTRL + Key_A, this, 0 ); actionEditSelectAll->setStatusTip( tr( "Selects all widgets" ) ); actionEditSelectAll->setWhatsThis( whatsThisFrom( "Edit|Select All" ) ); - connect( actionEditSelectAll, SIGNAL( activated() ), this, SLOT( editSelectAll() ) ); + connect( actionEditSelectAll, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSelectAll() ) ); actionEditSelectAll->setEnabled( TRUE ); actionEditRaise = new TQAction( tr( "Bring to Front" ), createIconSet("designer_editraise.png"), tr( "Bring to &Front" ), 0, this, 0 ); actionEditRaise->setStatusTip( tr( "Raises the selected widgets" ) ); actionEditRaise->setWhatsThis( tr( "Raises the selected widgets" ) ); - connect( actionEditRaise, SIGNAL( activated() ), this, SLOT( editRaise() ) ); + connect( actionEditRaise, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRaise() ) ); actionEditRaise->setEnabled( FALSE ); actionEditLower = new TQAction( tr( "Send to Back" ), createIconSet("designer_editlower.png"), tr( "Send to &Back" ), 0, this, 0 ); actionEditLower->setStatusTip( tr( "Lowers the selected widgets" ) ); actionEditLower->setWhatsThis( tr( "Lowers the selected widgets" ) ); - connect( actionEditLower, SIGNAL( activated() ), this, SLOT( editLower() ) ); + connect( actionEditLower, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLower() ) ); actionEditLower->setEnabled( FALSE ); actionEditAccels = new TQAction( tr( "Check Accelerators" ), TQPixmap(), tr( "Chec&k Accelerators" ), ALT + Key_R, this, 0 ); actionEditAccels->setStatusTip( tr("Checks if the accelerators used in the form are unique") ); actionEditAccels->setWhatsThis( whatsThisFrom( "Edit|Check Accelerator" ) ); - connect( actionEditAccels, SIGNAL( activated() ), this, SLOT( editAccels() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditAccels, SLOT( setEnabled(bool) ) ); + connect( actionEditAccels, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAccels() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); actionEditFunctions = new TQAction( tr( "Slots" ), createIconSet("designer_editslots.png"), tr( "S&lots..." ), 0, this, 0 ); actionEditFunctions->setStatusTip( tr("Opens a dialog for editing slots") ); actionEditFunctions->setWhatsThis( whatsThisFrom( "Edit|Slots" ) ); - connect( actionEditFunctions, SIGNAL( activated() ), this, SLOT( editFunctions() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFunctions, SLOT( setEnabled(bool) ) ); + connect( actionEditFunctions, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFunctions() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); actionEditConnections = new TQAction( tr( "Connections" ), createIconSet("designer_connecttool.png"), tr( "Co&nnections..." ), 0, this, 0 ); actionEditConnections->setStatusTip( tr("Opens a dialog for editing connections") ); actionEditConnections->setWhatsThis( whatsThisFrom( "Edit|Connections" ) ); - connect( actionEditConnections, SIGNAL( activated() ), this, SLOT( editConnections() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditConnections, SLOT( setEnabled(bool) ) ); + connect( actionEditConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editConnections() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); actionEditSource = new TQAction( tr( "Source" ), TQIconSet(), tr( "&Source..." ), CTRL + Key_E, this, 0 ); actionEditSource->setStatusTip( tr("Opens an editor to edit the form's source code") ); actionEditSource->setWhatsThis( whatsThisFrom( "Edit|Source" ) ); - connect( actionEditSource, SIGNAL( activated() ), this, SLOT( editSource() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditSource, SLOT( setEnabled(bool) ) ); + connect( actionEditSource, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSource() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings = new TQAction( tr( "Form Settings" ), TQPixmap(), tr( "&Form Settings..." ), 0, this, 0 ); actionEditFormSettings->setStatusTip( tr("Opens a dialog to change the form's settings") ); actionEditFormSettings->setWhatsThis( whatsThisFrom( "Edit|Form Settings" ) ); - connect( actionEditFormSettings, SIGNAL( activated() ), this, SLOT( editFormSettings() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, SLOT( setEnabled(bool) ) ); + connect( actionEditFormSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFormSettings() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditPreferences = new TQAction( tr( "Preferences" ), TQPixmap(), tr( "Preferences..." ), 0, this, 0 ); actionEditPreferences->setStatusTip( tr("Opens a dialog to change preferences") ); actionEditPreferences->setWhatsThis( whatsThisFrom( "Edit|Preferences" ) ); - connect( actionEditPreferences, SIGNAL( activated() ), this, SLOT( editPreferences() ) ); + connect( actionEditPreferences, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPreferences() ) ); TQToolBar *tb = new TQToolBar( this, "Edit" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -240,7 +240,7 @@ void MainWindow::setupEditActions() #endif TQPopupMenu *menu = new TQPopupMenu( this, "Edit" ); - connect( menu, SIGNAL( aboutToShow() ), this, SLOT( updateEditorUndoRedo() ) ); + connect( menu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( updateEditorUndoRedo() ) ); menubar->insertItem( tr( "&Edit" ), menu ); actionEditUndo->addTo( menu ); actionEditRedo->addTo( menu ); @@ -270,25 +270,25 @@ void MainWindow::setupSearchActions() { actionSearchFind = new TQAction( tr( "Find" ), createIconSet( "designer_searchfind.png" ), tr( "&Find..." ), CTRL + Key_F, this, 0 ); - connect( actionSearchFind, SIGNAL( activated() ), this, SLOT( searchFind() ) ); + connect( actionSearchFind, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchFind() ) ); actionSearchFind->setEnabled( FALSE ); actionSearchFind->setWhatsThis( whatsThisFrom( "Search|Find" ) ); actionSearchIncremetal = new TQAction( tr( "Find Incremental" ), TQIconSet(), tr( "Find &Incremental" ), ALT + Key_I, this, 0 ); - connect( actionSearchIncremetal, SIGNAL( activated() ), this, SLOT( searchIncremetalFindMenu() ) ); + connect( actionSearchIncremetal, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchIncremetalFindMenu() ) ); actionSearchIncremetal->setEnabled( FALSE ); actionSearchIncremetal->setWhatsThis( whatsThisFrom( "Search|Find Incremental" ) ); actionSearchReplace = new TQAction( tr( "Replace" ), TQIconSet(), tr( "&Replace..." ), CTRL + Key_R, this, 0 ); - connect( actionSearchReplace, SIGNAL( activated() ), this, SLOT( searchReplace() ) ); + connect( actionSearchReplace, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchReplace() ) ); actionSearchReplace->setEnabled( FALSE ); actionSearchReplace->setWhatsThis( whatsThisFrom( "Search|Replace" ) ); actionSearchGotoLine = new TQAction( tr( "Goto Line" ), TQIconSet(), tr( "&Goto Line..." ), ALT + Key_G, this, 0 ); - connect( actionSearchGotoLine, SIGNAL( activated() ), this, SLOT( searchGotoLine() ) ); + connect( actionSearchGotoLine, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchGotoLine() ) ); actionSearchGotoLine->setEnabled( FALSE ); actionSearchGotoLine->setWhatsThis( whatsThisFrom( "Search|Goto line" ) ); @@ -299,10 +299,10 @@ void MainWindow::setupSearchActions() actionSearchFind->addTo( tb ); incrementalSearch = new TQLineEdit( tb ); TQToolTip::add( incrementalSearch, tr( "Incremetal Search (Alt+I)" ) ); - connect( incrementalSearch, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( searchIncremetalFind() ) ); - connect( incrementalSearch, SIGNAL( returnPressed() ), - this, SLOT( searchIncremetalFindNext() ) ); + connect( incrementalSearch, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( searchIncremetalFind() ) ); + connect( incrementalSearch, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( searchIncremetalFindNext() ) ); incrementalSearch->setEnabled( FALSE ); TQPopupMenu *menu = new TQPopupMenu( this, "Search" ); @@ -319,56 +319,56 @@ void MainWindow::setupLayoutActions() if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, SIGNAL( selected(TQAction*) ), this, SLOT( toolSelected(TQAction*) ) ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionEditAdjustSize = new TQAction( tr( "Adjust Size" ), createIconSet("designer_adjustsize.png"), tr( "Adjust &Size" ), CTRL + Key_J, this, 0 ); actionEditAdjustSize->setStatusTip(tr("Adjusts the size of the selected widget") ); actionEditAdjustSize->setWhatsThis( whatsThisFrom( "Layout|Adjust Size" ) ); - connect( actionEditAdjustSize, SIGNAL( activated() ), this, SLOT( editAdjustSize() ) ); + connect( actionEditAdjustSize, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAdjustSize() ) ); actionEditAdjustSize->setEnabled( FALSE ); actionEditHLayout = new TQAction( tr( "Lay Out Horizontally" ), createIconSet("designer_edithlayout.png"), tr( "Lay Out &Horizontally" ), CTRL + Key_H, this, 0 ); actionEditHLayout->setStatusTip(tr("Lays out the selected widgets horizontally") ); actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally" ) ); - connect( actionEditHLayout, SIGNAL( activated() ), this, SLOT( editLayoutHorizontal() ) ); + connect( actionEditHLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontal() ) ); actionEditHLayout->setEnabled( FALSE ); actionEditVLayout = new TQAction( tr( "Lay Out Vertically" ), createIconSet("designer_editvlayout.png"), tr( "Lay Out &Vertically" ), CTRL + Key_L, this, 0 ); actionEditVLayout->setStatusTip(tr("Lays out the selected widgets vertically") ); actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically" ) ); - connect( actionEditVLayout, SIGNAL( activated() ), this, SLOT( editLayoutVertical() ) ); + connect( actionEditVLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVertical() ) ); actionEditVLayout->setEnabled( FALSE ); actionEditGridLayout = new TQAction( tr( "Lay Out in a Grid" ), createIconSet("designer_editgrid.png"), tr( "Lay Out in a &Grid" ), CTRL + Key_G, this, 0 ); actionEditGridLayout->setStatusTip(tr("Lays out the selected widgets in a grid") ); actionEditGridLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out in a Grid" ) ); - connect( actionEditGridLayout, SIGNAL( activated() ), this, SLOT( editLayoutGrid() ) ); + connect( actionEditGridLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutGrid() ) ); actionEditGridLayout->setEnabled( FALSE ); actionEditSplitHorizontal = new TQAction( tr( "Lay Out Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"), tr( "Lay Out Horizontally (in S&plitter)" ), 0, this, 0 ); actionEditSplitHorizontal->setStatusTip(tr("Lays out the selected widgets horizontally in a splitter") ); actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally (in Splitter)" ) ); - connect( actionEditSplitHorizontal, SIGNAL( activated() ), this, SLOT( editLayoutHorizontalSplit() ) ); + connect( actionEditSplitHorizontal, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontalSplit() ) ); actionEditSplitHorizontal->setEnabled( FALSE ); actionEditSplitVertical = new TQAction( tr( "Lay Out Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"), tr( "Lay Out Vertically (in Sp&litter)" ), 0, this, 0 ); actionEditSplitVertical->setStatusTip(tr("Lays out the selected widgets vertically in a splitter") ); actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically (in Splitter)" ) ); - connect( actionEditSplitVertical, SIGNAL( activated() ), this, SLOT( editLayoutVerticalSplit() ) ); + connect( actionEditSplitVertical, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVerticalSplit() ) ); actionEditSplitVertical->setEnabled( FALSE ); actionEditBreakLayout = new TQAction( tr( "Break Layout" ), createIconSet("designer_editbreaklayout.png"), tr( "&Break Layout" ), CTRL + Key_B, this, 0 ); actionEditBreakLayout->setStatusTip(tr("Breaks the selected layout") ); actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) ); - connect( actionEditBreakLayout, SIGNAL( activated() ), this, SLOT( editBreakLayout() ) ); + connect( actionEditBreakLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editBreakLayout() ) ); actionEditBreakLayout->setEnabled( FALSE ); int id = WidgetDatabase::idFromClassName( "Spacer" ); @@ -423,8 +423,8 @@ void MainWindow::setupToolActions() if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, SIGNAL( selected(TQAction*) ), - this, SLOT( toolSelected(TQAction*) ) ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), + this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionPointerTool = new TQAction( tr("Pointer"), createIconSet("designer_pointer.png"), @@ -491,8 +491,8 @@ void MainWindow::setupToolActions() "custom widgets") ); actionToolsCustomWidget->setWhatsThis( whatsThisFrom( "Tools|Custom|Edit Custom" "Widgets" ) ); - connect( actionToolsCustomWidget, SIGNAL( activated() ), - this, SLOT( toolsCustomWidget() ) ); + connect( actionToolsCustomWidget, TQ_SIGNAL( activated() ), + this, TQ_SLOT( toolsCustomWidget() ) ); for ( int j = 0; j < WidgetDatabase::numWidgetGroups(); ++j ) { TQString grp = WidgetDatabase::widgetGroup( j ); @@ -604,7 +604,7 @@ void MainWindow::setupToolActions() TQAction *a = new TQAction( tr( "Configure Toolbox" ), tr( "Configure Toolbox..." ), 0, this ); a->setStatusTip( tr( "Opens a dialog to configure the common " "widgets page of the toolbox") ); - connect( a, SIGNAL( activated() ), this, SLOT( toolsConfigure() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( toolsConfigure() ) ); mmenu->insertSeparator(); a->addTo( mmenu ); resetTool(); @@ -632,7 +632,7 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_N ); a->setStatusTip( tr( "Creates a new project, form or source file." ) ); a->setWhatsThis( whatsThisFrom( "File|New" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNew() ) ); a->addTo( tb ); a->addTo( fileMenu ); } else { @@ -651,7 +651,7 @@ void MainWindow::setupFileActions() newForm->setIconSet( createIconSet("designer_form.png") ); newForm->setAccel( CTRL + Key_N ); newForm->setStatusTip( tr( "Creates a new dialog." ) ); - connect( newForm, SIGNAL( activated() ), this, SLOT( fileNewDialog() ) ); + connect( newForm, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewDialog() ) ); TQAction *newFile = new TQAction( a, 0 ); newFile->setText( tr( "New File" ) ); @@ -659,7 +659,7 @@ void MainWindow::setupFileActions() newFile->setIconSet( createIconSet("designer_filenew.png") ); newFile->setAccel( ALT + Key_N ); newFile->setStatusTip( tr( "Creates a new file." ) ); - connect( newFile, SIGNAL( activated() ), this, SLOT( fileNewFile() ) ); + connect( newFile, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewFile() ) ); actionNewFile = newFile; a->addTo( tb ); @@ -675,7 +675,7 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_O ); a->setStatusTip( tr( "Opens an existing project, form or source file ") ); a->setWhatsThis( whatsThisFrom( "File|Open" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileOpen() ) ); if ( !singleProject ) { a->addTo( tb ); a->addTo( fileMenu ); @@ -688,8 +688,8 @@ void MainWindow::setupFileActions() a->setMenuText( tr( "&Close" ) ); a->setStatusTip( tr( "Closes the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Close" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileClose() ) ); - connect( this, SIGNAL( hasActiveWindowOrProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileClose() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); @@ -703,8 +703,8 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_S ); a->setStatusTip( tr( "Saves the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Save" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) ); - connect( this, SIGNAL( hasActiveWindowOrProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSave() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( tb ); a->addTo( fileMenu ); @@ -713,8 +713,8 @@ void MainWindow::setupFileActions() a->setMenuText( tr( "Save &As..." ) ); a->setStatusTip( tr( "Saves the current form with a new filename" ) ); a->setWhatsThis( whatsThisFrom( "File|Save As" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) ); - connect( this, SIGNAL( hasActiveWindow(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAs() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( fileMenu ); @@ -723,8 +723,8 @@ void MainWindow::setupFileActions() a->setMenuText( tr( "Sa&ve All" ) ); a->setStatusTip( tr( "Saves all open documents" ) ); a->setWhatsThis( whatsThisFrom( "File|Save All" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAll() ) ); - connect( this, SIGNAL( hasActiveWindowOrProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAll() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); @@ -735,7 +735,7 @@ void MainWindow::setupFileActions() a->setMenuText( tr( "Create &Template..." ) ); a->setStatusTip( tr( "Creates a new template" ) ); a->setWhatsThis( whatsThisFrom( "File|Create Template" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileCreateTemplate() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileCreateTemplate() ) ); if ( !singleProject ) a->addTo( fileMenu ); @@ -750,14 +750,14 @@ void MainWindow::setupFileActions() fileMenu->insertItem( tr( "Recently opened projects" ), recentlyProjectsMenu ); } - connect( recentlyFilesMenu, SIGNAL( aboutToShow() ), - this, SLOT( setupRecentlyFilesMenu() ) ); - connect( recentlyProjectsMenu, SIGNAL( aboutToShow() ), - this, SLOT( setupRecentlyProjectsMenu() ) ); - connect( recentlyFilesMenu, SIGNAL( activated( int ) ), - this, SLOT( recentlyFilesMenuActivated( int ) ) ); - connect( recentlyProjectsMenu, SIGNAL( activated( int ) ), - this, SLOT( recentlyProjectsMenuActivated( int ) ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyFilesMenu() ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyProjectsMenu() ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyFilesMenuActivated( int ) ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyProjectsMenuActivated( int ) ) ); if ( !singleProject ) fileMenu->insertSeparator(); @@ -774,7 +774,7 @@ void MainWindow::setupFileActions() a->setText( tr( "Close" ) ); a->setMenuText( tr( "&Close" ) ); } - connect( a, SIGNAL( activated() ), this, SLOT( fileQuit() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileQuit() ) ); a->addTo( fileMenu ); } @@ -788,8 +788,8 @@ void MainWindow::setupProjectActions() ag->setMenuText( tr( "Active Project" ) ); ag->setExclusive( TRUE ); ag->setUsesDropDown( TRUE ); - connect( ag, SIGNAL( selected( TQAction * ) ), this, SLOT( projectSelected( TQAction * ) ) ); - connect( ag, SIGNAL( selected( TQAction * ) ), this, SIGNAL( projectChanged() ) ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SLOT( projectSelected( TQAction * ) ) ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SIGNAL( projectChanged() ) ); TQAction *a = new TQAction( tr( "<No Project>" ), tr( "<No Project>" ), 0, ag, 0, TRUE ); eProject = new Project( "", tr( "<No Project>" ), projectSettingsPluginManager, TRUE ); projects.insert( a, eProject ); @@ -804,9 +804,9 @@ void MainWindow::setupProjectActions() a = new TQAction( tr( "Add File" ), TQPixmap(), tr( "&Add File..." ), 0, this, 0 ); a->setStatusTip( tr("Adds a file to the current project") ); a->setWhatsThis( whatsThisFrom( "Project|Add File" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( projectInsertFile() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( projectInsertFile() ) ); a->setEnabled( FALSE ); - connect( this, SIGNAL( hasNonDummyProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( projectMenu ); @@ -814,9 +814,9 @@ void MainWindow::setupProjectActions() tr( "&Image Collection..." ), 0, this, 0 ); actionEditPixmapCollection->setStatusTip( tr("Opens a dialog for editing the current project's image collection") ); actionEditPixmapCollection->setWhatsThis( whatsThisFrom( "Project|Image Collection" ) ); - connect( actionEditPixmapCollection, SIGNAL( activated() ), this, SLOT( editPixmapCollection() ) ); + connect( actionEditPixmapCollection, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPixmapCollection() ) ); actionEditPixmapCollection->setEnabled( FALSE ); - connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQ_SLOT( setEnabled(bool) ) ); actionEditPixmapCollection->addTo( projectMenu ); #ifndef TQT_NO_SQL @@ -824,9 +824,9 @@ void MainWindow::setupProjectActions() tr( "&Database Connections..." ), 0, this, 0 ); actionEditDatabaseConnections->setStatusTip( tr("Opens a dialog for editing the current project's database connections") ); actionEditDatabaseConnections->setWhatsThis( whatsThisFrom( "Project|Database Connections" ) ); - connect( actionEditDatabaseConnections, SIGNAL( activated() ), this, SLOT( editDatabaseConnections() ) ); + connect( actionEditDatabaseConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDatabaseConnections() ) ); //actionEditDatabaseConnections->setEnabled( FALSE ); - //connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, SLOT( setEnabled(bool) ) ); + //connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) actionEditDatabaseConnections->addTo( projectMenu ); #endif @@ -835,9 +835,9 @@ void MainWindow::setupProjectActions() tr( "&Project Settings..." ), 0, this, 0 ); actionEditProjectSettings->setStatusTip( tr("Opens a dialog to change the project's settings") ); actionEditProjectSettings->setWhatsThis( whatsThisFrom( "Project|Project Settings" ) ); - connect( actionEditProjectSettings, SIGNAL( activated() ), this, SLOT( editProjectSettings() ) ); + connect( actionEditProjectSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editProjectSettings() ) ); actionEditProjectSettings->setEnabled( FALSE ); - connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditProjectSettings->addTo( projectMenu ); } @@ -853,14 +853,14 @@ void MainWindow::setupPreviewActions() a->setAccel( CTRL + Key_T ); a->setStatusTip( tr("Opens a preview") ); a->setWhatsThis( whatsThisFrom( "Preview|Preview Form" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( previewForm() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( previewForm() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); menu->insertSeparator(); TQSignalMapper *mapper = new TQSignalMapper( this ); - connect( mapper, SIGNAL(mapped(const TQString&)), this, SLOT(previewForm(const TQString&)) ); + connect( mapper, TQ_SIGNAL(mapped(const TQString&)), this, TQ_SLOT(previewForm(const TQString&)) ); TQStringList styles = TQStyleFactory::keys(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString info; @@ -884,8 +884,8 @@ void MainWindow::setupPreviewActions() "<p>Use the preview to test the design and " "signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) ); mapper->setMapping( a, *it ); - connect( a, SIGNAL(activated()), mapper, SLOT(map()) ); - connect( this, SIGNAL( hasActiveForm(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL(activated()), mapper, TQ_SLOT(map()) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); } } @@ -899,38 +899,38 @@ void MainWindow::setupWindowActions() actionWindowTile = new TQAction( tr( "Tile" ), tr( "&Tile" ), 0, this ); actionWindowTile->setStatusTip( tr("Tiles the windows so that they are all visible") ); actionWindowTile->setWhatsThis( whatsThisFrom( "Window|Tile" ) ); - connect( actionWindowTile, SIGNAL( activated() ), qworkspace, SLOT( tile() ) ); + connect( actionWindowTile, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( tile() ) ); actionWindowCascade = new TQAction( tr( "Cascade" ), tr( "&Cascade" ), 0, this ); actionWindowCascade->setStatusTip( tr("Cascades the windows so that all their title bars are visible") ); actionWindowCascade->setWhatsThis( whatsThisFrom( "Window|Cascade" ) ); - connect( actionWindowCascade, SIGNAL( activated() ), qworkspace, SLOT( cascade() ) ); + connect( actionWindowCascade, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( cascade() ) ); actionWindowClose = new TQAction( tr( "Close" ), tr( "Cl&ose" ), CTRL + Key_F4, this ); actionWindowClose->setStatusTip( tr( "Closes the active window") ); actionWindowClose->setWhatsThis( whatsThisFrom( "Window|Close" ) ); - connect( actionWindowClose, SIGNAL( activated() ), qworkspace, SLOT( closeActiveWindow() ) ); + connect( actionWindowClose, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeActiveWindow() ) ); actionWindowCloseAll = new TQAction( tr( "Close All" ), tr( "Close Al&l" ), 0, this ); actionWindowCloseAll->setStatusTip( tr( "Closes all form windows") ); actionWindowCloseAll->setWhatsThis( whatsThisFrom( "Window|Close All" ) ); - connect( actionWindowCloseAll, SIGNAL( activated() ), qworkspace, SLOT( closeAllWindows() ) ); + connect( actionWindowCloseAll, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeAllWindows() ) ); actionWindowNext = new TQAction( tr( "Next" ), tr( "Ne&xt" ), CTRL + Key_F6, this ); actionWindowNext->setStatusTip( tr( "Activates the next window" ) ); actionWindowNext->setWhatsThis( whatsThisFrom( "Window|Next" ) ); - connect( actionWindowNext, SIGNAL( activated() ), qworkspace, SLOT( activateNextWindow() ) ); + connect( actionWindowNext, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activateNextWindow() ) ); actionWindowPrevious = new TQAction( tr( "Previous" ), tr( "Pre&vious" ), CTRL + SHIFT + Key_F6, this ); actionWindowPrevious->setStatusTip( tr( "Activates the previous window" ) ); actionWindowPrevious->setWhatsThis( whatsThisFrom( "Window|Previous" ) ); - connect( actionWindowPrevious, SIGNAL( activated() ), qworkspace, SLOT( activatePreviousWindow() ) ); + connect( actionWindowPrevious, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activatePreviousWindow() ) ); } if ( !windowMenu ) { windowMenu = new TQPopupMenu( this, "Window" ); menubar->insertItem( tr( "&Window" ), windowMenu ); - connect( windowMenu, SIGNAL( aboutToShow() ), - this, SLOT( setupWindowActions() ) ); + connect( windowMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupWindowActions() ) ); } else { windowMenu->clear(); } @@ -965,7 +965,7 @@ void MainWindow::setupWindowActions() else itemText += w->caption(); - int id = windowMenu->insertItem( itemText, this, SLOT( windowsMenuActivated( int ) ) ); + int id = windowMenu->insertItem( itemText, this, TQ_SLOT( windowsMenuActivated( int ) ) ); windowMenu->setItemParameter( id, i ); windowMenu->setItemChecked( id, qworkspace->activeWindow() == windows.at( i ) ); } @@ -976,28 +976,28 @@ void MainWindow::setupHelpActions() actionHelpContents = new TQAction( tr( "Contents" ), tr( "&Contents" ), Key_F1, this, 0 ); actionHelpContents->setStatusTip( tr("Opens the online help") ); actionHelpContents->setWhatsThis( whatsThisFrom( "Help|Contents" ) ); - connect( actionHelpContents, SIGNAL( activated() ), this, SLOT( helpContents() ) ); + connect( actionHelpContents, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpContents() ) ); actionHelpManual = new TQAction( tr( "Manual" ), tr( "&Manual" ), CTRL + Key_M, this, 0 ); actionHelpManual->setStatusTip( tr("Opens the TQt Designer manual") ); actionHelpManual->setWhatsThis( whatsThisFrom( "Help|Manual" ) ); - connect( actionHelpManual, SIGNAL( activated() ), this, SLOT( helpManual() ) ); + connect( actionHelpManual, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpManual() ) ); actionHelpAbout = new TQAction( tr("About"), TQPixmap(), tr("&About"), 0, this, 0 ); actionHelpAbout->setStatusTip( tr("Displays information about TQt Designer") ); actionHelpAbout->setWhatsThis( whatsThisFrom( "Help|About" ) ); - connect( actionHelpAbout, SIGNAL( activated() ), this, SLOT( helpAbout() ) ); + connect( actionHelpAbout, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAbout() ) ); actionHelpAboutTQt = new TQAction( tr("About TQt"), TQPixmap(), tr("About &TQt"), 0, this, 0 ); actionHelpAboutTQt->setStatusTip( tr("Displays information about the TQt Toolkit") ); actionHelpAboutTQt->setWhatsThis( whatsThisFrom( "Help|About TQt" ) ); - connect( actionHelpAboutTQt, SIGNAL( activated() ), this, SLOT( helpAboutTQt() ) ); + connect( actionHelpAboutTQt, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAboutTQt() ) ); actionHelpWhatsThis = new TQAction( tr("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ), tr("What's This?"), SHIFT + Key_F1, this, 0 ); actionHelpWhatsThis->setStatusTip( tr("\"What's This?\" context sensitive help") ); actionHelpWhatsThis->setWhatsThis( whatsThisFrom( "Help|What's This?" ) ); - connect( actionHelpWhatsThis, SIGNAL( activated() ), this, SLOT( whatsThis() ) ); + connect( actionHelpWhatsThis, TQ_SIGNAL( activated() ), this, TQ_SLOT( whatsThis() ) ); TQToolBar *tb = new TQToolBar( this, "Help" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -1418,8 +1418,8 @@ void MainWindow::fileCreateTemplate() } dia.editName->setText( tr( "NewTemplate" ) ); - connect( dia.buttonCreate, SIGNAL( clicked() ), - this, SLOT( createNewTemplate() ) ); + connect( dia.buttonCreate, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( createNewTemplate() ) ); dia.exec(); } @@ -1851,7 +1851,7 @@ void MainWindow::editPreferences() statusBar()->message( tr( "Edit preferences..." ) ); Preferences *dia = new Preferences( this, 0, TRUE ); prefDia = dia; - connect( dia->helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( dia->helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia->buttonColor->setEditor( StyledButton::ColorEditor ); dia->buttonPixmap->setEditor( StyledButton::PixmapEditor ); dia->groupBoxGrid->setChecked( sGrid ); @@ -1885,11 +1885,11 @@ void MainWindow::editPreferences() Tab t = *it; dia->tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia->buttonOk, SIGNAL( clicked() ), senderObject, SLOT( emitAcceptSignal() ) ); - connect( senderObject, SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia->buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp index 1d3cd2f87..709ebd596 100644 --- a/tools/designer/designer/multilineeditorimpl.cpp +++ b/tools/designer/designer/multilineeditorimpl.cpp @@ -58,7 +58,7 @@ ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, setAccel( key ); addTo( toolBar ); tag = tagstr; - connect( this, SIGNAL( activated() ), this, SLOT( wasActivated() ) ); + connect( this, TQ_SIGNAL( activated() ), this, TQ_SLOT( wasActivated() ) ); } ToolBarItem::~ToolBarItem() @@ -105,26 +105,26 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget ToolBarItem *it = new ToolBarItem( this, basicToolBar, tr( "Italic" ), "i", TQPixmap::fromMimeSource( "designer_textitalic.png" ), CTRL+Key_I ); it->addTo( stylesMenu ); - connect( it, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( it, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *b = new ToolBarItem( this, basicToolBar, tr( "Bold" ), "b", TQPixmap::fromMimeSource( "designer_textbold.png" ), CTRL+Key_B ); b->addTo( stylesMenu ); - connect( b, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( b, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ul = new ToolBarItem( this, basicToolBar, tr( "Underline" ), "u", TQPixmap::fromMimeSource( "designer_textunderline.png" ), CTRL+Key_U ); ul->addTo( stylesMenu ); - connect( ul, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( ul, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *tt = new ToolBarItem( this, basicToolBar, tr( "Typewriter" ), "tt", TQPixmap::fromMimeSource( "designer_textteletext.png" ) ); tt->addTo( stylesMenu ); - connect( tt, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( tt, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); basicToolBar->addSeparator(); @@ -136,39 +136,39 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget brAction->setText( tr("Break" ) ); brAction->addTo( basicToolBar ); brAction->addTo( layoutMenu ); - connect( brAction, SIGNAL( activated() ) , this, SLOT( insertBR() ) ); + connect( brAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( insertBR() ) ); ToolBarItem *p = new ToolBarItem( this, basicToolBar, tr( "Paragraph" ), "p", TQPixmap::fromMimeSource( "designer_textparagraph.png" ) ); p->addTo( layoutMenu ); - connect( p, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( p, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); layoutMenu->insertSeparator(); basicToolBar->addSeparator(); ToolBarItem *al = new ToolBarItem( this, basicToolBar, tr( "Align left" ), "p align=\"left\"", TQPixmap::fromMimeSource( "designer_textleft.png" ) ); al->addTo( layoutMenu ); - connect( al, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( al, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ac = new ToolBarItem( this, basicToolBar, tr( "Align center" ), "p align=\"center\"", TQPixmap::fromMimeSource( "designer_textcenter.png" ) ); ac->addTo( layoutMenu ); - connect( ac, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( ac, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ar = new ToolBarItem( this, basicToolBar, tr( "Align right" ), "p align=\"right\"", TQPixmap::fromMimeSource( "designer_textright.png" ) ); ar->addTo( layoutMenu ); - connect( ar, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( ar, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *block = new ToolBarItem( this, basicToolBar, tr( "Blockquote" ), "blockquote", TQPixmap::fromMimeSource( "designer_textjustify.png" ) ); block->addTo( layoutMenu ); - connect( block, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( block, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *fontMenu = new TQPopupMenu( this ); @@ -181,33 +181,33 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget fontAction->setText( tr("Font" ) ); fontAction->addTo( fontToolBar ); fontAction->addTo( fontMenu ); - connect( fontAction, SIGNAL( activated() ) , this, SLOT( showFontDialog() ) ); + connect( fontAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( showFontDialog() ) ); ToolBarItem *fp1 = new ToolBarItem( this, fontToolBar, tr( "Fontsize +1" ), "font size=\"+1\"", TQPixmap::fromMimeSource( "designer_textlarger.png" ) ); - connect( fp1, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( fp1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *fm1 = new ToolBarItem( this, fontToolBar, tr( "Fontsize -1" ), "font size=\"-1\"", TQPixmap::fromMimeSource( "designer_textsmaller.png" ) ); - connect( fm1, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( fm1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h1 = new ToolBarItem( this, fontToolBar, tr( "Headline 1" ), "h1", TQPixmap::fromMimeSource( "designer_texth1.png" ) ); - connect( h1, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( h1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h2 = new ToolBarItem( this, fontToolBar, tr( "Headline 2" ), "h2", TQPixmap::fromMimeSource( "designer_texth2.png" ) ); - connect( h2, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( h2, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h3 = new ToolBarItem( this, fontToolBar, tr( "Headline 3" ), "h3", TQPixmap::fromMimeSource( "designer_texth3.png" ) ); - connect( h3, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( h3, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *optionsMenu = new TQPopupMenu( this ); menuBar->insertItem( tr( "O&ptions" ), optionsMenu ); @@ -219,12 +219,12 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget wrapAction->setText( tr( "Word Wrapping" ) ); wrapAction->addTo( optionsToolBar ); wrapAction->addTo( optionsMenu ); - connect( wrapAction, SIGNAL( toggled( bool ) ), this, SLOT( changeWrapMode( bool ) ) ); + connect( wrapAction, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changeWrapMode( bool ) ) ); oldDoWrap = doWrap; wrapAction->setOn( doWrap ); - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); textEdit->document()->setFormatter( new TQTextFormatterBreakInWords ); textEdit->document()->setUseFormatCollection( FALSE ); textEdit->document()->setPreProcessor( new SyntaxHighlighter_HTML ); diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp index df7b99f2c..378fcabfe 100644 --- a/tools/designer/designer/newformimpl.cpp +++ b/tools/designer/designer/newformimpl.cpp @@ -372,7 +372,7 @@ NewForm::NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ) : NewFormBase( parent, 0, TRUE ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); projectCombo->insertStringList( projects ); projectCombo->setCurrentText( currentProject ); diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp index 5d069f7ab..89c0b0553 100644 --- a/tools/designer/designer/outputwindow.cpp +++ b/tools/designer/designer/outputwindow.cpp @@ -76,10 +76,10 @@ void OutputWindow::setupError() { errorView = new TQListView( this, "OutputWindow::errorView" ); errorView->setSorting( -1 ); - connect( errorView, SIGNAL( currentChanged( TQListViewItem* ) ), - this, SLOT( currentErrorChanged( TQListViewItem* ) ) ); - connect( errorView, SIGNAL( clicked( TQListViewItem* ) ), - this, SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); if ( MetaDataBase::languages().count() > 1 ) addTab( errorView, tr( "Warnings/Errors" ) ); diff --git a/tools/designer/designer/paletteeditoradvancedimpl.cpp b/tools/designer/designer/paletteeditoradvancedimpl.cpp index f632f8b56..112a42490 100644 --- a/tools/designer/designer/paletteeditoradvancedimpl.cpp +++ b/tools/designer/designer/paletteeditoradvancedimpl.cpp @@ -76,7 +76,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); diff --git a/tools/designer/designer/paletteeditorimpl.cpp b/tools/designer/designer/paletteeditorimpl.cpp index 319f110e6..c23808f35 100644 --- a/tools/designer/designer/paletteeditorimpl.cpp +++ b/tools/designer/designer/paletteeditorimpl.cpp @@ -46,7 +46,7 @@ PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp index fc93bf882..037694e7d 100644 --- a/tools/designer/designer/pixmapchooser.cpp +++ b/tools/designer/designer/pixmapchooser.cpp @@ -164,7 +164,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T } } else { PixmapFunction dia( parent, 0, TRUE ); - TQObject::connect( dia.helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + TQObject::connect( dia.helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); diff --git a/tools/designer/designer/pixmapcollectioneditor.ui.h b/tools/designer/designer/pixmapcollectioneditor.ui.h index fbdaeeade..3cac8bb71 100644 --- a/tools/designer/designer/pixmapcollectioneditor.ui.h +++ b/tools/designer/designer/pixmapcollectioneditor.ui.h @@ -116,8 +116,8 @@ void PixmapCollectionEditor::setChooserMode( bool c ) buttonCancel->show(); buttonOk->setEnabled( FALSE ); buttonOk->setDefault( TRUE ); - connect( viewPixmaps, SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, SIGNAL( clicked() ) ); - connect( viewPixmaps, SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, SIGNAL( clicked() ) ); + connect( viewPixmaps, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); + connect( viewPixmaps, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); setCaption( tr( "Choose an Image" ) ); } else { buttonClose->show(); diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp index 9d95f54d2..f0903e000 100644 --- a/tools/designer/designer/popupmenueditor.cpp +++ b/tools/designer/designer/popupmenueditor.cpp @@ -110,7 +110,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * par { init(); a = new TQAction( this ); - TQObject::connect( a, SIGNAL( destroyed() ), this, SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); } @@ -152,7 +152,7 @@ PopupMenuEditorItem::~PopupMenuEditorItem() void PopupMenuEditorItem::init() { if ( a ) { - TQObject::connect( a, SIGNAL( destroyed() ), this, SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); if ( m && !isSeparator() ) { s = new PopupMenuEditor( m->formWindow(), m ); TQString n = "popupMenu"; @@ -847,7 +847,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) // Hide the sub menu of the current item, but do it later if ( currentIndex < (int)itemList.count() ) { PopupMenuEditor *s = itemList.at( currentIndex )->s; - TQTimer::singleShot( 0, s, SLOT( hide() ) ); + TQTimer::singleShot( 0, s, TQ_SLOT( hide() ) ); } draggedItem = 0; @@ -884,11 +884,11 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) if ( i ) { dropInPlace( i, e->pos().y() ); - TQTimer::singleShot( 0, this, SLOT( resizeToContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeToContents() ) ); } - TQTimer::singleShot( 0, this, SLOT( showSubMenu() ) ); - TQTimer::singleShot( 0, this, SLOT( setFocus() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showSubMenu() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( setFocus() ) ); dropLine->hide(); e->accept(); } diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp index aadadc82f..02899830a 100644 --- a/tools/designer/designer/project.cpp +++ b/tools/designer/designer/project.cpp @@ -1351,9 +1351,9 @@ void Project::addObject( TQObject *o ) if ( MainWindow::self ) { TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), TQEvent::ChildInserted ); connect( fw, - SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), MainWindow::self, - SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) + TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); } if ( fw->parentWidget() ) { @@ -1527,9 +1527,9 @@ void Project::designerCreated() if ( !fw || fw->mainWindow() ) continue; fw->setMainWindow( MainWindow::self ); - connect( fw, SIGNAL( undoRedoChanged( bool, bool, const TQString &, + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - MainWindow::self, SLOT( updateUndoRedo( bool, bool, + MainWindow::self, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), FALSE ); TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp index 87800fa00..19f6fedeb 100644 --- a/tools/designer/designer/projectsettingsimpl.cpp +++ b/tools/designer/designer/projectsettingsimpl.cpp @@ -61,7 +61,7 @@ ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : ProjectSettingsBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editProjectFile->setFocus(); diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index 8f0cd223b..5058a3618 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -416,8 +416,8 @@ void PropertyItem::createResetButton() hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - TQObject::connect( resetButton, SIGNAL( clicked() ), - listview, SLOT( resetProperty() ) ); + TQObject::connect( resetButton, TQ_SIGNAL( clicked() ), + listview, TQ_SLOT( resetProperty() ) ); TQToolTip::add( resetButton, PropertyEditor::tr( "Reset the property to its default value" ) ); TQWhatsThis::add( resetButton, PropertyEditor::tr( "Click this button to reset the property to its default value" ) ); updateResetButtonState(); @@ -613,18 +613,18 @@ TQLineEdit *PropertyTextItem::lined() button = new TQPushButton( tr("..."), box ); setupStyle( button ); button->setFixedWidth( 20 ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getText() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getText() ) ); lin->setFrame( FALSE ); } - connect( lin, SIGNAL( returnPressed() ), - this, SLOT( setValue() ) ); - connect( lin, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, SIGNAL( returnPressed() ), + connect( lin, TQ_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - SLOT( checkCompressedCommand() ) ); + TQ_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } @@ -782,10 +782,10 @@ TQLineEdit *PropertyDoubleItem::lined() lin = new TQLineEdit( listview->viewport() ); lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, SIGNAL( returnPressed() ), - this, SLOT( setValue() ) ); - connect( lin, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } @@ -864,8 +864,8 @@ TQDateEdit *PropertyDateItem::lined() for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, SIGNAL( valueChanged( const TQDate & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ), + this, TQ_SLOT( setValue() ) ); return lin; } @@ -935,8 +935,8 @@ TQTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new TQTimeEdit( listview->viewport() ); - connect( lin, SIGNAL( valueChanged( const TQTime & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1010,8 +1010,8 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new TQDateTimeEdit( listview->viewport() ); - connect( lin, SIGNAL( valueChanged( const TQDateTime & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1088,8 +1088,8 @@ TQComboBox *PropertyBoolItem::combo() comb->hide(); comb->insertItem( tr( "False" ) ); comb->insertItem( tr( "True" ) ); - connect( comb, SIGNAL( activated( int ) ), - this, SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -1185,8 +1185,8 @@ TQSpinBox *PropertyIntItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, SIGNAL( valueChanged( int ) ), - this, SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1281,8 +1281,8 @@ TQSpinBox* PropertyLayoutItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, SIGNAL( valueChanged( int ) ), - this, SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1346,8 +1346,8 @@ TQComboBox *PropertyListItem::combo() return comb; comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, SIGNAL( activated( int ) ), - this, SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { TQObjectList *ol = comb->queryList( "TQLineEdit" ); @@ -1643,8 +1643,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box->setLineWidth( 2 ); pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getPixmap() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() @@ -1746,8 +1746,8 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getColor() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() @@ -1868,8 +1868,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getFont() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() @@ -2268,8 +2268,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, box->setLineWidth( 2 ); palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getPalette() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { @@ -2375,8 +2375,8 @@ TQComboBox *PropertyCursorItem::combo() comb->insertItem( TQPixmap::fromMimeSource( "designer_hand.png" ), tr("Pointing Hand"), TQObject::PointingHandCursor ); comb->insertItem( TQPixmap::fromMimeSource( "designer_no.png" ), tr("Forbidden"), TQObject::ForbiddenCursor ); - connect( comb, SIGNAL( activated( int ) ), - this, SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -2443,8 +2443,8 @@ PropertyKeysequenceItem::PropertyKeysequenceItem( PropertyList *l, box = new TQHBox( listview->viewport() ); box->hide(); sequence = new TQLineEdit( box ); - connect( sequence, SIGNAL(textChanged( const TQString & )), - this, SLOT(setValue()) ); + connect( sequence, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(setValue()) ); sequence->installEventFilter( this ); } @@ -2644,8 +2644,8 @@ EnumBox::EnumBox( TQWidget *parent, const char *name ) : TQComboBox( parent, name ) { pop = new EnumPopup( this, "popup", TQObject::WType_Popup ); - connect( pop, SIGNAL( hidden() ), this, SLOT( popupHidden() ) ); - connect( pop, SIGNAL( closed() ), this, SLOT( popupClosed() ) ); + connect( pop, TQ_SIGNAL( hidden() ), this, TQ_SLOT( popupHidden() ) ); + connect( pop, TQ_SIGNAL( closed() ), this, TQ_SLOT( popupClosed() ) ); popupShown = FALSE; arrowDown = FALSE; } @@ -2740,14 +2740,14 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) } popup(); - TQTimer::singleShot( 100, this, SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } void EnumBox::keyPressEvent( TQKeyEvent *e ) { if ( e->key() == Key_Space ) { popup(); - TQTimer::singleShot( 100, this, SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } else if ( e->key() == Key_Enter || e->key() == Key_Return ) { popup(); } @@ -2776,8 +2776,8 @@ PropertyEnumItem::PropertyEnumItem( PropertyList *l, box = new EnumBox( listview->viewport() ); box->hide(); box->installEventFilter( listview ); - connect( box, SIGNAL( aboutToShowPopup() ), this, SLOT( insertEnums() ) ); - connect( box, SIGNAL( valueChanged() ), this, SLOT( setValue() ) ); + connect( box, TQ_SIGNAL( aboutToShowPopup() ), this, TQ_SLOT( insertEnums() ) ); + connect( box, TQ_SIGNAL( valueChanged() ), this, TQ_SLOT( setValue() ) ); } PropertyEnumItem::~PropertyEnumItem() @@ -2907,16 +2907,16 @@ PropertyList::PropertyList( PropertyEditor *e ) viewport()->installEventFilter( this ); addColumn( tr( "Property" ) ); addColumn( tr( "Value" ) ); - connect( header(), SIGNAL( sizeChange( int, int, int ) ), - this, SLOT( updateEditorSize() ) ); - disconnect( header(), SIGNAL( sectionClicked( int ) ), - this, SLOT( changeSortColumn( int ) ) ); - connect( header(), SIGNAL( sectionClicked( int ) ), - this, SLOT( toggleSort() ) ); - connect( this, SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), - this, SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem * ) ), - this, SLOT( toggleOpen( TQListViewItem * ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( toggleSort() ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); @@ -3556,7 +3556,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) return TRUE; } } else if ( e->type() == TQEvent::FocusOut && ::tqt_cast<TQLineEdit*>(o) && editor->formWindow() ) { - TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), SLOT( checkCompressedCommand() ) ); + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) ); } else if ( o == viewport() ) { TQMouseEvent *me; PropertyListItem* i; @@ -3908,8 +3908,8 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) header()->hide(); removeColumn( 1 ); setRootIsDecorated( TRUE ); - connect( this, SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); } TQString clean_arguments( const TQString &s ) diff --git a/tools/designer/designer/qcompletionedit.cpp b/tools/designer/designer/qcompletionedit.cpp index febde1052..79cdae62c 100644 --- a/tools/designer/designer/qcompletionedit.cpp +++ b/tools/designer/designer/qcompletionedit.cpp @@ -52,8 +52,8 @@ TQCompletionEdit::TQCompletionEdit( TQWidget *parent, const char *name ) listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( textDidChange( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } diff --git a/tools/designer/designer/sourceeditor.cpp b/tools/designer/designer/sourceeditor.cpp index 823a39f00..32df118bf 100644 --- a/tools/designer/designer/sourceeditor.cpp +++ b/tools/designer/designer/sourceeditor.cpp @@ -52,7 +52,7 @@ SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageIn lIface->addRef(); editor = iFace->editor( MainWindow::self->areEditorsReadOnly(), this, MainWindow::self->designerInterface() ); - iFace->onBreakPointChange( MainWindow::self, SLOT( breakPointsChanged() ) ); + iFace->onBreakPointChange( MainWindow::self, TQ_SLOT( breakPointsChanged() ) ); resize( 600, 400 ); setIcon( TQPixmap::fromMimeSource( "designer_filenew.png" ) ); } diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp index 2328360f6..0b5200fdd 100644 --- a/tools/designer/designer/startdialogimpl.cpp +++ b/tools/designer/designer/startdialogimpl.cpp @@ -40,13 +40,13 @@ StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath ) initFileOpen(); showInFuture = TRUE; - connect( buttonHelp, SIGNAL( clicked() ), - MainWindow::self, SLOT( showDialogHelp() ) ); - connect( recentView, SIGNAL( doubleClicked(TQIconViewItem*) ), - this, SLOT( accept() ) ); - connect( recentView, SIGNAL( returnPressed(TQIconViewItem*) ), - this, SLOT( accept() ) ); - connect( fd, SIGNAL( fileSelected() ), this, SLOT( accept() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), + MainWindow::self, TQ_SLOT( showDialogHelp() ) ); + connect( recentView, TQ_SIGNAL( doubleClicked(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( recentView, TQ_SIGNAL( returnPressed(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( fd, TQ_SIGNAL( fileSelected() ), this, TQ_SLOT( accept() ) ); } void StartDialog::accept() diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp index c60c0944d..22096d36e 100644 --- a/tools/designer/designer/styledbutton.cpp +++ b/tools/designer/designer/styledbutton.cpp @@ -51,7 +51,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) setMinimumSize( minimumSizeHint() ); setAcceptDrops( TRUE ); - connect( this, SIGNAL(clicked()), SLOT(onEditor())); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(onEditor())); setEditor( ColorEditor ); } diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp index 34100071e..2a82127fb 100644 --- a/tools/designer/designer/tableeditorimpl.cpp +++ b/tools/designer/designer/tableeditorimpl.cpp @@ -58,7 +58,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f #endif formWindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); #ifndef TQT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); diff --git a/tools/designer/designer/timestamp.cpp b/tools/designer/designer/timestamp.cpp index 3996108a8..f9bb3f1b5 100644 --- a/tools/designer/designer/timestamp.cpp +++ b/tools/designer/designer/timestamp.cpp @@ -41,7 +41,7 @@ TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) : TQObject( parent ), filename( f ), autoCheck( FALSE ) { timer = new TQTimer( this ); - connect( timer, SIGNAL( timeout() ), this, SLOT( autoCheckTimeStamp() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoCheckTimeStamp() ) ); update(); } diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp index 4a094105b..7a2e45865 100644 --- a/tools/designer/designer/widgetfactory.cpp +++ b/tools/designer/designer/widgetfactory.cpp @@ -302,8 +302,8 @@ TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *parent, const char *name next->setAutoRaise( TRUE ); next->setAutoRepeat( TRUE ); next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); - connect( prev, SIGNAL( clicked() ), this, SLOT( prevPage() ) ); - connect( next, SIGNAL( clicked() ), this, SLOT( nextPage() ) ); + connect( prev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevPage() ) ); + connect( next, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPage() ) ); updateButtons(); } @@ -865,7 +865,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); MetaDataBase::addEntry( dw ); wiz->addPage( dw, FormWindow::tr( "Page" ) ); - TQTimer::singleShot( 0, wiz, SLOT( next() ) ); + TQTimer::singleShot( 0, wiz, TQ_SLOT( next() ) ); } return wiz; } else if ( className == "Spacer" ) { diff --git a/tools/designer/designer/wizardeditorimpl.cpp b/tools/designer/designer/wizardeditorimpl.cpp index 47468ceab..a04a33f36 100644 --- a/tools/designer/designer/wizardeditorimpl.cpp +++ b/tools/designer/designer/wizardeditorimpl.cpp @@ -46,19 +46,19 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); fillListBox(); // Add drag and drop ListBoxDnd *listBoxDnd = new ListBoxDnd( listBox ); listBoxDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( listBoxDnd, SIGNAL( dropped( TQListBoxItem * ) ), - listBoxDnd, SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + listBoxDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, SIGNAL( dragged( TQListBoxItem * ) ), - this, SLOT( itemDragged( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, SIGNAL( dropped( TQListBoxItem * ) ), - this, SLOT( itemDropped( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dragged( TQListBoxItem * ) ), + this, TQ_SLOT( itemDragged( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + this, TQ_SLOT( itemDropped( TQListBoxItem * ) ) ); // Add in-place rename new ListBoxRename( listBox ); diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp index ff0d68688..2a7f194f0 100644 --- a/tools/designer/designer/workspace.cpp +++ b/tools/designer/designer/workspace.cpp @@ -82,8 +82,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) project = p; t = ObjectType; setPixmap( 0, TQPixmap::fromMimeSource( "designer_object.png" ) ); - TQObject::connect( p->fakeFormFileFor( o ), SIGNAL( somethingChanged(FormFile*) ), - listView(), SLOT( update() ) ); + TQObject::connect( p->fakeFormFileFor( o ), TQ_SIGNAL( somethingChanged(FormFile*) ), + listView(), TQ_SLOT( update() ) ); } WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) @@ -94,7 +94,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, TQPixmap::fromMimeSource( "designer_form.png" ) ); - TQObject::connect( ff, SIGNAL( somethingChanged(FormFile*) ), listView(), SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); if ( formFile->supportsCodeFile() ) { (void) new WorkspaceItem( this, formFile, FormSourceType ); } @@ -294,12 +294,12 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw ) #endif addColumn( tr( "Files" ) ); setAllColumnsShowFocus( TRUE ); - connect( this, SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), - this, SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), - connect( this, SIGNAL( doubleClicked( TQListViewItem * ) ), - this, SLOT( itemDoubleClicked( TQListViewItem * ) ) ), - connect( this, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); viewport()->setAcceptDrops( TRUE ); @@ -321,23 +321,23 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, SIGNAL( sourceFileAdded(SourceFile*) ), this, SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, SIGNAL( sourceFileRemoved(SourceFile*) ), this, SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, SIGNAL( formFileAdded(FormFile*) ), this, SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, SIGNAL( formFileRemoved(FormFile*) ), this, SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, SIGNAL( objectAdded(TQObject*) ), this, SLOT( objectAdded(TQObject*) ) ); - disconnect( project, SIGNAL( objectRemoved(TQObject*) ), this, SLOT( objectRemoved(TQObject*) ) ); - disconnect( project, SIGNAL( projectModified() ), this, SLOT( update() ) ); + disconnect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); } project = pro; - connect( project, SIGNAL( sourceFileAdded(SourceFile*) ), this, SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, SIGNAL( sourceFileRemoved(SourceFile*) ), this, SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, SIGNAL( formFileAdded(FormFile*) ), this, SLOT( formFileAdded(FormFile*) ) ); - connect( project, SIGNAL( formFileRemoved(FormFile*) ), this, SLOT( formFileRemoved(FormFile*) ) ); - connect( project, SIGNAL( destroyed(TQObject*) ), this, SLOT( projectDestroyed(TQObject*) ) ); - connect( project, SIGNAL( objectAdded(TQObject*) ), this, SLOT( objectAdded(TQObject*) ) ); - connect( project, SIGNAL( objectRemoved(TQObject*) ), this, SLOT( objectRemoved(TQObject*) ) ); - connect( project, SIGNAL( projectModified() ), this, SLOT( update() ) ); + connect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQ_SIGNAL( destroyed(TQObject*) ), this, TQ_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + connect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -658,8 +658,8 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) void Workspace::setBufferEdit( TQCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, SIGNAL( chosen( const TQString & ) ), - this, SLOT( bufferChosen( const TQString & ) ) ); + connect( bufferEdit, TQ_SIGNAL( chosen( const TQString & ) ), + this, TQ_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp index c49066c0c..90bf4a8dd 100644 --- a/tools/designer/editor/arghintwidget.cpp +++ b/tools/designer/editor/arghintwidget.cpp @@ -180,8 +180,8 @@ ArgHintWidget::ArgHintWidget( TQWidget *parent, const char*name ) hbox->addWidget( ( next = new ArrowButton( this, "editor_right_btn", ArrowButton::Right ) ) ); funcLabel->setBackgroundColor( white ); funcLabel->setAlignment( AlignCenter ); - connect( prev, SIGNAL( clicked() ), this, SLOT( gotoPrev() ) ); - connect( next, SIGNAL( clicked() ), this, SLOT( gotoNext() ) ); + connect( prev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( gotoPrev() ) ); + connect( next, TQ_SIGNAL( clicked() ), this, TQ_SLOT( gotoNext() ) ); updateState(); setFocusPolicy( NoFocus ); prev->setFocusPolicy( NoFocus ); diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp index 77499c8d2..fb7365058 100644 --- a/tools/designer/editor/completion.cpp +++ b/tools/designer/editor/completion.cpp @@ -670,7 +670,7 @@ bool EditorCompletion::doArgumentHint( bool useIndex ) functionLabel->show(); curEditor->setFocus(); } - TQTimer::singleShot( 0, functionLabel, SLOT( relayout() ) ); + TQTimer::singleShot( 0, functionLabel, TQ_SLOT( relayout() ) ); return TRUE; } diff --git a/tools/designer/editor/editor.cpp b/tools/designer/editor/editor.cpp index cba812362..58b5ed90d 100644 --- a/tools/designer/editor/editor.cpp +++ b/tools/designer/editor/editor.cpp @@ -50,8 +50,8 @@ Editor::Editor( const TQString &fn, TQWidget *parent, const char *name ) setVScrollBarMode( TQScrollView::AlwaysOn ); document()->setUseFormatCollection( FALSE ); parenMatcher = new ParenMatcher; - connect( this, SIGNAL( cursorPositionChanged( TQTextCursor * ) ), - this, SLOT( cursorPosChanged( TQTextCursor * ) ) ); + connect( this, TQ_SIGNAL( cursorPositionChanged( TQTextCursor * ) ), + this, TQ_SLOT( cursorPosChanged( TQTextCursor * ) ) ); cfg = new Config; document()->addSelection( Error ); document()->addSelection( Step ); @@ -68,10 +68,10 @@ Editor::Editor( const TQString &fn, TQWidget *parent, const char *name ) accelComment = new TQAccel( this ); accelComment->connectItem( accelComment->insertItem( ALT + Key_C ), - this, SLOT( commentSelection() ) ); + this, TQ_SLOT( commentSelection() ) ); accelUncomment = new TQAccel( this ); accelUncomment->connectItem( accelUncomment->insertItem( ALT + Key_U ), - this, SLOT( uncommentSelection() ) ); + this, TQ_SLOT( uncommentSelection() ) ); editable = TRUE; } @@ -202,8 +202,8 @@ TQPopupMenu *Editor::createPopupMenu( const TQPoint &p ) { TQPopupMenu *menu = TQTextEdit::createPopupMenu( p ); menu->insertSeparator(); - menu->insertItem( tr( "C&omment Code\tAlt+C" ), this, SLOT( commentSelection() ) ); - menu->insertItem( tr( "Unco&mment Code\tAlt+U" ), this, SLOT( uncommentSelection() ) ); + menu->insertItem( tr( "C&omment Code\tAlt+C" ), this, TQ_SLOT( commentSelection() ) ); + menu->insertItem( tr( "Unco&mment Code\tAlt+U" ), this, TQ_SLOT( uncommentSelection() ) ); return menu; } diff --git a/tools/designer/editor/viewmanager.cpp b/tools/designer/editor/viewmanager.cpp index 96c106f03..e3627bf5e 100644 --- a/tools/designer/editor/viewmanager.cpp +++ b/tools/designer/editor/viewmanager.cpp @@ -46,24 +46,24 @@ ViewManager::ViewManager( TQWidget *parent, const char *name ) { TQHBoxLayout *l = new TQHBoxLayout( this ); markerWidget = new MarkerWidget( this, "editor_markerwidget" ); - connect( markerWidget, SIGNAL( markersChanged() ), - this, SIGNAL( markersChanged() ) ); - connect( markerWidget, SIGNAL( collapseFunction( TQTextParagraph * ) ), - this, SIGNAL( collapseFunction( TQTextParagraph * ) ) ); - connect( markerWidget, SIGNAL( expandFunction( TQTextParagraph * ) ), - this, SIGNAL( expandFunction( TQTextParagraph * ) ) ); - connect( markerWidget, SIGNAL( collapse( bool ) ), - this, SIGNAL( collapse( bool ) ) ); - connect( markerWidget, SIGNAL( expand( bool ) ), - this, SIGNAL( expand( bool ) ) ); - connect( markerWidget, SIGNAL( editBreakPoints() ), - this, SIGNAL( editBreakPoints() ) ); - connect( markerWidget, SIGNAL( isBreakpointPossible( bool&, const TQString &, int ) ), - this, SIGNAL( isBreakpointPossible( bool&, const TQString &, int ) ) ); - connect( markerWidget, SIGNAL( showMessage( const TQString & ) ), - this, SLOT( showMessage( const TQString & ) ) ); + connect( markerWidget, TQ_SIGNAL( markersChanged() ), + this, TQ_SIGNAL( markersChanged() ) ); + connect( markerWidget, TQ_SIGNAL( collapseFunction( TQTextParagraph * ) ), + this, TQ_SIGNAL( collapseFunction( TQTextParagraph * ) ) ); + connect( markerWidget, TQ_SIGNAL( expandFunction( TQTextParagraph * ) ), + this, TQ_SIGNAL( expandFunction( TQTextParagraph * ) ) ); + connect( markerWidget, TQ_SIGNAL( collapse( bool ) ), + this, TQ_SIGNAL( collapse( bool ) ) ); + connect( markerWidget, TQ_SIGNAL( expand( bool ) ), + this, TQ_SIGNAL( expand( bool ) ) ); + connect( markerWidget, TQ_SIGNAL( editBreakPoints() ), + this, TQ_SIGNAL( editBreakPoints() ) ); + connect( markerWidget, TQ_SIGNAL( isBreakpointPossible( bool&, const TQString &, int ) ), + this, TQ_SIGNAL( isBreakpointPossible( bool&, const TQString &, int ) ) ); + connect( markerWidget, TQ_SIGNAL( showMessage( const TQString & ) ), + this, TQ_SLOT( showMessage( const TQString & ) ) ); messageTimer = new TQTimer( this ); - connect( messageTimer, SIGNAL( timeout() ), this, SLOT( clearStatusBar() ) ); + connect( messageTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( clearStatusBar() ) ); markerWidget->setFixedWidth( fontMetrics().width( "0000" ) + 20 ); l->addWidget( markerWidget ); layout = new TQVBoxLayout( l ); @@ -73,12 +73,12 @@ void ViewManager::addView( TQWidget *view ) { layout->addWidget( view ); curView = view; - connect( ( (Editor*)curView )->verticalScrollBar(), SIGNAL( valueChanged( int ) ), - markerWidget, SLOT( doRepaint() ) ); - connect( (Editor*)curView, SIGNAL( textChanged() ), - markerWidget, SLOT( doRepaint() ) ); - connect( (Editor*)curView, SIGNAL( clearErrorMarker() ), - this, SLOT( clearErrorMarker() ) ); + connect( ( (Editor*)curView )->verticalScrollBar(), TQ_SIGNAL( valueChanged( int ) ), + markerWidget, TQ_SLOT( doRepaint() ) ); + connect( (Editor*)curView, TQ_SIGNAL( textChanged() ), + markerWidget, TQ_SLOT( doRepaint() ) ); + connect( (Editor*)curView, TQ_SIGNAL( clearErrorMarker() ), + this, TQ_SLOT( clearErrorMarker() ) ); posLabel = new TQLabel( this, "editor_poslabel" ); posLabel->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); posLabel->setText( " Line: 1 Col: 1" ); @@ -86,8 +86,8 @@ void ViewManager::addView( TQWidget *view ) posLabel->setLineWidth( 1 ); posLabel->setFixedHeight( posLabel->fontMetrics().height() ); layout->addWidget( posLabel ); - connect( curView, SIGNAL( cursorPositionChanged( int, int ) ), - this, SLOT( cursorPositionChanged( int, int ) ) ); + connect( curView, TQ_SIGNAL( cursorPositionChanged( int, int ) ), + this, TQ_SLOT( cursorPositionChanged( int, int ) ) ); } TQWidget *ViewManager::currentView() const diff --git a/tools/designer/examples/addressbook/addressbook.ui.h b/tools/designer/examples/addressbook/addressbook.ui.h index 83d177573..93f3d50e5 100644 --- a/tools/designer/examples/addressbook/addressbook.ui.h +++ b/tools/designer/examples/addressbook/addressbook.ui.h @@ -16,14 +16,14 @@ void AddressBook::fileNew() { AddressDetails dia( this, 0, TRUE ); - connect( &dia, SIGNAL( newAddress( const TQString &, + connect( &dia, TQ_SIGNAL( newAddress( const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString & ) ), - this, SLOT( insertAddress( const TQString &, + this, TQ_SLOT( insertAddress( const TQString &, const TQString &, const TQString &, const TQString &, @@ -118,8 +118,8 @@ void AddressBook::fileExit() void AddressBook::editFind() { SearchDialog dia( this, 0, TRUE ); - connect( &dia, SIGNAL( searchAddress( const TQString & ) ), - this, SLOT( searchAddress( const TQString & ) ) ); + connect( &dia, TQ_SIGNAL( searchAddress( const TQString & ) ), + this, TQ_SLOT( searchAddress( const TQString & ) ) ); dia.exec(); } diff --git a/tools/designer/examples/addressbook/main.cpp b/tools/designer/examples/addressbook/main.cpp index 4b80e6d3e..0359e37c0 100644 --- a/tools/designer/examples/addressbook/main.cpp +++ b/tools/designer/examples/addressbook/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char ** argv ) TQApplication a( argc, argv ); AddressBook *w = new AddressBook; w->show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); return a.exec(); } diff --git a/tools/designer/examples/colortool/mainform.ui.h b/tools/designer/examples/colortool/mainform.ui.h index c6343f957..7a0f8a8db 100644 --- a/tools/designer/examples/colortool/mainform.ui.h +++ b/tools/designer/examples/colortool/mainform.ui.h @@ -356,8 +356,8 @@ void MainForm::editFind() { if ( ! findForm ) { findForm = new FindForm( this ); - connect( findForm, SIGNAL( lookfor(const TQString&) ), - this, SLOT( lookfor(const TQString&) ) ); + connect( findForm, TQ_SIGNAL( lookfor(const TQString&) ), + this, TQ_SLOT( lookfor(const TQString&) ) ); } findForm->show(); } diff --git a/tools/designer/examples/credit/creditformbase.cpp b/tools/designer/examples/credit/creditformbase.cpp index 51c5e6a40..372a756d3 100644 --- a/tools/designer/examples/credit/creditformbase.cpp +++ b/tools/designer/examples/credit/creditformbase.cpp @@ -106,10 +106,10 @@ CreditFormBase::CreditFormBase( TQWidget* parent, const char* name, bool modal, // signals and slots connections - connect( okPushButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( cancelPushButton, SIGNAL( clicked() ), this, SLOT( reject() ) ); - connect( creditButtonGroup, SIGNAL( clicked(int) ), this, SLOT( setAmount() ) ); - connect( specialRadioButton, SIGNAL( toggled(bool) ), amountSpinBox, SLOT( setEnabled(bool) ) ); + connect( okPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( cancelPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); + connect( creditButtonGroup, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( setAmount() ) ); + connect( specialRadioButton, TQ_SIGNAL( toggled(bool) ), amountSpinBox, TQ_SLOT( setEnabled(bool) ) ); } /* diff --git a/tools/designer/examples/filechooser/widget/filechooser.cpp b/tools/designer/examples/filechooser/widget/filechooser.cpp index 3b510baf1..4e886829e 100644 --- a/tools/designer/examples/filechooser/widget/filechooser.cpp +++ b/tools/designer/examples/filechooser/widget/filechooser.cpp @@ -13,15 +13,15 @@ FileChooser::FileChooser( TQWidget *parent, const char *name ) lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, SIGNAL( textChanged( const TQString & ) ), - this, SIGNAL( fileNameChanged( const TQString & ) ) ); + connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, SIGNAL( clicked() ), - this, SLOT( chooseFile() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } diff --git a/tools/designer/examples/metric/main.cpp b/tools/designer/examples/metric/main.cpp index 8fe7bf6fc..00ec8c418 100644 --- a/tools/designer/examples/metric/main.cpp +++ b/tools/designer/examples/metric/main.cpp @@ -7,6 +7,6 @@ int main( int argc, char ** argv ) ConversionForm *w = new ConversionForm; w->show(); a.setMainWidget( w ); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); return a.exec(); } diff --git a/tools/designer/examples/multiclip/multiclip.ui.h b/tools/designer/examples/multiclip/multiclip.ui.h index a4287fa44..203fc6906 100644 --- a/tools/designer/examples/multiclip/multiclip.ui.h +++ b/tools/designer/examples/multiclip/multiclip.ui.h @@ -36,9 +36,9 @@ void MulticlipForm::init() currentLineEdit->setFocus(); cb = tqApp->clipboard(); - connect( cb, SIGNAL( dataChanged() ), SLOT( dataChanged() ) ); + connect( cb, TQ_SIGNAL( dataChanged() ), TQ_SLOT( dataChanged() ) ); if ( cb->supportsSelection() ) - connect( cb, SIGNAL( selectionChanged() ), SLOT( selectionChanged() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) ); dataChanged(); } diff --git a/tools/designer/examples/vcr/vcr.cpp b/tools/designer/examples/vcr/vcr.cpp index fd39e1a98..d5b36f4d7 100644 --- a/tools/designer/examples/vcr/vcr.cpp +++ b/tools/designer/examples/vcr/vcr.cpp @@ -99,19 +99,19 @@ Vcr::Vcr( TQWidget *parent, const char *name ) TQPushButton *rewind = new TQPushButton( TQPixmap( rewind_xpm ), 0, this, "vcr_rewind" ); layout->addWidget( rewind ); - connect( rewind, SIGNAL(clicked()), SIGNAL(rewind()) ); + connect( rewind, TQ_SIGNAL(clicked()), TQ_SIGNAL(rewind()) ); TQPushButton *play = new TQPushButton( TQPixmap( play_xpm ), 0, this, "vcr_play" ); layout->addWidget( play ); - connect( play, SIGNAL(clicked()), SIGNAL(play()) ); + connect( play, TQ_SIGNAL(clicked()), TQ_SIGNAL(play()) ); TQPushButton *next = new TQPushButton( TQPixmap( next_xpm ), 0, this, "vcr_next" ); layout->addWidget( next ); - connect( next, SIGNAL(clicked()), SIGNAL(next()) ); + connect( next, TQ_SIGNAL(clicked()), TQ_SIGNAL(next()) ); TQPushButton *stop = new TQPushButton( TQPixmap( stop_xpm ), 0, this, "vcr_stop" ); layout->addWidget( stop ); - connect( stop, SIGNAL(clicked()), SIGNAL(stop()) ); + connect( stop, TQ_SIGNAL(clicked()), TQ_SIGNAL(stop()) ); } diff --git a/tools/designer/plugins/cppeditor/cppeditor.cpp b/tools/designer/plugins/cppeditor/cppeditor.cpp index 13069230c..8b567ab20 100644 --- a/tools/designer/plugins/cppeditor/cppeditor.cpp +++ b/tools/designer/plugins/cppeditor/cppeditor.cpp @@ -108,9 +108,9 @@ TQPopupMenu *CppEditor::createPopupMenu( const TQPoint &p ) { TQPopupMenu *m = Editor::createPopupMenu( p ); m->insertSeparator(); - int adddeclid = m->insertItem( tr( "Add Include File (in Declaration)..." ), this, SLOT( addInclDecl() ) ); - int addimplid = m->insertItem( tr( "Add Include File (in Implementation)..." ), this, SLOT( addInclImpl() ) ); - int addforid = m->insertItem( tr( "Add Forward Declaration..." ), this, SLOT( addForward() ) ); + int adddeclid = m->insertItem( tr( "Add Include File (in Declaration)..." ), this, TQ_SLOT( addInclDecl() ) ); + int addimplid = m->insertItem( tr( "Add Include File (in Implementation)..." ), this, TQ_SLOT( addInclImpl() ) ); + int addforid = m->insertItem( tr( "Add Forward Declaration..." ), this, TQ_SLOT( addForward() ) ); if ( !dIface->currentForm() ) { m->setItemEnabled( adddeclid, FALSE ); m->setItemEnabled( addimplid, FALSE ); diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp index 22e51cf49..7b7747f3b 100644 --- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp @@ -45,8 +45,8 @@ EditorInterfaceImpl::EditorInterfaceImpl() : EditorInterface(), viewManager( 0 ), dIface( 0 ) { updateTimer = new TQTimer( this ); - connect( updateTimer, SIGNAL( timeout() ), - this, SLOT( update() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( update() ) ); } EditorInterfaceImpl::~EditorInterfaceImpl() @@ -82,7 +82,7 @@ TQWidget *EditorInterfaceImpl::editor( bool readonly, CppEditor *e = new CppEditor( TQString::null, viewManager, "editor", dIface ); e->setEditable( !readonly ); e->installEventFilter( this ); - connect( e, SIGNAL( intervalChanged() ), this, SLOT( intervalChanged() ) ); + connect( e, TQ_SIGNAL( intervalChanged() ), this, TQ_SLOT( intervalChanged() ) ); TQApplication::sendPostedEvents( viewManager, TQEvent::ChildInserted ); } return viewManager->currentView(); @@ -93,10 +93,10 @@ void EditorInterfaceImpl::setText( const TQString &txt ) if ( !viewManager || !viewManager->currentView() ) return; CppEditor *e = (CppEditor*)viewManager->currentView(); - disconnect( e, SIGNAL( modificationChanged( bool ) ), this, SLOT( modificationChanged( bool ) ) ); + disconnect( e, TQ_SIGNAL( modificationChanged( bool ) ), this, TQ_SLOT( modificationChanged( bool ) ) ); e->setText( txt ); e->setModified( FALSE ); - connect( e, SIGNAL( modificationChanged( bool ) ), this, SLOT( modificationChanged( bool ) ) ); + connect( e, TQ_SIGNAL( modificationChanged( bool ) ), this, TQ_SLOT( modificationChanged( bool ) ) ); } TQString EditorInterfaceImpl::text() const @@ -334,5 +334,5 @@ void EditorInterfaceImpl::onBreakPointChange( TQObject *receiver, const char *sl { if ( !viewManager ) return; - connect( viewManager, SIGNAL( markersChanged() ), receiver, slot ); + connect( viewManager, TQ_SIGNAL( markersChanged() ), receiver, slot ); } diff --git a/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp index a0b174b72..96a5d217d 100644 --- a/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp @@ -91,8 +91,8 @@ PreferenceInterface::Preference *PreferenceInterfaceImpl::preference() pf->tab = cppEditorSyntax; pf->title = "C++ Editor"; pf->receiver = pf->tab; - pf->init_slot = SLOT( reInit() ); - pf->accept_slot = SLOT( save() ); + pf->init_slot = TQ_SLOT( reInit() ); + pf->accept_slot = TQ_SLOT( save() ); return pf; } diff --git a/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp index 8f042a714..5bbc9bdc5 100644 --- a/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp @@ -69,8 +69,8 @@ ProjectSettingsInterface::ProjectSettings *ProjectSettingsInterfaceImpl::project pf->tab = settingsTab; pf->title = "C++"; pf->receiver = pf->tab; - pf->init_slot = SLOT( reInit( TQUnknownInterface * ) ); - pf->accept_slot = SLOT( save( TQUnknownInterface * ) ); + pf->init_slot = TQ_SLOT( reInit( TQUnknownInterface * ) ); + pf->accept_slot = TQ_SLOT( save( TQUnknownInterface * ) ); return pf; } diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp index a140903f9..fbf6f059d 100644 --- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp @@ -76,7 +76,7 @@ static TQString generateMainCppCode( const TQString &formname, const TQString &i code += " TQApplication a( argc, argv );\n"; code += " " + formname + " w;\n"; code += " w.show();\n"; - code += " a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );\n"; + code += " a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) );\n"; code += " return a.exec();\n"; code += "}\n"; return code; diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index 5da841fe6..adb283a79 100644 --- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -91,7 +91,7 @@ SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, mode = View; } - connect( nextButton(), SIGNAL(clicked()), SLOT(nextPageClicked()) ); + connect( nextButton(), TQ_SIGNAL(clicked()), TQ_SLOT(nextPageClicked()) ); setupPage1(); } diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp index 198f2c089..42ee08cb1 100644 --- a/tools/designer/uic/form.cpp +++ b/tools/designer/uic/form.cpp @@ -1179,8 +1179,8 @@ void Uic::createFormImpl( const TQDomElement &e ) if ( receiver == objName ) receiver = "this"; - out << indent << "connect( " << sender << ", SIGNAL( " << signal << " ), " - << receiver << ", SLOT( " << slot << " ) );" << endl; + out << indent << "connect( " << sender << ", TQ_SIGNAL( " << signal << " ), " + << receiver << ", TQ_SLOT( " << slot << " ) );" << endl; } } else if ( n.tagName() == "tabstops" ) { // setup tab order diff --git a/tools/designer/uilib/test/main.cpp b/tools/designer/uilib/test/main.cpp index 1a8c14a02..f6ccfd757 100644 --- a/tools/designer/uilib/test/main.cpp +++ b/tools/designer/uilib/test/main.cpp @@ -45,6 +45,6 @@ int main( int argc, char ** argv ) if ( !w ) return 0; w->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); + a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); return a.exec(); } |