diff options
Diffstat (limited to 'examples')
124 files changed, 878 insertions, 878 deletions
diff --git a/examples/aclock/aclock.cpp b/examples/aclock/aclock.cpp index cc312da0..e492529e 100644 --- a/examples/aclock/aclock.cpp +++ b/examples/aclock/aclock.cpp @@ -21,7 +21,7 @@ AnalogClock::AnalogClock( TQWidget *parent, const char *name ) { time = TQTime::currentTime(); // get current time internalTimer = new TQTimer( this ); // create internal timer - connect( internalTimer, SIGNAL(timeout()), SLOT(timeout()) ); + connect( internalTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); internalTimer->start( 5000 ); // emit signal every 5 seconds } @@ -48,7 +48,7 @@ void AnalogClock::mouseMoveEvent( TQMouseEvent *e ) void AnalogClock::setTime( const TQTime & t ) { time = t; - disconnect( internalTimer, SIGNAL(timeout()), this, SLOT(timeout()) ); + disconnect( internalTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) ); if (autoMask()) updateMask(); else diff --git a/examples/action/application.cpp b/examples/action/application.cpp index 0edd623c..ecd70cdd 100644 --- a/examples/action/application.cpp +++ b/examples/action/application.cpp @@ -46,12 +46,12 @@ ApplicationWindow::ApplicationWindow() TQAction * fileCloseAction, * fileQuitAction; fileNewAction = new TQAction( "&New", CTRL+Key_N, this, "new" ); - connect( fileNewAction, SIGNAL( activated() ) , this, - SLOT( newDoc() ) ); + connect( fileNewAction, TQ_SIGNAL( activated() ) , this, + TQ_SLOT( newDoc() ) ); fileOpenAction = new TQAction( TQPixmap( fileopen ), "&Open...", CTRL+Key_O, this, "open" ); - connect( fileOpenAction, SIGNAL( activated() ) , this, SLOT( choose() ) ); + connect( fileOpenAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( choose() ) ); const char * fileOpenText = "<p><img source=\"fileopen\"> " "Click this button to open a <em>new file</em>. <br>" @@ -63,7 +63,7 @@ ApplicationWindow::ApplicationWindow() fileSaveAction = new TQAction( TQPixmap( filesave ), "&Save", CTRL+Key_S, this, "save" ); - connect( fileSaveAction, SIGNAL( activated() ) , this, SLOT( save() ) ); + connect( fileSaveAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( save() ) ); const char * fileSaveText = "<p>Click this button to save the file you " "are editing. You will be prompted for a file name.\n" @@ -73,14 +73,14 @@ ApplicationWindow::ApplicationWindow() fileSaveAsAction = new TQAction( "Save File As", "Save &As...", 0, this, "save as" ); - connect( fileSaveAsAction, SIGNAL( activated() ) , this, - SLOT( saveAs() ) ); + connect( fileSaveAsAction, TQ_SIGNAL( activated() ) , this, + TQ_SLOT( saveAs() ) ); fileSaveAsAction->setWhatsThis( fileSaveText ); filePrintAction = new TQAction( "Print File", TQPixmap( fileprint ), "&Print...", CTRL+Key_P, this, "print" ); - connect( filePrintAction, SIGNAL( activated() ) , this, - SLOT( print() ) ); + connect( filePrintAction, TQ_SIGNAL( activated() ) , this, + TQ_SLOT( print() ) ); const char * filePrintText = "Click this button to print the file you " "are editing.\n You can also select the Print " @@ -89,13 +89,13 @@ ApplicationWindow::ApplicationWindow() fileCloseAction = new TQAction( "Close", "&Close", CTRL+Key_W, this, "close" ); - connect( fileCloseAction, SIGNAL( activated() ) , this, - SLOT( close() ) ); + connect( fileCloseAction, TQ_SIGNAL( activated() ) , this, + TQ_SLOT( close() ) ); fileQuitAction = new TQAction( "Quit", "&Quit", CTRL+Key_Q, this, "quit" ); - connect( fileQuitAction, SIGNAL( activated() ) , tqApp, - SLOT( closeAllWindows() ) ); + connect( fileQuitAction, TQ_SIGNAL( activated() ) , tqApp, + TQ_SLOT( closeAllWindows() ) ); // populate a tool bar with some actions @@ -128,10 +128,10 @@ ApplicationWindow::ApplicationWindow() TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( "&Help", help ); - help->insertItem( "&About", this, SLOT(about()), Key_F1 ); - help->insertItem( "About &TQt", this, SLOT(aboutTQt()) ); + help->insertItem( "&About", this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt()) ); help->insertSeparator(); - help->insertItem( "What's &This", this, SLOT(whatsThis()), + help->insertItem( "What's &This", this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 ); diff --git a/examples/action/main.cpp b/examples/action/main.cpp index ca75f8c2..fd3df505 100644 --- a/examples/action/main.cpp +++ b/examples/action/main.cpp @@ -15,6 +15,6 @@ int main( int argc, char ** argv ) { ApplicationWindow * mw = new ApplicationWindow(); mw->setCaption( "Document 1" ); mw->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/examples/action/toggleaction/toggleaction.cpp b/examples/action/toggleaction/toggleaction.cpp index 810de04c..5da1a685 100644 --- a/examples/action/toggleaction/toggleaction.cpp +++ b/examples/action/toggleaction/toggleaction.cpp @@ -19,8 +19,8 @@ int main( int argc, char **argv ) labelonoffaction->setAccel( TQt::ALT+TQt::Key_L ); labelonoffaction->setIconSet( (TQPixmap) labelonoff_xpm ); - TQObject::connect( labelonoffaction, SIGNAL( toggled( bool ) ), - window, SLOT( setUsesTextLabel( bool ) ) ); + TQObject::connect( labelonoffaction, TQ_SIGNAL( toggled( bool ) ), + window, TQ_SLOT( setUsesTextLabel( bool ) ) ); labelonoffaction->addTo( toolbar ); diff --git a/examples/addressbook/centralwidget.cpp b/examples/addressbook/centralwidget.cpp index 51e67f73..82a2c81a 100644 --- a/examples/addressbook/centralwidget.cpp +++ b/examples/addressbook/centralwidget.cpp @@ -100,7 +100,7 @@ void ABCentralWidget::setupTabWidget() add = new TQPushButton( "A&dd", input ); add->resize( add->sizeHint() ); grid1->addWidget( add, 0, 4 ); - connect( add, SIGNAL( clicked() ), this, SLOT( addEntry() ) ); + connect( add, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addEntry() ) ); iFirstName = new TQLineEdit( input ); iFirstName->resize( iFirstName->sizeHint() ); @@ -125,7 +125,7 @@ void ABCentralWidget::setupTabWidget() change = new TQPushButton( "&Change", input ); change->resize( change->sizeHint() ); grid1->addWidget( change, 1, 4 ); - connect( change, SIGNAL( clicked() ), this, SLOT( changeEntry() ) ); + connect( change, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeEntry() ) ); tabWidget->addTab( input, "&Add/Change Entry" ); @@ -137,22 +137,22 @@ void ABCentralWidget::setupTabWidget() cFirstName = new TQCheckBox( "First &Name", search ); cFirstName->resize( cFirstName->sizeHint() ); grid2->addWidget( cFirstName, 0, 0 ); - connect( cFirstName, SIGNAL( clicked() ), this, SLOT( toggleFirstName() ) ); + connect( cFirstName, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleFirstName() ) ); cLastName = new TQCheckBox( "&Last Name", search ); cLastName->resize( cLastName->sizeHint() ); grid2->addWidget( cLastName, 0, 1 ); - connect( cLastName, SIGNAL( clicked() ), this, SLOT( toggleLastName() ) ); + connect( cLastName, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleLastName() ) ); cAddress = new TQCheckBox( "Add&ress", search ); cAddress->resize( cAddress->sizeHint() ); grid2->addWidget( cAddress, 0, 2 ); - connect( cAddress, SIGNAL( clicked() ), this, SLOT( toggleAddress() ) ); + connect( cAddress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleAddress() ) ); cEMail = new TQCheckBox( "&E-Mail", search ); cEMail->resize( cEMail->sizeHint() ); grid2->addWidget( cEMail, 0, 3 ); - connect( cEMail, SIGNAL( clicked() ), this, SLOT( toggleEMail() ) ); + connect( cEMail, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleEMail() ) ); sFirstName = new TQLineEdit( search ); sFirstName->resize( sFirstName->sizeHint() ); @@ -173,7 +173,7 @@ void ABCentralWidget::setupTabWidget() find = new TQPushButton( "F&ind", search ); find->resize( find->sizeHint() ); grid2->addWidget( find, 1, 4 ); - connect( find, SIGNAL( clicked() ), this, SLOT( findEntries() ) ); + connect( find, TQ_SIGNAL( clicked() ), this, TQ_SLOT( findEntries() ) ); cFirstName->setChecked( TRUE ); sFirstName->setEnabled( TRUE ); @@ -196,7 +196,7 @@ void ABCentralWidget::setupListView() listView->setSelectionMode( TQListView::Single ); - connect( listView, SIGNAL( clicked( TQListViewItem* ) ), this, SLOT( itemSelected( TQListViewItem* ) ) ); + connect( listView, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( itemSelected( TQListViewItem* ) ) ); mainGrid->addWidget( listView, 1, 0 ); listView->setAllColumnsShowFocus( TRUE ); diff --git a/examples/addressbook/main.cpp b/examples/addressbook/main.cpp index b74f36e4..80c36dc0 100644 --- a/examples/addressbook/main.cpp +++ b/examples/addressbook/main.cpp @@ -20,7 +20,7 @@ int main( int argc, char ** argv ) a.setMainWidget( mw ); mw->show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); int result = a.exec(); delete mw; return result; diff --git a/examples/addressbook/mainwindow.cpp b/examples/addressbook/mainwindow.cpp index 11b93a8e..09176d31 100644 --- a/examples/addressbook/mainwindow.cpp +++ b/examples/addressbook/mainwindow.cpp @@ -38,16 +38,16 @@ void ABMainWindow::setupMenuBar() TQPopupMenu *file = new TQPopupMenu( this ); menuBar()->insertItem( "&File", file ); - file->insertItem( "New", this, SLOT( fileNew() ), CTRL + Key_N ); - file->insertItem( TQPixmap( "fileopen.xpm" ), "Open", this, SLOT( fileOpen() ), CTRL + Key_O ); + file->insertItem( "New", this, TQ_SLOT( fileNew() ), CTRL + Key_N ); + file->insertItem( TQPixmap( "fileopen.xpm" ), "Open", this, TQ_SLOT( fileOpen() ), CTRL + Key_O ); file->insertSeparator(); - file->insertItem( TQPixmap( "filesave.xpm" ), "Save", this, SLOT( fileSave() ), CTRL + Key_S ); - file->insertItem( "Save As...", this, SLOT( fileSaveAs() ) ); + file->insertItem( TQPixmap( "filesave.xpm" ), "Save", this, TQ_SLOT( fileSave() ), CTRL + Key_S ); + file->insertItem( "Save As...", this, TQ_SLOT( fileSaveAs() ) ); file->insertSeparator(); - file->insertItem( TQPixmap( "fileprint.xpm" ), "Print...", this, SLOT( filePrint() ), CTRL + Key_P ); + file->insertItem( TQPixmap( "fileprint.xpm" ), "Print...", this, TQ_SLOT( filePrint() ), CTRL + Key_P ); file->insertSeparator(); - file->insertItem( "Close", this, SLOT( closeWindow() ), CTRL + Key_W ); - file->insertItem( "Quit", tqApp, SLOT( quit() ), CTRL + Key_Q ); + file->insertItem( "Close", this, TQ_SLOT( closeWindow() ), CTRL + Key_W ); + file->insertItem( "Quit", tqApp, TQ_SLOT( quit() ), CTRL + Key_Q ); } void ABMainWindow::setupFileTools() diff --git a/examples/application/application.cpp b/examples/application/application.cpp index d67a5149..455bcc42 100644 --- a/examples/application/application.cpp +++ b/examples/application/application.cpp @@ -45,17 +45,17 @@ ApplicationWindow::ApplicationWindow() openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new TQToolButton( openIcon, "Open File", TQString::null, - this, SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new TQToolButton( saveIcon, "Save File", TQString::null, - this, SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new TQToolButton( printIcon, "Print File", TQString::null, - this, SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); (void)TQWhatsThis::whatsThisButton( fileTools ); @@ -88,41 +88,41 @@ ApplicationWindow::ApplicationWindow() menuBar()->insertItem( "&File", file ); - file->insertItem( "&New", this, SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( "&New", this, TQ_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, "&Open...", - this, SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, "&Save", - this, SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( "Save &As...", this, SLOT(saveAs()) ); + id = file->insertItem( "Save &As...", this, TQ_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, "&Print...", - this, SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( "&Close", this, SLOT(close()), CTRL+Key_W ); + file->insertItem( "&Close", this, TQ_SLOT(close()), CTRL+Key_W ); - file->insertItem( "&Quit", tqApp, SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( "&Quit", tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( "&Help", help ); - help->insertItem( "&About", this, SLOT(about()), Key_F1 ); - help->insertItem( "About &TQt", this, SLOT(aboutTQt()) ); + help->insertItem( "&About", this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt()) ); help->insertSeparator(); - help->insertItem( "What's &This", this, SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( "What's &This", this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 ); e = new TQTextEdit( this, "editor" ); e->setFocus(); diff --git a/examples/application/main.cpp b/examples/application/main.cpp index faf5eb0c..442af120 100644 --- a/examples/application/main.cpp +++ b/examples/application/main.cpp @@ -15,6 +15,6 @@ int main( int argc, char ** argv ) { ApplicationWindow *mw = new ApplicationWindow(); mw->setCaption( "TQt Example - Application" ); mw->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/examples/buttongroups/buttongroups.cpp b/examples/buttongroups/buttongroups.cpp index 2ec343d8..2ae71486 100644 --- a/examples/buttongroups/buttongroups.cpp +++ b/examples/buttongroups/buttongroups.cpp @@ -75,8 +75,8 @@ ButtonsGroups::ButtonsGroups( TQWidget *parent, const char *name ) // insert a checkbox... state = new TQCheckBox( "E&nable Radiobuttons", bgrp3 ); state->setChecked( TRUE ); - // ...and connect its SIGNAL clicked() with the SLOT slotChangeGrp3State() - connect( state, SIGNAL( clicked() ), this, SLOT( slotChangeGrp3State() ) ); + // ...and connect its TQ_SIGNAL clicked() with the TQ_SLOT slotChangeGrp3State() + connect( state, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChangeGrp3State() ) ); // ------------ fourth group @@ -107,7 +107,7 @@ ButtonsGroups::ButtonsGroups( TQWidget *parent, const char *name ) } /* - * SLOT slotChangeGrp3State() + * TQ_SLOT slotChangeGrp3State() * * enables/disables the radiobuttons of the third buttongroup */ diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp index 7e78c7ce..24744693 100644 --- a/examples/canvas/canvas.cpp +++ b/examples/canvas/canvas.cpp @@ -313,52 +313,52 @@ Main::Main(TQCanvas& c, TQWidget* parent, const char* name, WFlags f) : TQMenuBar* menu = menuBar(); TQPopupMenu* file = new TQPopupMenu( menu ); - file->insertItem("&Fill canvas", this, SLOT(init()), CTRL+Key_F); - file->insertItem("&Erase canvas", this, SLOT(clear()), CTRL+Key_E); - file->insertItem("&New view", this, SLOT(newView()), CTRL+Key_N); + file->insertItem("&Fill canvas", this, TQ_SLOT(init()), CTRL+Key_F); + file->insertItem("&Erase canvas", this, TQ_SLOT(clear()), CTRL+Key_E); + file->insertItem("&New view", this, TQ_SLOT(newView()), CTRL+Key_N); file->insertSeparator(); - file->insertItem("&Print...", this, SLOT(print()), CTRL+Key_P); + file->insertItem("&Print...", this, TQ_SLOT(print()), CTRL+Key_P); file->insertSeparator(); - file->insertItem("E&xit", tqApp, SLOT(quit()), CTRL+Key_Q); + file->insertItem("E&xit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q); menu->insertItem("&File", file); TQPopupMenu* edit = new TQPopupMenu( menu ); - edit->insertItem("Add &Circle", this, SLOT(addCircle()), ALT+Key_C); - edit->insertItem("Add &Hexagon", this, SLOT(addHexagon()), ALT+Key_H); - edit->insertItem("Add &Polygon", this, SLOT(addPolygon()), ALT+Key_P); - edit->insertItem("Add Spl&ine", this, SLOT(addSpline()), ALT+Key_I); - edit->insertItem("Add &Text", this, SLOT(addText()), ALT+Key_T); - edit->insertItem("Add &Line", this, SLOT(addLine()), ALT+Key_L); - edit->insertItem("Add &Rectangle", this, SLOT(addRectangle()), ALT+Key_R); - edit->insertItem("Add &Sprite", this, SLOT(addSprite()), ALT+Key_S); - edit->insertItem("Create &Mesh", this, SLOT(addMesh()), ALT+Key_M ); - edit->insertItem("Add &Alpha-blended image", this, SLOT(addButterfly()), ALT+Key_A); + edit->insertItem("Add &Circle", this, TQ_SLOT(addCircle()), ALT+Key_C); + edit->insertItem("Add &Hexagon", this, TQ_SLOT(addHexagon()), ALT+Key_H); + edit->insertItem("Add &Polygon", this, TQ_SLOT(addPolygon()), ALT+Key_P); + edit->insertItem("Add Spl&ine", this, TQ_SLOT(addSpline()), ALT+Key_I); + edit->insertItem("Add &Text", this, TQ_SLOT(addText()), ALT+Key_T); + edit->insertItem("Add &Line", this, TQ_SLOT(addLine()), ALT+Key_L); + edit->insertItem("Add &Rectangle", this, TQ_SLOT(addRectangle()), ALT+Key_R); + edit->insertItem("Add &Sprite", this, TQ_SLOT(addSprite()), ALT+Key_S); + edit->insertItem("Create &Mesh", this, TQ_SLOT(addMesh()), ALT+Key_M ); + edit->insertItem("Add &Alpha-blended image", this, TQ_SLOT(addButterfly()), ALT+Key_A); menu->insertItem("&Edit", edit); TQPopupMenu* view = new TQPopupMenu( menu ); - view->insertItem("&Enlarge", this, SLOT(enlarge()), SHIFT+CTRL+Key_Plus); - view->insertItem("Shr&ink", this, SLOT(shrink()), SHIFT+CTRL+Key_Minus); + view->insertItem("&Enlarge", this, TQ_SLOT(enlarge()), SHIFT+CTRL+Key_Plus); + view->insertItem("Shr&ink", this, TQ_SLOT(shrink()), SHIFT+CTRL+Key_Minus); view->insertSeparator(); - view->insertItem("&Rotate clockwise", this, SLOT(rotateClockwise()), CTRL+Key_PageDown); - view->insertItem("Rotate &counterclockwise", this, SLOT(rotateCounterClockwise()), CTRL+Key_PageUp); - view->insertItem("&Zoom in", this, SLOT(zoomIn()), CTRL+Key_Plus); - view->insertItem("Zoom &out", this, SLOT(zoomOut()), CTRL+Key_Minus); - view->insertItem("Translate left", this, SLOT(moveL()), CTRL+Key_Left); - view->insertItem("Translate right", this, SLOT(moveR()), CTRL+Key_Right); - view->insertItem("Translate up", this, SLOT(moveU()), CTRL+Key_Up); - view->insertItem("Translate down", this, SLOT(moveD()), CTRL+Key_Down); - view->insertItem("&Mirror", this, SLOT(mirror()), CTRL+Key_Home); + view->insertItem("&Rotate clockwise", this, TQ_SLOT(rotateClockwise()), CTRL+Key_PageDown); + view->insertItem("Rotate &counterclockwise", this, TQ_SLOT(rotateCounterClockwise()), CTRL+Key_PageUp); + view->insertItem("&Zoom in", this, TQ_SLOT(zoomIn()), CTRL+Key_Plus); + view->insertItem("Zoom &out", this, TQ_SLOT(zoomOut()), CTRL+Key_Minus); + view->insertItem("Translate left", this, TQ_SLOT(moveL()), CTRL+Key_Left); + view->insertItem("Translate right", this, TQ_SLOT(moveR()), CTRL+Key_Right); + view->insertItem("Translate up", this, TQ_SLOT(moveU()), CTRL+Key_Up); + view->insertItem("Translate down", this, TQ_SLOT(moveD()), CTRL+Key_Down); + view->insertItem("&Mirror", this, TQ_SLOT(mirror()), CTRL+Key_Home); menu->insertItem("&View", view); options = new TQPopupMenu( menu ); - dbf_id = options->insertItem("Double buffer", this, SLOT(toggleDoubleBuffer())); + dbf_id = options->insertItem("Double buffer", this, TQ_SLOT(toggleDoubleBuffer())); options->setItemChecked(dbf_id, TRUE); menu->insertItem("&Options",options); menu->insertSeparator(); TQPopupMenu* help = new TQPopupMenu( menu ); - help->insertItem("&About", this, SLOT(help()), Key_F1); + help->insertItem("&About", this, TQ_SLOT(help()), Key_F1); help->setItemChecked(dbf_id, TRUE); menu->insertItem("&Help",help); diff --git a/examples/canvas/main.cpp b/examples/canvas/main.cpp index 92c720d7..aad94c54 100644 --- a/examples/canvas/main.cpp +++ b/examples/canvas/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char** argv) else m.showMaximized(); - TQObject::connect( tqApp, SIGNAL(lastWindowClosed()), tqApp, SLOT(quit()) ); + TQObject::connect( tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit()) ); return app.exec(); } diff --git a/examples/chart/chartform.cpp b/examples/chart/chartform.cpp index c9106dc3..48300375 100644 --- a/examples/chart/chartform.cpp +++ b/examples/chart/chartform.cpp @@ -57,41 +57,41 @@ ChartForm::ChartForm( const TQString& filename ) fileNewAction = new TQAction( "New Chart", TQPixmap( file_new ), "&New", CTRL+Key_N, this, "new" ); - connect( fileNewAction, SIGNAL( activated() ), this, SLOT( fileNew() ) ); + connect( fileNewAction, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNew() ) ); fileOpenAction = new TQAction( "Open Chart", TQPixmap( file_open ), "&Open...", CTRL+Key_O, this, "open" ); - connect( fileOpenAction, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); + connect( fileOpenAction, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileOpen() ) ); fileSaveAction = new TQAction( "Save Chart", TQPixmap( file_save ), "&Save", CTRL+Key_S, this, "save" ); - connect( fileSaveAction, SIGNAL( activated() ), this, SLOT( fileSave() ) ); + connect( fileSaveAction, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSave() ) ); fileSaveAsAction = new TQAction( "Save Chart As", TQPixmap( file_save ), "Save &As...", 0, this, "save as" ); - connect( fileSaveAsAction, SIGNAL( activated() ), - this, SLOT( fileSaveAs() ) ); + connect( fileSaveAsAction, TQ_SIGNAL( activated() ), + this, TQ_SLOT( fileSaveAs() ) ); fileSaveAsPixmapAction = new TQAction( "Save Chart As Bitmap", TQPixmap( file_save ), "Save As &Bitmap...", CTRL+Key_B, this, "save as bitmap" ); - connect( fileSaveAsPixmapAction, SIGNAL( activated() ), - this, SLOT( fileSaveAsPixmap() ) ); + connect( fileSaveAsPixmapAction, TQ_SIGNAL( activated() ), + this, TQ_SLOT( fileSaveAsPixmap() ) ); filePrintAction = new TQAction( "Print Chart", TQPixmap( file_print ), "&Print Chart...", CTRL+Key_P, this, "print chart" ); - connect( filePrintAction, SIGNAL( activated() ), - this, SLOT( filePrint() ) ); + connect( filePrintAction, TQ_SIGNAL( activated() ), + this, TQ_SLOT( filePrint() ) ); optionsSetDataAction = new TQAction( "Set Data", TQPixmap( options_setdata ), "Set &Data...", CTRL+Key_D, this, "set data" ); - connect( optionsSetDataAction, SIGNAL( activated() ), - this, SLOT( optionsSetData() ) ); + connect( optionsSetDataAction, TQ_SIGNAL( activated() ), + this, TQ_SLOT( optionsSetData() ) ); TQActionGroup *chartGroup = new TQActionGroup( this ); // Connected later @@ -117,17 +117,17 @@ ChartForm::ChartForm( const TQString& filename ) optionsSetFontAction = new TQAction( "Set Font", TQPixmap( options_setfont ), "Set &Font...", CTRL+Key_F, this, "set font" ); - connect( optionsSetFontAction, SIGNAL( activated() ), - this, SLOT( optionsSetFont() ) ); + connect( optionsSetFontAction, TQ_SIGNAL( activated() ), + this, TQ_SLOT( optionsSetFont() ) ); optionsSetOptionsAction = new TQAction( "Set Options", TQPixmap( options_setoptions ), "Set &Options...", 0, this, "set options" ); - connect( optionsSetOptionsAction, SIGNAL( activated() ), - this, SLOT( optionsSetOptions() ) ); + connect( optionsSetOptionsAction, TQ_SIGNAL( activated() ), + this, TQ_SLOT( optionsSetOptions() ) ); fileQuitAction = new TQAction( "Quit", "&Quit", CTRL+Key_Q, this, "quit" ); - connect( fileQuitAction, SIGNAL( activated() ), this, SLOT( fileQuit() ) ); + connect( fileQuitAction, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileQuit() ) ); TQToolBar* fileTools = new TQToolBar( this, "file operations" ); @@ -179,9 +179,9 @@ ChartForm::ChartForm( const TQString& filename ) TQPopupMenu *helpMenu = new TQPopupMenu( this ); menuBar()->insertItem( "&Help", helpMenu ); - helpMenu->insertItem( "&Help", this, SLOT(helpHelp()), Key_F1 ); - helpMenu->insertItem( "&About", this, SLOT(helpAbout()) ); - helpMenu->insertItem( "About &TQt", this, SLOT(helpAboutTQt()) ); + helpMenu->insertItem( "&Help", this, TQ_SLOT(helpHelp()), Key_F1 ); + helpMenu->insertItem( "&About", this, TQ_SLOT(helpAbout()) ); + helpMenu->insertItem( "About &TQt", this, TQ_SLOT(helpAboutTQt()) ); m_printer = 0; @@ -213,8 +213,8 @@ ChartForm::ChartForm( const TQString& filename ) // Connect *after* we've set the chart type on so we don't call // drawElements() prematurely. - connect( chartGroup, SIGNAL( selected(TQAction*) ), - this, SLOT( updateChartType(TQAction*) ) ); + connect( chartGroup, TQ_SIGNAL( selected(TQAction*) ), + this, TQ_SLOT( updateChartType(TQAction*) ) ); resize( windowWidth, windowHeight ); if ( windowX != -1 || windowY != -1 ) @@ -358,7 +358,7 @@ void ChartForm::updateRecentFilesMenu() if ( i < int(m_recentFiles.count()) ) fileMenu->insertItem( TQString( "&%1 %2" ). arg( i + 1 ).arg( m_recentFiles[i] ), - this, SLOT( fileOpenRecent(int) ), + this, TQ_SLOT( fileOpenRecent(int) ), 0, i ); } } diff --git a/examples/chart/optionsform.cpp b/examples/chart/optionsform.cpp index 21ba4b51..543783c3 100644 --- a/examples/chart/optionsform.cpp +++ b/examples/chart/optionsform.cpp @@ -104,9 +104,9 @@ OptionsForm::OptionsForm( TQWidget* parent, const char* name, buttonsLayout->addWidget( cancelPushButton ); optionsFormLayout->addLayout( buttonsLayout ); - connect( fontPushButton, SIGNAL( clicked() ), this, SLOT( chooseFont() ) ); - connect( okPushButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( cancelPushButton, SIGNAL( clicked() ), this, SLOT( reject() ) ); + connect( fontPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( chooseFont() ) ); + connect( okPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( cancelPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); chartTypeTextLabel->setBuddy( chartTypeComboBox ); decimalPlacesTextLabel->setBuddy( decimalPlacesSpinBox ); diff --git a/examples/chart/setdataform.cpp b/examples/chart/setdataform.cpp index d13d2097..7de1e2b0 100644 --- a/examples/chart/setdataform.cpp +++ b/examples/chart/setdataform.cpp @@ -82,15 +82,15 @@ SetDataForm::SetDataForm( ElementVector *elements, int decimalPlaces, tableButtonBox->addLayout( buttonBox ); - connect( table, SIGNAL( clicked(int,int,int,const TQPoint&) ), - this, SLOT( setColor(int,int) ) ); - connect( table, SIGNAL( currentChanged(int,int) ), - this, SLOT( currentChanged(int,int) ) ); - connect( table, SIGNAL( valueChanged(int,int) ), - this, SLOT( valueChanged(int,int) ) ); - connect( colorPushButton, SIGNAL( clicked() ), this, SLOT( setColor() ) ); - connect( okPushButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( cancelPushButton, SIGNAL( clicked() ), this, SLOT( reject() ) ); + connect( table, TQ_SIGNAL( clicked(int,int,int,const TQPoint&) ), + this, TQ_SLOT( setColor(int,int) ) ); + connect( table, TQ_SIGNAL( currentChanged(int,int) ), + this, TQ_SLOT( currentChanged(int,int) ) ); + connect( table, TQ_SIGNAL( valueChanged(int,int) ), + this, TQ_SLOT( valueChanged(int,int) ) ); + connect( colorPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setColor() ) ); + connect( okPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( cancelPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); TQPixmap patterns[MAX_PATTERNS]; patterns[0] = TQPixmap( pattern01 ); diff --git a/examples/checklists/checklists.cpp b/examples/checklists/checklists.cpp index 08b11fc3..a75043ed 100644 --- a/examples/checklists/checklists.cpp +++ b/examples/checklists/checklists.cpp @@ -69,8 +69,8 @@ CheckLists::CheckLists( TQWidget *parent, const char *name ) TQPushButton *copy1 = new TQPushButton( " -> ", this ); tmp->addWidget( copy1 ); copy1->setMaximumWidth( copy1->sizeHint().width() ); - // connect the SIGNAL clicked() of the pushbutton with the SLOT copy1to2() - connect( copy1, SIGNAL( clicked() ), this, SLOT( copy1to2() ) ); + // connect the TQ_SIGNAL clicked() of the pushbutton with the TQ_SLOT copy1to2() + connect( copy1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( copy1to2() ) ); // another widget for layouting TQVBoxLayout *vbox2 = new TQVBoxLayout( lay ); @@ -93,8 +93,8 @@ CheckLists::CheckLists( TQWidget *parent, const char *name ) TQPushButton *copy2 = new TQPushButton( " -> ", this ); lay->addWidget( copy2 ); copy2->setMaximumWidth( copy2->sizeHint().width() ); - // ...and connect its clicked() SIGNAL to the copy2to3() SLOT - connect( copy2, SIGNAL( clicked() ), this, SLOT( copy2to3() ) ); + // ...and connect its clicked() TQ_SIGNAL to the copy2to3() TQ_SLOT + connect( copy2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( copy2to3() ) ); tmp = new TQVBoxLayout( lay ); tmp->setMargin( 5 ); @@ -105,7 +105,7 @@ CheckLists::CheckLists( TQWidget *parent, const char *name ) } /* - * SLOT copy1to2() + * TQ_SLOT copy1to2() * * Copies all checked ListViewItems from the first ListView to * the second one, and inserts them as Radio-ListViewItem. @@ -137,7 +137,7 @@ void CheckLists::copy1to2() } /* - * SLOT copy2to3() + * TQ_SLOT copy2to3() * * Copies the checked item of the second ListView into the * Label at the right. diff --git a/examples/customlayout/main.cpp b/examples/customlayout/main.cpp index c6ccf72e..b22f6ffc 100644 --- a/examples/customlayout/main.cpp +++ b/examples/customlayout/main.cpp @@ -36,7 +36,7 @@ int main( int argc, char **argv ) b1->add( new TQPushButton( "More text", f ) ); b1->add( new TQPushButton( "Even longer button text", f ) ); TQPushButton* qb = new TQPushButton( "Quit", f ); - a.connect( qb, SIGNAL( clicked() ), SLOT( quit() ) ); + a.connect( qb, TQ_SIGNAL( clicked() ), TQ_SLOT( quit() ) ); b1->add( qb ); TQWidget *wid = new TQWidget( f ); diff --git a/examples/demo/display.cpp b/examples/demo/display.cpp index 7ca28c82..7cc6a44a 100644 --- a/examples/demo/display.cpp +++ b/examples/demo/display.cpp @@ -160,8 +160,8 @@ DisplayWidget::DisplayWidget( TQWidget *parent, const char *name ) dial->setRange( -10, 10 ); dial->setValue( 1 ); screen->setStep( dial->value() ); - connect( dial, SIGNAL( valueChanged( int )), - screen, SLOT( setStep( int ))); + connect( dial, TQ_SIGNAL( valueChanged( int )), + screen, TQ_SLOT( setStep( int ))); lcd = new TQLCDNumber( 2, this ); lcd->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); lcdval = 0; @@ -172,7 +172,7 @@ DisplayWidget::DisplayWidget( TQWidget *parent, const char *name ) curve = new Curve( this ); spin = new TQSpinBox( 1, 10, 1, this ); - connect( spin, SIGNAL( valueChanged( int )), curve, SLOT( setFactor( int ))); + connect( spin, TQ_SIGNAL( valueChanged( int )), curve, TQ_SLOT( setFactor( int ))); spin->setValue( 2 ); vb2->addWidget( curve ); vb2->addWidget( spin ); @@ -192,7 +192,7 @@ void DisplayWidget::run() { if ( !timer ) { timer = new TQTimer( this ); - connect( timer, SIGNAL( timeout() ), SLOT( tick() ) ); + connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( tick() ) ); } timer->start( 5 ); diff --git a/examples/demo/dnd/iconview.cpp b/examples/demo/dnd/iconview.cpp index fe65c491..89cac969 100644 --- a/examples/demo/dnd/iconview.cpp +++ b/examples/demo/dnd/iconview.cpp @@ -7,8 +7,8 @@ IconView::IconView( TQWidget* parent, const char* name ) : TQIconView( parent, name ) { - connect( this, SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), - SLOT(slotNewItem(TQDropEvent*, const TQValueList<TQIconDragItem>&))); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), + TQ_SLOT(slotNewItem(TQDropEvent*, const TQValueList<TQIconDragItem>&))); } IconView::~IconView() diff --git a/examples/demo/dnd/styledbutton.cpp b/examples/demo/dnd/styledbutton.cpp index e04be631..690a1054 100644 --- a/examples/demo/dnd/styledbutton.cpp +++ b/examples/demo/dnd/styledbutton.cpp @@ -49,7 +49,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())); } StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name, WFlags f ) diff --git a/examples/demo/frame.cpp b/examples/demo/frame.cpp index 0cd5006a..a263b8b1 100644 --- a/examples/demo/frame.cpp +++ b/examples/demo/frame.cpp @@ -34,7 +34,7 @@ Frame::Frame( TQWidget *parent, const char *name ) { TQMenuBar *mainMenu = menuBar(); TQPopupMenu *fileMenu = new TQPopupMenu( this, "file" ); - fileMenu->insertItem( tr( "&Exit" ), this, SLOT( close() ), + fileMenu->insertItem( tr( "&Exit" ), this, TQ_SLOT( close() ), TQAccel::stringToKey( tr( "Ctrl+Q" ) ) ); TQPopupMenu *styleMenu = new TQPopupMenu( this, "style" ); @@ -42,8 +42,8 @@ Frame::Frame( TQWidget *parent, const char *name ) TQActionGroup *ag = new TQActionGroup( this, 0 ); ag->setExclusive( TRUE ); TQSignalMapper *styleMapper = new TQSignalMapper( this ); - connect( styleMapper, SIGNAL( mapped( const TQString& ) ), - this, SLOT( setStyle( const TQString& ) ) ); + connect( styleMapper, TQ_SIGNAL( mapped( const TQString& ) ), + this, TQ_SLOT( setStyle( const TQString& ) ) ); TQStringList list = TQStyleFactory::keys(); list.sort(); @@ -65,7 +65,7 @@ Frame::Frame( TQWidget *parent, const char *name ) } TQAction *a = new TQAction( style, TQIconSet(), styleAccel, 0, ag, 0, ag->isExclusive() ); - connect( a, SIGNAL( activated() ), styleMapper, SLOT(map()) ); + connect( a, TQ_SIGNAL( activated() ), styleMapper, TQ_SLOT(map()) ); styleMapper->setMapping( a, a->text() ); } ag->addTo( styleMenu ); @@ -117,7 +117,7 @@ TQWidget *Frame::createCategoryPage( CategoryInterface *c ) b->setTextPosition( TQToolButton::Right ); b->setUsesTextLabel( TRUE ); g->insert( b, i + c->categoryOffset() ); - connect( g, SIGNAL( clicked( int ) ), c, SLOT( setCurrentCategory( int ) ) ); + connect( g, TQ_SIGNAL( clicked( int ) ), c, TQ_SLOT( setCurrentCategory( int ) ) ); } return g; } diff --git a/examples/demo/graph.cpp b/examples/demo/graph.cpp index b99e93ac..257609f1 100644 --- a/examples/demo/graph.cpp +++ b/examples/demo/graph.cpp @@ -346,12 +346,12 @@ GraphWidget::GraphWidget( TQWidget *parent, const char *name) TQHBoxLayout* hb = new TQHBoxLayout( vb ); hb->addWidget( new TQLabel("Slow", this ) ); TQSlider* slider = new TQSlider( 0, 300, 25, d->speed, Horizontal, this ); - connect( slider, SIGNAL( valueChanged(int) ), this, SLOT( setSpeed(int) ) ); + connect( slider, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( setSpeed(int) ) ); hb->addWidget( slider ); hb->addWidget( new TQLabel("Fast", this ) ); hb->addSpacing( 10 ); TQPushButton* btn = new TQPushButton( "Shuffle Nodes", this ); - connect( btn, SIGNAL( clicked() ), this, SLOT( shuffle() ) ); + connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( shuffle() ) ); hb->addWidget( btn ); } diff --git a/examples/demo/i18n/i18n.cpp b/examples/demo/i18n/i18n.cpp index 925fdf13..4458e18b 100644 --- a/examples/demo/i18n/i18n.cpp +++ b/examples/demo/i18n/i18n.cpp @@ -34,8 +34,8 @@ I18nDemo::I18nDemo(TQWidget *parent, const char *name) box->setLineWidth( 1 ); workspace = new TQWorkspace(box); - connect(workspace, SIGNAL(windowActivated(TQWidget *)), - SLOT(windowActivated(TQWidget *))); + connect(workspace, TQ_SIGNAL(windowActivated(TQWidget *)), + TQ_SLOT(windowActivated(TQWidget *))); workspace->setBackgroundMode(PaletteMid); setCentralWidget(box); @@ -53,32 +53,32 @@ void I18nDemo::initActions() tr("Close"), CTRL + Key_F4, this); - connect(actionClose, SIGNAL(activated()), SLOT(closeSlot())); + connect(actionClose, TQ_SIGNAL(activated()), TQ_SLOT(closeSlot())); actionCloseAll = new TQAction(tr("Close all opened windows."), tr("Close All"), 0, this); - connect(actionCloseAll, SIGNAL(activated()), SLOT(closeAllSlot())); + connect(actionCloseAll, TQ_SIGNAL(activated()), TQ_SLOT(closeAllSlot())); actionTile = new TQAction(tr("Tile opened windows."), tr("Tile"), 0, this); - connect(actionTile, SIGNAL(activated()), SLOT(tileSlot())); + connect(actionTile, TQ_SIGNAL(activated()), TQ_SLOT(tileSlot())); actionCascade = new TQAction(tr("Cascade opened windows."), tr("Cascade"), 0, this); - connect(actionCascade, SIGNAL(activated()), SLOT(cascadeSlot())); + connect(actionCascade, TQ_SIGNAL(activated()), TQ_SLOT(cascadeSlot())); } void I18nDemo::initMenuBar() { newMenu = new TQPopupMenu(this); - connect(newMenu, SIGNAL(activated(int)), SLOT(newSlot(int))); + connect(newMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(newSlot(int))); newMenu->insertItem("&English", 0); newMenu->insertItem("&Japanese", 1); @@ -86,7 +86,7 @@ void I18nDemo::initMenuBar() newMenu->insertItem("&Norwegian", 3); windowMenu = new TQPopupMenu(this); - connect(windowMenu, SIGNAL(activated(int)), SLOT(windowSlot(int))); + connect(windowMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(windowSlot(int))); windowMenu->setCheckable(TRUE); @@ -123,7 +123,7 @@ void I18nDemo::newSlot(int id) tqApp->installTranslator(&wrapper->translator); - connect(wrapper, SIGNAL(destroyed()), SLOT(wrapperDead())); + connect(wrapper, TQ_SIGNAL(destroyed()), TQ_SLOT(wrapperDead())); wrapper->setCaption(tr("--language--")); TextEdit *te = new TextEdit(wrapper); diff --git a/examples/demo/opengl/glcontrolwidget.cpp b/examples/demo/opengl/glcontrolwidget.cpp index 5c75b948..b0d490e7 100644 --- a/examples/demo/opengl/glcontrolwidget.cpp +++ b/examples/demo/opengl/glcontrolwidget.cpp @@ -11,7 +11,7 @@ GLControlWidget::GLControlWidget( TQWidget *parent, const char *name, TQGLWidget { setCursor( pointingHandCursor ); timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(animate()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(animate()) ); timer->start( delay ); } diff --git a/examples/demo/opengl/glworkspace.cpp b/examples/demo/opengl/glworkspace.cpp index 3010d410..8d7541fc 100644 --- a/examples/demo/opengl/glworkspace.cpp +++ b/examples/demo/opengl/glworkspace.cpp @@ -50,13 +50,13 @@ void GLWorkspace::setupSceneActions() newGroup->setExclusive( FALSE ); newGroup->setIconSet( TQPixmap( "textdrawing/filenew.png" ) ); a = new TQAction( tr( "Wirebox" ), TQPixmap( "opengl/wirebox.xpm" ), tr( "&Wirebox" ), 0, newGroup ); - connect( a, SIGNAL( activated() ), this, SLOT( newWirebox() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( newWirebox() ) ); a = new TQAction( tr( "Gear" ), TQPixmap( "opengl/gear.xpm" ), tr( "&Gears" ), 0, newGroup ); - connect( a, SIGNAL( activated() ), this, SLOT( newGear() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( newGear() ) ); a = new TQAction( tr( "Texture" ), TQPixmap( "opengl/texture.xpm" ), tr( "&Texture" ), 0, newGroup ); - connect( a, SIGNAL( activated() ), this, SLOT( newTexture() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( newTexture() ) ); /* a = new TQAction( tr( "Nurbs" ), TQPixmap( "opengl/nurbs.xpm" ), tr( "&Nurbs" ), 0, newGroup ); - connect( a, SIGNAL( activated() ), this, SLOT( newNurbs() ) );*/ + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( newNurbs() ) );*/ newGroup->addTo( tb ); newGroup->addTo( menu ); @@ -68,21 +68,21 @@ void GLWorkspace::setupSceneActions() printGroup->setExclusive( FALSE ); printGroup->setIconSet( TQPixmap( "textdrawing/print.png" ) ); TQAction *da = new TQAction( tr( "Window Size" ), TQPixmap( "textdrawing/print.png" ), tr( "&Window Size" ), CTRL + Key_P, printGroup ); - connect( da, SIGNAL( activated() ), this, SLOT( filePrintWindowRes() ) ); + connect( da, TQ_SIGNAL( activated() ), this, TQ_SLOT( filePrintWindowRes() ) ); a = new TQAction( tr( "Low Resolution" ), tr( "&Low Resolution" ), 0, printGroup ); - connect( a, SIGNAL( activated() ), this, SLOT( filePrintLowRes() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( filePrintLowRes() ) ); a = new TQAction( tr( "Medium Resolution" ), tr( "&Medium Resolution" ), 0, printGroup ); - connect( a, SIGNAL( activated() ), this, SLOT( filePrintMedRes() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( filePrintMedRes() ) ); a = new TQAction( tr( "High Resolution" ), tr( "&High Resolution" ), 0, printGroup ); - connect( a, SIGNAL( activated() ), this, SLOT( filePrintHighRes() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( filePrintHighRes() ) ); printGroup->addSeparator(); a = new TQAction( tr( "Setup" ), tr( "&Setup..." ), 0, printGroup ); - connect( a, SIGNAL( activated() ), this, SLOT( filePrintSetup() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( filePrintSetup() ) ); da->addTo( tb ); printGroup->addTo( menu ); a = new TQAction( tr( "Close" ), TQPixmap(), tr( "&Close" ), 0, this ); - connect( a, SIGNAL( activated() ), this, SLOT( fileClose() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileClose() ) ); a->addTo( menu ); } diff --git a/examples/demo/qasteroids/toplevel.cpp b/examples/demo/qasteroids/toplevel.cpp index 973bc6c7..c2a22ea1 100644 --- a/examples/demo/qasteroids/toplevel.cpp +++ b/examples/demo/qasteroids/toplevel.cpp @@ -80,10 +80,10 @@ KAstTopLevel::KAstTopLevel( TQWidget *parent, const char *name ) view = new KAsteroidsView( mainWin ); view->setFocusPolicy( StrongFocus ); - connect( view, SIGNAL( shipKilled() ), SLOT( slotShipKilled() ) ); - connect( view, SIGNAL( rockHit(int) ), SLOT( slotRockHit(int) ) ); - connect( view, SIGNAL( rocksRemoved() ), SLOT( slotRocksRemoved() ) ); - connect( view, SIGNAL( updateVitals() ), SLOT( slotUpdateVitals() ) ); + connect( view, TQ_SIGNAL( shipKilled() ), TQ_SLOT( slotShipKilled() ) ); + connect( view, TQ_SIGNAL( rockHit(int) ), TQ_SLOT( slotRockHit(int) ) ); + connect( view, TQ_SIGNAL( rocksRemoved() ), TQ_SLOT( slotRocksRemoved() ) ); + connect( view, TQ_SIGNAL( updateVitals() ), TQ_SLOT( slotUpdateVitals() ) ); TQVBoxLayout *vb = new TQVBoxLayout( mainWin ); TQHBoxLayout *hb = new TQHBoxLayout; diff --git a/examples/demo/qasteroids/view.cpp b/examples/demo/qasteroids/view.cpp index 7aa86c4e..9e673a38 100644 --- a/examples/demo/qasteroids/view.cpp +++ b/examples/demo/qasteroids/view.cpp @@ -93,7 +93,7 @@ KAsteroidsView::KAsteroidsView( TQWidget *parent, const char *name ) initialized = readSprites(); shieldTimer = new TQTimer( this ); - connect( shieldTimer, SIGNAL(timeout()), this, SLOT(hideShield()) ); + connect( shieldTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideShield()) ); mTimerId = -1; shipPower = MAX_POWER_LEVEL; diff --git a/examples/demo/textdrawing/helpwindow.cpp b/examples/demo/textdrawing/helpwindow.cpp index 833caa17..01bb90ad 100644 --- a/examples/demo/textdrawing/helpwindow.cpp +++ b/examples/demo/textdrawing/helpwindow.cpp @@ -46,23 +46,23 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, browser = new TQTextBrowser( this ); browser->mimeSourceFactory()->setFilePath( _path ); browser->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - connect( browser, SIGNAL( textChanged() ), - this, SLOT( textChanged() ) ); + connect( browser, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( textChanged() ) ); setCentralWidget( browser ); if ( !home_.isEmpty() ) browser->setSource( home_ ); - connect( browser, SIGNAL( highlighted( const TQString&) ), - statusBar(), SLOT( message( const TQString&)) ); + connect( browser, TQ_SIGNAL( highlighted( const TQString&) ), + statusBar(), TQ_SLOT( message( const TQString&)) ); resize( 640,700 ); TQPopupMenu* file = new TQPopupMenu( this ); - file->insertItem( tr("&New Window"), this, SLOT( newWindow() ), ALT | Key_N ); - file->insertItem( tr("&Open File"), this, SLOT( openFile() ), ALT | Key_O ); - file->insertItem( tr("&Print"), this, SLOT( print() ), ALT | Key_P ); + file->insertItem( tr("&New Window"), this, TQ_SLOT( newWindow() ), ALT | Key_N ); + file->insertItem( tr("&Open File"), this, TQ_SLOT( openFile() ), ALT | Key_O ); + file->insertItem( tr("&Print"), this, TQ_SLOT( print() ), ALT | Key_P ); // The same three icons are used twice each. TQIconSet icon_back( TQPixmap("textdrawing/previous.png") ); @@ -71,29 +71,29 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, TQPopupMenu* go = new TQPopupMenu( this ); backwardId = go->insertItem( icon_back, - tr("&Backward"), browser, SLOT( backward() ), + tr("&Backward"), browser, TQ_SLOT( backward() ), ALT | Key_Left ); forwardId = go->insertItem( icon_forward, - tr("&Forward"), browser, SLOT( forward() ), + tr("&Forward"), browser, TQ_SLOT( forward() ), ALT | Key_Right ); - go->insertItem( icon_home, tr("&Home"), browser, SLOT( home() ) ); + go->insertItem( icon_home, tr("&Home"), browser, TQ_SLOT( home() ) ); hist = new TQPopupMenu( this ); TQStringList::Iterator it = history.begin(); for ( ; it != history.end(); ++it ) mHistory[ hist->insertItem( *it ) ] = *it; - connect( hist, SIGNAL( activated( int ) ), - this, SLOT( histChosen( int ) ) ); + connect( hist, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( histChosen( int ) ) ); bookm = new TQPopupMenu( this ); - bookm->insertItem( tr( "Add Bookmark" ), this, SLOT( addBookmark() ) ); + bookm->insertItem( tr( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) ); bookm->insertSeparator(); TQStringList::Iterator it2 = bookmarks.begin(); for ( ; it2 != bookmarks.end(); ++it2 ) mBookmarks[ bookm->insertItem( *it2 ) ] = *it2; - connect( bookm, SIGNAL( activated( int ) ), - this, SLOT( bookmChosen( int ) ) ); + connect( bookm, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( bookmChosen( int ) ) ); menuBar()->insertItem( tr("&File"), file ); menuBar()->insertItem( tr("&Go"), go ); @@ -102,29 +102,29 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, menuBar()->setItemEnabled( forwardId, FALSE); menuBar()->setItemEnabled( backwardId, FALSE); - connect( browser, SIGNAL( backwardAvailable( bool ) ), - this, SLOT( setBackwardAvailable( bool ) ) ); - connect( browser, SIGNAL( forwardAvailable( bool ) ), - this, SLOT( setForwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( backwardAvailable( bool ) ), + this, TQ_SLOT( setBackwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( forwardAvailable( bool ) ), + this, TQ_SLOT( setForwardAvailable( bool ) ) ); TQToolBar* toolbar = new TQToolBar( this ); addToolBar( toolbar, "Toolbar"); TQToolButton* button; - button = new TQToolButton( icon_back, tr("Backward"), "", browser, SLOT(backward()), toolbar ); - connect( browser, SIGNAL( backwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT(backward()), toolbar ); + connect( browser, TQ_SIGNAL( backwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( FALSE ); - button = new TQToolButton( icon_forward, tr("Forward"), "", browser, SLOT(forward()), toolbar ); - connect( browser, SIGNAL( forwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT(forward()), toolbar ); + connect( browser, TQ_SIGNAL( forwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( FALSE ); - button = new TQToolButton( icon_home, tr("Home"), "", browser, SLOT(home()), toolbar ); + button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT(home()), toolbar ); toolbar->addSeparator(); pathCombo = new TQComboBox( TRUE, toolbar ); - connect( pathCombo, SIGNAL( activated( const TQString & ) ), - this, SLOT( pathSelected( const TQString & ) ) ); + connect( pathCombo, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( pathSelected( const TQString & ) ) ); toolbar->setStretchableWidget( pathCombo ); setRightJustification( TRUE ); setDockEnabled( DockLeft, FALSE ); diff --git a/examples/demo/textdrawing/textedit.cpp b/examples/demo/textdrawing/textedit.cpp index c564f21b..5e203ed1 100644 --- a/examples/demo/textdrawing/textedit.cpp +++ b/examples/demo/textdrawing/textedit.cpp @@ -36,8 +36,8 @@ TextEdit::TextEdit( TQWidget *parent, const char *name ) setupTextActions(); tabWidget = new TQTabWidget( this ); - connect( tabWidget, SIGNAL( currentChanged( TQWidget * ) ), - this, SLOT( editorChanged( TQWidget * ) ) ); + connect( tabWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), + this, TQ_SLOT( editorChanged( TQWidget * ) ) ); setCentralWidget( tabWidget ); } @@ -49,28 +49,28 @@ void TextEdit::setupFileActions() TQAction *a; a = new TQAction( tr( "New" ), TQPixmap( "textdrawing/filenew.png" ), tr( "&New..." ), CTRL + Key_N, this, "fileNew" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNew() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( tr( "Open" ), TQPixmap( "textdrawing/fileopen.png" ), tr( "&Open..." ), CTRL + Key_O, this, "fileOpen" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileOpen() ) ); a->addTo( tb ); a->addTo( menu ); menu->insertSeparator(); a = new TQAction( tr( "Save" ), TQPixmap( "textdrawing/filesave.png" ), tr( "&Save..." ), CTRL + Key_S, this, "fileSave" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSave() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( tr( "Save As" ), TQPixmap(), tr( "Save &As..." ), 0, this, "fileSaveAs" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAs() ) ); a->addTo( menu ); menu->insertSeparator(); a = new TQAction( tr( "Print" ), TQPixmap( "textdrawing/print.png" ), tr( "&Print..." ), CTRL + Key_P, this, "filePrint" ); - connect( a, SIGNAL( activated() ), this, SLOT( filePrint() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( filePrint() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( tr( "Close" ), TQPixmap(), tr( "&Close" ), 0, this, "fileClose" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileClose() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileClose() ) ); a->addTo( menu ); } @@ -82,24 +82,24 @@ void TextEdit::setupEditActions() TQAction *a; a = new TQAction( tr( "Undo" ), TQPixmap( "textdrawing/undo.png" ), tr( "&Undo" ), CTRL + Key_Z, this, "editUndo" ); - connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editUndo() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( tr( "Redo" ), TQPixmap( "textdrawing/redo.png" ), tr( "&Redo" ), CTRL + Key_Y, this, "editRedo" ); - connect( a, SIGNAL( activated() ), this, SLOT( editRedo() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRedo() ) ); a->addTo( tb ); a->addTo( menu ); menu->insertSeparator(); a = new TQAction( tr( "Cut" ), TQPixmap( "textdrawing/editcut.png" ), tr( "&Cut" ), CTRL + Key_X, this, "editCut" ); - connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCut() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( tr( "Copy" ), TQPixmap( "textdrawing/editcopy.png" ), tr( "C&opy" ), CTRL + Key_C, this, "editCopy" ); - connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCopy() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( tr( "Paste" ), TQPixmap( "textdrawing/editpaste.png" ), tr( "&Paste" ), CTRL + Key_V, this, "editPaste" ); - connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPaste() ) ); a->addTo( tb ); a->addTo( menu ); } @@ -118,14 +118,14 @@ void TextEdit::setupTextActions() comboStyle->insertItem( tr("Ordered List (Decimal)") ); comboStyle->insertItem( tr("Ordered List (Alpha lower)") ); comboStyle->insertItem( tr("Ordered List (Alpha upper)") ); - connect( comboStyle, SIGNAL( activated( int ) ), - this, SLOT( textStyle( int ) ) ); + connect( comboStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( textStyle( int ) ) ); comboFont = new TQComboBox( TRUE, tb ); TQFontDatabase db; comboFont->insertStringList( db.families() ); - connect( comboFont, SIGNAL( activated( const TQString & ) ), - this, SLOT( textFamily( const TQString & ) ) ); + connect( comboFont, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( textFamily( const TQString & ) ) ); comboFont->lineEdit()->setText( TQApplication::font().family() ); comboSize = new TQComboBox( TRUE, tb ); @@ -133,22 +133,22 @@ void TextEdit::setupTextActions() TQValueList<int>::Iterator it = sizes.begin(); for ( ; it != sizes.end(); ++it ) comboSize->insertItem( TQString::number( *it ) ); - connect( comboSize, SIGNAL( activated( const TQString & ) ), - this, SLOT( textSize( const TQString & ) ) ); + connect( comboSize, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( textSize( const TQString & ) ) ); comboSize->lineEdit()->setText( TQString::number( TQApplication::font().pointSize() ) ); actionTextBold = new TQAction( tr( "Bold" ), TQPixmap( "textdrawing/textbold.png" ), tr( "&Bold" ), CTRL + Key_B, this, "textBold" ); - connect( actionTextBold, SIGNAL( activated() ), this, SLOT( textBold() ) ); + connect( actionTextBold, TQ_SIGNAL( activated() ), this, TQ_SLOT( textBold() ) ); actionTextBold->addTo( tb ); actionTextBold->addTo( menu ); actionTextBold->setToggleAction( TRUE ); actionTextItalic = new TQAction( tr( "Italic" ), TQPixmap( "textdrawing/textitalic.png" ), tr( "&Italic" ), CTRL + Key_I, this, "textItalic" ); - connect( actionTextItalic, SIGNAL( activated() ), this, SLOT( textItalic() ) ); + connect( actionTextItalic, TQ_SIGNAL( activated() ), this, TQ_SLOT( textItalic() ) ); actionTextItalic->addTo( tb ); actionTextItalic->addTo( menu ); actionTextItalic->setToggleAction( TRUE ); actionTextUnderline = new TQAction( tr( "Underline" ), TQPixmap( "textdrawing/textunderline.png" ), tr( "&Underline" ), CTRL + Key_U, this, "textUnderline" ); - connect( actionTextUnderline, SIGNAL( activated() ), this, SLOT( textUnderline() ) ); + connect( actionTextUnderline, TQ_SIGNAL( activated() ), this, TQ_SLOT( textUnderline() ) ); actionTextUnderline->addTo( tb ); actionTextUnderline->addTo( menu ); actionTextUnderline->setToggleAction( TRUE ); @@ -156,7 +156,7 @@ void TextEdit::setupTextActions() TQActionGroup *grp = new TQActionGroup( this ); grp->setExclusive( TRUE ); - connect( grp, SIGNAL( selected( TQAction* ) ), this, SLOT( textAlign( TQAction* ) ) ); + connect( grp, TQ_SIGNAL( selected( TQAction* ) ), this, TQ_SLOT( textAlign( TQAction* ) ) ); actionAlignLeft = new TQAction( tr( "Left" ), TQPixmap( "textdrawing/textleft.png" ), tr( "&Left" ), CTRL + Key_L, grp, "textLeft" ); actionAlignLeft->addTo( tb ); @@ -180,7 +180,7 @@ void TextEdit::setupTextActions() TQPixmap pix( 16, 16 ); pix.fill( black ); actionTextColor = new TQAction( tr( "Color" ), pix, tr( "&Color..." ), 0, this, "textColor" ); - connect( actionTextColor, SIGNAL( activated() ), this, SLOT( textColor() ) ); + connect( actionTextColor, TQ_SIGNAL( activated() ), this, TQ_SLOT( textColor() ) ); actionTextColor->addTo( tb ); actionTextColor->addTo( menu ); } @@ -215,12 +215,12 @@ TQTextEdit *TextEdit::currentEditor() const void TextEdit::doConnections( TQTextEdit *e ) { - connect( e, SIGNAL( currentFontChanged( const TQFont & ) ), - this, SLOT( fontChanged( const TQFont & ) ) ); - connect( e, SIGNAL( currentColorChanged( const TQColor & ) ), - this, SLOT( colorChanged( const TQColor & ) ) ); - connect( e, SIGNAL( currentAlignmentChanged( int ) ), - this, SLOT( alignmentChanged( int ) ) ); + connect( e, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), + this, TQ_SLOT( fontChanged( const TQFont & ) ) ); + connect( e, TQ_SIGNAL( currentColorChanged( const TQColor & ) ), + this, TQ_SLOT( colorChanged( const TQColor & ) ) ); + connect( e, TQ_SIGNAL( currentAlignmentChanged( int ) ), + this, TQ_SLOT( alignmentChanged( int ) ) ); } void TextEdit::fileNew() diff --git a/examples/dirview/dirview.cpp b/examples/dirview/dirview.cpp index 9c04a4b6..0e12751e 100644 --- a/examples/dirview/dirview.cpp +++ b/examples/dirview/dirview.cpp @@ -284,16 +284,16 @@ DirectoryView::DirectoryView( TQWidget *parent, const char *name, bool sdo ) fileNormal = new TQPixmap( pix_file ); } - connect( this, SIGNAL( doubleClicked( TQListViewItem * ) ), - this, SLOT( slotFolderSelected( TQListViewItem * ) ) ); - connect( this, SIGNAL( returnPressed( TQListViewItem * ) ), - this, SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); setAcceptDrops( TRUE ); viewport()->setAcceptDrops( TRUE ); - connect( autoopen_timer, SIGNAL( timeout() ), - this, SLOT( openFolder() ) ); + connect( autoopen_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( openFolder() ) ); } void DirectoryView::slotFolderSelected( TQListViewItem *i ) diff --git a/examples/distributor/distributor.ui.h b/examples/distributor/distributor.ui.h index 01c6b9bd..93e6826c 100644 --- a/examples/distributor/distributor.ui.h +++ b/examples/distributor/distributor.ui.h @@ -22,7 +22,7 @@ void Distributor::init() { timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(checkLibData()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(checkLibData()) ); cancelButton()->setAutoDefault( FALSE ); backButton()->setAutoDefault( FALSE ); diff --git a/examples/distributor/main.cpp b/examples/distributor/main.cpp index 743ae88e..37c51c80 100644 --- a/examples/distributor/main.cpp +++ b/examples/distributor/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char ** argv ) TQApplication a( argc, argv ); Distributor w; 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/examples/dragdrop/dropsite.cpp b/examples/dragdrop/dropsite.cpp index 18c5b60c..7257e6ed 100644 --- a/examples/dragdrop/dropsite.cpp +++ b/examples/dragdrop/dropsite.cpp @@ -122,7 +122,7 @@ DragMoviePlayer::DragMoviePlayer( TQDragObject* p ) : dobj(p), movie("trolltech.gif" ) { - movie.connectUpdate(this,SLOT(updatePixmap(const TQRect&))); + movie.connectUpdate(this,TQ_SLOT(updatePixmap(const TQRect&))); } void DragMoviePlayer::updatePixmap( const TQRect& ) diff --git a/examples/dragdrop/main.cpp b/examples/dragdrop/main.cpp index 2af77d59..3a618b60 100644 --- a/examples/dragdrop/main.cpp +++ b/examples/dragdrop/main.cpp @@ -44,8 +44,8 @@ static void addStuff( TQWidget * parent, bool image, bool secret = FALSE ) tll->activate(); parent->resize( parent->sizeHint() ); - TQObject::connect( d, SIGNAL(message(const TQString&)), - format, SLOT(setText(const TQString&)) ); + TQObject::connect( d, TQ_SIGNAL(message(const TQString&)), + format, TQ_SLOT(setText(const TQString&)) ); } @@ -68,6 +68,6 @@ int main( int argc, char ** argv ) mw3.setCaption( "TQt Example - Drag and Drop" ); mw3.show(); - TQObject::connect(tqApp,SIGNAL(lastWindowClosed()),tqApp,SLOT(quit())); + TQObject::connect(tqApp,TQ_SIGNAL(lastWindowClosed()),tqApp,TQ_SLOT(quit())); return a.exec(); } diff --git a/examples/drawdemo/drawdemo.cpp b/examples/drawdemo/drawdemo.cpp index 4d5ab201..5fc1e0f7 100644 --- a/examples/drawdemo/drawdemo.cpp +++ b/examples/drawdemo/drawdemo.cpp @@ -162,7 +162,7 @@ DrawView::DrawView() // Create a button group to contain all buttons bgroup = new TQButtonGroup( this ); bgroup->resize( 200, 200 ); - connect( bgroup, SIGNAL(clicked(int)), SLOT(updateIt(int)) ); + connect( bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(updateIt(int)) ); // Calculate the size for the radio buttons int maxwidth = 80; @@ -219,7 +219,7 @@ DrawView::DrawView() print = new TQPushButton( "Print...", bgroup ); print->resize( 80, 30 ); print->move( maxwidth/2 - print->width()/2, maxindex*30+20 ); - connect( print, SIGNAL(clicked()), SLOT(printIt()) ); + connect( print, TQ_SIGNAL(clicked()), TQ_SLOT(printIt()) ); // Resize bgroup to its final size when printersupport is given. bgroup->resize( maxwidth, print->y()+print->height()+10 ); diff --git a/examples/extension/main.cpp b/examples/extension/main.cpp index 98579af1..0bcaef44 100644 --- a/examples/extension/main.cpp +++ b/examples/extension/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char ** argv ) TQApplication a( argc, argv ); MainForm *w = new MainForm; w->show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), w, SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), w, TQ_SLOT( quit() ) ); return a.exec(); } diff --git a/examples/fileiconview/mainwindow.cpp b/examples/fileiconview/mainwindow.cpp index 2d2791ed..d2d6f2ed 100644 --- a/examples/fileiconview/mainwindow.cpp +++ b/examples/fileiconview/mainwindow.cpp @@ -97,8 +97,8 @@ void FileMainWindow::setup() pathCombo = new TQComboBox( TRUE, toolbar ); pathCombo->setAutoCompletion( TRUE ); toolbar->setStretchableWidget( pathCombo ); - connect( pathCombo, SIGNAL( activated( const TQString & ) ), - this, SLOT ( changePath( const TQString & ) ) ); + connect( pathCombo, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT ( changePath( const TQString & ) ) ); toolbar->addSeparator(); @@ -106,22 +106,22 @@ void FileMainWindow::setup() pix = TQPixmap( cdtoparent_xpm ); upButton = new TQToolButton( pix, "One directory up", TQString::null, - this, SLOT( cdUp() ), toolbar, "cd up" ); + this, TQ_SLOT( cdUp() ), toolbar, "cd up" ); pix = TQPixmap( newfolder_xpm ); mkdirButton = new TQToolButton( pix, "New Folder", TQString::null, - this, SLOT( newFolder() ), toolbar, "new folder" ); - - connect( dirlist, SIGNAL( folderSelected( const TQString & ) ), - fileview, SLOT ( setDirectory( const TQString & ) ) ); - connect( fileview, SIGNAL( directoryChanged( const TQString & ) ), - this, SLOT( directoryChanged( const TQString & ) ) ); - connect( fileview, SIGNAL( startReadDir( int ) ), - this, SLOT( slotStartReadDir( int ) ) ); - connect( fileview, SIGNAL( readNextDir() ), - this, SLOT( slotReadNextDir() ) ); - connect( fileview, SIGNAL( readDirDone() ), - this, SLOT( slotReadDirDone() ) ); + this, TQ_SLOT( newFolder() ), toolbar, "new folder" ); + + connect( dirlist, TQ_SIGNAL( folderSelected( const TQString & ) ), + fileview, TQ_SLOT ( setDirectory( const TQString & ) ) ); + connect( fileview, TQ_SIGNAL( directoryChanged( const TQString & ) ), + this, TQ_SLOT( directoryChanged( const TQString & ) ) ); + connect( fileview, TQ_SIGNAL( startReadDir( int ) ), + this, TQ_SLOT( slotStartReadDir( int ) ) ); + connect( fileview, TQ_SIGNAL( readNextDir() ), + this, TQ_SLOT( slotReadNextDir() ) ); + connect( fileview, TQ_SIGNAL( readDirDone() ), + this, TQ_SLOT( slotReadDirDone() ) ); setDockEnabled( DockLeft, FALSE ); setDockEnabled( DockRight, FALSE ); @@ -131,14 +131,14 @@ void FileMainWindow::setup() progress = new TQProgressBar( statusBar() ); statusBar()->addWidget( progress, 1, TRUE ); - connect( fileview, SIGNAL( enableUp() ), - this, SLOT( enableUp() ) ); - connect( fileview, SIGNAL( disableUp() ), - this, SLOT( disableUp() ) ); - connect( fileview, SIGNAL( enableMkdir() ), - this, SLOT( enableMkdir() ) ); - connect( fileview, SIGNAL( disableMkdir() ), - this, SLOT( disableMkdir() ) ); + connect( fileview, TQ_SIGNAL( enableUp() ), + this, TQ_SLOT( enableUp() ) ); + connect( fileview, TQ_SIGNAL( disableUp() ), + this, TQ_SLOT( disableUp() ) ); + connect( fileview, TQ_SIGNAL( enableMkdir() ), + this, TQ_SLOT( enableMkdir() ) ); + connect( fileview, TQ_SIGNAL( disableMkdir() ), + this, TQ_SLOT( disableMkdir() ) ); } void FileMainWindow::setPathCombo() diff --git a/examples/fileiconview/qfileiconview.cpp b/examples/fileiconview/qfileiconview.cpp index 1c735a9b..ed636bd1 100644 --- a/examples/fileiconview/qfileiconview.cpp +++ b/examples/fileiconview/qfileiconview.cpp @@ -326,8 +326,8 @@ TQtFileIconViewItem::TQtFileIconViewItem( TQtFileIconView *parent, TQFileInfo *f checkSetText = TRUE; - TQObject::connect( &timer, SIGNAL( timeout() ), - iconView(), SLOT( openFolder() ) ); + TQObject::connect( &timer, TQ_SIGNAL( timeout() ), + iconView(), TQ_SLOT( openFolder() ) ); } void TQtFileIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg ) @@ -498,14 +498,14 @@ TQtFileIconView::TQtFileIconView( const TQString &dir, TQWidget *parent, const c setResizeMode( Adjust ); setWordWrapIconText( FALSE ); - connect( this, SIGNAL( doubleClicked( TQIconViewItem * ) ), - this, SLOT( itemDoubleClicked( TQIconViewItem * ) ) ); - connect( this, SIGNAL( returnPressed( TQIconViewItem * ) ), - this, SLOT( itemDoubleClicked( TQIconViewItem * ) ) ); - connect( this, SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), - this, SLOT( slotDropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) ); - connect( this, SIGNAL( contextMenuRequested( TQIconViewItem *, const TQPoint & ) ), - this, SLOT( slotRightPressed( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), + this, TQ_SLOT( slotDropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQIconViewItem *, const TQPoint & ) ), + this, TQ_SLOT( slotRightPressed( TQIconViewItem * ) ) ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( Auto ); @@ -780,22 +780,22 @@ void TQtFileIconView::slotRightPressed( TQIconViewItem *item ) if ( !item ) { // right pressed on viewport TQPopupMenu menu( this ); - menu.insertItem( "&Large view", this, SLOT( viewLarge() ) ); - menu.insertItem( "&Small view", this, SLOT( viewSmall() ) ); + menu.insertItem( "&Large view", this, TQ_SLOT( viewLarge() ) ); + menu.insertItem( "&Small view", this, TQ_SLOT( viewSmall() ) ); menu.insertSeparator(); - menu.insertItem( "Text at the &bottom", this, SLOT( viewBottom() ) ); - menu.insertItem( "Text at the &right", this, SLOT( viewRight() ) ); + menu.insertItem( "Text at the &bottom", this, TQ_SLOT( viewBottom() ) ); + menu.insertItem( "Text at the &right", this, TQ_SLOT( viewRight() ) ); menu.insertSeparator(); - menu.insertItem( "Arrange l&eft to right", this, SLOT( flowEast() ) ); - menu.insertItem( "Arrange t&op to bottom", this, SLOT( flowSouth() ) ); + menu.insertItem( "Arrange l&eft to right", this, TQ_SLOT( flowEast() ) ); + menu.insertItem( "Arrange t&op to bottom", this, TQ_SLOT( flowSouth() ) ); menu.insertSeparator(); - menu.insertItem( "&Truncate item text", this, SLOT( itemTextTruncate() ) ); - menu.insertItem( "&Wordwrap item text", this, SLOT( itemTextWordWrap() ) ); + menu.insertItem( "&Truncate item text", this, TQ_SLOT( itemTextTruncate() ) ); + menu.insertItem( "&Wordwrap item text", this, TQ_SLOT( itemTextWordWrap() ) ); menu.insertSeparator(); - menu.insertItem( "Arrange items in &grid", this, SLOT( arrangeItemsInGrid() ) ); + menu.insertItem( "Arrange items in &grid", this, TQ_SLOT( arrangeItemsInGrid() ) ); menu.insertSeparator(); - menu.insertItem( "Sort &ascending", this, SLOT( sortAscending() ) ); - menu.insertItem( "Sort &descending", this, SLOT( sortDescending() ) ); + menu.insertItem( "Sort &ascending", this, TQ_SLOT( sortAscending() ) ); + menu.insertItem( "Sort &descending", this, TQ_SLOT( sortDescending() ) ); menu.setMouseTracking( TRUE ); menu.exec( TQCursor::pos() ); diff --git a/examples/fonts/simple-qfont-demo/viewer.cpp b/examples/fonts/simple-qfont-demo/viewer.cpp index 990449ad..2e60808c 100644 --- a/examples/fonts/simple-qfont-demo/viewer.cpp +++ b/examples/fonts/simple-qfont-demo/viewer.cpp @@ -28,20 +28,20 @@ Viewer::Viewer() defaultButton = new TQPushButton( "Default", this, "pushbutton1" ); defaultButton->setFont( TQFont( "times" ) ); - connect( defaultButton, SIGNAL( clicked() ), - this, SLOT( setDefault() ) ); + connect( defaultButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( setDefault() ) ); sansSerifButton = new TQPushButton( "Sans Serif", this, "pushbutton2" ); sansSerifButton->setFont( TQFont( "Helvetica", 12 ) ); - connect( sansSerifButton, SIGNAL( clicked() ), - this, SLOT( setSansSerif() ) ); + connect( sansSerifButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( setSansSerif() ) ); italicsButton = new TQPushButton( "Italics", this, "pushbutton3" ); italicsButton->setFont( TQFont( "lucida", 12, TQFont::Bold, TRUE ) ); - connect( italicsButton, SIGNAL( clicked() ), - this, SLOT( setItalics() ) ); + connect( italicsButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( setItalics() ) ); layout(); } diff --git a/examples/forever/forever.cpp b/examples/forever/forever.cpp index e21dfef6..24e5af91 100644 --- a/examples/forever/forever.cpp +++ b/examples/forever/forever.cpp @@ -34,8 +34,8 @@ Forever::Forever( TQWidget *parent, const char *name ) rectangles = 0; startTimer( 0 ); // run continuous timer TQTimer * counter = new TQTimer( this ); - connect( counter, SIGNAL(timeout()), - this, SLOT(updateCaption()) ); + connect( counter, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateCaption()) ); counter->start( 1000 ); } diff --git a/examples/hello/hello.cpp b/examples/hello/hello.cpp index a1782cf0..a1f5f9ed 100644 --- a/examples/hello/hello.cpp +++ b/examples/hello/hello.cpp @@ -22,7 +22,7 @@ Hello::Hello( const char *text, TQWidget *parent, const char *name ) : TQWidget(parent,name), t(text), b(0) { TQTimer *timer = new TQTimer(this); - connect( timer, SIGNAL(timeout()), SLOT(animate()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(animate()) ); timer->start( 40 ); resize( 260, 130 ); diff --git a/examples/hello/main.cpp b/examples/hello/main.cpp index 95fd3773..22608f09 100644 --- a/examples/hello/main.cpp +++ b/examples/hello/main.cpp @@ -31,7 +31,7 @@ int main( int argc, char **argv ) #ifndef TQT_NO_WIDGET_TOPEXTRA // for TQt/Embedded minimal build h.setCaption( "TQt says hello" ); #endif - TQObject::connect( &h, SIGNAL(clicked()), &a, SLOT(quit()) ); + TQObject::connect( &h, TQ_SIGNAL(clicked()), &a, TQ_SLOT(quit()) ); h.setFont( TQFont("times",32,TQFont::Bold) ); // default font h.setBackgroundColor( TQt::white ); // default bg color a.setMainWidget( &h ); diff --git a/examples/helpdemo/helpdemo.cpp b/examples/helpdemo/helpdemo.cpp index 4ca9039e..88ed7cb9 100644 --- a/examples/helpdemo/helpdemo.cpp +++ b/examples/helpdemo/helpdemo.cpp @@ -28,11 +28,11 @@ HelpDemo::HelpDemo( TQWidget *parent, const char *name ) TQAction *helpAction = new TQAction( "Show Help", TQKeySequence(tr("F1")), this ); helpAction->addTo( menu ); - connect( helpAction, SIGNAL(activated()), this, SLOT(showHelp()) ); - connect( assistant, SIGNAL(assistantOpened()), this, SLOT(assistantOpened()) ); - connect( assistant, SIGNAL(assistantClosed()), this, SLOT(assistantClosed())); - connect( assistant, SIGNAL(error(const TQString&)), - this, SLOT(showAssistantErrors(const TQString&)) ); + connect( helpAction, TQ_SIGNAL(activated()), this, TQ_SLOT(showHelp()) ); + connect( assistant, TQ_SIGNAL(assistantOpened()), this, TQ_SLOT(assistantOpened()) ); + connect( assistant, TQ_SIGNAL(assistantClosed()), this, TQ_SLOT(assistantClosed())); + connect( assistant, TQ_SIGNAL(error(const TQString&)), + this, TQ_SLOT(showAssistantErrors(const TQString&)) ); closeTQAButton->setEnabled(FALSE); } diff --git a/examples/helpdemo/main.cpp b/examples/helpdemo/main.cpp index acf769b6..f632cfc2 100644 --- a/examples/helpdemo/main.cpp +++ b/examples/helpdemo/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char ** argv ) TQApplication a( argc, argv ); HelpDemo help; help.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/examples/helpsystem/mainwindow.cpp b/examples/helpsystem/mainwindow.cpp index cb64166b..95b2786f 100644 --- a/examples/helpsystem/mainwindow.cpp +++ b/examples/helpsystem/mainwindow.cpp @@ -59,9 +59,9 @@ MainWindow::MainWindow() menuBar()->insertItem( "&File", fileMenu ); menuBar()->insertItem( "&Help", helpMenu ); - int fileId = fileMenu->insertItem( "E&xit", this, SLOT(close()) ); + int fileId = fileMenu->insertItem( "E&xit", this, TQ_SLOT(close()) ); - int helpId = helpMenu->insertItem( "Open Assistant", this, SLOT(assistantSlot()) ); + int helpId = helpMenu->insertItem( "Open Assistant", this, TQ_SLOT(assistantSlot()) ); // populate toolbar TQToolBar* toolbar = new TQToolBar( this ); @@ -71,9 +71,9 @@ MainWindow::MainWindow() //create tooltipgroup TQToolTipGroup * tipGroup = new TQToolTipGroup( this ); - connect( tipGroup, SIGNAL(showTip(const TQString&)), statusBar(), - SLOT(message(const TQString&)) ); - connect( tipGroup, SIGNAL(removeTip()), statusBar(), SLOT(clear()) ); + connect( tipGroup, TQ_SIGNAL(showTip(const TQString&)), statusBar(), + TQ_SLOT(message(const TQString&)) ); + connect( tipGroup, TQ_SIGNAL(removeTip()), statusBar(), TQ_SLOT(clear()) ); // set up tooltips TQToolTip::add( assistantButton, tr ("Open Assistant"), tipGroup, "Opens TQt Assistant" ); @@ -95,13 +95,13 @@ MainWindow::MainWindow() helpMenu->setWhatsThis( helpId, "Click here to open Assistant" ); // connections - connect( assistantButton, SIGNAL(clicked()), this, SLOT(assistantSlot()) ); - connect( horizontalWhatsThis, SIGNAL(linkClicked(const TQString&)), assistant, - SLOT(showPage(const TQString&)) ); - connect( verticalWhatsThis, SIGNAL(linkClicked(const TQString&)), assistant, - SLOT(showPage(const TQString&)) ); - connect( cellWhatsThis, SIGNAL(linkClicked(const TQString&)), assistant, - SLOT(showPage(const TQString&)) ); + connect( assistantButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(assistantSlot()) ); + connect( horizontalWhatsThis, TQ_SIGNAL(linkClicked(const TQString&)), assistant, + TQ_SLOT(showPage(const TQString&)) ); + connect( verticalWhatsThis, TQ_SIGNAL(linkClicked(const TQString&)), assistant, + TQ_SLOT(showPage(const TQString&)) ); + connect( cellWhatsThis, TQ_SIGNAL(linkClicked(const TQString&)), assistant, + TQ_SLOT(showPage(const TQString&)) ); } MainWindow::~MainWindow() diff --git a/examples/helpviewer/helpwindow.cpp b/examples/helpviewer/helpwindow.cpp index 7bdbad8a..140a9333 100644 --- a/examples/helpviewer/helpwindow.cpp +++ b/examples/helpviewer/helpwindow.cpp @@ -47,26 +47,26 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, browser->mimeSourceFactory()->setFilePath( _path ); browser->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - connect( browser, SIGNAL( sourceChanged(const TQString& ) ), - this, SLOT( sourceChanged( const TQString&) ) ); + connect( browser, TQ_SIGNAL( sourceChanged(const TQString& ) ), + this, TQ_SLOT( sourceChanged( const TQString&) ) ); setCentralWidget( browser ); if ( !home_.isEmpty() ) browser->setSource( home_ ); - connect( browser, SIGNAL( highlighted( const TQString&) ), - statusBar(), SLOT( message( const TQString&)) ); + connect( browser, TQ_SIGNAL( highlighted( const TQString&) ), + statusBar(), TQ_SLOT( message( const TQString&)) ); resize( 640,700 ); TQPopupMenu* file = new TQPopupMenu( this ); - file->insertItem( tr("&New Window"), this, SLOT( newWindow() ), CTRL+Key_N ); - file->insertItem( tr("&Open File"), this, SLOT( openFile() ), CTRL+Key_O ); - file->insertItem( tr("&Print"), this, SLOT( print() ), CTRL+Key_P ); + file->insertItem( tr("&New Window"), this, TQ_SLOT( newWindow() ), CTRL+Key_N ); + file->insertItem( tr("&Open File"), this, TQ_SLOT( openFile() ), CTRL+Key_O ); + file->insertItem( tr("&Print"), this, TQ_SLOT( print() ), CTRL+Key_P ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, SLOT( close() ), CTRL+Key_Q ); - file->insertItem( tr("E&xit"), tqApp, SLOT( closeAllWindows() ), CTRL+Key_X ); + file->insertItem( tr("&Close"), this, TQ_SLOT( close() ), CTRL+Key_Q ); + file->insertItem( tr("E&xit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_X ); // The same three icons are used twice each. TQIconSet icon_back( TQPixmap("back.xpm") ); @@ -75,33 +75,33 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, TQPopupMenu* go = new TQPopupMenu( this ); backwardId = go->insertItem( icon_back, - tr("&Backward"), browser, SLOT( backward() ), + tr("&Backward"), browser, TQ_SLOT( backward() ), CTRL+Key_Left ); forwardId = go->insertItem( icon_forward, - tr("&Forward"), browser, SLOT( forward() ), + tr("&Forward"), browser, TQ_SLOT( forward() ), CTRL+Key_Right ); - go->insertItem( icon_home, tr("&Home"), browser, SLOT( home() ) ); + go->insertItem( icon_home, tr("&Home"), browser, TQ_SLOT( home() ) ); TQPopupMenu* help = new TQPopupMenu( this ); - help->insertItem( tr("&About"), this, SLOT( about() ) ); - help->insertItem( tr("About &TQt"), this, SLOT( aboutTQt() ) ); + help->insertItem( tr("&About"), this, TQ_SLOT( about() ) ); + help->insertItem( tr("About &TQt"), this, TQ_SLOT( aboutTQt() ) ); hist = new TQPopupMenu( this ); TQStringList::Iterator it = history.begin(); for ( ; it != history.end(); ++it ) mHistory[ hist->insertItem( *it ) ] = *it; - connect( hist, SIGNAL( activated( int ) ), - this, SLOT( histChosen( int ) ) ); + connect( hist, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( histChosen( int ) ) ); bookm = new TQPopupMenu( this ); - bookm->insertItem( tr( "Add Bookmark" ), this, SLOT( addBookmark() ) ); + bookm->insertItem( tr( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) ); bookm->insertSeparator(); TQStringList::Iterator it2 = bookmarks.begin(); for ( ; it2 != bookmarks.end(); ++it2 ) mBookmarks[ bookm->insertItem( *it2 ) ] = *it2; - connect( bookm, SIGNAL( activated( int ) ), - this, SLOT( bookmChosen( int ) ) ); + connect( bookm, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( bookmChosen( int ) ) ); menuBar()->insertItem( tr("&File"), file ); menuBar()->insertItem( tr("&Go"), go ); @@ -112,29 +112,29 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, menuBar()->setItemEnabled( forwardId, FALSE); menuBar()->setItemEnabled( backwardId, FALSE); - connect( browser, SIGNAL( backwardAvailable( bool ) ), - this, SLOT( setBackwardAvailable( bool ) ) ); - connect( browser, SIGNAL( forwardAvailable( bool ) ), - this, SLOT( setForwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( backwardAvailable( bool ) ), + this, TQ_SLOT( setBackwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( forwardAvailable( bool ) ), + this, TQ_SLOT( setForwardAvailable( bool ) ) ); TQToolBar* toolbar = new TQToolBar( this ); addToolBar( toolbar, "Toolbar"); TQToolButton* button; - button = new TQToolButton( icon_back, tr("Backward"), "", browser, SLOT(backward()), toolbar ); - connect( browser, SIGNAL( backwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT(backward()), toolbar ); + connect( browser, TQ_SIGNAL( backwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( FALSE ); - button = new TQToolButton( icon_forward, tr("Forward"), "", browser, SLOT(forward()), toolbar ); - connect( browser, SIGNAL( forwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT(forward()), toolbar ); + connect( browser, TQ_SIGNAL( forwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( FALSE ); - button = new TQToolButton( icon_home, tr("Home"), "", browser, SLOT(home()), toolbar ); + button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT(home()), toolbar ); toolbar->addSeparator(); pathCombo = new TQComboBox( TRUE, toolbar ); - connect( pathCombo, SIGNAL( activated( const TQString & ) ), - this, SLOT( pathSelected( const TQString & ) ) ); + connect( pathCombo, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( pathSelected( const TQString & ) ) ); toolbar->setStretchableWidget( pathCombo ); setRightJustification( TRUE ); setDockEnabled( DockLeft, FALSE ); diff --git a/examples/helpviewer/main.cpp b/examples/helpviewer/main.cpp index d09840c2..7a873852 100644 --- a/examples/helpviewer/main.cpp +++ b/examples/helpviewer/main.cpp @@ -34,8 +34,8 @@ int main( int argc, char ** argv ) else help->showMaximized(); - TQObject::connect( &a, SIGNAL(lastWindowClosed()), - &a, SLOT(quit()) ); + TQObject::connect( &a, TQ_SIGNAL(lastWindowClosed()), + &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/examples/i18n/main.cpp b/examples/i18n/main.cpp index 700547ef..8e8e8661 100644 --- a/examples/i18n/main.cpp +++ b/examples/i18n/main.cpp @@ -37,7 +37,7 @@ public: vb->setAutoAdd(TRUE); hb = 0; sm = new TQSignalMapper(this); - connect(sm,SIGNAL(mapped(int)),this,SLOT(done(int))); + connect(sm,TQ_SIGNAL(mapped(int)),this,TQ_SLOT(done(int))); } void addButtons( const TQString& cancel=TQString::null, const TQString& ok=TQString::null, @@ -58,7 +58,7 @@ public: hb = new TQHBox(this); TQPushButton *c = new TQPushButton(text, hb); sm->setMapping(c,result); - connect(c,SIGNAL(clicked()),sm,SLOT(map())); + connect(c,TQ_SIGNAL(clicked()),sm,TQ_SLOT(map())); } private: @@ -135,7 +135,7 @@ int main( int argc, char** argv ) MyWidget* w = showLang((const char*)qm[i]); if( w == 0 ) exit( 0 ); - TQObject::connect(w, SIGNAL(closed()), tqApp, SLOT(quit())); + TQObject::connect(w, TQ_SIGNAL(closed()), tqApp, TQ_SLOT(quit())); w->setGeometry(x,y,197,356); w->show(); if ( tight ) { diff --git a/examples/i18n/mywidget.cpp b/examples/i18n/mywidget.cpp index 6e78b8bf..2562e2be 100644 --- a/examples/i18n/mywidget.cpp +++ b/examples/i18n/mywidget.cpp @@ -32,7 +32,7 @@ MyWidget::MyWidget( TQWidget* parent, const char* name ) setCentralWidget(central); TQPopupMenu* file = new TQPopupMenu(this); - file->insertItem( tr("E&xit"), tqApp, SLOT(quit()), + file->insertItem( tr("E&xit"), tqApp, TQ_SLOT(quit()), TQAccel::stringToKey(tr("Ctrl+Q")) ); menuBar()->insertItem( tr("&File"), file ); diff --git a/examples/iconview/main.cpp b/examples/iconview/main.cpp index f7f3593c..f7ed6eeb 100644 --- a/examples/iconview/main.cpp +++ b/examples/iconview/main.cpp @@ -61,9 +61,9 @@ int main( int argc, char **argv ) qiconview.setCaption( "TQt Example - Iconview" ); ListenDND listen_dnd( &qiconview ); - TQObject::connect( &qiconview, SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), - &listen_dnd, SLOT( dropped( TQDropEvent * ) ) ); - TQObject::connect( &qiconview, SIGNAL( moved() ), &listen_dnd, SLOT( moved() ) ); + TQObject::connect( &qiconview, TQ_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), + &listen_dnd, TQ_SLOT( dropped( TQDropEvent * ) ) ); + TQObject::connect( &qiconview, TQ_SIGNAL( moved() ), &listen_dnd, TQ_SLOT( moved() ) ); a.setMainWidget( &qiconview ); qiconview.show(); diff --git a/examples/iconview/simple_dd/main.cpp b/examples/iconview/simple_dd/main.cpp index 3093e89a..16d3b53c 100644 --- a/examples/iconview/simple_dd/main.cpp +++ b/examples/iconview/simple_dd/main.cpp @@ -169,8 +169,8 @@ int main( int argc, char *argv[] ) // Set up the connection so that we can drop items into the icon view TQObject::connect( - iv, SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), - iv, SLOT(slotNewItem(TQDropEvent*, const TQValueList<TQIconDragItem>&))); + iv, TQ_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), + iv, TQ_SLOT(slotNewItem(TQDropEvent*, const TQValueList<TQIconDragItem>&))); // Populate the TQIconView with icons DDIconViewItem *item; diff --git a/examples/layout/layout.cpp b/examples/layout/layout.cpp index e40f96be..bc2ff269 100644 --- a/examples/layout/layout.cpp +++ b/examples/layout/layout.cpp @@ -36,7 +36,7 @@ ExampleWidget::ExampleWidget( TQWidget *parent, const char *name ) menubar->setSeparator( TQMenuBar::InWindowsStyle ); TQPopupMenu* popup; popup = new TQPopupMenu( this ); - popup->insertItem( "&Quit", tqApp, SLOT(quit()) ); + popup->insertItem( "&Quit", tqApp, TQ_SLOT(quit()) ); menubar->insertItem( "&File", popup ); // ...and tell the layout about it. diff --git a/examples/life/lifedlg.cpp b/examples/life/lifedlg.cpp index c1be353b..c24f7d50 100644 --- a/examples/life/lifedlg.cpp +++ b/examples/life/lifedlg.cpp @@ -55,14 +55,14 @@ LifeDialog::LifeDialog( int scale, TQWidget * parent, const char * name ) life->move( SIDEBORDER, TOPBORDER ); - connect( qb, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( qb, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); qb->setGeometry( SIDEBORDER, SIDEBORDER, qb->sizeHint().width(), 25 ); timer = new LifeTimer( this ); - connect( timer, SIGNAL(timeout()), life, SLOT(nextGeneration()) ); + connect( timer, TQ_SIGNAL(timeout()), life, TQ_SLOT(nextGeneration()) ); pb = new TQPushButton( "Pause", this ); pb->setToggleButton( TRUE ); - connect( pb, SIGNAL(toggled(bool)), timer, SLOT(pause(bool)) ); + connect( pb, TQ_SIGNAL(toggled(bool)), timer, TQ_SLOT(pause(bool)) ); pb->resize( pb->sizeHint().width(), 25 ); pb->move( width() - SIDEBORDER - pb->width(), SIDEBORDER ); @@ -72,8 +72,8 @@ LifeDialog::LifeDialog( int scale, TQWidget * parent, const char * name ) scroll = new TQSlider( 0, LifeTimer::MAXSPEED, 50, LifeTimer::MAXSPEED / 2, TQSlider::Horizontal, this ); - connect( scroll, SIGNAL(valueChanged(int)), - timer, SLOT(setSpeed(int)) ); + connect( scroll, TQ_SIGNAL(valueChanged(int)), + timer, TQ_SLOT(setSpeed(int)) ); scroll->move( sp->width() + 2 * SIDEBORDER, 45 ); scroll->resize( 200, 15 ); @@ -118,7 +118,7 @@ LifeDialog::LifeDialog( int scale, TQWidget * parent, const char * name ) cb->setAutoResize( FALSE ); cb->setCurrentItem( sel ); cb->show(); - connect( cb, SIGNAL(activated(int)), SLOT(getPattern(int)) ); + connect( cb, TQ_SIGNAL(activated(int)), TQ_SLOT(getPattern(int)) ); TQSize s; s = life->minimumSize(); diff --git a/examples/lineedits/lineedits.cpp b/examples/lineedits/lineedits.cpp index 38568e76..6e778c62 100644 --- a/examples/lineedits/lineedits.cpp +++ b/examples/lineedits/lineedits.cpp @@ -43,9 +43,9 @@ LineEdits::LineEdits( TQWidget *parent, const char *name ) combo1->insertItem( "Normal" ); combo1->insertItem( "Password" ); combo1->insertItem( "No Echo" ); - // ...and connect the activated() SIGNAL with the slotEchoChanged() SLOT to be able + // ...and connect the activated() TQ_SIGNAL with the slotEchoChanged() TQ_SLOT to be able // to react when an item is selected - connect( combo1, SIGNAL( activated( int ) ), this, SLOT( slotEchoChanged( int ) ) ); + connect( combo1, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotEchoChanged( int ) ) ); // insert the first LineEdit lined1 = new TQLineEdit( this ); @@ -65,8 +65,8 @@ LineEdits::LineEdits( TQWidget *parent, const char *name ) combo2->insertItem( "No Validator" ); combo2->insertItem( "Integer Validator" ); combo2->insertItem( "Double Validator" ); - // ...and again the activated() SIGNAL gets connected with a SLOT - connect( combo2, SIGNAL( activated( int ) ), this, SLOT( slotValidatorChanged( int ) ) ); + // ...and again the activated() TQ_SIGNAL gets connected with a TQ_SLOT + connect( combo2, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotValidatorChanged( int ) ) ); // and the second LineEdit lined2 = new TQLineEdit( this ); @@ -86,8 +86,8 @@ LineEdits::LineEdits( TQWidget *parent, const char *name ) combo3->insertItem( "Left" ); combo3->insertItem( "Centered" ); combo3->insertItem( "Right" ); - // ...and again the activated() SIGNAL gets connected with a SLOT - connect( combo3, SIGNAL( activated( int ) ), this, SLOT( slotAlignmentChanged( int ) ) ); + // ...and again the activated() TQ_SIGNAL gets connected with a TQ_SLOT + connect( combo3, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAlignmentChanged( int ) ) ); // and the third lineedit lined3 = new TQLineEdit( this ); @@ -110,8 +110,8 @@ LineEdits::LineEdits( TQWidget *parent, const char *name ) combo4->insertItem( "License key" ); // ...this time we use the activated( const TQString & ) signal - connect( combo4, SIGNAL( activated( int ) ), - this, SLOT( slotInputMaskChanged( int ) ) ); + connect( combo4, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotInputMaskChanged( int ) ) ); // and the fourth lineedit lined4 = new TQLineEdit( this ); @@ -129,8 +129,8 @@ LineEdits::LineEdits( TQWidget *parent, const char *name ) combo5 = new TQComboBox( FALSE, row5 ); combo5->insertItem( "False" ); combo5->insertItem( "True" ); - // ...and again the activated() SIGNAL gets connected with a SLOT - connect( combo5, SIGNAL( activated( int ) ), this, SLOT( slotReadOnlyChanged( int ) ) ); + // ...and again the activated() TQ_SIGNAL gets connected with a TQ_SLOT + connect( combo5, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotReadOnlyChanged( int ) ) ); // and the last lineedit lined5 = new TQLineEdit( this ); @@ -141,7 +141,7 @@ LineEdits::LineEdits( TQWidget *parent, const char *name ) } /* - * SLOT slotEchoChanged( int i ) + * TQ_SLOT slotEchoChanged( int i ) * * i contains the number of the item which the user has been chosen in the * first Combobox. According to this value, we set the Echo-Mode for the @@ -166,7 +166,7 @@ void LineEdits::slotEchoChanged( int i ) } /* - * SLOT slotValidatorChanged( int i ) + * TQ_SLOT slotValidatorChanged( int i ) * * i contains the number of the item which the user has been chosen in the * second Combobox. According to this value, we set a validator for the @@ -196,7 +196,7 @@ void LineEdits::slotValidatorChanged( int i ) /* - * SLOT slotAlignmentChanged( int i ) + * TQ_SLOT slotAlignmentChanged( int i ) * * i contains the number of the item which the user has been chosen in * the third Combobox. According to this value, we set an alignment @@ -221,7 +221,7 @@ void LineEdits::slotAlignmentChanged( int i ) } /* - * SLOT slotInputMaskChanged( const TQString &mask ) + * TQ_SLOT slotInputMaskChanged( const TQString &mask ) * * i contains the number of the item which the user has been chosen in * the third Combobox. According to this value, we set an input mask on @@ -250,7 +250,7 @@ void LineEdits::slotInputMaskChanged( int i ) } /* - * SLOT slotReadOnlyChanged( int i ) + * TQ_SLOT slotReadOnlyChanged( int i ) * * i contains the number of the item which the user has been chosen in * the fourth Combobox. According to this value, we toggle read-only. diff --git a/examples/listbox/listbox.cpp b/examples/listbox/listbox.cpp index be09f0a8..6f0a018b 100644 --- a/examples/listbox/listbox.cpp +++ b/examples/listbox/listbox.cpp @@ -43,7 +43,7 @@ ListBoxDemo::ListBoxDemo() bg->insert( b ); v->addWidget( b ); b->setChecked( TRUE ); - connect( b, SIGNAL(clicked()), this, SLOT(setNumCols()) ); + connect( b, TQ_SIGNAL(clicked()), this, TQ_SLOT(setNumCols()) ); TQHBoxLayout * h = new TQHBoxLayout; v->addLayout( h ); h->addSpacing( 30 ); @@ -59,7 +59,7 @@ ListBoxDemo::ListBoxDemo() this ); bg->insert( b ); v->addWidget( b ); - connect( b, SIGNAL(clicked()), this, SLOT(setColsByWidth()) ); + connect( b, TQ_SIGNAL(clicked()), this, TQ_SLOT(setColsByWidth()) ); v->addSpacing( 12 ); @@ -68,7 +68,7 @@ ListBoxDemo::ListBoxDemo() this ); bg->insert( b ); v->addWidget( b ); - connect( b, SIGNAL(clicked()), this, SLOT(setNumRows()) ); + connect( b, TQ_SIGNAL(clicked()), this, TQ_SLOT(setNumRows()) ); h = new TQHBoxLayout; v->addLayout( h ); h->addSpacing( 30 ); @@ -85,30 +85,30 @@ ListBoxDemo::ListBoxDemo() this ); bg->insert( b ); v->addWidget( b ); - connect( b, SIGNAL(clicked()), this, SLOT(setRowsByHeight()) ); + connect( b, TQ_SIGNAL(clicked()), this, TQ_SLOT(setRowsByHeight()) ); v->addSpacing( 12 ); TQCheckBox * cb = new TQCheckBox( "Variable-height rows", this ); cb->setChecked( TRUE ); - connect( cb, SIGNAL(toggled(bool)), this, SLOT(setVariableHeight(bool)) ); + connect( cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setVariableHeight(bool)) ); v->addWidget( cb ); v->addSpacing( 6 ); cb = new TQCheckBox( "Variable-width columns", this ); - connect( cb, SIGNAL(toggled(bool)), this, SLOT(setVariableWidth(bool)) ); + connect( cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setVariableWidth(bool)) ); v->addWidget( cb ); cb = new TQCheckBox( "Extended-Selection", this ); - connect( cb, SIGNAL(toggled(bool)), this, SLOT(setMultiSelection(bool)) ); + connect( cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setMultiSelection(bool)) ); v->addWidget( cb ); TQPushButton *pb = new TQPushButton( "Sort ascending", this ); - connect( pb, SIGNAL( clicked() ), this, SLOT( sortAscending() ) ); + connect( pb, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sortAscending() ) ); v->addWidget( pb ); pb = new TQPushButton( "Sort descending", this ); - connect( pb, SIGNAL( clicked() ), this, SLOT( sortDescending() ) ); + connect( pb, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sortDescending() ) ); v->addWidget( pb ); v->addStretch( 100 ); @@ -122,8 +122,8 @@ ListBoxDemo::ListBoxDemo() rows->setRange( 1, 256 ); rows->setValue( 256 ); - connect( columns, SIGNAL(valueChanged(int)), this, SLOT(setNumCols()) ); - connect( rows, SIGNAL(valueChanged(int)), this, SLOT(setNumRows()) ); + connect( columns, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setNumCols()) ); + connect( rows, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setNumRows()) ); } diff --git a/examples/listboxcombo/listboxcombo.cpp b/examples/listboxcombo/listboxcombo.cpp index 537ad1a9..cf06c806 100644 --- a/examples/listboxcombo/listboxcombo.cpp +++ b/examples/listboxcombo/listboxcombo.cpp @@ -85,8 +85,8 @@ ListBoxCombo::ListBoxCombo( TQWidget *parent, const char *name ) // Create a pushbutton... TQPushButton *arrow1 = new TQPushButton( " -> ", row1 ); - // ...and connect the clicked SIGNAL with the SLOT slotLeft2Right - connect( arrow1, SIGNAL( clicked() ), this, SLOT( slotLeft2Right() ) ); + // ...and connect the clicked TQ_SIGNAL with the TQ_SLOT slotLeft2Right + connect( arrow1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotLeft2Right() ) ); // create an empty single-selection ListBox lb2 = new TQListBox( row1 ); @@ -131,12 +131,12 @@ ListBoxCombo::ListBoxCombo( TQWidget *parent, const char *name ) } // Connect the activated SIGNALs of the Comboboxes with SLOTs - connect( cb1, SIGNAL( activated( const TQString & ) ), this, SLOT( slotCombo1Activated( const TQString & ) ) ); - connect( cb2, SIGNAL( activated( const TQString & ) ), this, SLOT( slotCombo2Activated( const TQString & ) ) ); + connect( cb1, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( slotCombo1Activated( const TQString & ) ) ); + connect( cb2, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( slotCombo2Activated( const TQString & ) ) ); } /* - * SLOT slotLeft2Right + * TQ_SLOT slotLeft2Right * * Copies all selected items of the first ListBox into the * second ListBox @@ -161,7 +161,7 @@ void ListBoxCombo::slotLeft2Right() } /* - * SLOT slotCombo1Activated( const TQString &s ) + * TQ_SLOT slotCombo1Activated( const TQString &s ) * * Sets the text of the item which the user just selected * in the first Combobox (and is now the value of s) to @@ -174,7 +174,7 @@ void ListBoxCombo::slotCombo1Activated( const TQString &s ) } /* - * SLOT slotCombo2Activated( const TQString &s ) + * TQ_SLOT slotCombo2Activated( const TQString &s ) * * Sets the text of the item which the user just selected * in the second Combobox (and is now the value of s) to diff --git a/examples/listviews/listviews.cpp b/examples/listviews/listviews.cpp index 1344db99..66680f85 100644 --- a/examples/listviews/listviews.cpp +++ b/examples/listviews/listviews.cpp @@ -127,20 +127,20 @@ ListViews::ListViews( TQWidget *parent, const char *name ) menu = new TQPopupMenu( messages ); for( int i = 1; i <= 10; i++ ) menu->insertItem( TQString( "Context Item %1" ).arg( i ) ); - connect(messages, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), - this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); + connect(messages, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), + this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); vsplitter->setResizeMode( messages, TQSplitter::KeepSize ); message = new TQLabel( vsplitter ); message->setAlignment( TQt::AlignTop ); message->setBackgroundMode( PaletteBase ); - connect( folders, SIGNAL( selectionChanged( TQListViewItem* ) ), - this, SLOT( slotFolderChanged( TQListViewItem* ) ) ); - connect( messages, SIGNAL( selectionChanged() ), - this, SLOT( slotMessageChanged() ) ); - connect( messages, SIGNAL( currentChanged( TQListViewItem * ) ), - this, SLOT( slotMessageChanged() ) ); + connect( folders, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotFolderChanged( TQListViewItem* ) ) ); + connect( messages, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotMessageChanged() ) ); + connect( messages, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotMessageChanged() ) ); messages->setSelectionMode( TQListView::Extended ); // some preparations diff --git a/examples/mdi/application.cpp b/examples/mdi/application.cpp index 6ec40009..138ffa53 100644 --- a/examples/mdi/application.cpp +++ b/examples/mdi/application.cpp @@ -62,12 +62,12 @@ ApplicationWindow::ApplicationWindow() openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new TQToolButton( openIcon, "Open File", TQString::null, - this, SLOT(load()), fileTools, "open file" ); + this, TQ_SLOT(load()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new TQToolButton( saveIcon, "Save File", TQString::null, - this, SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); #ifndef TQT_NO_PRINTER printer = new TQPrinter( TQPrinter::HighResolution ); @@ -76,7 +76,7 @@ ApplicationWindow::ApplicationWindow() printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new TQToolButton( printIcon, "Print File", TQString::null, - this, SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); TQWhatsThis::add( filePrint, filePrintText ); #endif @@ -88,41 +88,41 @@ ApplicationWindow::ApplicationWindow() TQPopupMenu * file = new TQPopupMenu( this ); menuBar()->insertItem( "&File", file ); - file->insertItem( "&New", this, SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( "&New", this, TQ_SLOT(newDoc()), CTRL+Key_N ); id = file->insertItem( openIcon, "&Open...", - this, SLOT(load()), CTRL+Key_O ); + this, TQ_SLOT(load()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, "&Save", - this, SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( "Save &As...", this, SLOT(saveAs()) ); + id = file->insertItem( "Save &As...", this, TQ_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); #ifndef TQT_NO_PRINTER file->insertSeparator(); id = file->insertItem( printIcon, "&Print...", - this, SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); #endif file->insertSeparator(); - file->insertItem( "&Close", this, SLOT(closeWindow()), CTRL+Key_W ); - file->insertItem( "&Quit", tqApp, SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( "&Close", this, TQ_SLOT(closeWindow()), CTRL+Key_W ); + file->insertItem( "&Quit", tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); windowsMenu = new TQPopupMenu( this ); windowsMenu->setCheckable( TRUE ); - connect( windowsMenu, SIGNAL( aboutToShow() ), - this, SLOT( windowsMenuAboutToShow() ) ); + connect( windowsMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( windowsMenuAboutToShow() ) ); menuBar()->insertItem( "&Windows", windowsMenu ); menuBar()->insertSeparator(); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( "&Help", help ); - help->insertItem( "&About", this, SLOT(about()), Key_F1); - help->insertItem( "About &TQt", this, SLOT(aboutTQt())); + help->insertItem( "&About", this, TQ_SLOT(about()), Key_F1); + help->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt())); help->insertSeparator(); - help->insertItem( "What's &This", this, SLOT(whatsThis()), SHIFT+Key_F1); + help->insertItem( "What's &This", this, TQ_SLOT(whatsThis()), SHIFT+Key_F1); TQVBox* vb = new TQVBox( this ); vb->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); @@ -146,7 +146,7 @@ ApplicationWindow::~ApplicationWindow() MDIWindow* ApplicationWindow::newDoc() { MDIWindow* w = new MDIWindow( ws, 0, WDestructiveClose ); - connect( w, SIGNAL( message(const TQString&, int) ), statusBar(), SLOT( message(const TQString&, int )) ); + connect( w, TQ_SIGNAL( message(const TQString&, int) ), statusBar(), TQ_SLOT( message(const TQString&, int )) ); w->setCaption("unnamed document"); w->setIcon( TQPixmap("document.xpm") ); // show the very first window in maximized mode @@ -218,9 +218,9 @@ void ApplicationWindow::aboutTQt() void ApplicationWindow::windowsMenuAboutToShow() { windowsMenu->clear(); - int cascadeId = windowsMenu->insertItem("&Cascade", ws, SLOT(cascade() ) ); - int tileId = windowsMenu->insertItem("&Tile", ws, SLOT(tile() ) ); - int horTileId = windowsMenu->insertItem("Tile &Horizontally", this, SLOT(tileHorizontal() ) ); + int cascadeId = windowsMenu->insertItem("&Cascade", ws, TQ_SLOT(cascade() ) ); + int tileId = windowsMenu->insertItem("&Tile", ws, TQ_SLOT(tile() ) ); + int horTileId = windowsMenu->insertItem("Tile &Horizontally", this, TQ_SLOT(tileHorizontal() ) ); if ( ws->windowList().isEmpty() ) { windowsMenu->setItemEnabled( cascadeId, FALSE ); windowsMenu->setItemEnabled( tileId, FALSE ); @@ -230,7 +230,7 @@ void ApplicationWindow::windowsMenuAboutToShow() TQWidgetList windows = ws->windowList(); for ( int i = 0; i < int(windows.count()); ++i ) { int id = windowsMenu->insertItem(windows.at(i)->caption(), - this, SLOT( windowsMenuActivated( int ) ) ); + this, TQ_SLOT( windowsMenuActivated( int ) ) ); windowsMenu->setItemParameter( id, i ); windowsMenu->setItemChecked( id, ws->activeWindow() == windows.at(i) ); } diff --git a/examples/mdi/main.cpp b/examples/mdi/main.cpp index e7e206be..07fd5d76 100644 --- a/examples/mdi/main.cpp +++ b/examples/mdi/main.cpp @@ -16,7 +16,7 @@ int main( int argc, char ** argv ) { a.setMainWidget(mw); mw->setCaption( "TQt Example - Multiple Documents Interface (MDI)" ); mw->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); + a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); int res = a.exec(); return res; } diff --git a/examples/menu/menu.cpp b/examples/menu/menu.cpp index 14e1b583..8997ddaa 100644 --- a/examples/menu/menu.cpp +++ b/examples/menu/menu.cpp @@ -122,27 +122,27 @@ MenuExample::MenuExample( TQWidget *parent, const char *name ) TQPopupMenu *print = new TQPopupMenu( this ); TQ_CHECK_PTR( print ); print->insertTearOffHandle(); - print->insertItem( "&Print to printer", this, SLOT(printer()) ); - print->insertItem( "Print to &file", this, SLOT(file()) ); - print->insertItem( "Print to fa&x", this, SLOT(fax()) ); + print->insertItem( "&Print to printer", this, TQ_SLOT(printer()) ); + print->insertItem( "Print to &file", this, TQ_SLOT(file()) ); + print->insertItem( "Print to fa&x", this, TQ_SLOT(fax()) ); print->insertSeparator(); - print->insertItem( "Printer &Setup", this, SLOT(printerSetup()) ); + print->insertItem( "Printer &Setup", this, TQ_SLOT(printerSetup()) ); TQPopupMenu *file = new TQPopupMenu( this ); TQ_CHECK_PTR( file ); - file->insertItem( p1, "&Open", this, SLOT(open()), CTRL+Key_O ); - file->insertItem( p2, "&New", this, SLOT(news()), CTRL+Key_N ); - file->insertItem( p3, "&Save", this, SLOT(save()), CTRL+Key_S ); - file->insertItem( "&Close", this, SLOT(closeDoc()), CTRL+Key_W ); + file->insertItem( p1, "&Open", this, TQ_SLOT(open()), CTRL+Key_O ); + file->insertItem( p2, "&New", this, TQ_SLOT(news()), CTRL+Key_N ); + file->insertItem( p3, "&Save", this, TQ_SLOT(save()), CTRL+Key_S ); + file->insertItem( "&Close", this, TQ_SLOT(closeDoc()), CTRL+Key_W ); file->insertSeparator(); file->insertItem( "&Print", print, CTRL+Key_P ); file->insertSeparator(); - file->insertItem( "E&xit", tqApp, SLOT(quit()), CTRL+Key_Q ); + file->insertItem( "E&xit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q ); TQPopupMenu *edit = new TQPopupMenu( this ); TQ_CHECK_PTR( edit ); - int undoID = edit->insertItem( "&Undo", this, SLOT(undo()) ); - int redoID = edit->insertItem( "&Redo", this, SLOT(redo()) ); + int undoID = edit->insertItem( "&Undo", this, TQ_SLOT(undo()) ); + int redoID = edit->insertItem( "&Redo", this, TQ_SLOT(redo()) ); edit->setItemEnabled( undoID, FALSE ); edit->setItemEnabled( redoID, FALSE ); @@ -150,7 +150,7 @@ MenuExample::MenuExample( TQWidget *parent, const char *name ) TQ_CHECK_PTR( options ); options->insertTearOffHandle(); options->setCaption("Options"); - options->insertItem( "&Normal Font", this, SLOT(normal()) ); + options->insertItem( "&Normal Font", this, TQ_SLOT(normal()) ); options->insertSeparator(); options->polish(); // adjust system settings @@ -158,12 +158,12 @@ MenuExample::MenuExample( TQWidget *parent, const char *name ) f.setBold( TRUE ); boldID = options->insertItem( new MyMenuItem( "Bold", f ) ); options->setAccel( CTRL+Key_B, boldID ); - options->connectItem( boldID, this, SLOT(bold()) ); + options->connectItem( boldID, this, TQ_SLOT(bold()) ); f = font(); f.setUnderline( TRUE ); underlineID = options->insertItem( new MyMenuItem( "Underline", f ) ); options->setAccel( CTRL+Key_U, underlineID ); - options->connectItem( underlineID, this, SLOT(underline()) ); + options->connectItem( underlineID, this, TQ_SLOT(underline()) ); isBold = FALSE; isUnderline = FALSE; @@ -172,8 +172,8 @@ MenuExample::MenuExample( TQWidget *parent, const char *name ) TQPopupMenu *help = new TQPopupMenu( this ); TQ_CHECK_PTR( help ); - help->insertItem( "&About", this, SLOT(about()), CTRL+Key_H ); - help->insertItem( "About &TQt", this, SLOT(aboutTQt()) ); + help->insertItem( "&About", this, TQ_SLOT(about()), CTRL+Key_H ); + help->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt()) ); // If we used a TQMainWindow we could use its built-in menuBar(). menu = new TQMenuBar( this ); @@ -201,8 +201,8 @@ MenuExample::MenuExample( TQWidget *parent, const char *name ) label->setLineWidth( 1 ); label->setAlignment( AlignCenter ); - connect( this, SIGNAL(explain(const TQString&)), - label, SLOT(setText(const TQString&)) ); + connect( this, TQ_SIGNAL(explain(const TQString&)), + label, TQ_SLOT(setText(const TQString&)) ); setMinimumSize( 100, 80 ); setFocusPolicy( TQWidget::ClickFocus ); @@ -217,14 +217,14 @@ void MenuExample::contextMenuEvent( TQContextMenuEvent * ) "Context Menu</b></u></font>", this ); caption->setAlignment( TQt::AlignCenter ); contextMenu->insertItem( caption ); - contextMenu->insertItem( "&New", this, SLOT(news()), CTRL+Key_N ); - contextMenu->insertItem( "&Open...", this, SLOT(open()), CTRL+Key_O ); - contextMenu->insertItem( "&Save", this, SLOT(save()), CTRL+Key_S ); + contextMenu->insertItem( "&New", this, TQ_SLOT(news()), CTRL+Key_N ); + contextMenu->insertItem( "&Open...", this, TQ_SLOT(open()), CTRL+Key_O ); + contextMenu->insertItem( "&Save", this, TQ_SLOT(save()), CTRL+Key_S ); TQPopupMenu *submenu = new TQPopupMenu( this ); TQ_CHECK_PTR( submenu ); - submenu->insertItem( "&Print to printer", this, SLOT(printer()) ); - submenu->insertItem( "Print to &file", this, SLOT(file()) ); - submenu->insertItem( "Print to fa&x", this, SLOT(fax()) ); + submenu->insertItem( "&Print to printer", this, TQ_SLOT(printer()) ); + submenu->insertItem( "Print to &file", this, TQ_SLOT(file()) ); + submenu->insertItem( "Print to fa&x", this, TQ_SLOT(fax()) ); contextMenu->insertItem( "&Print", submenu ); contextMenu->exec( TQCursor::pos() ); delete contextMenu; diff --git a/examples/movies/main.cpp b/examples/movies/main.cpp index da2b0b9e..3fa2ec73 100644 --- a/examples/movies/main.cpp +++ b/examples/movies/main.cpp @@ -40,9 +40,9 @@ public: setBackgroundMode(NoBackground); // Get the movie to tell use when interesting things happen. - movie.connectUpdate(this, SLOT(movieUpdated(const TQRect&))); - movie.connectResize(this, SLOT(movieResized(const TQSize&))); - movie.connectStatus(this, SLOT(movieStatus(int))); + movie.connectUpdate(this, TQ_SLOT(movieUpdated(const TQRect&))); + movie.connectResize(this, TQ_SLOT(movieResized(const TQSize&))); + movie.connectStatus(this, TQ_SLOT(movieStatus(int))); setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); } @@ -204,13 +204,13 @@ public: TQHBox* hb = new TQHBox(this); TQPushButton* btn; btn = new TQPushButton("<<", hb); - connect(btn, SIGNAL(clicked()), movie, SLOT(restart())); + connect(btn, TQ_SIGNAL(clicked()), movie, TQ_SLOT(restart())); btn = new TQPushButton("||", hb); - connect(btn, SIGNAL(clicked()), movie, SLOT(togglePause())); + connect(btn, TQ_SIGNAL(clicked()), movie, TQ_SLOT(togglePause())); btn = new TQPushButton(">|", hb); - connect(btn, SIGNAL(clicked()), movie, SLOT(step())); + connect(btn, TQ_SIGNAL(clicked()), movie, TQ_SLOT(step())); btn = new TQPushButton(">>|", hb); - connect(btn, SIGNAL(clicked()), movie, SLOT(step10())); + connect(btn, TQ_SIGNAL(clicked()), movie, TQ_SLOT(step10())); } }; @@ -236,8 +236,8 @@ MovieStarter::MovieStarter(const char *dir) //behave as in getOpenFilename setMode( ExistingFile ); // When a file is selected, show it as a movie. - connect(this, SIGNAL(fileSelected(const TQString&)), - this, SLOT(startMovie(const TQString&))); + connect(this, TQ_SIGNAL(fileSelected(const TQString&)), + this, TQ_SLOT(startMovie(const TQString&))); } @@ -276,7 +276,7 @@ int main(int argc, char **argv) (void)new MovieScreen(argv[arg], TQMovie(argv[arg]), 0, 0, TQt::WDestructiveClose); } - TQObject::connect(tqApp, SIGNAL(lastWindowClosed()), tqApp, SLOT(quit())); + TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit())); } else { // "GUI" mode - open a chooser for movies // diff --git a/examples/network/archivesearch/archivedialog.ui.h b/examples/network/archivesearch/archivedialog.ui.h index e5b70cb1..45c4553e 100644 --- a/examples/network/archivesearch/archivedialog.ui.h +++ b/examples/network/archivesearch/archivedialog.ui.h @@ -18,12 +18,12 @@ void ArchiveDialog::init() { - connect(&articleSearcher, SIGNAL(done(bool)), this, SLOT(searchDone(bool))); - connect(&articleFetcher, SIGNAL(done(bool)), this, SLOT(fetchDone(bool))); - connect(myListView, SIGNAL(selectionChanged(TQListViewItem*)), this, SLOT(fetch(TQListViewItem*))); - connect(myLineEdit, SIGNAL(returnPressed()), this, SLOT(search())); - connect(myListView, SIGNAL(returnPressed(TQListViewItem*)), this, SLOT(fetch(TQListViewItem*))); - connect(myPushButton, SIGNAL(clicked()), this, SLOT(close())); + connect(&articleSearcher, TQ_SIGNAL(done(bool)), this, TQ_SLOT(searchDone(bool))); + connect(&articleFetcher, TQ_SIGNAL(done(bool)), this, TQ_SLOT(fetchDone(bool))); + connect(myListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(fetch(TQListViewItem*))); + connect(myLineEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(search())); + connect(myListView, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(fetch(TQListViewItem*))); + connect(myPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); } void ArchiveDialog::fetch( TQListViewItem *it ) diff --git a/examples/network/archivesearch/main.cpp b/examples/network/archivesearch/main.cpp index 9db13ff1..53e7e928 100644 --- a/examples/network/archivesearch/main.cpp +++ b/examples/network/archivesearch/main.cpp @@ -16,8 +16,8 @@ int main(int argc, char **argv) ArchiveDialog ad; ad.show(); - TQObject::connect( &a, SIGNAL(lastWindowClosed()), - &a, SLOT(quit()) ); + TQObject::connect( &a, TQ_SIGNAL(lastWindowClosed()), + &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/examples/network/clientserver/client/client.cpp b/examples/network/clientserver/client/client.cpp index cda1f571..aba0fef0 100644 --- a/examples/network/clientserver/client/client.cpp +++ b/examples/network/clientserver/client/client.cpp @@ -32,20 +32,20 @@ public: TQPushButton *close = new TQPushButton( tr("Close connection") , this ); TQPushButton *quit = new TQPushButton( tr("Quit") , this ); - connect( send, SIGNAL(clicked()), SLOT(sendToServer()) ); - connect( close, SIGNAL(clicked()), SLOT(closeConnection()) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( send, TQ_SIGNAL(clicked()), TQ_SLOT(sendToServer()) ); + connect( close, TQ_SIGNAL(clicked()), TQ_SLOT(closeConnection()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); // create the socket and connect various of its signals socket = new TQSocket( this ); - connect( socket, SIGNAL(connected()), - SLOT(socketConnected()) ); - connect( socket, SIGNAL(connectionClosed()), - SLOT(socketConnectionClosed()) ); - connect( socket, SIGNAL(readyRead()), - SLOT(socketReadyRead()) ); - connect( socket, SIGNAL(error(int)), - SLOT(socketError(int)) ); + connect( socket, TQ_SIGNAL(connected()), + TQ_SLOT(socketConnected()) ); + connect( socket, TQ_SIGNAL(connectionClosed()), + TQ_SLOT(socketConnectionClosed()) ); + connect( socket, TQ_SIGNAL(readyRead()), + TQ_SLOT(socketReadyRead()) ); + connect( socket, TQ_SIGNAL(error(int)), + TQ_SLOT(socketError(int)) ); // connect to the server infoText->append( tr("Trying to connect to the server\n") ); @@ -62,8 +62,8 @@ private slots: socket->close(); if ( socket->state() == TQSocket::Closing ) { // We have a delayed close. - connect( socket, SIGNAL(delayedCloseFinished()), - SLOT(socketClosed()) ); + connect( socket, TQ_SIGNAL(delayedCloseFinished()), + TQ_SLOT(socketClosed()) ); } else { // The socket is closed. socketClosed(); diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp index e2b04e4a..3d974cb5 100644 --- a/examples/network/clientserver/server/server.cpp +++ b/examples/network/clientserver/server/server.cpp @@ -32,10 +32,10 @@ public: TQSocket( parent, name ) { line = 0; - connect( this, SIGNAL(readyRead()), - SLOT(readClient()) ); - connect( this, SIGNAL(connectionClosed()), - SLOT(deleteLater()) ); + connect( this, TQ_SIGNAL(readyRead()), + TQ_SLOT(readClient()) ); + connect( this, TQ_SIGNAL(connectionClosed()), + TQ_SLOT(deleteLater()) ); setSocket( sock ); } @@ -120,10 +120,10 @@ public: infoText = new TQTextView( this ); TQPushButton *quit = new TQPushButton( tr("Quit") , this ); - connect( server, SIGNAL(newConnect(ClientSocket*)), - SLOT(newConnect(ClientSocket*)) ); - connect( quit, SIGNAL(clicked()), tqApp, - SLOT(quit()) ); + connect( server, TQ_SIGNAL(newConnect(ClientSocket*)), + TQ_SLOT(newConnect(ClientSocket*)) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, + TQ_SLOT(quit()) ); } ~ServerInfo() @@ -134,10 +134,10 @@ private slots: void newConnect( ClientSocket *s ) { infoText->append( tr("New connection\n") ); - connect( s, SIGNAL(logText(const TQString&)), - infoText, SLOT(append(const TQString&)) ); - connect( s, SIGNAL(connectionClosed()), - SLOT(connectionClosed()) ); + connect( s, TQ_SIGNAL(logText(const TQString&)), + infoText, TQ_SLOT(append(const TQString&)) ); + connect( s, TQ_SIGNAL(connectionClosed()), + TQ_SLOT(connectionClosed()) ); } void connectionClosed() diff --git a/examples/network/ftpclient/ftpmainwindow.ui.h b/examples/network/ftpclient/ftpmainwindow.ui.h index 8f3cde07..ded8b260 100644 --- a/examples/network/ftpclient/ftpmainwindow.ui.h +++ b/examples/network/ftpclient/ftpmainwindow.ui.h @@ -36,18 +36,18 @@ void FtpMainWindow::init() statusBar()->addWidget( stateFtp, 0, TRUE ); ftp = new TQFtp( this ); - connect( ftp, SIGNAL(commandStarted(int)), - SLOT(ftp_commandStarted()) ); - connect( ftp, SIGNAL(commandFinished(int,bool)), - SLOT(ftp_commandFinished()) ); - connect( ftp, SIGNAL(done(bool)), - SLOT(ftp_done(bool)) ); - connect( ftp, SIGNAL(stateChanged(int)), - SLOT(ftp_stateChanged(int)) ); - connect( ftp, SIGNAL(listInfo(const TQUrlInfo &)), - SLOT(ftp_listInfo(const TQUrlInfo &)) ); - connect( ftp, SIGNAL(rawCommandReply(int, const TQString &)), - SLOT(ftp_rawCommandReply(int, const TQString &)) ); + connect( ftp, TQ_SIGNAL(commandStarted(int)), + TQ_SLOT(ftp_commandStarted()) ); + connect( ftp, TQ_SIGNAL(commandFinished(int,bool)), + TQ_SLOT(ftp_commandFinished()) ); + connect( ftp, TQ_SIGNAL(done(bool)), + TQ_SLOT(ftp_done(bool)) ); + connect( ftp, TQ_SIGNAL(stateChanged(int)), + TQ_SLOT(ftp_stateChanged(int)) ); + connect( ftp, TQ_SIGNAL(listInfo(const TQUrlInfo &)), + TQ_SLOT(ftp_listInfo(const TQUrlInfo &)) ); + connect( ftp, TQ_SIGNAL(rawCommandReply(int, const TQString &)), + TQ_SLOT(ftp_rawCommandReply(int, const TQString &)) ); } void FtpMainWindow::destroy() @@ -82,12 +82,12 @@ void FtpMainWindow::uploadFile() this, "upload progress dialog", TRUE ); - connect( ftp, SIGNAL(dataTransferProgress(int,int)), - &progress, SLOT(setProgress(int,int)) ); - connect( ftp, SIGNAL(commandFinished(int,bool)), - &progress, SLOT(reset()) ); - connect( &progress, SIGNAL(cancelled()), - ftp, SLOT(abort()) ); + connect( ftp, TQ_SIGNAL(dataTransferProgress(int,int)), + &progress, TQ_SLOT(setProgress(int,int)) ); + connect( ftp, TQ_SIGNAL(commandFinished(int,bool)), + &progress, TQ_SLOT(reset()) ); + connect( &progress, TQ_SIGNAL(cancelled()), + ftp, TQ_SLOT(abort()) ); TQFileInfo fi( fileName ); ftp->put( file, fi.fileName() ); @@ -128,12 +128,12 @@ void FtpMainWindow::downloadFile() this, "download progress dialog", TRUE ); - connect( ftp, SIGNAL(dataTransferProgress(int,int)), - &progress, SLOT(setProgress(int,int)) ); - connect( ftp, SIGNAL(commandFinished(int,bool)), - &progress, SLOT(reset()) ); - connect( &progress, SIGNAL(cancelled()), - ftp, SLOT(abort()) ); + connect( ftp, TQ_SIGNAL(dataTransferProgress(int,int)), + &progress, TQ_SLOT(setProgress(int,int)) ); + connect( ftp, TQ_SIGNAL(commandFinished(int,bool)), + &progress, TQ_SLOT(reset()) ); + connect( &progress, TQ_SIGNAL(cancelled()), + ftp, TQ_SLOT(abort()) ); ftp->get( item->text(0), file ); progress.exec(); // ### takes a lot of time!!! diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp index 28e0bd37..09942bcc 100644 --- a/examples/network/httpd/httpd.cpp +++ b/examples/network/httpd/httpd.cpp @@ -39,8 +39,8 @@ public: // works asynchronouslyl, this means that all the communication is done // in the two slots readClient() and discardClient(). TQSocket* s = new TQSocket( this ); - connect( s, SIGNAL(readyRead()), this, SLOT(readClient()) ); - connect( s, SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); + connect( s, TQ_SIGNAL(readyRead()), this, TQ_SLOT(readClient()) ); + connect( s, TQ_SIGNAL(delayedCloseFinished()), this, TQ_SLOT(discardClient()) ); s->setSocket( socket ); emit newConnect(); } @@ -100,10 +100,10 @@ public: infoText = new TQTextView( this ); TQPushButton *quit = new TQPushButton( "quit" , this ); - connect( httpd, SIGNAL(newConnect()), SLOT(newConnect()) ); - connect( httpd, SIGNAL(endConnect()), SLOT(endConnect()) ); - connect( httpd, SIGNAL(wroteToClient()), SLOT(wroteToClient()) ); - connect( quit, SIGNAL(pressed()), tqApp, SLOT(quit()) ); + connect( httpd, TQ_SIGNAL(newConnect()), TQ_SLOT(newConnect()) ); + connect( httpd, TQ_SIGNAL(endConnect()), TQ_SLOT(endConnect()) ); + connect( httpd, TQ_SIGNAL(wroteToClient()), TQ_SLOT(wroteToClient()) ); + connect( quit, TQ_SIGNAL(pressed()), tqApp, TQ_SLOT(quit()) ); } ~HttpInfo() diff --git a/examples/network/infoprotocol/infoclient/client.cpp b/examples/network/infoprotocol/infoclient/client.cpp index 7bff123b..c1d05b6c 100644 --- a/examples/network/infoprotocol/infoclient/client.cpp +++ b/examples/network/infoprotocol/infoclient/client.cpp @@ -25,10 +25,10 @@ ClientInfo::ClientInfo( TQWidget *parent, const char *name ) : edHost->setText( "localhost" ); edPort->setText( TQString::number( (uint)infoPort ) ); - connect( infoList, SIGNAL(selected(const TQString&)), SLOT(selectItem(const TQString&)) ); - connect( btnConnect, SIGNAL(clicked()), SLOT(connectToServer()) ); - connect( btnBack, SIGNAL(clicked()), SLOT(stepBack()) ); - connect( btnQuit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( infoList, TQ_SIGNAL(selected(const TQString&)), TQ_SLOT(selectItem(const TQString&)) ); + connect( btnConnect, TQ_SIGNAL(clicked()), TQ_SLOT(connectToServer()) ); + connect( btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(stepBack()) ); + connect( btnQuit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); } @@ -36,10 +36,10 @@ void ClientInfo::connectToServer() { delete socket; socket = new TQSocket( this ); - connect( socket, SIGNAL(connected()), SLOT(socketConnected()) ); - connect( socket, SIGNAL(connectionClosed()), SLOT(socketConnectionClosed()) ); - connect( socket, SIGNAL(readyRead()), SLOT(socketReadyRead()) ); - connect( socket, SIGNAL(error(int)), SLOT(socketError(int)) ); + connect( socket, TQ_SIGNAL(connected()), TQ_SLOT(socketConnected()) ); + connect( socket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(socketConnectionClosed()) ); + connect( socket, TQ_SIGNAL(readyRead()), TQ_SLOT(socketReadyRead()) ); + connect( socket, TQ_SIGNAL(error(int)), TQ_SLOT(socketError(int)) ); socket->connectToHost( edHost->text(), edPort->text().toInt() ); } diff --git a/examples/network/infoprotocol/infoserver/server.cpp b/examples/network/infoprotocol/infoserver/server.cpp index a405fd8b..d71de659 100644 --- a/examples/network/infoprotocol/infoserver/server.cpp +++ b/examples/network/infoprotocol/infoserver/server.cpp @@ -22,8 +22,8 @@ ServerInfo::ServerInfo( TQ_UINT16 port, TQWidget *parent, const char *name ) : ServerInfoBase( parent, name ) { SimpleServer *server = new SimpleServer( port, this, "simple server" ); - connect( server, SIGNAL(newConnect()), SLOT(newConnect()) ); - connect( btnQuit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( server, TQ_SIGNAL(newConnect()), TQ_SLOT(newConnect()) ); + connect( btnQuit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); } void ServerInfo::newConnect() @@ -51,8 +51,8 @@ void SimpleServer::newConnection( int socket ) ClientSocket::ClientSocket( int sock, InfoData *i, TQObject *parent, const char *name ) : TQSocket( parent, name ), info( i ) { - connect( this, SIGNAL(readyRead()), SLOT(readClient()) ); - connect( this, SIGNAL(connectionClosed()), SLOT(connectionClosed()) ); + connect( this, TQ_SIGNAL(readyRead()), TQ_SLOT(readClient()) ); + connect( this, TQ_SIGNAL(connectionClosed()), TQ_SLOT(connectionClosed()) ); setSocket( sock ); } diff --git a/examples/network/infoprotocol/infourlclient/client.cpp b/examples/network/infoprotocol/infourlclient/client.cpp index 992880dd..c3101639 100644 --- a/examples/network/infoprotocol/infourlclient/client.cpp +++ b/examples/network/infoprotocol/infourlclient/client.cpp @@ -21,10 +21,10 @@ ClientInfo::ClientInfo( TQWidget *parent, const char *name ) : ClientInfoBase( parent, name ) { - connect( btnOpen, SIGNAL(clicked()), SLOT(downloadFile()) ); - connect( btnQuit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); - connect( &op, SIGNAL( data( const TQByteArray &, TQNetworkOperation * ) ), - this, SLOT( newData( const TQByteArray & ) ) ); + connect( btnOpen, TQ_SIGNAL(clicked()), TQ_SLOT(downloadFile()) ); + connect( btnQuit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); + connect( &op, TQ_SIGNAL( data( const TQByteArray &, TQNetworkOperation * ) ), + this, TQ_SLOT( newData( const TQByteArray & ) ) ); } void ClientInfo::downloadFile() diff --git a/examples/network/infoprotocol/infourlclient/qip.cpp b/examples/network/infoprotocol/infourlclient/qip.cpp index aa153501..aed84838 100644 --- a/examples/network/infoprotocol/infourlclient/qip.cpp +++ b/examples/network/infoprotocol/infourlclient/qip.cpp @@ -19,10 +19,10 @@ Qip::Qip() { state = Start; socket = new TQSocket( this ); - connect( socket, SIGNAL(connected()), SLOT(socketConnected()) ); - connect( socket, SIGNAL(connectionClosed()), SLOT(socketConnectionClosed()) ); - connect( socket, SIGNAL(readyRead()), SLOT(socketReadyRead()) ); - connect( socket, SIGNAL(error(int)), SLOT(socketError(int)) ); + connect( socket, TQ_SIGNAL(connected()), TQ_SLOT(socketConnected()) ); + connect( socket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(socketConnectionClosed()) ); + connect( socket, TQ_SIGNAL(readyRead()), TQ_SLOT(socketReadyRead()) ); + connect( socket, TQ_SIGNAL(error(int)), TQ_SLOT(socketError(int)) ); } int Qip::supportedOperations() const diff --git a/examples/network/mail/composer.cpp b/examples/network/mail/composer.cpp index cee25929..51f69012 100644 --- a/examples/network/mail/composer.cpp +++ b/examples/network/mail/composer.cpp @@ -38,7 +38,7 @@ Composer::Composer( TQWidget *parent ) send = new TQPushButton( tr( "&Send" ), this ); layout->addWidget( send, 4, 0 ); - connect( send, SIGNAL( clicked() ), this, SLOT( sendMessage() ) ); + connect( send, TQ_SIGNAL( clicked() ), this, TQ_SLOT( sendMessage() ) ); sendStatus = new TQLabel( this ); layout->addWidget( sendStatus, 4, 1 ); @@ -52,10 +52,10 @@ void Composer::sendMessage() Smtp *smtp = new Smtp( from->text(), to->text(), subject->text(), message->text() ); - connect( smtp, SIGNAL(destroyed()), - this, SLOT(enableSend()) ); - connect( smtp, SIGNAL(status(const TQString &)), - sendStatus, SLOT(setText(const TQString &)) ); + connect( smtp, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(enableSend()) ); + connect( smtp, TQ_SIGNAL(status(const TQString &)), + sendStatus, TQ_SLOT(setText(const TQString &)) ); } diff --git a/examples/network/mail/smtp.cpp b/examples/network/mail/smtp.cpp index 3a288fc0..e9a34b28 100644 --- a/examples/network/mail/smtp.cpp +++ b/examples/network/mail/smtp.cpp @@ -23,14 +23,14 @@ Smtp::Smtp( const TQString &from, const TQString &to, const TQString &body ) { socket = new TQSocket( this ); - connect ( socket, SIGNAL( readyRead() ), - this, SLOT( readyRead() ) ); - connect ( socket, SIGNAL( connected() ), - this, SLOT( connected() ) ); + connect ( socket, TQ_SIGNAL( readyRead() ), + this, TQ_SLOT( readyRead() ) ); + connect ( socket, TQ_SIGNAL( connected() ), + this, TQ_SLOT( connected() ) ); mxLookup = new TQDns( to.mid( to.find( '@' )+1 ), TQDns::Mx ); - connect( mxLookup, SIGNAL(resultsReady()), - this, SLOT(dnsLookupHelper()) ); + connect( mxLookup, TQ_SIGNAL(resultsReady()), + this, TQ_SLOT(dnsLookupHelper()) ); message = TQString::fromLatin1( "From: " ) + from + TQString::fromLatin1( "\nTo: " ) + to + diff --git a/examples/network/networkprotocol/nntp.cpp b/examples/network/networkprotocol/nntp.cpp index 1fe31dda..833718ad 100644 --- a/examples/network/networkprotocol/nntp.cpp +++ b/examples/network/networkprotocol/nntp.cpp @@ -20,16 +20,16 @@ Nntp::Nntp() { // create the command socket and connect to its signals commandSocket = new TQSocket( this ); - connect( commandSocket, SIGNAL( hostFound() ), - this, SLOT( hostFound() ) ); - connect( commandSocket, SIGNAL( connected() ), - this, SLOT( connected() ) ); - connect( commandSocket, SIGNAL( connectionClosed() ), - this, SLOT( closed() ) ); - connect( commandSocket, SIGNAL( readyRead() ), - this, SLOT( readyRead() ) ); - connect( commandSocket, SIGNAL( error( int ) ), - this, SLOT( error( int ) ) ); + connect( commandSocket, TQ_SIGNAL( hostFound() ), + this, TQ_SLOT( hostFound() ) ); + connect( commandSocket, TQ_SIGNAL( connected() ), + this, TQ_SLOT( connected() ) ); + connect( commandSocket, TQ_SIGNAL( connectionClosed() ), + this, TQ_SLOT( closed() ) ); + connect( commandSocket, TQ_SIGNAL( readyRead() ), + this, TQ_SLOT( readyRead() ) ); + connect( commandSocket, TQ_SIGNAL( error( int ) ), + this, TQ_SLOT( error( int ) ) ); } Nntp::~Nntp() diff --git a/examples/network/networkprotocol/view.cpp b/examples/network/networkprotocol/view.cpp index 3c24e03d..070b8a7c 100644 --- a/examples/network/networkprotocol/view.cpp +++ b/examples/network/networkprotocol/view.cpp @@ -40,15 +40,15 @@ View::View() "for downloading a news article start with an url like " "<u>nntp://news.tu-graz.ac.at</u> " ) ); TQPushButton *b = new TQPushButton( tr( "Open a file..." ), this ); - connect( b, SIGNAL( clicked() ), - this, SLOT( downloadFile() ) ); + connect( b, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( downloadFile() ) ); fileView = new TQMultiLineEdit( this ); fileView->setReadOnly( TRUE ); // if new data comes in, display it - connect( &op, SIGNAL( data( const TQByteArray &, TQNetworkOperation * ) ), - this, SLOT( newData( const TQByteArray & ) ) ); + connect( &op, TQ_SIGNAL( data( const TQByteArray &, TQNetworkOperation * ) ), + this, TQ_SLOT( newData( const TQByteArray & ) ) ); } void View::downloadFile() diff --git a/examples/network/remotecontrol/ipcserver.cpp b/examples/network/remotecontrol/ipcserver.cpp index e7cbc2c5..4bd7b642 100644 --- a/examples/network/remotecontrol/ipcserver.cpp +++ b/examples/network/remotecontrol/ipcserver.cpp @@ -14,7 +14,7 @@ public: IpcSocket( TQObject *parent) : TQSocket( parent ) { packetSize = 0; - connect( this, SIGNAL(readyRead()), SLOT(read()) ); + connect( this, TQ_SIGNAL(readyRead()), TQ_SLOT(read()) ); } signals: @@ -75,10 +75,10 @@ void IpcServer::newConnection( int socket ) { IpcSocket *s = new IpcSocket( this ); s->setSocket( socket ); - connect( s, SIGNAL(receivedText(const TQString&)), - SIGNAL(receivedText(const TQString&)) ); - connect( s, SIGNAL(receivedPixmap(const TQPixmap&)), - SIGNAL(receivedPixmap(const TQPixmap&)) ); + connect( s, TQ_SIGNAL(receivedText(const TQString&)), + TQ_SIGNAL(receivedText(const TQString&)) ); + connect( s, TQ_SIGNAL(receivedPixmap(const TQPixmap&)), + TQ_SIGNAL(receivedPixmap(const TQPixmap&)) ); } #include "ipcserver.moc" diff --git a/examples/network/remotecontrol/main.cpp b/examples/network/remotecontrol/main.cpp index 76072217..914d5685 100644 --- a/examples/network/remotecontrol/main.cpp +++ b/examples/network/remotecontrol/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char **argv ) { TQApplication a( argc, argv ); StartUp s; - TQObject::connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); + TQObject::connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/examples/network/remotecontrol/remotectrlimpl.cpp b/examples/network/remotecontrol/remotectrlimpl.cpp index ac1f0167..68e0a3c7 100644 --- a/examples/network/remotecontrol/remotectrlimpl.cpp +++ b/examples/network/remotecontrol/remotectrlimpl.cpp @@ -10,9 +10,9 @@ RemoteCtrlImpl::RemoteCtrlImpl( TQSocket *s ) { socket = s; - connect( sImage, SIGNAL(clicked()), SLOT(sendImage()) ); - connect( sText, SIGNAL(clicked()), SLOT(sendText()) ); - connect( sPalette, SIGNAL(clicked()), SLOT(sendPalette()) ); + connect( sImage, TQ_SIGNAL(clicked()), TQ_SLOT(sendImage()) ); + connect( sText, TQ_SIGNAL(clicked()), TQ_SLOT(sendText()) ); + connect( sPalette, TQ_SIGNAL(clicked()), TQ_SLOT(sendPalette()) ); } void RemoteCtrlImpl::sendPacket( const TQVariant &v ) diff --git a/examples/network/remotecontrol/startup.cpp b/examples/network/remotecontrol/startup.cpp index 11b9d227..95e33e26 100644 --- a/examples/network/remotecontrol/startup.cpp +++ b/examples/network/remotecontrol/startup.cpp @@ -14,8 +14,8 @@ StartUp::StartUp() mainDialog = 0; socket = new TQSocket( this ); - connect( socket, SIGNAL(connected()), SLOT(startRemoteCtrl()) ); - connect( socket, SIGNAL(error(int)), SLOT(startMainDialog()) ); + connect( socket, TQ_SIGNAL(connected()), TQ_SLOT(startRemoteCtrl()) ); + connect( socket, TQ_SIGNAL(error(int)), TQ_SLOT(startMainDialog()) ); socket->connectToHost( "localhost", ipcPort ); } @@ -38,8 +38,8 @@ void StartUp::startMainDialog() IpcServer *server = new IpcServer( ipcPort, this ); - connect( server, SIGNAL(receivedText(const TQString&)), - mainDialog->description, SLOT(setText(const TQString&)) ); - connect( server, SIGNAL(receivedPixmap(const TQPixmap&)), - mainDialog->image, SLOT(setPixmap(const TQPixmap&)) ); + connect( server, TQ_SIGNAL(receivedText(const TQString&)), + mainDialog->description, TQ_SLOT(setText(const TQString&)) ); + connect( server, TQ_SIGNAL(receivedPixmap(const TQPixmap&)), + mainDialog->image, TQ_SLOT(setPixmap(const TQPixmap&)) ); } diff --git a/examples/opengl/box/globjwin.cpp b/examples/opengl/box/globjwin.cpp index 9176fe4b..d93c61af 100644 --- a/examples/opengl/box/globjwin.cpp +++ b/examples/opengl/box/globjwin.cpp @@ -25,7 +25,7 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Create a menu TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( "Exit", tqApp, SLOT(quit()), CTRL+Key_Q ); + file->insertItem( "Exit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); @@ -43,15 +43,15 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Create the three sliders; one for each rotation axis TQSlider* x = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "xsl" ); x->setTickmarks( TQSlider::Left ); - TQObject::connect( x, SIGNAL(valueChanged(int)),c,SLOT(setXRotation(int)) ); + TQObject::connect( x, TQ_SIGNAL(valueChanged(int)),c,TQ_SLOT(setXRotation(int)) ); TQSlider* y = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "ysl" ); y->setTickmarks( TQSlider::Left ); - TQObject::connect( y, SIGNAL(valueChanged(int)),c,SLOT(setYRotation(int)) ); + TQObject::connect( y, TQ_SIGNAL(valueChanged(int)),c,TQ_SLOT(setYRotation(int)) ); TQSlider* z = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "zsl" ); z->setTickmarks( TQSlider::Left ); - TQObject::connect( z, SIGNAL(valueChanged(int)),c,SLOT(setZRotation(int)) ); + TQObject::connect( z, TQ_SIGNAL(valueChanged(int)),c,TQ_SLOT(setZRotation(int)) ); // Now that we have all the widgets, put them into a nice layout diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp index 3f59ecd1..11cb675a 100644 --- a/examples/opengl/glpixmap/globjwin.cpp +++ b/examples/opengl/glpixmap/globjwin.cpp @@ -36,17 +36,17 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Create a menu file = new TQPopupMenu( this ); file->setCheckable( TRUE ); - file->insertItem( "Grab Frame Buffer", this, SLOT(grabFrameBuffer()) ); - file->insertItem( "Render Pixmap", this, SLOT(makePixmap()) ); - file->insertItem( "Render Pixmap Hidden", this, SLOT(makePixmapHidden()) ); + file->insertItem( "Grab Frame Buffer", this, TQ_SLOT(grabFrameBuffer()) ); + file->insertItem( "Render Pixmap", this, TQ_SLOT(makePixmap()) ); + file->insertItem( "Render Pixmap Hidden", this, TQ_SLOT(makePixmapHidden()) ); file->insertSeparator(); fixMenuItemId = file->insertItem( "Use Fixed Pixmap Size", this, - SLOT(useFixedPixmapSize()) ); + TQ_SLOT(useFixedPixmapSize()) ); file->insertSeparator(); insertMenuItemId = file->insertItem( "Insert Pixmap Here", this, - SLOT(makePixmapForMenu()) ); + TQ_SLOT(makePixmapForMenu()) ); file->insertSeparator(); - file->insertItem( "Exit", tqApp, SLOT(quit()), CTRL+Key_Q ); + file->insertItem( "Exit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); @@ -72,15 +72,15 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Create the three sliders; one for each rotation axis TQSlider* x = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "xsl" ); x->setTickmarks( TQSlider::Left ); - connect( x, SIGNAL(valueChanged(int)), c1, SLOT(setXRotation(int)) ); + connect( x, TQ_SIGNAL(valueChanged(int)), c1, TQ_SLOT(setXRotation(int)) ); TQSlider* y = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "ysl" ); y->setTickmarks( TQSlider::Left ); - connect( y, SIGNAL(valueChanged(int)), c1, SLOT(setYRotation(int)) ); + connect( y, TQ_SIGNAL(valueChanged(int)), c1, TQ_SLOT(setYRotation(int)) ); TQSlider* z = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "zsl" ); z->setTickmarks( TQSlider::Left ); - connect( z, SIGNAL(valueChanged(int)), c1, SLOT(setZRotation(int)) ); + connect( z, TQ_SIGNAL(valueChanged(int)), c1, TQ_SLOT(setZRotation(int)) ); // Now that we have all the widgets, put them into a nice layout diff --git a/examples/opengl/overlay/globjwin.cpp b/examples/opengl/overlay/globjwin.cpp index 2b3761b1..585994a7 100644 --- a/examples/opengl/overlay/globjwin.cpp +++ b/examples/opengl/overlay/globjwin.cpp @@ -22,7 +22,7 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) { // Create a menu TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( "Exit", tqApp, SLOT(quit()), CTRL+Key_Q ); + file->insertItem( "Exit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); diff --git a/examples/opengl/sharedbox/globjwin.cpp b/examples/opengl/sharedbox/globjwin.cpp index d95482ff..11878390 100644 --- a/examples/opengl/sharedbox/globjwin.cpp +++ b/examples/opengl/sharedbox/globjwin.cpp @@ -25,8 +25,8 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Create a menu TQPopupMenu *file = new TQPopupMenu( this ); file->insertItem( "Delete Left TQGLWidget", this, - SLOT(deleteFirstWidget()) ); - file->insertItem( "Exit", tqApp, SLOT(quit()), CTRL+Key_Q ); + TQ_SLOT(deleteFirstWidget()) ); + file->insertItem( "Exit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); @@ -51,18 +51,18 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Make them spin the boxes, but not in synch TQSlider* x = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "xsl" ); x->setTickmarks( TQSlider::Left ); - connect( x, SIGNAL(valueChanged(int)), c1, SLOT(setXRotation(int)) ); - connect( x, SIGNAL(valueChanged(int)), c2, SLOT(setZRotation(int)) ); + connect( x, TQ_SIGNAL(valueChanged(int)), c1, TQ_SLOT(setXRotation(int)) ); + connect( x, TQ_SIGNAL(valueChanged(int)), c2, TQ_SLOT(setZRotation(int)) ); TQSlider* y = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "ysl" ); y->setTickmarks( TQSlider::Left ); - connect( y, SIGNAL(valueChanged(int)), c1, SLOT(setYRotation(int)) ); - connect( y, SIGNAL(valueChanged(int)), c2, SLOT(setXRotation(int)) ); + connect( y, TQ_SIGNAL(valueChanged(int)), c1, TQ_SLOT(setYRotation(int)) ); + connect( y, TQ_SIGNAL(valueChanged(int)), c2, TQ_SLOT(setXRotation(int)) ); TQSlider* z = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "zsl" ); z->setTickmarks( TQSlider::Left ); - connect( z, SIGNAL(valueChanged(int)), c1, SLOT(setZRotation(int)) ); - connect( z, SIGNAL(valueChanged(int)), c2, SLOT(setYRotation(int)) ); + connect( z, TQ_SIGNAL(valueChanged(int)), c1, TQ_SLOT(setZRotation(int)) ); + connect( z, TQ_SIGNAL(valueChanged(int)), c2, TQ_SLOT(setYRotation(int)) ); // Now that we have all the widgets, put them into a nice layout diff --git a/examples/opengl/texture/globjwin.cpp b/examples/opengl/texture/globjwin.cpp index b02d0d17..3a591c22 100644 --- a/examples/opengl/texture/globjwin.cpp +++ b/examples/opengl/texture/globjwin.cpp @@ -33,10 +33,10 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Create a menu TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( "Toggle Animation", c, SLOT(toggleAnimation()), + file->insertItem( "Toggle Animation", c, TQ_SLOT(toggleAnimation()), CTRL+Key_A ); file->insertSeparator(); - file->insertItem( "Exit", tqApp, SLOT(quit()), CTRL+Key_Q ); + file->insertItem( "Exit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); @@ -46,15 +46,15 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Create the three sliders; one for each rotation axis TQSlider* x = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "xsl" ); x->setTickmarks( TQSlider::Left ); - connect( x, SIGNAL(valueChanged(int)), c, SLOT(setXRotation(int)) ); + connect( x, TQ_SIGNAL(valueChanged(int)), c, TQ_SLOT(setXRotation(int)) ); TQSlider* y = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "ysl" ); y->setTickmarks( TQSlider::Left ); - connect( y, SIGNAL(valueChanged(int)), c, SLOT(setYRotation(int)) ); + connect( y, TQ_SIGNAL(valueChanged(int)), c, TQ_SLOT(setYRotation(int)) ); TQSlider* z = new TQSlider ( 0, 360, 60, 0, TQSlider::Vertical, this, "zsl" ); z->setTickmarks( TQSlider::Left ); - connect( z, SIGNAL(valueChanged(int)), c, SLOT(setZRotation(int)) ); + connect( z, TQ_SIGNAL(valueChanged(int)), c, TQ_SLOT(setZRotation(int)) ); // Now that we have all the widgets, put them into a nice layout diff --git a/examples/opengl/texture/gltexobj.cpp b/examples/opengl/texture/gltexobj.cpp index 973cd4d5..78b0fcef 100644 --- a/examples/opengl/texture/gltexobj.cpp +++ b/examples/opengl/texture/gltexobj.cpp @@ -35,7 +35,7 @@ GLTexobj::GLTexobj( TQWidget* parent, const char* name ) object = 0; animation = TRUE; timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(update()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(update()) ); timer->start( redrawWait, TRUE ); } diff --git a/examples/popup/popup.cpp b/examples/popup/popup.cpp index 4438c4c4..25fd14b0 100644 --- a/examples/popup/popup.cpp +++ b/examples/popup/popup.cpp @@ -64,9 +64,9 @@ void FancyPopup::popup( TQWidget* parent) { Frame::Frame(TQWidget* parent, const char* name): TQFrame(parent, name){ button1 = new TQPushButton("Simple Popup", this); - connect ( button1, SIGNAL( clicked() ), SLOT( button1Clicked() ) ); + connect ( button1, TQ_SIGNAL( clicked() ), TQ_SLOT( button1Clicked() ) ); button2 = new TQPushButton("Fancy Popup", this); - connect ( button2, SIGNAL( pressed() ), SLOT( button2Pressed() ) ); + connect ( button2, TQ_SIGNAL( pressed() ), TQ_SLOT( button2Pressed() ) ); TQBoxLayout * l = new TQHBoxLayout( this ); button1->setMaximumSize(button1->sizeHint()); @@ -86,11 +86,11 @@ Frame::Frame(TQWidget* parent, const char* name): TQFrame(parent, name){ popup1->setFrameStyle( WinPanel|Raised ); popup1->resize(150,100); TQLineEdit *tmpE = new TQLineEdit( popup1 ); - connect( tmpE, SIGNAL( returnPressed() ), popup1, SLOT( hide() ) ); + connect( tmpE, TQ_SIGNAL( returnPressed() ), popup1, TQ_SLOT( hide() ) ); tmpE->setGeometry(10,10, 130, 30); tmpE->setFocus(); TQPushButton *tmpB = new TQPushButton("Click me!", popup1); - connect( tmpB, SIGNAL( clicked() ), popup1, SLOT( close() ) ); + connect( tmpB, TQ_SIGNAL( clicked() ), popup1, TQ_SLOT( close() ) ); tmpB->setGeometry(10, 50, 130, 30); // the fancier version uses its own class. It will be shown when @@ -105,7 +105,7 @@ Frame::Frame(TQWidget* parent, const char* name): TQFrame(parent, name){ // tmpE = new TQLineEdit( popup2 ); // tmpE->setFocus(); -// connect( tmpE, SIGNAL( returnPressed() ), popup2, SLOT( close() ) ); +// connect( tmpE, TQ_SIGNAL( returnPressed() ), popup2, TQ_SLOT( close() ) ); // tmpE->setGeometry(10, 10, 130, 30); } diff --git a/examples/process/process.cpp b/examples/process/process.cpp index aceb71cc..5c3c73c9 100644 --- a/examples/process/process.cpp +++ b/examples/process/process.cpp @@ -40,8 +40,8 @@ UicManager::UicManager() // Layout output = new TQTextView( this ); quitButton = new TQPushButton( tr("Quit"), this ); - connect( quitButton, SIGNAL(clicked()), - tqApp, SLOT(quit()) ); + connect( quitButton, TQ_SIGNAL(clicked()), + tqApp, TQ_SLOT(quit()) ); resize( 500, 500 ); // TQProcess related code @@ -55,10 +55,10 @@ UicManager::UicManager() proc->addArgument( "i18n" ); proc->addArgument( "small_dialog.ui" ); - connect( proc, SIGNAL(readyReadStdout()), - this, SLOT(readFromStdout()) ); - connect( proc, SIGNAL(processExited()), - this, SLOT(scrollToTop()) ); + connect( proc, TQ_SIGNAL(readyReadStdout()), + this, TQ_SLOT(readFromStdout()) ); + connect( proc, TQ_SIGNAL(processExited()), + this, TQ_SLOT(scrollToTop()) ); if ( !proc->start() ) { // error handling diff --git a/examples/progress/progress.cpp b/examples/progress/progress.cpp index d12867e3..190f50de 100644 --- a/examples/progress/progress.cpp +++ b/examples/progress/progress.cpp @@ -149,20 +149,20 @@ public: menubar->insertItem( "&File", file ); for (int i=first_draw_item; i<=last_draw_item; i++) file->insertItem( drawItemText(i), i ); - connect( menubar, SIGNAL(activated(int)), this, SLOT(doMenuItem(int)) ); + connect( menubar, TQ_SIGNAL(activated(int)), this, TQ_SLOT(doMenuItem(int)) ); file->insertSeparator(); - file->insertItem( "Quit", tqApp, SLOT(quit()) ); + file->insertItem( "Quit", tqApp, TQ_SLOT(quit()) ); options = new TQPopupMenu(); TQ_CHECK_PTR( options ); menubar->insertItem( "&Options", options ); - td_id = options->insertItem( "Timer driven", this, SLOT(timerDriven()) ); - ld_id = options->insertItem( "Loop driven", this, SLOT(loopDriven()) ); + td_id = options->insertItem( "Timer driven", this, TQ_SLOT(timerDriven()) ); + ld_id = options->insertItem( "Loop driven", this, TQ_SLOT(loopDriven()) ); options->insertSeparator(); - dl_id = options->insertItem( "Default label", this, SLOT(defaultLabel()) ); - cl_id = options->insertItem( "Custom label", this, SLOT(customLabel()) ); + dl_id = options->insertItem( "Default label", this, TQ_SLOT(defaultLabel()) ); + cl_id = options->insertItem( "Custom label", this, TQ_SLOT(customLabel()) ); options->insertSeparator(); - md_id = options->insertItem( "No minimum duration", this, SLOT(toggleMinimumDuration()) ); + md_id = options->insertItem( "No minimum duration", this, TQ_SLOT(toggleMinimumDuration()) ); options->setCheckable( TRUE ); loopDriven(); defaultLabel(); @@ -279,7 +279,7 @@ private: pb = newProgressDialog("Drawing rectangles.\n" "Using timer event.", n, FALSE); pb->setCaption("Please Wait"); - connect(pb, SIGNAL(cancelled()), this, SLOT(stopDrawing())); + connect(pb, TQ_SIGNAL(cancelled()), this, TQ_SLOT(stopDrawing())); enableDrawingItems(FALSE); startTimer(0); got_stop = FALSE; diff --git a/examples/progressbar/progressbar.cpp b/examples/progressbar/progressbar.cpp index 47fc2490..dfe2d70a 100644 --- a/examples/progressbar/progressbar.cpp +++ b/examples/progressbar/progressbar.cpp @@ -57,11 +57,11 @@ ProgressBar::ProgressBar( TQWidget *parent, const char *name ) toplayout->addMultiCellWidget( progress, 1, 1, 0, 1 ); // connect the clicked() SIGNALs of the pushbuttons to SLOTs - connect( start, SIGNAL( clicked() ), this, SLOT( slotStart() ) ); - connect( reset, SIGNAL( clicked() ), this, SLOT( slotReset() ) ); + connect( start, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotStart() ) ); + connect( reset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotReset() ) ); - // connect the timeout() SIGNAL of the progress-timer to a SLOT - connect( &timer, SIGNAL( timeout() ), this, SLOT( slotTimeout() ) ); + // connect the timeout() TQ_SIGNAL of the progress-timer to a TQ_SLOT + connect( &timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); // Let's start with normal speed... normal->setChecked( TRUE ); @@ -73,9 +73,9 @@ ProgressBar::ProgressBar( TQWidget *parent, const char *name ) } /* - * SLOT slotStart + * TQ_SLOT slotStart * - * This SLOT is called if the user clicks start/pause/continue + * This TQ_SLOT is called if the user clicks start/pause/continue * button */ @@ -113,9 +113,9 @@ void ProgressBar::slotStart() } /* - * SLOT slotReset + * TQ_SLOT slotReset * - * This SLOT is called when the user clicks the reset button + * This TQ_SLOT is called when the user clicks the reset button */ void ProgressBar::slotReset() @@ -138,9 +138,9 @@ void ProgressBar::slotReset() } /* - * SLOT slotTimeout + * TQ_SLOT slotTimeout * - * This SLOT is called each ms when the timer is + * This TQ_SLOT is called each ms when the timer is * active (== progress is running) */ diff --git a/examples/qdir/qdir.cpp b/examples/qdir/qdir.cpp index 1f13f72f..b2cf108b 100644 --- a/examples/qdir/qdir.cpp +++ b/examples/qdir/qdir.cpp @@ -201,8 +201,8 @@ CustomFileDialog::CustomFileDialog() TQToolTip::add( p, tr( "Bookmarks" ) ); bookmarkMenu = new TQPopupMenu( this ); - connect( bookmarkMenu, SIGNAL( activated( int ) ), - this, SLOT( bookmarkChosen( int ) ) ); + connect( bookmarkMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( bookmarkChosen( int ) ) ); addId = bookmarkMenu->insertItem( tr( "Add bookmark" ) ); bookmarkMenu->insertSeparator(); @@ -222,16 +222,16 @@ CustomFileDialog::CustomFileDialog() addToolButton( p, TRUE ); - connect( dirView, SIGNAL( folderSelected( const TQString & ) ), - this, SLOT( setDir2( const TQString & ) ) ); - connect( this, SIGNAL( dirEntered( const TQString & ) ), - dirView, SLOT( setDir( const TQString & ) ) ); + connect( dirView, TQ_SIGNAL( folderSelected( const TQString & ) ), + this, TQ_SLOT( setDir2( const TQString & ) ) ); + connect( this, TQ_SIGNAL( dirEntered( const TQString & ) ), + dirView, TQ_SLOT( setDir( const TQString & ) ) ); TQToolButton *b = new TQToolButton( this ); TQToolTip::add( b, tr( "Go Home!" ) ); b->setPixmap( TQPixmap( home ) ); - connect( b, SIGNAL( clicked() ), - this, SLOT( goHome() ) ); + connect( b, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( goHome() ) ); addToolButton( b ); diff --git a/examples/qfd/fontdisplayer.cpp b/examples/qfd/fontdisplayer.cpp index 9fcd73b3..a580e879 100644 --- a/examples/qfd/fontdisplayer.cpp +++ b/examples/qfd/fontdisplayer.cpp @@ -146,10 +146,10 @@ FontDisplayer::FontDisplayer( TQWidget* parent, const char* name ) : controls->addSeparator(); TQPushButton *fontbutton = new TQPushButton(tr("Font..."), controls); - connect(row,SIGNAL(valueChanged(int)),table,SLOT(setRow(int))); - connect(fontbutton, SIGNAL(clicked()), table, SLOT(chooseFont())); - connect(table,SIGNAL(fontInformation(const TQString&)), - statusBar(),SLOT(message(const TQString&))); + connect(row,TQ_SIGNAL(valueChanged(int)),table,TQ_SLOT(setRow(int))); + connect(fontbutton, TQ_SIGNAL(clicked()), table, TQ_SLOT(chooseFont())); + connect(table,TQ_SIGNAL(fontInformation(const TQString&)), + statusBar(),TQ_SLOT(message(const TQString&))); table->setRow(0); setCentralWidget(table); } diff --git a/examples/qmag/qmag.cpp b/examples/qmag/qmag.cpp index fa371f65..b5705df6 100644 --- a/examples/qmag/qmag.cpp +++ b/examples/qmag/qmag.cpp @@ -90,12 +90,12 @@ MagWidget::MagWidget( TQWidget *parent, const char *name ) zoom = new TQComboBox( FALSE, this ); TQ_CHECK_PTR(zoom); zoom->insertStrList( zoomfactors, 9 ); - connect( zoom, SIGNAL(activated(int)), SLOT(setZoom(int)) ); + connect( zoom, TQ_SIGNAL(activated(int)), TQ_SLOT(setZoom(int)) ); refresh = new TQComboBox( FALSE, this ); TQ_CHECK_PTR(refresh); refresh->insertStrList( refreshrates, 9 ); - connect( refresh, SIGNAL(activated(int)), SLOT(setRefresh(int)) ); + connect( refresh, TQ_SIGNAL(activated(int)), TQ_SLOT(setRefresh(int)) ); for( n=0; n<9; n++) { int w2 = zoom->fontMetrics().width( zoomfactors[n] ); @@ -113,7 +113,7 @@ MagWidget::MagWidget( TQWidget *parent, const char *name ) saveButton = new TQPushButton( this ); TQ_CHECK_PTR(saveButton); - connect( saveButton, SIGNAL(clicked()), this, SLOT(save()) ); + connect( saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(save()) ); saveButton->setText( "Save" ); saveButton->setGeometry( x+w+30+2, 2, 10+saveButton->fontMetrics().width("Save"), 20 ); @@ -121,14 +121,14 @@ MagWidget::MagWidget( TQWidget *parent, const char *name ) multiSaveButton = new TQPushButton( this ); multiSaveButton->setToggleButton(TRUE); TQ_CHECK_PTR(multiSaveButton); - connect( multiSaveButton, SIGNAL(clicked()), this, SLOT(multiSave()) ); + connect( multiSaveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(multiSave()) ); multiSaveButton->setText( "MultiSave" ); multiSaveButton->setGeometry( saveButton->geometry().right() + 2, 2, 10+multiSaveButton->fontMetrics().width("MultiSave"), 20 ); quitButton = new TQPushButton( this ); TQ_CHECK_PTR(quitButton); - connect( quitButton, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quitButton, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); quitButton->setText( "Quit" ); quitButton->setGeometry( multiSaveButton->geometry().right() + 2, 2, 10+quitButton->fontMetrics().width("Quit"), 20 ); diff --git a/examples/qwerty/main.cpp b/examples/qwerty/main.cpp index c5b29d70..90a1c0d4 100644 --- a/examples/qwerty/main.cpp +++ b/examples/qwerty/main.cpp @@ -32,6 +32,6 @@ int main( int argc, char **argv ) e->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/examples/qwerty/qwerty.cpp b/examples/qwerty/qwerty.cpp index ab144174..28dbc48a 100644 --- a/examples/qwerty/qwerty.cpp +++ b/examples/qwerty/qwerty.cpp @@ -37,40 +37,40 @@ Editor::Editor( TQWidget * parent , const char * name ) TQ_CHECK_PTR( file ); m->insertItem( "&File", file ); - file->insertItem( "&New", this, SLOT(newDoc()), ALT+Key_N ); - file->insertItem( "&Open...", this, SLOT(load()), ALT+Key_O ); - file->insertItem( "&Save...", this, SLOT(save()), ALT+Key_S ); + file->insertItem( "&New", this, TQ_SLOT(newDoc()), ALT+Key_N ); + file->insertItem( "&Open...", this, TQ_SLOT(load()), ALT+Key_O ); + file->insertItem( "&Save...", this, TQ_SLOT(save()), ALT+Key_S ); file->insertSeparator(); open_as = new TQPopupMenu(); file->insertItem( "Open &As", open_as ); save_as = new TQPopupMenu(); file->insertItem( "Sa&ve As", save_as ); - file->insertItem( "Add &Encoding", this, SLOT(addEncoding()) ); + file->insertItem( "Add &Encoding", this, TQ_SLOT(addEncoding()) ); #ifndef TQT_NO_PRINTER file->insertSeparator(); - file->insertItem( "&Print...", this, SLOT(print()), ALT+Key_P ); + file->insertItem( "&Print...", this, TQ_SLOT(print()), ALT+Key_P ); #endif file->insertSeparator(); - file->insertItem( "&Close", this, SLOT(close()),ALT+Key_W ); - file->insertItem( "&Quit", tqApp, SLOT(closeAllWindows()), ALT+Key_Q ); + file->insertItem( "&Close", this, TQ_SLOT(close()),ALT+Key_W ); + file->insertItem( "&Quit", tqApp, TQ_SLOT(closeAllWindows()), ALT+Key_Q ); - connect( save_as, SIGNAL(activated(int)), this, SLOT(saveAsEncoding(int)) ); - connect( open_as, SIGNAL(activated(int)), this, SLOT(openAsEncoding(int)) ); + connect( save_as, TQ_SIGNAL(activated(int)), this, TQ_SLOT(saveAsEncoding(int)) ); + connect( open_as, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openAsEncoding(int)) ); rebuildCodecList(); TQPopupMenu * edit = new TQPopupMenu(); TQ_CHECK_PTR( edit ); m->insertItem( "&Edit", edit ); - edit->insertItem( "To &Uppercase", this, SLOT(toUpper()), ALT+Key_U ); - edit->insertItem( "To &Lowercase", this, SLOT(toLower()), ALT+Key_L ); + edit->insertItem( "To &Uppercase", this, TQ_SLOT(toUpper()), ALT+Key_U ); + edit->insertItem( "To &Lowercase", this, TQ_SLOT(toLower()), ALT+Key_L ); #ifndef TQT_NO_FONTDIALOG edit->insertSeparator(); - edit->insertItem( "&Select Font" , this, SLOT(font()), ALT+Key_T ); + edit->insertItem( "&Select Font" , this, TQ_SLOT(font()), ALT+Key_T ); #endif changed = FALSE; e = new TQMultiLineEdit( this, "editor" ); - connect( e, SIGNAL( textChanged() ), this, SLOT( textChanged() ) ); + connect( e, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( textChanged() ) ); // We use Unifont - if you have it installed you'll see all // Unicode character glyphs. diff --git a/examples/rangecontrols/rangecontrols.cpp b/examples/rangecontrols/rangecontrols.cpp index 1dd9260d..e423cc7e 100644 --- a/examples/rangecontrols/rangecontrols.cpp +++ b/examples/rangecontrols/rangecontrols.cpp @@ -58,7 +58,7 @@ RangeControls::RangeControls( TQWidget *parent, const char *name ) TQLCDNumber *lcd2 = new TQLCDNumber( 2, cell3 ); lcd2->display( 33 ); lcd2->setSegmentStyle( TQLCDNumber::Filled ); - connect( hslider, SIGNAL( valueChanged( int ) ), lcd2, SLOT( display( int ) ) ); + connect( hslider, TQ_SIGNAL( valueChanged( int ) ), lcd2, TQ_SLOT( display( int ) ) ); TQHBox *cell4 = new TQHBox( row2 ); cell4->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken ); @@ -66,5 +66,5 @@ RangeControls::RangeControls( TQWidget *parent, const char *name ) TQSlider *vslider = new TQSlider( 0, 64, 1, 8, TQt::Vertical, cell4 ); TQLCDNumber *lcd3 = new TQLCDNumber( 3, cell4 ); lcd3->display( 8 ); - connect( vslider, SIGNAL( valueChanged( int ) ), lcd3, SLOT( display( int ) ) ); + connect( vslider, TQ_SIGNAL( valueChanged( int ) ), lcd3, TQ_SLOT( display( int ) ) ); } diff --git a/examples/regexptester/main.cpp b/examples/regexptester/main.cpp index 1d372e4b..c52c8373 100644 --- a/examples/regexptester/main.cpp +++ b/examples/regexptester/main.cpp @@ -6,6 +6,6 @@ int main(int argc, char **argv) TQApplication app(argc, argv); RegexpTester form; form.show(); - app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); + app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); return app.exec(); } diff --git a/examples/regexptester/regexptester.cpp b/examples/regexptester/regexptester.cpp index caa58178..e9743515 100644 --- a/examples/regexptester/regexptester.cpp +++ b/examples/regexptester/regexptester.cpp @@ -70,9 +70,9 @@ RegexpTester::RegexpTester(TQWidget* parent, const char* name, bool modal, languageChange(); - connect(copyPushButton, SIGNAL(clicked()), this, SLOT(copy())); - connect(executePushButton, SIGNAL(clicked()), this, SLOT(execute())); - connect(quitPushButton, SIGNAL(clicked()), this, SLOT(accept())); + connect(copyPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(copy())); + connect(executePushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(execute())); + connect(quitPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); execute(); } diff --git a/examples/richtext/richtext.cpp b/examples/richtext/richtext.cpp index 066af1f3..b166017a 100644 --- a/examples/richtext/richtext.cpp +++ b/examples/richtext/richtext.cpp @@ -100,9 +100,9 @@ MyRichText::MyRichText( TQWidget *parent, const char *name ) bPrev->setEnabled( FALSE ); - connect( bClose, SIGNAL( clicked() ), tqApp, SLOT( quit() ) ); - connect( bPrev, SIGNAL( clicked() ), this, SLOT( prev() ) ); - connect( bNext, SIGNAL( clicked() ), this, SLOT( next() ) ); + connect( bClose, TQ_SIGNAL( clicked() ), tqApp, TQ_SLOT( quit() ) ); + connect( bPrev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prev() ) ); + connect( bNext, TQ_SIGNAL( clicked() ), this, TQ_SLOT( next() ) ); num = 0; } diff --git a/examples/rot13/rot13.cpp b/examples/rot13/rot13.cpp index e3d17d87..dfcc5d68 100644 --- a/examples/rot13/rot13.cpp +++ b/examples/rot13/rot13.cpp @@ -18,12 +18,12 @@ Rot13::Rot13() { left = new TQMultiLineEdit( this, "left" ); right = new TQMultiLineEdit( this, "right" ); - connect( left, SIGNAL(textChanged()), this, SLOT(changeRight()) ); - connect( right, SIGNAL(textChanged()), this, SLOT(changeLeft()) ); + connect( left, TQ_SIGNAL(textChanged()), this, TQ_SLOT(changeRight()) ); + connect( right, TQ_SIGNAL(textChanged()), this, TQ_SLOT(changeLeft()) ); TQPushButton * quit = new TQPushButton( "&Quit", this ); quit->setFocusPolicy( NoFocus ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); TQGridLayout * l = new TQGridLayout( this, 2, 2, 5 ); l->addWidget( left, 0, 0 ); diff --git a/examples/scribble/scribble.cpp b/examples/scribble/scribble.cpp index f031044b..3f80d888 100644 --- a/examples/scribble/scribble.cpp +++ b/examples/scribble/scribble.cpp @@ -123,24 +123,24 @@ Scribble::Scribble( TQWidget *parent, const char *name ) TQToolBar *tools = new TQToolBar( this ); - bSave = new TQToolButton( TQPixmap(), "Save", "Save as PNG image", this, SLOT( slotSave() ), tools ); + bSave = new TQToolButton( TQPixmap(), "Save", "Save as PNG image", this, TQ_SLOT( slotSave() ), tools ); bSave->setText( "Save as..." ); tools->addSeparator(); - bPColor = new TQToolButton( TQPixmap(), "Choose Pen Color", "Choose Pen Color", this, SLOT( slotColor() ), tools ); + bPColor = new TQToolButton( TQPixmap(), "Choose Pen Color", "Choose Pen Color", this, TQ_SLOT( slotColor() ), tools ); bPColor->setText( "Choose Pen Color..." ); tools->addSeparator(); bPWidth = new TQSpinBox( 1, 20, 1, tools ); TQToolTip::add( bPWidth, "Choose Pen Width" ); - connect( bPWidth, SIGNAL( valueChanged( int ) ), this, SLOT( slotWidth( int ) ) ); + connect( bPWidth, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotWidth( int ) ) ); bPWidth->setValue( 3 ); tools->addSeparator(); - bClear = new TQToolButton( TQPixmap(), "Clear Screen", "Clear Screen", this, SLOT( slotClear() ), tools ); + bClear = new TQToolButton( TQPixmap(), "Clear Screen", "Clear Screen", this, TQ_SLOT( slotClear() ), tools ); bClear->setText( "Clear Screen" ); } diff --git a/examples/scrollview/scrollview.cpp b/examples/scrollview/scrollview.cpp index f44853dd..29d6e1b5 100644 --- a/examples/scrollview/scrollview.cpp +++ b/examples/scrollview/scrollview.cpp @@ -43,7 +43,7 @@ public: for (int y=0; y<2000-h; y+=h+10) { if (y == 0) { TQButton* q=new TQPushButton("Quit", this); - connect(q, SIGNAL(clicked()), tqApp, SLOT(quit())); + connect(q, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit())); } else { TQString str; if ( b > 0 ) { @@ -207,14 +207,14 @@ public: TQPopupMenu* file = new TQPopupMenu( menubar ); TQ_CHECK_PTR( file ); menubar->insertItem( "&File", file ); - file->insertItem( "Quit", tqApp, SLOT(quit()) ); + file->insertItem( "Quit", tqApp, TQ_SLOT(quit()) ); vp_options = new TQPopupMenu( menubar ); TQ_CHECK_PTR( vp_options ); vp_options->setCheckable( TRUE ); menubar->insertItem( "&ScrollView", vp_options ); - connect( vp_options, SIGNAL(activated(int)), - this, SLOT(doVPMenuItem(int)) ); + connect( vp_options, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(doVPMenuItem(int)) ); vauto_id = vp_options->insertItem( "Vertical Auto" ); vaoff_id = vp_options->insertItem( "Vertical AlwaysOff" ); @@ -231,8 +231,8 @@ public: BigShrinker *bs = new BigShrinker(0);//(vp->viewport()); vp->addChild(bs); bs->setAcceptDrops(TRUE); - TQObject::connect(bs, SIGNAL(clicked(int,int)), - vp, SLOT(center(int,int))); + TQObject::connect(bs, TQ_SIGNAL(clicked(int,int)), + vp, TQ_SLOT(center(int,int))); } else { vp = new BigMatrix(this); if ( technique == 3 ) @@ -251,8 +251,8 @@ public: TQ_CHECK_PTR( f_options ); f_options->setCheckable( TRUE ); menubar->insertItem( "F&rame", f_options ); - connect( f_options, SIGNAL(activated(int)), - this, SLOT(doFMenuItem(int)) ); + connect( f_options, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(doFMenuItem(int)) ); f_options->insertItem( "No Frame", style_id ); f_options->insertItem( "Box", style_id|TQFrame::Box ); @@ -273,8 +273,8 @@ public: lw_options->insertItem( str, lw_id | lw ); } f_options->insertItem( "Line Width", lw_options ); - connect( lw_options, SIGNAL(activated(int)), - this, SLOT(doFMenuItem(int)) ); + connect( lw_options, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(doFMenuItem(int)) ); mlw_options = new TQPopupMenu( menubar ); TQ_CHECK_PTR( mlw_options ); mlw_options->setCheckable( TRUE ); @@ -284,8 +284,8 @@ public: mlw_options->insertItem( str, mlw_id | mlw ); } f_options->insertItem( "Midline Width", mlw_options ); - connect( mlw_options, SIGNAL(activated(int)), - this, SLOT(doFMenuItem(int)) ); + connect( mlw_options, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(doFMenuItem(int)) ); mw_options = new TQPopupMenu( menubar ); TQ_CHECK_PTR( mw_options ); mw_options->setCheckable( TRUE ); @@ -295,8 +295,8 @@ public: mw_options->insertItem( str, mw_id | mw ); } f_options->insertItem( "Margin Width", mw_options ); - connect( mw_options, SIGNAL(activated(int)), - this, SLOT(doFMenuItem(int)) ); + connect( mw_options, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(doFMenuItem(int)) ); setVPMenuItems(); setFMenuItems(); @@ -433,7 +433,7 @@ int main( int argc, char **argv ) ve3.setCaption("TQt Example - Scrollviews"); ve3.show(); - TQObject::connect(tqApp, SIGNAL(lastWindowClosed()), tqApp, SLOT(quit())); + TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit())); return a.exec(); } diff --git a/examples/showimg/imagetexteditor.cpp b/examples/showimg/imagetexteditor.cpp index 5f950b33..2abdabfb 100644 --- a/examples/showimg/imagetexteditor.cpp +++ b/examples/showimg/imagetexteditor.cpp @@ -48,23 +48,23 @@ ImageTextEditor::ImageTextEditor( TQImage& i, TQWidget *parent, const char *name TQPushButton* cancel = new TQPushButton("Cancel",hbox); TQPushButton* ok = new TQPushButton("OK",hbox); - connect(add,SIGNAL(clicked()), - this,SLOT(addText())); + connect(add,TQ_SIGNAL(clicked()), + this,TQ_SLOT(addText())); - connect(remove,SIGNAL(clicked()), - this,SLOT(removeText())); + connect(remove,TQ_SIGNAL(clicked()), + this,TQ_SLOT(removeText())); - connect(ok,SIGNAL(clicked()), - this,SLOT(accept())); + connect(ok,TQ_SIGNAL(clicked()), + this,TQ_SLOT(accept())); - connect(cancel,SIGNAL(clicked()), - this,SLOT(reject())); + connect(cancel,TQ_SIGNAL(clicked()), + this,TQ_SLOT(reject())); - connect(languages,SIGNAL(activated(int)), - this,SLOT(updateText())); + connect(languages,TQ_SIGNAL(activated(int)), + this,TQ_SLOT(updateText())); - connect(keys,SIGNAL(activated(int)), - this,SLOT(updateText())); + connect(keys,TQ_SIGNAL(activated(int)), + this,TQ_SLOT(updateText())); imageChanged(); } diff --git a/examples/showimg/main.cpp b/examples/showimg/main.cpp index 1d68c04b..a0f5d69a 100644 --- a/examples/showimg/main.cpp +++ b/examples/showimg/main.cpp @@ -50,7 +50,7 @@ int main( int argc, char **argv ) } } - TQObject::connect(tqApp, SIGNAL(lastWindowClosed()), tqApp, SLOT(quit())); + TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit())); return a.exec(); } diff --git a/examples/showimg/showimg.cpp b/examples/showimg/showimg.cpp index 52545f57..4ef1a1d9 100644 --- a/examples/showimg/showimg.cpp +++ b/examples/showimg/showimg.cpp @@ -47,32 +47,32 @@ ImageViewer::ImageViewer( TQWidget *parent, const char *name, int wFlags ) saveimage->insertItem( f ); savepixmap->insertItem( f ); } - connect( saveimage, SIGNAL(activated(int)), this, SLOT(saveImage(int)) ); - connect( savepixmap, SIGNAL(activated(int)), this, SLOT(savePixmap(int)) ); + connect( saveimage, TQ_SIGNAL(activated(int)), this, TQ_SLOT(saveImage(int)) ); + connect( savepixmap, TQ_SIGNAL(activated(int)), this, TQ_SLOT(savePixmap(int)) ); file = new TQPopupMenu( menubar ); menubar->insertItem( "&File", file ); - file->insertItem( "&New window", this, SLOT(newWindow()), CTRL+Key_N ); - file->insertItem( "&Open...", this, SLOT(openFile()), CTRL+Key_O ); + file->insertItem( "&New window", this, TQ_SLOT(newWindow()), CTRL+Key_N ); + file->insertItem( "&Open...", this, TQ_SLOT(openFile()), CTRL+Key_O ); si = file->insertItem( "Save image", saveimage ); sp = file->insertItem( "Save pixmap", savepixmap ); file->insertSeparator(); - file->insertItem( "E&xit", tqApp, SLOT(quit()), CTRL+Key_Q ); + file->insertItem( "E&xit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q ); edit = new TQPopupMenu( menubar ); menubar->insertItem( "&Edit", edit ); - edit->insertItem("&Copy", this, SLOT(copy()), CTRL+Key_C); - edit->insertItem("&Paste", this, SLOT(paste()), CTRL+Key_V); + edit->insertItem("&Copy", this, TQ_SLOT(copy()), CTRL+Key_C); + edit->insertItem("&Paste", this, TQ_SLOT(paste()), CTRL+Key_V); edit->insertSeparator(); - edit->insertItem("&Horizontal flip", this, SLOT(hFlip()), ALT+Key_H); - edit->insertItem("&Vertical flip", this, SLOT(vFlip()), ALT+Key_V); - edit->insertItem("&Rotate 180", this, SLOT(rot180()), ALT+Key_R); + edit->insertItem("&Horizontal flip", this, TQ_SLOT(hFlip()), ALT+Key_H); + edit->insertItem("&Vertical flip", this, TQ_SLOT(vFlip()), ALT+Key_V); + edit->insertItem("&Rotate 180", this, TQ_SLOT(rot180()), ALT+Key_R); edit->insertSeparator(); - edit->insertItem("&Text...", this, SLOT(editText())); + edit->insertItem("&Text...", this, TQ_SLOT(editText())); edit->insertSeparator(); - t1 = edit->insertItem( "Convert to &1 bit", this, SLOT(to1Bit()) ); - t8 = edit->insertItem( "Convert to &8 bit", this, SLOT(to8Bit()) ); - t32 = edit->insertItem( "Convert to &32 bit", this, SLOT(to32Bit()) ); + t1 = edit->insertItem( "Convert to &1 bit", this, TQ_SLOT(to1Bit()) ); + t8 = edit->insertItem( "Convert to &8 bit", this, TQ_SLOT(to8Bit()) ); + t32 = edit->insertItem( "Convert to &32 bit", this, TQ_SLOT(to32Bit()) ); options = new TQPopupMenu( menubar ); menubar->insertItem( "&Options", options ); @@ -102,9 +102,9 @@ ImageViewer::ImageViewer( TQWidget *parent, const char *name, int wFlags ) TQPopupMenu* help = new TQPopupMenu( menubar ); menubar->insertItem( "&Help", help ); - help->insertItem( "Help!", this, SLOT(giveHelp()), CTRL+Key_H ); + help->insertItem( "Help!", this, TQ_SLOT(giveHelp()), CTRL+Key_H ); - connect( options, SIGNAL(activated(int)), this, SLOT(doOption(int)) ); + connect( options, TQ_SIGNAL(activated(int)), this, TQ_SLOT(doOption(int)) ); status = new TQLabel(this); status->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken ); diff --git a/examples/sound/sound.cpp b/examples/sound/sound.cpp index f2808e90..fd508ca1 100644 --- a/examples/sound/sound.cpp +++ b/examples/sound/sound.cpp @@ -42,15 +42,15 @@ SoundPlayer::SoundPlayer() : } TQPopupMenu *file = new TQPopupMenu; - file->insertItem("Play &1", this, SLOT(doPlay1()), CTRL+Key_1); - file->insertItem("Play &2", this, SLOT(doPlay2()), CTRL+Key_2); - file->insertItem("Play from bucket &3", this, SLOT(doPlay3()), CTRL+Key_3); - file->insertItem("Play from bucket &4", this, SLOT(doPlay4()), CTRL+Key_4); + file->insertItem("Play &1", this, TQ_SLOT(doPlay1()), CTRL+Key_1); + file->insertItem("Play &2", this, TQ_SLOT(doPlay2()), CTRL+Key_2); + file->insertItem("Play from bucket &3", this, TQ_SLOT(doPlay3()), CTRL+Key_3); + file->insertItem("Play from bucket &4", this, TQ_SLOT(doPlay4()), CTRL+Key_4); file->insertSeparator(); - file->insertItem("Play 3 and 4 together", this, SLOT(doPlay34())); - file->insertItem("Play all together", this, SLOT(doPlay1234())); + file->insertItem("Play 3 and 4 together", this, TQ_SLOT(doPlay34())); + file->insertItem("Play all together", this, TQ_SLOT(doPlay1234())); file->insertSeparator(); - file->insertItem("E&xit", tqApp, SLOT(quit())); + file->insertItem("E&xit", tqApp, TQ_SLOT(quit())); menuBar()->insertItem("&File", file); } diff --git a/examples/sql/overview/custom1/main.cpp b/examples/sql/overview/custom1/main.cpp index 808444c7..adde6e2e 100644 --- a/examples/sql/overview/custom1/main.cpp +++ b/examples/sql/overview/custom1/main.cpp @@ -13,8 +13,8 @@ CustomEdit::CustomEdit( TQWidget *parent, const char *name ) : TQLineEdit( parent, name ) { - connect( this, SIGNAL(textChanged(const TQString &)), - this, SLOT(changed(const TQString &)) ); + connect( this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(changed(const TQString &)) ); } @@ -47,7 +47,7 @@ FormDialog::FormDialog() TQLineEdit *salaryEdit = new TQLineEdit( this ); salaryEdit->setAlignment( TQt::AlignRight ); TQPushButton *saveButton = new TQPushButton( "&Save", this ); - connect( saveButton, SIGNAL(clicked()), this, SLOT(save()) ); + connect( saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(save()) ); TQGridLayout *grid = new TQGridLayout( this ); grid->addWidget( forenameLabel, 0, 0 ); diff --git a/examples/sql/overview/form2/main.cpp b/examples/sql/overview/form2/main.cpp index 2d5420bd..115a2742 100644 --- a/examples/sql/overview/form2/main.cpp +++ b/examples/sql/overview/form2/main.cpp @@ -22,7 +22,7 @@ FormDialog::FormDialog() TQLabel *salaryLabel = new TQLabel( "Salary:", this ); TQLineEdit *salaryEdit = new TQLineEdit( this ); TQPushButton *saveButton = new TQPushButton( "&Save", this ); - connect( saveButton, SIGNAL(clicked()), this, SLOT(save()) ); + connect( saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(save()) ); TQGridLayout *grid = new TQGridLayout( this ); grid->addWidget( forenameLabel, 0, 0 ); diff --git a/examples/tabdialog/tabdialog.cpp b/examples/tabdialog/tabdialog.cpp index dd2b107f..e3cfece5 100644 --- a/examples/tabdialog/tabdialog.cpp +++ b/examples/tabdialog/tabdialog.cpp @@ -25,7 +25,7 @@ TabDialog::TabDialog( TQWidget *parent, const char *name, const TQString &_filen setupTab2(); setupTab3(); - connect( this, SIGNAL( applyButtonPressed() ), tqApp, SLOT( quit() ) ); + connect( this, TQ_SIGNAL( applyButtonPressed() ), tqApp, TQ_SLOT( quit() ) ); } void TabDialog::setupTab1() diff --git a/examples/table/statistics/statistics.cpp b/examples/table/statistics/statistics.cpp index c67c1938..7726ba4c 100644 --- a/examples/table/statistics/statistics.cpp +++ b/examples/table/statistics/statistics.cpp @@ -39,8 +39,8 @@ Table::Table() adjustColumn( 0 ); // if the user edited something we might need to recalculate the sum - connect( this, SIGNAL( valueChanged( int, int ) ), - this, SLOT( recalcSum( int, int ) ) ); + connect( this, TQ_SIGNAL( valueChanged( int, int ) ), + this, TQ_SLOT( recalcSum( int, int ) ) ); } void Table::initTable() @@ -140,7 +140,7 @@ TQWidget *ComboItem::createEditor() const { // create an editor - a combobox in our case ( (ComboItem*)this )->cb = new TQComboBox( table()->viewport() ); - TQObject::connect( cb, SIGNAL( activated( int ) ), table(), SLOT( doValueChanged() ) ); + TQObject::connect( cb, TQ_SIGNAL( activated( int ) ), table(), TQ_SLOT( doValueChanged() ) ); cb->insertItem( "Yes" ); cb->insertItem( "No" ); // and initialize it diff --git a/examples/tablet/scribble.cpp b/examples/tablet/scribble.cpp index adf247a7..45742507 100644 --- a/examples/tablet/scribble.cpp +++ b/examples/tablet/scribble.cpp @@ -37,24 +37,24 @@ Scribble::Scribble( TQWidget *parent, const char *name ) TQToolBar *tools = new TQToolBar( this ); - bSave = new TQToolButton( TQPixmap(), "Save", "Save as PNG image", this, SLOT( slotSave() ), tools ); + bSave = new TQToolButton( TQPixmap(), "Save", "Save as PNG image", this, TQ_SLOT( slotSave() ), tools ); bSave->setText( "Save as..." ); tools->addSeparator(); - bPColor = new TQToolButton( TQPixmap(), "Choose Pen Color", "Choose Pen Color", this, SLOT( slotColor() ), tools ); + bPColor = new TQToolButton( TQPixmap(), "Choose Pen Color", "Choose Pen Color", this, TQ_SLOT( slotColor() ), tools ); bPColor->setText( "Choose Pen Color..." ); tools->addSeparator(); bPWidth = new TQSpinBox( 1, 20, 1, tools ); TQToolTip::add( bPWidth, "Choose Pen Width" ); - connect( bPWidth, SIGNAL( valueChanged( int ) ), this, SLOT( slotWidth( int ) ) ); + connect( bPWidth, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotWidth( int ) ) ); bPWidth->setValue( 3 ); tools->addSeparator(); - bClear = new TQToolButton( TQPixmap(), "Clear Screen", "Clear Screen", this, SLOT( slotClear() ), tools ); + bClear = new TQToolButton( TQPixmap(), "Clear Screen", "Clear Screen", this, TQ_SLOT( slotClear() ), tools ); bClear->setText( "Clear Screen" ); } @@ -79,15 +79,15 @@ Scribble::Scribble( TQWidget *parent, const char *name ) bPWidth = new TQSpinBox( 1, 20, 1, tools ); TQToolTip::add( bPWidth, "Choose Pen Width" ); - connect( bPWidth, SIGNAL( valueChanged( int ) ), this, SLOT( slotWidth( int ) ) ); + connect( bPWidth, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotWidth( int ) ) ); bPWidth->setValue( 3 ); tools->addSeparator(); bClear = new TQPushButton( "Clear Screen", tools ); - TQObject::connect( bSave, SIGNAL( clicked() ), this, SLOT( slotSave() ) ); - TQObject::connect( bPColor, SIGNAL( clicked() ), this, SLOT( slotColor() ) ); - TQObject::connect( bClear, SIGNAL( clicked() ), this, SLOT( slotClear() ) ); + TQObject::connect( bSave, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSave() ) ); + TQObject::connect( bPColor, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotColor() ) ); + TQObject::connect( bClear, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClear() ) ); } diff --git a/examples/tablet/tabletstats.cpp b/examples/tablet/tabletstats.cpp index 1f72181d..07bf2d44 100644 --- a/examples/tablet/tabletstats.cpp +++ b/examples/tablet/tabletstats.cpp @@ -159,14 +159,14 @@ TabletStats::TabletStats( TQWidget *parent, const char *name ) lblXTilt->setMinimumSize( lblXTilt->sizeHint() ); lblYTilt->setMinimumSize( lblYTilt->sizeHint() ); - TQObject::connect( statCan, SIGNAL(signalNewTilt(int, int)), - orient, SLOT(newOrient(int, int)) ); - TQObject::connect( statCan, SIGNAL(signalNewTilt(int, int)), - this, SLOT(slotTiltChanged(int, int)) ); - TQObject::connect( statCan, SIGNAL(signalNewDev(int)), - this, SLOT(slotDevChanged(int)) ); - TQObject::connect( statCan, SIGNAL(signalNewLoc(int,int)), - this, SLOT( slotLocationChanged(int,int)) ); + TQObject::connect( statCan, TQ_SIGNAL(signalNewTilt(int, int)), + orient, TQ_SLOT(newOrient(int, int)) ); + TQObject::connect( statCan, TQ_SIGNAL(signalNewTilt(int, int)), + this, TQ_SLOT(slotTiltChanged(int, int)) ); + TQObject::connect( statCan, TQ_SIGNAL(signalNewDev(int)), + this, TQ_SLOT(slotDevChanged(int)) ); + TQObject::connect( statCan, TQ_SIGNAL(signalNewLoc(int,int)), + this, TQ_SLOT( slotLocationChanged(int,int)) ); } TabletStats::~TabletStats() diff --git a/examples/tetrix/qdragapp.cpp b/examples/tetrix/qdragapp.cpp index 41fd5eb3..19fc9fec 100644 --- a/examples/tetrix/qdragapp.cpp +++ b/examples/tetrix/qdragapp.cpp @@ -144,11 +144,11 @@ TQDragger::TQDragger() // menu->insertItem( "Send child home", 4 ); menu->insertItem( "Send all children home", 5 ); - menu->connectItem( 1, this, SLOT(openDropWindow()) ); - menu->connectItem( 2, this, SLOT(killDropWindow()) ); - menu->connectItem( 3, this, SLOT(killAllDropWindows()) ); -// menu->connectItem( 4, this, SLOT(sendChildHome()) ); - menu->connectItem( 5, this, SLOT(sendAllChildrenHome()) ); + menu->connectItem( 1, this, TQ_SLOT(openDropWindow()) ); + menu->connectItem( 2, this, TQ_SLOT(killDropWindow()) ); + menu->connectItem( 3, this, TQ_SLOT(killAllDropWindows()) ); +// menu->connectItem( 4, this, TQ_SLOT(sendChildHome()) ); + menu->connectItem( 5, this, TQ_SLOT(sendAllChildrenHome()) ); } TQDragger::~TQDragger() diff --git a/examples/tetrix/qtetrix.cpp b/examples/tetrix/qtetrix.cpp index bd624b4a..84941cbe 100644 --- a/examples/tetrix/qtetrix.cpp +++ b/examples/tetrix/qtetrix.cpp @@ -120,28 +120,28 @@ TQTetrix::TQTetrix( TQWidget *parent, const char *name ) startButton->setFocusPolicy( TQWidget::NoFocus ); pauseButton->setFocusPolicy( TQWidget::NoFocus ); - connect( board, SIGNAL(gameOverSignal()), SLOT(gameOver()) ); - connect( board, SIGNAL(drawNextSquareSignal(int,int,TQColor*)), showNext, - SLOT(drawNextSquare(int,int,TQColor*)) ); - connect( showNext, SIGNAL(update()), board, SLOT(updateNext()) ); + connect( board, TQ_SIGNAL(gameOverSignal()), TQ_SLOT(gameOver()) ); + connect( board, TQ_SIGNAL(drawNextSquareSignal(int,int,TQColor*)), showNext, + TQ_SLOT(drawNextSquare(int,int,TQColor*)) ); + connect( showNext, TQ_SIGNAL(update()), board, TQ_SLOT(updateNext()) ); #ifndef TQT_NO_LCDNUMBER - connect( board, SIGNAL(updateScoreSignal(int)), showScore, - SLOT(display(int)) ); - connect( board, SIGNAL(updateLevelSignal(int)), showLevel, - SLOT(display(int))); - connect( board, SIGNAL(updateRemovedSignal(int)), showLines, - SLOT(display(int))); + connect( board, TQ_SIGNAL(updateScoreSignal(int)), showScore, + TQ_SLOT(display(int)) ); + connect( board, TQ_SIGNAL(updateLevelSignal(int)), showLevel, + TQ_SLOT(display(int))); + connect( board, TQ_SIGNAL(updateRemovedSignal(int)), showLines, + TQ_SLOT(display(int))); #else - connect( board, SIGNAL(updateScoreSignal(int)), showScore, - SLOT(setNum(int)) ); - connect( board, SIGNAL(updateLevelSignal(int)), showLevel, - SLOT(setNum(int))); - connect( board, SIGNAL(updateRemovedSignal(int)), showLines, - SLOT(setNum(int))); + connect( board, TQ_SIGNAL(updateScoreSignal(int)), showScore, + TQ_SLOT(setNum(int)) ); + connect( board, TQ_SIGNAL(updateLevelSignal(int)), showLevel, + TQ_SLOT(setNum(int))); + connect( board, TQ_SIGNAL(updateRemovedSignal(int)), showLines, + TQ_SLOT(setNum(int))); #endif - connect( startButton, SIGNAL(clicked()), board, SLOT(start()) ); - connect( quitButton , SIGNAL(clicked()), SLOT(quit())); - connect( pauseButton, SIGNAL(clicked()), board, SLOT(pause()) ); + connect( startButton, TQ_SIGNAL(clicked()), board, TQ_SLOT(start()) ); + connect( quitButton , TQ_SIGNAL(clicked()), TQ_SLOT(quit())); + connect( pauseButton, TQ_SIGNAL(clicked()), board, TQ_SLOT(pause()) ); board->setGeometry( 150, 20, 153, 333 ); showNext->setGeometry( 50, 40, 78, 94 ); diff --git a/examples/tetrix/qtetrixb.cpp b/examples/tetrix/qtetrixb.cpp index fc5816a7..e3df48d7 100644 --- a/examples/tetrix/qtetrixb.cpp +++ b/examples/tetrix/qtetrixb.cpp @@ -21,7 +21,7 @@ TQTetrixBoard::TQTetrixBoard( TQWidget *p, const char *name ) paint = 0; paint_widget = 0; timer = new TQTimer(this); - connect( timer, SIGNAL(timeout()), SLOT(timeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); colors[0].setRgb(200,100,100); colors[1].setRgb(100,200,100); diff --git a/examples/textedit/main.cpp b/examples/textedit/main.cpp index f07bf4a2..afa86f3d 100644 --- a/examples/textedit/main.cpp +++ b/examples/textedit/main.cpp @@ -17,6 +17,6 @@ int main( int argc, char ** argv ) mw->setCaption( "Richtext Editor" ); mw->resize( 640, 800 ); mw->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/examples/textedit/textedit.cpp b/examples/textedit/textedit.cpp index 20294997..fdc6402f 100644 --- a/examples/textedit/textedit.cpp +++ b/examples/textedit/textedit.cpp @@ -36,8 +36,8 @@ TextEdit::TextEdit( TQWidget *parent, const char *name ) setupTextActions(); tabWidget = new TQTabWidget( this ); - connect( tabWidget, SIGNAL( currentChanged( TQWidget * ) ), - this, SLOT( editorChanged( TQWidget * ) ) ); + connect( tabWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), + this, TQ_SLOT( editorChanged( TQWidget * ) ) ); setCentralWidget( tabWidget ); if ( tqApp->argc() == 1 ) { @@ -57,31 +57,31 @@ void TextEdit::setupFileActions() TQAction *a; a = new TQAction( TQPixmap::fromMimeSource( "filenew.xpm" ), tr( "&New..." ), CTRL + Key_N, this, "fileNew" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNew() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( TQPixmap::fromMimeSource( "fileopen.xpm" ), tr( "&Open..." ), CTRL + Key_O, this, "fileOpen" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileOpen() ) ); a->addTo( tb ); a->addTo( menu ); menu->insertSeparator(); a = new TQAction( TQPixmap::fromMimeSource( "filesave.xpm" ), tr( "&Save..." ), CTRL + Key_S, this, "fileSave" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSave() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( tr( "Save &As..." ), 0, this, "fileSaveAs" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAs() ) ); a->addTo( menu ); menu->insertSeparator(); a = new TQAction( TQPixmap::fromMimeSource( "fileprint.xpm" ), tr( "&Print..." ), CTRL + Key_P, this, "filePrint" ); - connect( a, SIGNAL( activated() ), this, SLOT( filePrint() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( filePrint() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( tr( "&Close" ), 0, this, "fileClose" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileClose() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileClose() ) ); a->addTo( menu ); a = new TQAction( tr( "E&xit" ), 0, this, "fileExit" ); - connect( a, SIGNAL( activated() ), this, SLOT( fileExit() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileExit() ) ); a->addTo( menu ); } @@ -94,24 +94,24 @@ void TextEdit::setupEditActions() TQAction *a; a = new TQAction( TQPixmap::fromMimeSource( "editundo.xpm" ), tr( "&Undo" ), CTRL + Key_Z, this, "editUndo" ); - connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editUndo() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( TQPixmap::fromMimeSource( "editredo.xpm" ), tr( "&Redo" ), CTRL + Key_Y, this, "editRedo" ); - connect( a, SIGNAL( activated() ), this, SLOT( editRedo() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRedo() ) ); a->addTo( tb ); a->addTo( menu ); menu->insertSeparator(); a = new TQAction( TQPixmap::fromMimeSource( "editcopy.xpm" ), tr( "&Copy" ), CTRL + Key_C, this, "editCopy" ); - connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCopy() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( TQPixmap::fromMimeSource( "editcut.xpm" ), tr( "Cu&t" ), CTRL + Key_X, this, "editCut" ); - connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCut() ) ); a->addTo( tb ); a->addTo( menu ); a = new TQAction( TQPixmap::fromMimeSource( "editpaste.xpm" ), tr( "&Paste" ), CTRL + Key_V, this, "editPaste" ); - connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPaste() ) ); a->addTo( tb ); a->addTo( menu ); } @@ -126,8 +126,8 @@ void TextEdit::setupTextActions() comboFont = new TQComboBox( TRUE, tb ); TQFontDatabase db; comboFont->insertStringList( db.families() ); - connect( comboFont, SIGNAL( activated( const TQString & ) ), - this, SLOT( textFamily( const TQString & ) ) ); + connect( comboFont, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( textFamily( const TQString & ) ) ); comboFont->lineEdit()->setText( TQApplication::font().family() ); comboSize = new TQComboBox( TRUE, tb ); @@ -135,29 +135,29 @@ void TextEdit::setupTextActions() TQValueList<int>::Iterator it = sizes.begin(); for ( ; it != sizes.end(); ++it ) comboSize->insertItem( TQString::number( *it ) ); - connect( comboSize, SIGNAL( activated( const TQString & ) ), - this, SLOT( textSize( const TQString & ) ) ); + connect( comboSize, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( textSize( const TQString & ) ) ); comboSize->lineEdit()->setText( TQString::number( TQApplication::font().pointSize() ) ); actionTextBold = new TQAction( TQPixmap::fromMimeSource( "textbold.xpm" ), tr( "&Bold" ), CTRL + Key_B, this, "textBold" ); - connect( actionTextBold, SIGNAL( activated() ), this, SLOT( textBold() ) ); + connect( actionTextBold, TQ_SIGNAL( activated() ), this, TQ_SLOT( textBold() ) ); actionTextBold->addTo( tb ); actionTextBold->addTo( menu ); actionTextBold->setToggleAction( TRUE ); actionTextItalic = new TQAction( TQPixmap::fromMimeSource( "textitalic.xpm" ), tr( "&Italic" ), CTRL + Key_I, this, "textItalic" ); - connect( actionTextItalic, SIGNAL( activated() ), this, SLOT( textItalic() ) ); + connect( actionTextItalic, TQ_SIGNAL( activated() ), this, TQ_SLOT( textItalic() ) ); actionTextItalic->addTo( tb ); actionTextItalic->addTo( menu ); actionTextItalic->setToggleAction( TRUE ); actionTextUnderline = new TQAction( TQPixmap::fromMimeSource( "textunder.xpm" ), tr( "&Underline" ), CTRL + Key_U, this, "textUnderline" ); - connect( actionTextUnderline, SIGNAL( activated() ), this, SLOT( textUnderline() ) ); + connect( actionTextUnderline, TQ_SIGNAL( activated() ), this, TQ_SLOT( textUnderline() ) ); actionTextUnderline->addTo( tb ); actionTextUnderline->addTo( menu ); actionTextUnderline->setToggleAction( TRUE ); menu->insertSeparator(); TQActionGroup *grp = new TQActionGroup( this ); - connect( grp, SIGNAL( selected( TQAction* ) ), this, SLOT( textAlign( TQAction* ) ) ); + connect( grp, TQ_SIGNAL( selected( TQAction* ) ), this, TQ_SLOT( textAlign( TQAction* ) ) ); actionAlignLeft = new TQAction( TQPixmap::fromMimeSource( "textleft.xpm" ), tr( "&Left" ), CTRL + Key_L, grp, "textLeft" ); actionAlignLeft->setToggleAction( TRUE ); @@ -176,7 +176,7 @@ void TextEdit::setupTextActions() TQPixmap pix( 16, 16 ); pix.fill( black ); actionTextColor = new TQAction( pix, tr( "&Color..." ), 0, this, "textColor" ); - connect( actionTextColor, SIGNAL( activated() ), this, SLOT( textColor() ) ); + connect( actionTextColor, TQ_SIGNAL( activated() ), this, TQ_SLOT( textColor() ) ); actionTextColor->addTo( tb ); actionTextColor->addTo( menu ); } @@ -212,12 +212,12 @@ TQTextEdit *TextEdit::currentEditor() const void TextEdit::doConnections( TQTextEdit *e ) { - connect( e, SIGNAL( currentFontChanged( const TQFont & ) ), - this, SLOT( fontChanged( const TQFont & ) ) ); - connect( e, SIGNAL( currentColorChanged( const TQColor & ) ), - this, SLOT( colorChanged( const TQColor & ) ) ); - connect( e, SIGNAL( currentAlignmentChanged( int ) ), - this, SLOT( alignmentChanged( int ) ) ); + connect( e, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), + this, TQ_SLOT( fontChanged( const TQFont & ) ) ); + connect( e, TQ_SIGNAL( currentColorChanged( const TQColor & ) ), + this, TQ_SLOT( colorChanged( const TQColor & ) ) ); + connect( e, TQ_SIGNAL( currentAlignmentChanged( int ) ), + this, TQ_SLOT( alignmentChanged( int ) ) ); } void TextEdit::fileNew() diff --git a/examples/themes/themes.cpp b/examples/themes/themes.cpp index 88111945..7eee9c99 100644 --- a/examples/themes/themes.cpp +++ b/examples/themes/themes.cpp @@ -57,7 +57,7 @@ Themes::Themes( TQWidget *parent, const char *name, WFlags f ) TQActionGroup *ag = new TQActionGroup( this, 0 ); ag->setExclusive( TRUE ); TQSignalMapper *styleMapper = new TQSignalMapper( this ); - connect( styleMapper, SIGNAL( mapped( const TQString& ) ), this, SLOT( makeStyle( const TQString& ) ) ); + connect( styleMapper, TQ_SIGNAL( mapped( const TQString& ) ), this, TQ_SLOT( makeStyle( const TQString& ) ) ); TQStringList list = TQStyleFactory::keys(); list.sort(); #ifndef TQT_NO_STYLE_WINDOWS @@ -81,18 +81,18 @@ Themes::Themes( TQWidget *parent, const char *name, WFlags f ) styleAccel = "&"+styleAccel; } TQAction *a = new TQAction( styleStr, TQIconSet(), styleAccel, 0, ag, 0, ag->isExclusive() ); - connect( a, SIGNAL( activated() ), styleMapper, SLOT(map()) ); + connect( a, TQ_SIGNAL( activated() ), styleMapper, TQ_SLOT(map()) ); styleMapper->setMapping( a, a->text() ); } ag->addTo(style); style->insertSeparator(); - style->insertItem("&Quit", tqApp, SLOT( quit() ), CTRL | Key_Q ); + style->insertItem("&Quit", tqApp, TQ_SLOT( quit() ), CTRL | Key_Q ); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertSeparator(); menuBar()->insertItem( "&Help", help ); - help->insertItem( "&About", this, SLOT(about()), Key_F1); - help->insertItem( "About &TQt", this, SLOT(aboutTQt())); + help->insertItem( "&About", this, TQ_SLOT(about()), Key_F1); + help->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt())); #ifndef TQT_NO_STYLE_WINDOWS tqApp->setStyle( new NorwegianWoodStyle ); diff --git a/examples/thread/prodcons/prodcons.cpp b/examples/thread/prodcons/prodcons.cpp index 7f182f85..23004dfd 100644 --- a/examples/thread/prodcons/prodcons.cpp +++ b/examples/thread/prodcons/prodcons.cpp @@ -254,10 +254,10 @@ ProdCons::ProdCons() prod(0), cons(0), stopped(FALSE), redraw(TRUE) { startbutton = new TQPushButton("&Start", this); - connect(startbutton, SIGNAL(clicked()), SLOT(go())); + connect(startbutton, TQ_SIGNAL(clicked()), TQ_SLOT(go())); stopbutton = new TQPushButton("S&top", this); - connect(stopbutton, SIGNAL(clicked()), SLOT(stop())); + connect(stopbutton, TQ_SIGNAL(clicked()), TQ_SLOT(stop())); stopbutton->setEnabled(FALSE); loopcheckbox = new TQCheckBox("Loop", this); diff --git a/examples/thread/semaphores/main.cpp b/examples/thread/semaphores/main.cpp index 85dec717..913b75dc 100644 --- a/examples/thread/semaphores/main.cpp +++ b/examples/thread/semaphores/main.cpp @@ -173,7 +173,7 @@ SemaphoreExample::SemaphoreExample() greenSem = new TQSemaphore(1); button = new TQPushButton("&Ignition!", this); - connect(button, SIGNAL(clicked()), SLOT(startExample())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(startExample())); mlineedit = new TQMultiLineEdit(this); label = new TQLabel(this); diff --git a/examples/tictac/tictac.cpp b/examples/tictac/tictac.cpp index 03e4fa27..988df238 100644 --- a/examples/tictac/tictac.cpp +++ b/examples/tictac/tictac.cpp @@ -73,7 +73,7 @@ TicTacGameBoard::TicTacGameBoard( int n, TQWidget *parent, const char *name ) TicTacButton *ttb = new TicTacButton( this ); ttb->setPalette( p ); ttb->setEnabled( FALSE ); - connect( ttb, SIGNAL(clicked()), SLOT(buttonClicked()) ); + connect( ttb, TQ_SIGNAL(clicked()), TQ_SLOT(buttonClicked()) ); grid->addWidget( ttb, i%nBoard, i/nBoard ); buttons->insert( i, ttb ); btArray->at(i) = TicTacButton::Blank; // initial button type @@ -120,7 +120,7 @@ void TicTacGameBoard::newGame() // -------------------------------------------------------------------------- -// TicTacGameBoard::buttonClicked() - SLOT +// TicTacGameBoard::buttonClicked() - TQ_SLOT // // This slot is activated when a TicTacButton emits the signal "clicked()", // i.e. the user has clicked on a TicTacButton. @@ -301,7 +301,7 @@ TicTacToe::TicTacToe( int boardSize, TQWidget *parent, const char *name ) // gameOver() slot board = new TicTacGameBoard( boardSize, this ); - connect( board, SIGNAL(finished()), SLOT(gameOver()) ); + connect( board, TQ_SIGNAL(finished()), TQ_SLOT(gameOver()) ); l->addWidget( board ); // Create a horizontal frame line @@ -322,9 +322,9 @@ TicTacToe::TicTacToe( int boardSize, TQWidget *parent, const char *name ) // to this right slots. newGame = new TQPushButton( "Play!", this ); - connect( newGame, SIGNAL(clicked()), SLOT(newGameClicked()) ); + connect( newGame, TQ_SIGNAL(clicked()), TQ_SLOT(newGameClicked()) ); quit = new TQPushButton( "Quit", this ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); TQHBoxLayout * b = new TQHBoxLayout; l->addLayout( b ); b->addWidget( newGame ); @@ -335,7 +335,7 @@ TicTacToe::TicTacToe( int boardSize, TQWidget *parent, const char *name ) // -------------------------------------------------------------------------- -// TicTacToe::newGameClicked() - SLOT +// TicTacToe::newGameClicked() - TQ_SLOT // // This slot is activated when the new game button is clicked. // @@ -349,7 +349,7 @@ void TicTacToe::newGameClicked() // -------------------------------------------------------------------------- -// TicTacToe::gameOver() - SLOT +// TicTacToe::gameOver() - TQ_SLOT // // This slot is activated when the TicTacGameBoard emits the signal // "finished()", i.e. when a player has won or when it is a draw. diff --git a/examples/toplevel/options.ui.h b/examples/toplevel/options.ui.h index 210c2515..5e68c55e 100644 --- a/examples/toplevel/options.ui.h +++ b/examples/toplevel/options.ui.h @@ -78,7 +78,7 @@ void OptionsDialog::apply() label->setTextFormat(RichText); label->setAlignment(WordBreak); TQPushButton *okButton = new TQPushButton( "Close", widget ); - connect( okButton, SIGNAL(clicked()), widget, SLOT(close()) ); + connect( okButton, TQ_SIGNAL(clicked()), widget, TQ_SLOT(close()) ); widget->move( pos() ); } else { widget->reparent( parent, f, widget->geometry().topLeft(), FALSE); diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp index d012f1c1..860e6dd4 100644 --- a/examples/widgets/widgets.cpp +++ b/examples/widgets/widgets.cpp @@ -132,7 +132,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) // put something in it TQPixmap openIcon( fileopen ); TQToolButton * toolb = new TQToolButton( openIcon, "toolbutton 1", - TQString::null, this, SLOT(open()), + TQString::null, this, TQ_SLOT(open()), tools, "open file" ); TQWhatsThis::add( toolb, "This is a <b>TQToolButton</b>. It lives in a " "TQToolBar. This particular button doesn't do anything " @@ -140,13 +140,13 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) TQPixmap saveIcon( filesave ); toolb = new TQToolButton( saveIcon, "toolbutton 2", TQString::null, - this, SLOT(dummy()), + this, TQ_SLOT(dummy()), tools, "save file" ); TQWhatsThis::add( toolb, "This is also a <b>TQToolButton</b>." ); TQPixmap printIcon( fileprint ); toolb = new TQToolButton( printIcon, "toolbutton 3", TQString::null, - this, SLOT(dummy()), + this, TQ_SLOT(dummy()), tools, "print file" ); TQWhatsThis::add( toolb, "This is the third <b>TQToolButton</b>."); @@ -178,10 +178,10 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) int id; id = popup->insertItem( "&New" ); popup->setItemEnabled( id, FALSE ); - id = popup->insertItem( openIcon, "&Open...", this, SLOT( open() ) ); + id = popup->insertItem( openIcon, "&Open...", this, TQ_SLOT( open() ) ); popup->insertSeparator(); - popup->insertItem( "Quit", tqApp, SLOT(quit()), CTRL+Key_Q ); + popup->insertItem( "Quit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q ); textStylePopup = popup = new TQPopupMenu( this ); menuBar()->insertItem( "&Edit", popup ); @@ -206,8 +206,8 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) f = font(); f.setStrikeOut( TRUE ); id = popup->insertItem( new MyMenuItem( "&Strike", f ) ); - connect( textStylePopup, SIGNAL(activated(int)), - this, SLOT(popupSelected(int)) ); + connect( textStylePopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(popupSelected(int)) ); // Create an analog and a digital clock AnalogClock *aclock = new AnalogClock( central ); @@ -229,7 +229,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) TQPushButton *pb; pb = new TQPushButton( "&Push button 1", central, "button1" ); grid->addWidget( pb, 0, 0, AlignVCenter ); - connect( pb, SIGNAL(clicked()), SLOT(button1Clicked()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(button1Clicked()) ); TQToolTip::add( pb, "push button 1" ); TQWhatsThis::add( pb, "This is a <b>TQPushButton</b>.<br>" "Click it and watch...<br>" @@ -248,8 +248,8 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) // Create a label containing a TQMovie movie = TQMovie( MOVIEFILENAME ); movielabel = new TQLabel( central, "label0" ); - movie.connectStatus(this, SLOT(movieStatus(int))); - movie.connectUpdate(this, SLOT(movieUpdate(const TQRect&))); + movie.connectStatus(this, TQ_SLOT(movieStatus(int))); + movie.connectUpdate(this, TQ_SLOT(movieUpdate(const TQRect&))); movielabel->setFrameStyle( TQFrame::Box | TQFrame::Plain ); movielabel->setMovie( movie ); movielabel->setFixedSize( 128+movielabel->frameWidth()*2, @@ -279,7 +279,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) cb[2]->setText( "&Execute" ); vbox->addWidget( cb[2] ); - connect( bg, SIGNAL(clicked(int)), SLOT(checkBoxClicked(int)) ); + connect( bg, TQ_SIGNAL(clicked(int)), TQ_SLOT(checkBoxClicked(int)) ); TQToolTip::add( cb[0], "check box 1" ); TQToolTip::add( cb[1], "check box 2" ); @@ -309,7 +309,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) rb->setText( "&Short Wave" ); vbox->addWidget(rb); - connect( bg, SIGNAL(clicked(int)), SLOT(radioButtonClicked(int)) ); + connect( bg, TQ_SIGNAL(clicked(int)), TQ_SLOT(radioButtonClicked(int)) ); TQToolTip::add( rb, "radio button 3" ); // Create a list box @@ -323,7 +323,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) lb->insertItem( str ); } grid->addMultiCellWidget( lb, 2, 4, 0, 0 ); - connect( lb, SIGNAL(selected(int)), SLOT(listBoxItemSelected(int)) ); + connect( lb, TQ_SIGNAL(selected(int)), TQ_SLOT(listBoxItemSelected(int)) ); TQToolTip::add( lb, "list box" ); (void)new MyWhatsThis( lb ); @@ -338,7 +338,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) sb->setFocusPolicy( TQWidget::TabFocus ); vbox->addWidget( sb ); - connect( sb, SIGNAL(valueChanged(int)), SLOT(sliderValueChanged(int)) ); + connect( sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderValueChanged(int)) ); TQToolTip::add( sb, "slider" ); TQWhatsThis::add( sb, "This is a <b>TQSlider</b>. " "The tick marks are optional." @@ -351,8 +351,8 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) combo->insertItem( "blue" ); combo->insertItem( "red" ); vbox->addWidget( combo ); - connect( combo, SIGNAL(activated(int)), - this, SLOT(comboBoxItemActivated(int)) ); + connect( combo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(comboBoxItemActivated(int)) ); TQToolTip::add( combo, "read-only combo box" ); // Create an editable combo box @@ -365,8 +365,8 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) edComboLst->insertItem( "Alterable" ); edComboLst->insertItem( "Inconstant" ); vbox->addWidget( edCombo ); - connect( edCombo, SIGNAL(activated(const TQString&)), - this, SLOT(edComboBoxItemActivated(const TQString&)) ); + connect( edCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(edComboBoxItemActivated(const TQString&)) ); TQToolTip::add( edCombo, "editable combo box" ); edCombo->setAutoCompletion( TRUE ); @@ -378,8 +378,8 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) TQSpinBox *spin = new TQSpinBox( 0, 10, 1, central, "spin" ); spin->setSuffix(" mm"); spin->setSpecialValueText( "Auto" ); - connect( spin, SIGNAL( valueChanged(const TQString&) ), - SLOT( spinBoxValueChanged(const TQString&) ) ); + connect( spin, TQ_SIGNAL( valueChanged(const TQString&) ), + TQ_SLOT( spinBoxValueChanged(const TQString&) ) ); TQToolTip::add( spin, "spin box" ); TQWhatsThis::add( spin, "This is a <b>TQSpinBox</b>. " "You can chose values in a given range " @@ -431,8 +431,8 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) grid->addMultiCellWidget( le, 4, 4, 1, 2 ); - connect( le, SIGNAL(textChanged(const TQString&)), - SLOT(lineEditTextChanged(const TQString&)) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(lineEditTextChanged(const TQString&)) ); TQToolTip::add( le, "single line editor" ); TQWhatsThis::add( le, "This is a <b>TQLineEdit</b>, you can enter a " "single line of text in it. " @@ -453,14 +453,14 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) split->setOpaqueResize( TRUE ); topLayout->addWidget( split, 1 ); TQListView *lv = new MyListView( split ); - connect(lv, SIGNAL(selectionChanged() ), - this, SLOT( selectionChanged() ) ); - connect(lv, SIGNAL(selectionChanged(TQListViewItem*) ), - this, SLOT( selectionChanged(TQListViewItem*) ) ); - connect(lv, SIGNAL(clicked(TQListViewItem*) ), - this, SLOT( clicked(TQListViewItem*) ) ); - connect(lv, SIGNAL(mySelectionChanged(TQListViewItem*) ), - this, SLOT( mySelectionChanged(TQListViewItem*) ) ); + connect(lv, TQ_SIGNAL(selectionChanged() ), + this, TQ_SLOT( selectionChanged() ) ); + connect(lv, TQ_SIGNAL(selectionChanged(TQListViewItem*) ), + this, TQ_SLOT( selectionChanged(TQListViewItem*) ) ); + connect(lv, TQ_SIGNAL(clicked(TQListViewItem*) ), + this, TQ_SLOT( clicked(TQListViewItem*) ) ); + connect(lv, TQ_SIGNAL(mySelectionChanged(TQListViewItem*) ), + this, TQ_SLOT( mySelectionChanged(TQListViewItem*) ) ); lv->addColumn( "One" ); lv->addColumn( "Two" ); lv->setAllColumnsShowFocus( TRUE ); @@ -508,7 +508,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) "<p><a href=\"nogo://some.where.com\">Hypertext navigation</a> and style sheets are supported.</p>", "" ); browser->setFont(TQFont("Charter",11)); browser->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken ); - connect( browser, SIGNAL(linkClicked(const TQString&)), browser, SLOT(setText(const TQString&)) ); + connect( browser, TQ_SIGNAL(linkClicked(const TQString&)), browser, TQ_SLOT(setText(const TQString&)) ); // Create an label and a message in the status bar // The message is updated when buttons are clicked etc. @@ -521,7 +521,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) TQAccel* a = new TQAccel( this ); a->connectItem( a->insertItem( Key_F9 ), - this, SLOT( showProperties() ) ); + this, TQ_SLOT( showProperties() ) ); prog = new TQProgressBar( statusBar(), "progress" ); prog->setTotalSteps( 100 ); diff --git a/examples/wizard/wizard.cpp b/examples/wizard/wizard.cpp index ad5c8699..40cb686a 100644 --- a/examples/wizard/wizard.cpp +++ b/examples/wizard/wizard.cpp @@ -52,8 +52,8 @@ void Wizard::setupPage1() key->setMaxLength( 4 ); key->setValidator( new TQIntValidator( 1000, 9999, key ) ); - connect( key, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( keyChanged( const TQString & ) ) ); + connect( key, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( keyChanged( const TQString & ) ) ); addPage( page1, "Personal Key" ); @@ -108,12 +108,12 @@ void Wizard::setupPage2() phone = new TQLineEdit( row4 ); email = new TQLineEdit( row5 ); - connect( firstName, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( dataChanged( const TQString & ) ) ); - connect( lastName, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( dataChanged( const TQString & ) ) ); - connect( email, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( dataChanged( const TQString & ) ) ); + connect( firstName, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( dataChanged( const TQString & ) ) ); + connect( lastName, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( dataChanged( const TQString & ) ) ); + connect( email, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( dataChanged( const TQString & ) ) ); addPage( page2, "Personal Data" ); diff --git a/examples/xform/xform.cpp b/examples/xform/xform.cpp index d9632d6e..60f73402 100644 --- a/examples/xform/xform.cpp +++ b/examples/xform/xform.cpp @@ -144,16 +144,16 @@ XFormControl::XFormControl( const TQFont &initialFont, rotS->setRange( -180, 180 ); rotS->setValue( 0 ); - connect( rotS, SIGNAL(valueChanged(int)), SLOT(newMtx()) ); + connect( rotS, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(newMtx()) ); shearLCD->display( "0.00" ); shearS->setRange( -25, 25 ); shearS->setValue( 0 ); - connect( shearS, SIGNAL(valueChanged(int)), SLOT(newMtx()) ); + connect( shearS, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(newMtx()) ); mirror->setText( tr("Mirror") ); - connect( mirror, SIGNAL(clicked()), SLOT(newMtx()) ); + connect( mirror, TQ_SIGNAL(clicked()), TQ_SLOT(newMtx()) ); TQButtonGroup *bg = new TQButtonGroup(this); bg->hide(); @@ -164,23 +164,23 @@ XFormControl::XFormControl( const TQFont &initialFont, rb_img->setText( tr("Image") ); rb_img->setChecked(TRUE); rb_pic->setText( tr("Picture") ); - connect( bg, SIGNAL(clicked(int)), SLOT(changeMode(int)) ); + connect( bg, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeMode(int)) ); fpb->setText( tr("Select font...") ); - connect( fpb, SIGNAL(clicked()), SLOT(selectFont()) ); + connect( fpb, TQ_SIGNAL(clicked()), TQ_SLOT(selectFont()) ); textEd->setText( "Troll" ); - connect( textEd, SIGNAL(textChanged(const TQString&)), - SLOT(newTxt(const TQString&)) ); + connect( textEd, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(newTxt(const TQString&)) ); magLCD = new TQLCDNumber( 4,optionals_other, "magLCD" ); magLCD->display( "100" ); magS = new TQSlider( TQSlider::Horizontal, optionals_other, "magnifySlider" ); magS->setRange( 0, 800 ); - connect( magS, SIGNAL(valueChanged(int)), SLOT(newMtx()) ); + connect( magS, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(newMtx()) ); magS->setValue( 0 ); - connect( magS, SIGNAL(valueChanged(int)), magLCD, SLOT(display(int))); + connect( magS, TQ_SIGNAL(valueChanged(int)), magLCD, TQ_SLOT(display(int))); optionals_text->adjustSize(); optionals_other->adjustSize(); @@ -479,13 +479,13 @@ XFormCenter::XFormCenter( TQWidget *parent, const char *name ) setStretchFactor(sx,1); xc->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); xc->setLineWidth( 2 ); - connect( xc, SIGNAL(newText(const TQString&)), sx, - SLOT(setText(const TQString&)) ); - connect( xc, SIGNAL(newMatrix(TQWMatrix)), - sx, SLOT(setMatrix(TQWMatrix)) ); - connect( xc, SIGNAL(newFont(const TQFont&)), sx, - SLOT(setFont(const TQFont&)) ); - connect( xc, SIGNAL(newMode(int)), SLOT(newMode(int)) ); + connect( xc, TQ_SIGNAL(newText(const TQString&)), sx, + TQ_SLOT(setText(const TQString&)) ); + connect( xc, TQ_SIGNAL(newMatrix(TQWMatrix)), + sx, TQ_SLOT(setMatrix(TQWMatrix)) ); + connect( xc, TQ_SIGNAL(newFont(const TQFont&)), sx, + TQ_SLOT(setFont(const TQFont&)) ); + connect( xc, TQ_SIGNAL(newMode(int)), TQ_SLOT(newMode(int)) ); sx->setText( "Troll" ); newMode( Image ); sx->setMatrix(xc->matrix()); |