diff options
| author | Michele Calgaro <[email protected]> | 2023-12-27 19:25:43 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-12-27 19:25:43 +0900 |
| commit | fb401a891f1b426e9419c0cb16403df407138611 (patch) | |
| tree | 045b51949b3140039e37d898d8b0513016a86bea | |
| parent | a9d178f1000475ba1727ffe123a2c54585488c01 (diff) | |
| download | tqt3-fb401a891f1b426e9419c0cb16403df407138611.tar.gz tqt3-fb401a891f1b426e9419c0cb16403df407138611.zip | |
Rename METHOD, SIGNAL, SLOT to TQ_METHOD, TQ_SIGNAL, TQ_SLOT
Signed-off-by: Michele Calgaro <[email protected]>
472 files changed, 3800 insertions, 3800 deletions
diff --git a/doc/application-walkthrough.doc b/doc/application-walkthrough.doc index 10c052456..5c652e5f7 100644 --- a/doc/application-walkthrough.doc +++ b/doc/application-walkthrough.doc @@ -155,7 +155,7 @@ its location and floats it over the desktop, the toolbar-window will show "File Operations" as caption. \printline fileopen -\printuntil SLOT(choose()) +\printuntil TQ_SLOT(choose()) Now we create the first tool button for the \e fileTools toolbar with the appropriate icon and the tool-tip text "Open File". @@ -163,7 +163,7 @@ The \c fileopen.xpm we included at the beginning contains the definition of a pixmap called \e fileopen. We use this icon to illustrate our first tool button. -\printuntil SLOT(print()) +\printuntil TQ_SLOT(print()) In a similar way we create two more tool buttons in this toolbar, each with appropriate icons and tool-tip text. All three buttons are connected diff --git a/doc/html/aclock-example.html b/doc/html/aclock-example.html index 05e1d616c..e34925e3d 100644 --- a/doc/html/aclock-example.html +++ b/doc/html/aclock-example.html @@ -109,7 +109,7 @@ private: { <a name="x1201"></a> time = TQTime::<a href="qtime.html#currentTime">currentTime</a>(); // get current time internalTimer = new <a href="ntqtimer.html">TQTimer</a>( this ); // create internal timer -<a name="x1205"></a> <a href="ntqobject.html#connect">connect</a>( internalTimer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), SLOT(timeout()) ); +<a name="x1205"></a> <a href="ntqobject.html#connect">connect</a>( internalTimer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), TQ_SLOT(timeout()) ); <a name="x1204"></a> internalTimer-><a href="ntqtimer.html#start">start</a>( 5000 ); // emit signal every 5 seconds } @@ -136,7 +136,7 @@ void AnalogClock::<a href="ntqwidget.html#mousePressEvent">mousePressEvent</a>( void <a name="f385"></a>AnalogClock::setTime( const <a href="qtime.html">TQTime</a> & t ) { time = t; - <a href="ntqobject.html#disconnect">disconnect</a>( internalTimer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), this, SLOT(timeout()) ); + <a href="ntqobject.html#disconnect">disconnect</a>( internalTimer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), this, TQ_SLOT(timeout()) ); if (<a href="ntqwidget.html#autoMask">autoMask</a>()) <a href="ntqwidget.html#updateMask">updateMask</a>(); else diff --git a/doc/html/addressbook-example.html b/doc/html/addressbook-example.html index a1bcc8ef9..6c878fddb 100644 --- a/doc/html/addressbook-example.html +++ b/doc/html/addressbook-example.html @@ -132,16 +132,16 @@ void <a name="f264"></a>ABMainWindow::setupMenuBar() <a href="ntqpopupmenu.html">TQPopupMenu</a> *file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&File", file ); -<a name="x569"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "New", this, SLOT( fileNew() ), CTRL + Key_N ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "fileopen.xpm" ), "Open", this, SLOT( fileOpen() ), CTRL + Key_O ); +<a name="x569"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "New", this, TQ_SLOT( fileNew() ), CTRL + Key_N ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "fileopen.xpm" ), "Open", this, TQ_SLOT( fileOpen() ), CTRL + Key_O ); <a name="x570"></a> file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "filesave.xpm" ), "Save", this, SLOT( fileSave() ), CTRL + Key_S ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save As...", this, SLOT( fileSaveAs() ) ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "filesave.xpm" ), "Save", this, TQ_SLOT( fileSave() ), CTRL + Key_S ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save As...", this, TQ_SLOT( fileSaveAs() ) ); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "fileprint.xpm" ), "Print...", this, SLOT( filePrint() ), CTRL + Key_P ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "fileprint.xpm" ), "Print...", this, TQ_SLOT( filePrint() ), CTRL + Key_P ); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Close", this, SLOT( closeWindow() ), CTRL + Key_W ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Quit", tqApp, SLOT( <a href="ntqapplication.html#quit">quit</a>() ), CTRL + Key_Q ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Close", this, TQ_SLOT( closeWindow() ), CTRL + Key_W ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Quit", tqApp, TQ_SLOT( <a href="ntqapplication.html#quit">quit</a>() ), CTRL + Key_Q ); } void <a name="f265"></a>ABMainWindow::setupFileTools() @@ -371,7 +371,7 @@ void <a name="f277"></a>ABCentralWidget::setupTabWidget() add = new <a href="ntqpushbutton.html">TQPushButton</a>( "A&dd", input ); <a name="x599"></a><a name="x598"></a> add-><a href="ntqwidget.html#resize">resize</a>( add-><a href="ntqwidget.html#sizeHint">sizeHint</a>() ); grid1-><a href="qgridlayout.html#addWidget">addWidget</a>( add, 0, 4 ); - <a href="ntqobject.html#connect">connect</a>( add, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( addEntry() ) ); + <a href="ntqobject.html#connect">connect</a>( add, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( addEntry() ) ); iFirstName = new <a href="ntqlineedit.html">TQLineEdit</a>( input ); <a name="x583"></a> iFirstName-><a href="ntqwidget.html#resize">resize</a>( iFirstName-><a href="ntqlineedit.html#sizeHint">sizeHint</a>() ); @@ -396,7 +396,7 @@ void <a name="f277"></a>ABCentralWidget::setupTabWidget() change = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Change", input ); change-><a href="ntqwidget.html#resize">resize</a>( change-><a href="ntqwidget.html#sizeHint">sizeHint</a>() ); grid1-><a href="qgridlayout.html#addWidget">addWidget</a>( change, 1, 4 ); - <a href="ntqobject.html#connect">connect</a>( change, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( changeEntry() ) ); + <a href="ntqobject.html#connect">connect</a>( change, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( changeEntry() ) ); <a name="x600"></a> tabWidget-><a href="ntqtabwidget.html#addTab">addTab</a>( input, "&Add/Change Entry" ); @@ -408,22 +408,22 @@ void <a name="f277"></a>ABCentralWidget::setupTabWidget() cFirstName = new <a href="ntqcheckbox.html">TQCheckBox</a>( "First &Name", search ); <a name="x575"></a> cFirstName-><a href="ntqwidget.html#resize">resize</a>( cFirstName-><a href="ntqwidget.html#sizeHint">sizeHint</a>() ); grid2-><a href="qgridlayout.html#addWidget">addWidget</a>( cFirstName, 0, 0 ); - <a href="ntqobject.html#connect">connect</a>( cFirstName, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( toggleFirstName() ) ); + <a href="ntqobject.html#connect">connect</a>( cFirstName, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( toggleFirstName() ) ); cLastName = new <a href="ntqcheckbox.html">TQCheckBox</a>( "&Last Name", search ); cLastName-><a href="ntqwidget.html#resize">resize</a>( cLastName-><a href="ntqwidget.html#sizeHint">sizeHint</a>() ); grid2-><a href="qgridlayout.html#addWidget">addWidget</a>( cLastName, 0, 1 ); - <a href="ntqobject.html#connect">connect</a>( cLastName, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( toggleLastName() ) ); + <a href="ntqobject.html#connect">connect</a>( cLastName, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( toggleLastName() ) ); cAddress = new <a href="ntqcheckbox.html">TQCheckBox</a>( "Add&ress", search ); cAddress-><a href="ntqwidget.html#resize">resize</a>( cAddress-><a href="ntqwidget.html#sizeHint">sizeHint</a>() ); grid2-><a href="qgridlayout.html#addWidget">addWidget</a>( cAddress, 0, 2 ); - <a href="ntqobject.html#connect">connect</a>( cAddress, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( toggleAddress() ) ); + <a href="ntqobject.html#connect">connect</a>( cAddress, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( toggleAddress() ) ); cEMail = new <a href="ntqcheckbox.html">TQCheckBox</a>( "&E-Mail", search ); cEMail-><a href="ntqwidget.html#resize">resize</a>( cEMail-><a href="ntqwidget.html#sizeHint">sizeHint</a>() ); grid2-><a href="qgridlayout.html#addWidget">addWidget</a>( cEMail, 0, 3 ); - <a href="ntqobject.html#connect">connect</a>( cEMail, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( toggleEMail() ) ); + <a href="ntqobject.html#connect">connect</a>( cEMail, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( toggleEMail() ) ); sFirstName = new <a href="ntqlineedit.html">TQLineEdit</a>( search ); sFirstName-><a href="ntqwidget.html#resize">resize</a>( sFirstName-><a href="ntqlineedit.html#sizeHint">sizeHint</a>() ); @@ -444,7 +444,7 @@ void <a name="f277"></a>ABCentralWidget::setupTabWidget() find = new <a href="ntqpushbutton.html">TQPushButton</a>( "F&ind", search ); find-><a href="ntqwidget.html#resize">resize</a>( find-><a href="ntqwidget.html#sizeHint">sizeHint</a>() ); grid2-><a href="qgridlayout.html#addWidget">addWidget</a>( find, 1, 4 ); - <a href="ntqobject.html#connect">connect</a>( find, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( findEntries() ) ); + <a href="ntqobject.html#connect">connect</a>( find, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( findEntries() ) ); <a name="x574"></a> cFirstName-><a href="ntqcheckbox.html#setChecked">setChecked</a>( TRUE ); <a name="x605"></a> sFirstName-><a href="ntqwidget.html#setEnabled">setEnabled</a>( TRUE ); @@ -467,7 +467,7 @@ void <a name="f278"></a>ABCentralWidget::setupListView() <a name="x592"></a> listView-><a href="ntqlistview.html#setSelectionMode">setSelectionMode</a>( TQListView::Single ); -<a name="x588"></a> <a href="ntqobject.html#connect">connect</a>( listView, SIGNAL( <a href="ntqlistview.html#clicked">clicked</a>( <a href="qlistviewitem.html">TQListViewItem</a>* ) ), this, SLOT( itemSelected( <a href="qlistviewitem.html">TQListViewItem</a>* ) ) ); +<a name="x588"></a> <a href="ntqobject.html#connect">connect</a>( listView, TQ_SIGNAL( <a href="ntqlistview.html#clicked">clicked</a>( <a href="qlistviewitem.html">TQListViewItem</a>* ) ), this, TQ_SLOT( itemSelected( <a href="qlistviewitem.html">TQListViewItem</a>* ) ) ); mainGrid-><a href="qgridlayout.html#addWidget">addWidget</a>( listView, 1, 0 ); <a name="x591"></a> listView-><a href="ntqlistview.html#setAllColumnsShowFocus">setAllColumnsShowFocus</a>( TRUE ); @@ -647,7 +647,7 @@ int main( int argc, char ** argv ) a.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>( mw ); <a name="x611"></a> mw-><a href="ntqwidget.html#show">show</a>(); -<a name="x609"></a><a name="x608"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL( <a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>() ), &a, SLOT( <a href="ntqapplication.html#quit">quit</a>() ) ); +<a name="x609"></a><a name="x608"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL( <a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>() ), &a, TQ_SLOT( <a href="ntqapplication.html#quit">quit</a>() ) ); int result = a.<a href="ntqapplication.html#exec">exec</a>(); delete mw; return result; diff --git a/doc/html/archivesearch-example.html b/doc/html/archivesearch-example.html index 176357bf5..314d3cc60 100644 --- a/doc/html/archivesearch-example.html +++ b/doc/html/archivesearch-example.html @@ -59,12 +59,12 @@ were done using <a href="designer-manual.html">TQt Designer</a>. 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( <a href="qlistviewitem.html">TQListViewItem</a> *it ) @@ -164,8 +164,8 @@ int main(int argc, char **argv) ArchiveDialog ad; ad.show(); -<a name="x489"></a><a name="x487"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), -<a name="x488"></a> &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<a name="x489"></a><a name="x487"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), +<a name="x488"></a> &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a name="x486"></a> return a.<a href="ntqapplication.html#exec">exec</a>(); } diff --git a/doc/html/buttongroups-example.html b/doc/html/buttongroups-example.html index bf6b0edf0..b6ee7f5ea 100644 --- a/doc/html/buttongroups-example.html +++ b/doc/html/buttongroups-example.html @@ -154,8 +154,8 @@ protected slots: // insert a checkbox... state = new <a href="ntqcheckbox.html">TQCheckBox</a>( "E&nable Radiobuttons", bgrp3 ); state-><a href="ntqcheckbox.html#setChecked">setChecked</a>( TRUE ); - // ...and connect its SIGNAL clicked() with the SLOT slotChangeGrp3State() - <a href="ntqobject.html#connect">connect</a>( state, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( slotChangeGrp3State() ) ); + // ...and connect its TQ_SIGNAL clicked() with the TQ_SLOT slotChangeGrp3State() + <a href="ntqobject.html#connect">connect</a>( state, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( slotChangeGrp3State() ) ); // ------------ fourth group @@ -186,7 +186,7 @@ protected slots: } /* - * SLOT slotChangeGrp3State() + * TQ_SLOT slotChangeGrp3State() * * enables/disables the radiobuttons of the third buttongroup */ diff --git a/doc/html/canvas-chart-example.html b/doc/html/canvas-chart-example.html index 4ec518288..8a9a531fd 100644 --- a/doc/html/canvas-chart-example.html +++ b/doc/html/canvas-chart-example.html @@ -303,41 +303,41 @@ const <a href="ntqstring.html">TQString</a> APP_KEY = "/Chart/"; fileNewAction = new <a href="ntqaction.html">TQAction</a>( "New Chart", TQPixmap( file_new ), "&New", CTRL+Key_N, this, "new" ); -<a name="x2869"></a> <a href="ntqobject.html#connect">connect</a>( fileNewAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, SLOT( fileNew() ) ); +<a name="x2869"></a> <a href="ntqobject.html#connect">connect</a>( fileNewAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, TQ_SLOT( fileNew() ) ); fileOpenAction = new <a href="ntqaction.html">TQAction</a>( "Open Chart", TQPixmap( file_open ), "&Open...", CTRL+Key_O, this, "open" ); - <a href="ntqobject.html#connect">connect</a>( fileOpenAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, SLOT( fileOpen() ) ); + <a href="ntqobject.html#connect">connect</a>( fileOpenAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, TQ_SLOT( fileOpen() ) ); fileSaveAction = new <a href="ntqaction.html">TQAction</a>( "Save Chart", TQPixmap( file_save ), "&Save", CTRL+Key_S, this, "save" ); - <a href="ntqobject.html#connect">connect</a>( fileSaveAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, SLOT( fileSave() ) ); + <a href="ntqobject.html#connect">connect</a>( fileSaveAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, TQ_SLOT( fileSave() ) ); fileSaveAsAction = new <a href="ntqaction.html">TQAction</a>( "Save Chart As", TQPixmap( file_save ), "Save &As...", 0, this, "save as" ); - <a href="ntqobject.html#connect">connect</a>( fileSaveAsAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( fileSaveAs() ) ); + <a href="ntqobject.html#connect">connect</a>( fileSaveAsAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( fileSaveAs() ) ); fileSaveAsPixmapAction = new <a href="ntqaction.html">TQAction</a>( "Save Chart As Bitmap", TQPixmap( file_save ), "Save As &Bitmap...", CTRL+Key_B, this, "save as bitmap" ); - <a href="ntqobject.html#connect">connect</a>( fileSaveAsPixmapAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( fileSaveAsPixmap() ) ); + <a href="ntqobject.html#connect">connect</a>( fileSaveAsPixmapAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( fileSaveAsPixmap() ) ); filePrintAction = new <a href="ntqaction.html">TQAction</a>( "Print Chart", TQPixmap( file_print ), "&Print Chart...", CTRL+Key_P, this, "print chart" ); - <a href="ntqobject.html#connect">connect</a>( filePrintAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( filePrint() ) ); + <a href="ntqobject.html#connect">connect</a>( filePrintAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( filePrint() ) ); optionsSetDataAction = new <a href="ntqaction.html">TQAction</a>( "Set Data", TQPixmap( options_setdata ), "Set &Data...", CTRL+Key_D, this, "set data" ); - <a href="ntqobject.html#connect">connect</a>( optionsSetDataAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( optionsSetData() ) ); + <a href="ntqobject.html#connect">connect</a>( optionsSetDataAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( optionsSetData() ) ); <a href="qactiongroup.html">TQActionGroup</a> *chartGroup = new <a href="qactiongroup.html">TQActionGroup</a>( this ); // Connected later @@ -363,17 +363,17 @@ const <a href="ntqstring.html">TQString</a> APP_KEY = "/Chart/"; optionsSetFontAction = new <a href="ntqaction.html">TQAction</a>( "Set Font", TQPixmap( options_setfont ), "Set &Font...", CTRL+Key_F, this, "set font" ); - <a href="ntqobject.html#connect">connect</a>( optionsSetFontAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( optionsSetFont() ) ); + <a href="ntqobject.html#connect">connect</a>( optionsSetFontAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( optionsSetFont() ) ); optionsSetOptionsAction = new <a href="ntqaction.html">TQAction</a>( "Set Options", TQPixmap( options_setoptions ), "Set &Options...", 0, this, "set options" ); - <a href="ntqobject.html#connect">connect</a>( optionsSetOptionsAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( optionsSetOptions() ) ); + <a href="ntqobject.html#connect">connect</a>( optionsSetOptionsAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( optionsSetOptions() ) ); fileQuitAction = new <a href="ntqaction.html">TQAction</a>( "Quit", "&Quit", CTRL+Key_Q, this, "quit" ); - <a href="ntqobject.html#connect">connect</a>( fileQuitAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, SLOT( fileQuit() ) ); + <a href="ntqobject.html#connect">connect</a>( fileQuitAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, TQ_SLOT( fileQuit() ) ); <a href="ntqtoolbar.html">TQToolBar</a>* fileTools = new <a href="ntqtoolbar.html">TQToolBar</a>( this, "file operations" ); @@ -425,9 +425,9 @@ const <a href="ntqstring.html">TQString</a> APP_KEY = "/Chart/"; <a href="ntqpopupmenu.html">TQPopupMenu</a> *helpMenu = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&Help", helpMenu ); - helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Help", this, SLOT(helpHelp()), Key_F1 ); - helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, SLOT(helpAbout()) ); - helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, SLOT(helpAboutTQt()) ); + helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Help", this, TQ_SLOT(helpHelp()), Key_F1 ); + helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, TQ_SLOT(helpAbout()) ); + helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, TQ_SLOT(helpAboutTQt()) ); m_printer = 0; @@ -459,8 +459,8 @@ const <a href="ntqstring.html">TQString</a> APP_KEY = "/Chart/"; // Connect *after* we've set the chart type on so we don't call // drawElements() prematurely. -<a name="x2873"></a> <a href="ntqobject.html#connect">connect</a>( chartGroup, SIGNAL( <a href="qactiongroup.html#selected">selected</a>(TQAction*) ), - this, SLOT( updateChartType(TQAction*) ) ); +<a name="x2873"></a> <a href="ntqobject.html#connect">connect</a>( chartGroup, TQ_SIGNAL( <a href="qactiongroup.html#selected">selected</a>(TQAction*) ), + this, TQ_SLOT( updateChartType(TQAction*) ) ); <a href="ntqwidget.html#resize">resize</a>( windowWidth, windowHeight ); if ( windowX != -1 || windowY != -1 ) @@ -604,7 +604,7 @@ void <a name="f603"></a>ChartForm::updateRecentFilesMenu() if ( i < int(m_recentFiles.count()) ) fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQString( "&%1 %2" ). arg( i + 1 ).arg( m_recentFiles[i] ), - this, SLOT( fileOpenRecent(int) ), + this, TQ_SLOT( fileOpenRecent(int) ), 0, i ); } } diff --git a/doc/html/canvas-example.html b/doc/html/canvas-example.html index 2c36c44a3..2856d6842 100644 --- a/doc/html/canvas-example.html +++ b/doc/html/canvas-example.html @@ -448,52 +448,52 @@ static TQImage *logoimg; <a href="ntqmenubar.html">TQMenuBar</a>* menu = <a href="ntqmainwindow.html#menuBar">menuBar</a>(); <a href="ntqpopupmenu.html">TQPopupMenu</a>* file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menu ); -<a name="x2936"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Fill canvas", this, SLOT(init()), CTRL+Key_F); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Erase canvas", this, SLOT(clear()), CTRL+Key_E); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("&New view", this, SLOT(newView()), CTRL+Key_N); +<a name="x2936"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Fill canvas", this, TQ_SLOT(init()), CTRL+Key_F); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Erase canvas", this, TQ_SLOT(clear()), CTRL+Key_E); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("&New view", this, TQ_SLOT(newView()), CTRL+Key_N); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Print...", this, SLOT(print()), CTRL+Key_P); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Print...", this, TQ_SLOT(print()), CTRL+Key_P); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("E&xit", tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("E&xit", tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q); menu-><a href="ntqmenudata.html#insertItem">insertItem</a>("&File", file); <a href="ntqpopupmenu.html">TQPopupMenu</a>* edit = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menu ); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Circle", this, SLOT(addCircle()), ALT+Key_C); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Hexagon", this, SLOT(addHexagon()), ALT+Key_H); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Polygon", this, SLOT(addPolygon()), ALT+Key_P); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add Spl&ine", this, SLOT(addSpline()), ALT+Key_I); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Text", this, SLOT(addText()), ALT+Key_T); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Line", this, SLOT(addLine()), ALT+Key_L); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Rectangle", this, SLOT(addRectangle()), ALT+Key_R); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Sprite", this, SLOT(addSprite()), ALT+Key_S); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Create &Mesh", this, SLOT(addMesh()), ALT+Key_M ); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Alpha-blended image", this, SLOT(addButterfly()), ALT+Key_A); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Circle", this, TQ_SLOT(addCircle()), ALT+Key_C); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Hexagon", this, TQ_SLOT(addHexagon()), ALT+Key_H); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Polygon", this, TQ_SLOT(addPolygon()), ALT+Key_P); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add Spl&ine", this, TQ_SLOT(addSpline()), ALT+Key_I); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Text", this, TQ_SLOT(addText()), ALT+Key_T); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Line", this, TQ_SLOT(addLine()), ALT+Key_L); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Rectangle", this, TQ_SLOT(addRectangle()), ALT+Key_R); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Sprite", this, TQ_SLOT(addSprite()), ALT+Key_S); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Create &Mesh", this, TQ_SLOT(addMesh()), ALT+Key_M ); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("Add &Alpha-blended image", this, TQ_SLOT(addButterfly()), ALT+Key_A); menu-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Edit", edit); <a href="ntqpopupmenu.html">TQPopupMenu</a>* view = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menu ); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Enlarge", this, SLOT(enlarge()), SHIFT+CTRL+Key_Plus); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Shr&ink", this, SLOT(shrink()), SHIFT+CTRL+Key_Minus); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Enlarge", this, TQ_SLOT(enlarge()), SHIFT+CTRL+Key_Plus); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Shr&ink", this, TQ_SLOT(shrink()), SHIFT+CTRL+Key_Minus); view-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Rotate clockwise", this, SLOT(rotateClockwise()), CTRL+Key_PageDown); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Rotate &counterclockwise", this, SLOT(rotateCounterClockwise()), CTRL+Key_PageUp); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Zoom in", this, SLOT(zoomIn()), CTRL+Key_Plus); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Zoom &out", this, SLOT(zoomOut()), CTRL+Key_Minus); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Translate left", this, SLOT(moveL()), CTRL+Key_Left); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Translate right", this, SLOT(moveR()), CTRL+Key_Right); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Translate up", this, SLOT(moveU()), CTRL+Key_Up); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Translate down", this, SLOT(moveD()), CTRL+Key_Down); - view-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Mirror", this, SLOT(mirror()), CTRL+Key_Home); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Rotate clockwise", this, TQ_SLOT(rotateClockwise()), CTRL+Key_PageDown); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Rotate &counterclockwise", this, TQ_SLOT(rotateCounterClockwise()), CTRL+Key_PageUp); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Zoom in", this, TQ_SLOT(zoomIn()), CTRL+Key_Plus); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Zoom &out", this, TQ_SLOT(zoomOut()), CTRL+Key_Minus); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Translate left", this, TQ_SLOT(moveL()), CTRL+Key_Left); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Translate right", this, TQ_SLOT(moveR()), CTRL+Key_Right); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Translate up", this, TQ_SLOT(moveU()), CTRL+Key_Up); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("Translate down", this, TQ_SLOT(moveD()), CTRL+Key_Down); + view-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Mirror", this, TQ_SLOT(mirror()), CTRL+Key_Home); menu-><a href="ntqmenudata.html#insertItem">insertItem</a>("&View", view); options = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menu ); - dbf_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>("Double buffer", this, SLOT(toggleDoubleBuffer())); + dbf_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>("Double buffer", this, TQ_SLOT(toggleDoubleBuffer())); <a name="x2939"></a> options-><a href="ntqmenudata.html#setItemChecked">setItemChecked</a>(dbf_id, TRUE); menu-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Options",options); menu-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); <a href="ntqpopupmenu.html">TQPopupMenu</a>* help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menu ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>("&About", this, SLOT(help()), Key_F1); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>("&About", this, TQ_SLOT(help()), Key_F1); help-><a href="ntqmenudata.html#setItemChecked">setItemChecked</a>(dbf_id, TRUE); menu-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Help",help); @@ -922,7 +922,7 @@ int main(int argc, char** argv) else <a name="x2968"></a> m.<a href="ntqwidget.html#showMaximized">showMaximized</a>(); - TQObject::<a href="ntqobject.html#connect">connect</a>( tqApp, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + TQObject::<a href="ntqobject.html#connect">connect</a>( tqApp, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); return app.<a href="ntqapplication.html#exec">exec</a>(); } diff --git a/doc/html/chart-chartform-cpp.html b/doc/html/chart-chartform-cpp.html index e106621f9..881f791bb 100644 --- a/doc/html/chart-chartform-cpp.html +++ b/doc/html/chart-chartform-cpp.html @@ -91,41 +91,41 @@ const <a href="ntqstring.html">TQString</a> APP_KEY = "/Chart/"; fileNewAction = new <a href="ntqaction.html">TQAction</a>( "New Chart", TQPixmap( file_new ), "&New", CTRL+Key_N, this, "new" ); -<a name="x2869"></a> <a href="ntqobject.html#connect">connect</a>( fileNewAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, SLOT( fileNew() ) ); +<a name="x2869"></a> <a href="ntqobject.html#connect">connect</a>( fileNewAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, TQ_SLOT( fileNew() ) ); fileOpenAction = new <a href="ntqaction.html">TQAction</a>( "Open Chart", TQPixmap( file_open ), "&Open...", CTRL+Key_O, this, "open" ); - <a href="ntqobject.html#connect">connect</a>( fileOpenAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, SLOT( fileOpen() ) ); + <a href="ntqobject.html#connect">connect</a>( fileOpenAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, TQ_SLOT( fileOpen() ) ); fileSaveAction = new <a href="ntqaction.html">TQAction</a>( "Save Chart", TQPixmap( file_save ), "&Save", CTRL+Key_S, this, "save" ); - <a href="ntqobject.html#connect">connect</a>( fileSaveAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, SLOT( fileSave() ) ); + <a href="ntqobject.html#connect">connect</a>( fileSaveAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, TQ_SLOT( fileSave() ) ); fileSaveAsAction = new <a href="ntqaction.html">TQAction</a>( "Save Chart As", TQPixmap( file_save ), "Save &As...", 0, this, "save as" ); - <a href="ntqobject.html#connect">connect</a>( fileSaveAsAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( fileSaveAs() ) ); + <a href="ntqobject.html#connect">connect</a>( fileSaveAsAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( fileSaveAs() ) ); fileSaveAsPixmapAction = new <a href="ntqaction.html">TQAction</a>( "Save Chart As Bitmap", TQPixmap( file_save ), "Save As &Bitmap...", CTRL+Key_B, this, "save as bitmap" ); - <a href="ntqobject.html#connect">connect</a>( fileSaveAsPixmapAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( fileSaveAsPixmap() ) ); + <a href="ntqobject.html#connect">connect</a>( fileSaveAsPixmapAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( fileSaveAsPixmap() ) ); filePrintAction = new <a href="ntqaction.html">TQAction</a>( "Print Chart", TQPixmap( file_print ), "&Print Chart...", CTRL+Key_P, this, "print chart" ); - <a href="ntqobject.html#connect">connect</a>( filePrintAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( filePrint() ) ); + <a href="ntqobject.html#connect">connect</a>( filePrintAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( filePrint() ) ); optionsSetDataAction = new <a href="ntqaction.html">TQAction</a>( "Set Data", TQPixmap( options_setdata ), "Set &Data...", CTRL+Key_D, this, "set data" ); - <a href="ntqobject.html#connect">connect</a>( optionsSetDataAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( optionsSetData() ) ); + <a href="ntqobject.html#connect">connect</a>( optionsSetDataAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( optionsSetData() ) ); <a href="qactiongroup.html">TQActionGroup</a> *chartGroup = new <a href="qactiongroup.html">TQActionGroup</a>( this ); // Connected later @@ -151,17 +151,17 @@ const <a href="ntqstring.html">TQString</a> APP_KEY = "/Chart/"; optionsSetFontAction = new <a href="ntqaction.html">TQAction</a>( "Set Font", TQPixmap( options_setfont ), "Set &Font...", CTRL+Key_F, this, "set font" ); - <a href="ntqobject.html#connect">connect</a>( optionsSetFontAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( optionsSetFont() ) ); + <a href="ntqobject.html#connect">connect</a>( optionsSetFontAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( optionsSetFont() ) ); optionsSetOptionsAction = new <a href="ntqaction.html">TQAction</a>( "Set Options", TQPixmap( options_setoptions ), "Set &Options...", 0, this, "set options" ); - <a href="ntqobject.html#connect">connect</a>( optionsSetOptionsAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), - this, SLOT( optionsSetOptions() ) ); + <a href="ntqobject.html#connect">connect</a>( optionsSetOptionsAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), + this, TQ_SLOT( optionsSetOptions() ) ); fileQuitAction = new <a href="ntqaction.html">TQAction</a>( "Quit", "&Quit", CTRL+Key_Q, this, "quit" ); - <a href="ntqobject.html#connect">connect</a>( fileQuitAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, SLOT( fileQuit() ) ); + <a href="ntqobject.html#connect">connect</a>( fileQuitAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, TQ_SLOT( fileQuit() ) ); <a href="ntqtoolbar.html">TQToolBar</a>* fileTools = new <a href="ntqtoolbar.html">TQToolBar</a>( this, "file operations" ); @@ -213,9 +213,9 @@ const <a href="ntqstring.html">TQString</a> APP_KEY = "/Chart/"; <a href="ntqpopupmenu.html">TQPopupMenu</a> *helpMenu = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&Help", helpMenu ); - helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Help", this, SLOT(helpHelp()), Key_F1 ); - helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, SLOT(helpAbout()) ); - helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, SLOT(helpAboutTQt()) ); + helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Help", this, TQ_SLOT(helpHelp()), Key_F1 ); + helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, TQ_SLOT(helpAbout()) ); + helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, TQ_SLOT(helpAboutTQt()) ); m_printer = 0; @@ -247,8 +247,8 @@ const <a href="ntqstring.html">TQString</a> APP_KEY = "/Chart/"; // Connect *after* we've set the chart type on so we don't call // drawElements() prematurely. -<a name="x2873"></a> <a href="ntqobject.html#connect">connect</a>( chartGroup, SIGNAL( <a href="qactiongroup.html#selected">selected</a>(TQAction*) ), - this, SLOT( updateChartType(TQAction*) ) ); +<a name="x2873"></a> <a href="ntqobject.html#connect">connect</a>( chartGroup, TQ_SIGNAL( <a href="qactiongroup.html#selected">selected</a>(TQAction*) ), + this, TQ_SLOT( updateChartType(TQAction*) ) ); <a href="ntqwidget.html#resize">resize</a>( windowWidth, windowHeight ); if ( windowX != -1 || windowY != -1 ) @@ -392,7 +392,7 @@ void <a name="f155"></a>ChartForm::updateRecentFilesMenu() if ( i < int(m_recentFiles.count()) ) fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQString( "&%1 %2" ). arg( i + 1 ).arg( m_recentFiles[i] ), - this, SLOT( fileOpenRecent(int) ), + this, TQ_SLOT( fileOpenRecent(int) ), 0, i ); } } diff --git a/doc/html/chart-optionsform-cpp.html b/doc/html/chart-optionsform-cpp.html index c2caa73c7..06ed5a7f0 100644 --- a/doc/html/chart-optionsform-cpp.html +++ b/doc/html/chart-optionsform-cpp.html @@ -138,9 +138,9 @@ body { background: #ffffff; color: black; } buttonsLayout-><a href="qboxlayout.html#addWidget">addWidget</a>( cancelPushButton ); optionsFormLayout-><a href="qboxlayout.html#addLayout">addLayout</a>( buttonsLayout ); - <a href="ntqobject.html#connect">connect</a>( fontPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( chooseFont() ) ); - <a href="ntqobject.html#connect">connect</a>( okPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( <a href="ntqdialog.html#accept">accept</a>() ) ); - <a href="ntqobject.html#connect">connect</a>( cancelPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( <a href="ntqdialog.html#reject">reject</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( fontPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( chooseFont() ) ); + <a href="ntqobject.html#connect">connect</a>( okPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( <a href="ntqdialog.html#accept">accept</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( cancelPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( <a href="ntqdialog.html#reject">reject</a>() ) ); chartTypeTextLabel-><a href="ntqlabel.html#setBuddy">setBuddy</a>( chartTypeComboBox ); decimalPlacesTextLabel-><a href="ntqlabel.html#setBuddy">setBuddy</a>( decimalPlacesSpinBox ); diff --git a/doc/html/chart-setdataform-cpp.html b/doc/html/chart-setdataform-cpp.html index 4cf004ee8..5caecb386 100644 --- a/doc/html/chart-setdataform-cpp.html +++ b/doc/html/chart-setdataform-cpp.html @@ -116,15 +116,15 @@ const int MAX_PATTERNS = 14; tableButtonBox-><a href="qboxlayout.html#addLayout">addLayout</a>( buttonBox ); - <a href="ntqobject.html#connect">connect</a>( table, SIGNAL( <a href="ntqtable.html#clicked">clicked</a>(int,int,int,const <a href="ntqpoint.html">TQPoint</a>&) ), - this, SLOT( setColor(int,int) ) ); - <a href="ntqobject.html#connect">connect</a>( table, SIGNAL( <a href="ntqtable.html#currentChanged">currentChanged</a>(int,int) ), - this, SLOT( currentChanged(int,int) ) ); - <a href="ntqobject.html#connect">connect</a>( table, SIGNAL( <a href="ntqtable.html#valueChanged">valueChanged</a>(int,int) ), - this, SLOT( valueChanged(int,int) ) ); - <a href="ntqobject.html#connect">connect</a>( colorPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( setColor() ) ); - <a href="ntqobject.html#connect">connect</a>( okPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( <a href="ntqdialog.html#accept">accept</a>() ) ); - <a href="ntqobject.html#connect">connect</a>( cancelPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( <a href="ntqdialog.html#reject">reject</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( table, TQ_SIGNAL( <a href="ntqtable.html#clicked">clicked</a>(int,int,int,const <a href="ntqpoint.html">TQPoint</a>&) ), + this, TQ_SLOT( setColor(int,int) ) ); + <a href="ntqobject.html#connect">connect</a>( table, TQ_SIGNAL( <a href="ntqtable.html#currentChanged">currentChanged</a>(int,int) ), + this, TQ_SLOT( currentChanged(int,int) ) ); + <a href="ntqobject.html#connect">connect</a>( table, TQ_SIGNAL( <a href="ntqtable.html#valueChanged">valueChanged</a>(int,int) ), + this, TQ_SLOT( valueChanged(int,int) ) ); + <a href="ntqobject.html#connect">connect</a>( colorPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( setColor() ) ); + <a href="ntqobject.html#connect">connect</a>( okPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( <a href="ntqdialog.html#accept">accept</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( cancelPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( <a href="ntqdialog.html#reject">reject</a>() ) ); TQPixmap patterns[MAX_PATTERNS]; patterns[0] = TQPixmap( pattern01 ); diff --git a/doc/html/checklists-example.html b/doc/html/checklists-example.html index 54f945f02..db69b9c30 100644 --- a/doc/html/checklists-example.html +++ b/doc/html/checklists-example.html @@ -149,8 +149,8 @@ protected slots: <a href="ntqpushbutton.html">TQPushButton</a> *copy1 = new <a href="ntqpushbutton.html">TQPushButton</a>( " -> ", this ); tmp-><a href="qboxlayout.html#addWidget">addWidget</a>( copy1 ); <a name="x437"></a><a name="x433"></a> copy1-><a href="ntqwidget.html#setMaximumWidth">setMaximumWidth</a>( copy1-><a href="ntqwidget.html#sizeHint">sizeHint</a>().width() ); - // connect the SIGNAL clicked() of the pushbutton with the SLOT copy1to2() - <a href="ntqobject.html#connect">connect</a>( copy1, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( copy1to2() ) ); + // connect the TQ_SIGNAL clicked() of the pushbutton with the TQ_SLOT copy1to2() + <a href="ntqobject.html#connect">connect</a>( copy1, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( copy1to2() ) ); // another widget for layouting <a href="qvboxlayout.html">TQVBoxLayout</a> *vbox2 = new <a href="qvboxlayout.html">TQVBoxLayout</a>( lay ); @@ -173,8 +173,8 @@ protected slots: <a href="ntqpushbutton.html">TQPushButton</a> *copy2 = new <a href="ntqpushbutton.html">TQPushButton</a>( " -> ", this ); lay-><a href="qboxlayout.html#addWidget">addWidget</a>( copy2 ); copy2-><a href="ntqwidget.html#setMaximumWidth">setMaximumWidth</a>( copy2-><a href="ntqwidget.html#sizeHint">sizeHint</a>().width() ); - // ...and connect its clicked() SIGNAL to the copy2to3() SLOT - <a href="ntqobject.html#connect">connect</a>( copy2, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( copy2to3() ) ); + // ...and connect its clicked() TQ_SIGNAL to the copy2to3() TQ_SLOT + <a href="ntqobject.html#connect">connect</a>( copy2, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( copy2to3() ) ); tmp = new <a href="qvboxlayout.html">TQVBoxLayout</a>( lay ); tmp-><a href="ntqlayout.html#setMargin">setMargin</a>( 5 ); @@ -185,7 +185,7 @@ protected slots: } /* - * SLOT copy1to2() + * TQ_SLOT copy1to2() * * Copies all checked ListViewItems from the first ListView to * the second one, and inserts them as Radio-ListViewItem. @@ -217,7 +217,7 @@ void <a name="f249"></a>CheckLists::copy1to2() } /* - * SLOT copy2to3() + * TQ_SLOT copy2to3() * * Copies the checked item of the second ListView into the * Label at the right. diff --git a/doc/html/clientserver-example.html b/doc/html/clientserver-example.html index fd1e24793..0191069a5 100644 --- a/doc/html/clientserver-example.html +++ b/doc/html/clientserver-example.html @@ -80,10 +80,10 @@ public: <a href="ntqsocket.html">TQSocket</a>( 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 ); } @@ -168,10 +168,10 @@ public: infoText = new <a href="ntqtextview.html">TQTextView</a>( this ); <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( tr("Quit") , this ); - connect( server, SIGNAL(newConnect(ClientSocket*)), - SLOT(newConnect(ClientSocket*)) ); - connect( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, - SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + connect( server, TQ_SIGNAL(newConnect(ClientSocket*)), + TQ_SLOT(newConnect(ClientSocket*)) ); + connect( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, + TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); } ~ServerInfo() @@ -182,10 +182,10 @@ private slots: void newConnect( ClientSocket *s ) { <a name="x786"></a> infoText-><a href="ntqtextedit.html#append">append</a>( tr("New connection\n") ); - connect( s, SIGNAL(logText(const <a href="ntqstring.html">TQString</a>&)), - infoText, SLOT(<a href="ntqtextedit.html#append">append</a>(const <a href="ntqstring.html">TQString</a>&)) ); -<a name="x785"></a> connect( s, SIGNAL(<a href="ntqsocket.html#connectionClosed">connectionClosed</a>()), - SLOT(connectionClosed()) ); + connect( s, TQ_SIGNAL(logText(const <a href="ntqstring.html">TQString</a>&)), + infoText, TQ_SLOT(<a href="ntqtextedit.html#append">append</a>(const <a href="ntqstring.html">TQString</a>&)) ); +<a name="x785"></a> connect( s, TQ_SIGNAL(<a href="ntqsocket.html#connectionClosed">connectionClosed</a>()), + TQ_SLOT(connectionClosed()) ); } void connectionClosed() @@ -247,20 +247,20 @@ public: <a href="ntqpushbutton.html">TQPushButton</a> *close = new <a href="ntqpushbutton.html">TQPushButton</a>( tr("Close connection") , this ); <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( tr("Quit") , this ); -<a name="x792"></a> connect( send, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(sendToServer()) ); - connect( close, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(closeConnection()) ); - connect( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<a name="x792"></a> connect( send, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(sendToServer()) ); + connect( close, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(closeConnection()) ); + connect( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); // create the socket and connect various of its signals socket = new <a href="ntqsocket.html">TQSocket</a>( this ); -<a name="x798"></a> connect( socket, SIGNAL(<a href="ntqsocket.html#connected">connected</a>()), - SLOT(socketConnected()) ); -<a name="x799"></a> connect( socket, SIGNAL(<a href="ntqsocket.html#connectionClosed">connectionClosed</a>()), - SLOT(socketConnectionClosed()) ); -<a name="x803"></a> connect( socket, SIGNAL(<a href="ntqsocket.html#readyRead">readyRead</a>()), - SLOT(socketReadyRead()) ); -<a name="x801"></a> connect( socket, SIGNAL(<a href="ntqsocket.html#error">error</a>(int)), - SLOT(socketError(int)) ); +<a name="x798"></a> connect( socket, TQ_SIGNAL(<a href="ntqsocket.html#connected">connected</a>()), + TQ_SLOT(socketConnected()) ); +<a name="x799"></a> connect( socket, TQ_SIGNAL(<a href="ntqsocket.html#connectionClosed">connectionClosed</a>()), + TQ_SLOT(socketConnectionClosed()) ); +<a name="x803"></a> connect( socket, TQ_SIGNAL(<a href="ntqsocket.html#readyRead">readyRead</a>()), + TQ_SLOT(socketReadyRead()) ); +<a name="x801"></a> connect( socket, TQ_SIGNAL(<a href="ntqsocket.html#error">error</a>(int)), + TQ_SLOT(socketError(int)) ); // connect to the server <a name="x805"></a> infoText-><a href="ntqtextedit.html#append">append</a>( tr("Trying to connect to the server\n") ); @@ -277,8 +277,8 @@ private slots: <a name="x796"></a> socket-><a href="ntqsocket.html#close">close</a>(); <a name="x804"></a> if ( socket-><a href="ntqsocket.html#state">state</a>() == TQSocket::Closing ) { // We have a delayed close. -<a name="x800"></a> connect( socket, SIGNAL(<a href="ntqsocket.html#delayedCloseFinished">delayedCloseFinished</a>()), - SLOT(socketClosed()) ); +<a name="x800"></a> connect( socket, TQ_SIGNAL(<a href="ntqsocket.html#delayedCloseFinished">delayedCloseFinished</a>()), + TQ_SLOT(socketClosed()) ); } else { // The socket is closed. socketClosed(); diff --git a/doc/html/customlayout-example.html b/doc/html/customlayout-example.html index 09ec8dacd..671889c08 100644 --- a/doc/html/customlayout-example.html +++ b/doc/html/customlayout-example.html @@ -778,7 +778,7 @@ int main( int argc, char **argv ) b1-><a href="ntqlayout.html#add">add</a>( new <a href="ntqpushbutton.html">TQPushButton</a>( "More text", f ) ); b1-><a href="ntqlayout.html#add">add</a>( new <a href="ntqpushbutton.html">TQPushButton</a>( "Even longer button text", f ) ); <a href="ntqpushbutton.html">TQPushButton</a>* qb = new <a href="ntqpushbutton.html">TQPushButton</a>( "Quit", f ); - a.<a href="ntqobject.html#connect">connect</a>( qb, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), SLOT( quit() ) ); + a.<a href="ntqobject.html#connect">connect</a>( qb, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), TQ_SLOT( quit() ) ); b1-><a href="ntqlayout.html#add">add</a>( qb ); <a href="ntqwidget.html">TQWidget</a> *wid = new <a href="ntqwidget.html">TQWidget</a>( f ); diff --git a/doc/html/designer-manual-3.html b/doc/html/designer-manual-3.html index c034e9d22..507316fc4 100644 --- a/doc/html/designer-manual-3.html +++ b/doc/html/designer-manual-3.html @@ -474,7 +474,7 @@ body { background: #ffffff; color: black; } </pre> <p>When <em>TQt Designer</em> generates a <tt>main.cpp</tt> file it includes this line:</p> <pre> - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); </pre> <p>If we left this code as-is, the user could by-pass our own termination code by clicking the main window's close (X) button. Since we want to give the user the option to save any unsaved changes we need to ensure that we intercept any attempt to close the application. To achieve this we delete the connection and add a new slot, <tt>closeEvent()</tt> which will intercept attempts to close the application and call our <tt>fileExit()</tt> function.</p> <p>Click <tt>main.cpp</tt> in the Project Overview window. The file will appear in an editing window. Delete the connect line.</p> diff --git a/doc/html/designer-manual-4.html b/doc/html/designer-manual-4.html index e23d76c98..71560ab29 100644 --- a/doc/html/designer-manual-4.html +++ b/doc/html/designer-manual-4.html @@ -271,8 +271,8 @@ body { background: #ffffff; color: black; } { if ( ! findForm ) { findForm = new FindForm( this ); - <a href="ntqobject.html#connect">connect</a>( findForm, SIGNAL( lookfor(const <a href="ntqstring.html">TQString</a>&) ), - this, SLOT( lookfor(const <a href="ntqstring.html">TQString</a>&) ) ); + <a href="ntqobject.html#connect">connect</a>( findForm, TQ_SIGNAL( lookfor(const <a href="ntqstring.html">TQString</a>&) ), + this, TQ_SLOT( lookfor(const <a href="ntqstring.html">TQString</a>&) ) ); } findForm->show(); } diff --git a/doc/html/designer-manual-7.html b/doc/html/designer-manual-7.html index 725812bb1..e952c27ba 100644 --- a/doc/html/designer-manual-7.html +++ b/doc/html/designer-manual-7.html @@ -179,15 +179,15 @@ DBFILE = vcr.db layout-><a href="qboxlayout.html#addWidget">addWidget</a>( lineEdit ); </pre> <p>We begin by creating a horizontal box layout (<a href="qhboxlayout.html">TQHBoxLayout</a>) and add a <a href="ntqlineedit.html">TQLineEdit</a> and a <a href="ntqpushbutton.html">TQPushButton</a> to it.</p> -<pre> <a href="ntqobject.html#connect">connect</a>( lineEdit, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SIGNAL( fileNameChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); +<pre> <a href="ntqobject.html#connect">connect</a>( lineEdit, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SIGNAL( fileNameChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); button = new <a href="ntqpushbutton.html">TQPushButton</a>( "...", this, "filechooser_button" ); button-><a href="ntqwidget.html#setFixedWidth">setFixedWidth</a>( button-><a href="ntqwidget.html#fontMetrics">fontMetrics</a>().width( " ... " ) ); layout-><a href="qboxlayout.html#addWidget">addWidget</a>( button ); - <a href="ntqobject.html#connect">connect</a>( button, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), - this, SLOT( chooseFile() ) ); + <a href="ntqobject.html#connect">connect</a>( button, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), + this, TQ_SLOT( chooseFile() ) ); </pre> <p>We connect the lineEdit's<!-- index textChanged() --> <tt>textChanged()</tt> signal to the custom widget's <tt>fileNameChanged()</tt> signal. This ensures that if the user changes the text in the <a href="ntqlineedit.html">TQLineEdit</a> this fact will be propagated via the custom widget's own signal. The button's<!-- index clicked() --> <tt>clicked()</tt> signal is connected to the custom widget's <tt>chooseFile()</tt> slot which invokes the appropriate dialog for the user to choose their file or directory.</p> <pre> <a href="ntqwidget.html#setFocusProxy">setFocusProxy</a>( lineEdit ); diff --git a/doc/html/dirview-example.html b/doc/html/dirview-example.html index ebb7deda7..28a6db325 100644 --- a/doc/html/dirview-example.html +++ b/doc/html/dirview-example.html @@ -444,16 +444,16 @@ TQString <a name="f477"></a>Directory::fullName() fileNormal = new <a href="ntqpixmap.html">TQPixmap</a>( pix_file ); } - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqlistview.html#doubleClicked">doubleClicked</a>( <a href="qlistviewitem.html">TQListViewItem</a> * ) ), - this, SLOT( slotFolderSelected( <a href="qlistviewitem.html">TQListViewItem</a> * ) ) ); - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqlistview.html#returnPressed">returnPressed</a>( <a href="qlistviewitem.html">TQListViewItem</a> * ) ), - this, SLOT( slotFolderSelected( <a href="qlistviewitem.html">TQListViewItem</a> * ) ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqlistview.html#doubleClicked">doubleClicked</a>( <a href="qlistviewitem.html">TQListViewItem</a> * ) ), + this, TQ_SLOT( slotFolderSelected( <a href="qlistviewitem.html">TQListViewItem</a> * ) ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqlistview.html#returnPressed">returnPressed</a>( <a href="qlistviewitem.html">TQListViewItem</a> * ) ), + this, TQ_SLOT( slotFolderSelected( <a href="qlistviewitem.html">TQListViewItem</a> * ) ) ); <a href="ntqwidget.html#setAcceptDrops">setAcceptDrops</a>( TRUE ); <a href="ntqscrollview.html#viewport">viewport</a>()->setAcceptDrops( TRUE ); -<a name="x1706"></a> <a href="ntqobject.html#connect">connect</a>( autoopen_timer, SIGNAL( <a href="ntqtimer.html#timeout">timeout</a>() ), - this, SLOT( openFolder() ) ); +<a name="x1706"></a> <a href="ntqobject.html#connect">connect</a>( autoopen_timer, TQ_SIGNAL( <a href="ntqtimer.html#timeout">timeout</a>() ), + this, TQ_SLOT( openFolder() ) ); } void <a name="f479"></a>DirectoryView::slotFolderSelected( <a href="qlistviewitem.html">TQListViewItem</a> *i ) diff --git a/doc/html/distributor-example.html b/doc/html/distributor-example.html index 87f37c1df..8a02555aa 100644 --- a/doc/html/distributor-example.html +++ b/doc/html/distributor-example.html @@ -77,7 +77,7 @@ distributed with TQt. void Distributor::init() { timer = new <a href="ntqtimer.html">TQTimer</a>( this ); -<a name="x2672"></a> connect( timer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), SLOT(checkLibData()) ); +<a name="x2672"></a> connect( timer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), TQ_SLOT(checkLibData()) ); cancelButton()->setAutoDefault( FALSE ); backButton()->setAutoDefault( FALSE ); diff --git a/doc/html/drawdemo-example.html b/doc/html/drawdemo-example.html index 9019f9efa..4cf02e215 100644 --- a/doc/html/drawdemo-example.html +++ b/doc/html/drawdemo-example.html @@ -202,7 +202,7 @@ private: // Create a button group to contain all buttons bgroup = new <a href="ntqbuttongroup.html">TQButtonGroup</a>( this ); <a name="x1088"></a> bgroup-><a href="ntqwidget.html#resize">resize</a>( 200, 200 ); -<a name="x1062"></a> <a href="ntqobject.html#connect">connect</a>( bgroup, SIGNAL(<a href="ntqbuttongroup.html#clicked">clicked</a>(int)), SLOT(updateIt(int)) ); +<a name="x1062"></a> <a href="ntqobject.html#connect">connect</a>( bgroup, TQ_SIGNAL(<a href="ntqbuttongroup.html#clicked">clicked</a>(int)), TQ_SLOT(updateIt(int)) ); // Calculate the size for the radio buttons int maxwidth = 80; @@ -259,7 +259,7 @@ private: print = new <a href="ntqpushbutton.html">TQPushButton</a>( "Print...", bgroup ); <a name="x1081"></a> print-><a href="ntqwidget.html#resize">resize</a>( 80, 30 ); <a name="x1093"></a><a name="x1080"></a> print-><a href="ntqwidget.html#move">move</a>( maxwidth/2 - print-><a href="ntqwidget.html#width">width</a>()/2, maxindex*30+20 ); - <a href="ntqobject.html#connect">connect</a>( print, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(printIt()) ); + <a href="ntqobject.html#connect">connect</a>( print, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(printIt()) ); // Resize bgroup to its final size when printersupport is given. <a name="x1094"></a><a name="x1085"></a> bgroup-><a href="ntqwidget.html#resize">resize</a>( maxwidth, print-><a href="ntqwidget.html#y">y</a>()+print-><a href="ntqwidget.html#height">height</a>()+10 ); diff --git a/doc/html/extension-dialog-example.html b/doc/html/extension-dialog-example.html index 074b091ce..20700509e 100644 --- a/doc/html/extension-dialog-example.html +++ b/doc/html/extension-dialog-example.html @@ -151,7 +151,7 @@ int main( int argc, char ** argv ) <a href="ntqapplication.html">TQApplication</a> a( argc, argv ); MainForm *w = new MainForm; w->show(); -<a name="x2868"></a><a name="x2867"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL( <a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>() ), w, SLOT( quit() ) ); +<a name="x2868"></a><a name="x2867"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL( <a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>() ), w, TQ_SLOT( quit() ) ); return a.<a href="ntqapplication.html#exec">exec</a>(); } </pre> diff --git a/doc/html/fileiconview-example.html b/doc/html/fileiconview-example.html index 8815046be..31f08c410 100644 --- a/doc/html/fileiconview-example.html +++ b/doc/html/fileiconview-example.html @@ -544,8 +544,8 @@ static void cleanup() checkSetText = TRUE; - TQObject::<a href="ntqobject.html#connect">connect</a>( &timer, SIGNAL( timeout() ), - <a href="qiconviewitem.html#iconView">iconView</a>(), SLOT( openFolder() ) ); + TQObject::<a href="ntqobject.html#connect">connect</a>( &timer, TQ_SIGNAL( timeout() ), + <a href="qiconviewitem.html#iconView">iconView</a>(), TQ_SLOT( openFolder() ) ); } <a name="x842"></a>void TQtFileIconViewItem::<a href="qiconviewitem.html#paintItem">paintItem</a>( <a href="ntqpainter.html">TQPainter</a> *p, const <a href="qcolorgroup.html">TQColorGroup</a> &cg ) @@ -716,14 +716,14 @@ TQtFileIconViewItem::~TQtFileIconViewItem() <a href="ntqiconview.html#setResizeMode">setResizeMode</a>( Adjust ); <a href="ntqiconview.html#setWordWrapIconText">setWordWrapIconText</a>( FALSE ); - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqiconview.html#doubleClicked">doubleClicked</a>( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ), - this, SLOT( itemDoubleClicked( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ) ); - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqiconview.html#returnPressed">returnPressed</a>( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ), - this, SLOT( itemDoubleClicked( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ) ); - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqiconview.html#dropped">dropped</a>( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem> & ) ), - this, SLOT( slotDropped( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem> & ) ) ); - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqiconview.html#contextMenuRequested">contextMenuRequested</a>( <a href="qiconviewitem.html">TQIconViewItem</a> *, const <a href="ntqpoint.html">TQPoint</a> & ) ), - this, SLOT( slotRightPressed( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqiconview.html#doubleClicked">doubleClicked</a>( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ), + this, TQ_SLOT( itemDoubleClicked( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqiconview.html#returnPressed">returnPressed</a>( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ), + this, TQ_SLOT( itemDoubleClicked( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqiconview.html#dropped">dropped</a>( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem> & ) ), + this, TQ_SLOT( slotDropped( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqiconview.html#contextMenuRequested">contextMenuRequested</a>( <a href="qiconviewitem.html">TQIconViewItem</a> *, const <a href="ntqpoint.html">TQPoint</a> & ) ), + this, TQ_SLOT( slotRightPressed( <a href="qiconviewitem.html">TQIconViewItem</a> * ) ) ); <a href="ntqscrollview.html#setHScrollBarMode">setHScrollBarMode</a>( AlwaysOff ); <a href="ntqscrollview.html#setVScrollBarMode">setVScrollBarMode</a>( Auto ); @@ -998,22 +998,22 @@ void <a name="f320"></a>TQtFileIconView::slotRightPressed( <a href="qiconviewite if ( !item ) { // right pressed on viewport <a href="ntqpopupmenu.html">TQPopupMenu</a> menu( this ); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&Large view", this, SLOT( viewLarge() ) ); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&Small view", this, SLOT( viewSmall() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&Large view", this, TQ_SLOT( viewLarge() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&Small view", this, TQ_SLOT( viewSmall() ) ); menu.<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Text at the &bottom", this, SLOT( viewBottom() ) ); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Text at the &right", this, SLOT( viewRight() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Text at the &bottom", this, TQ_SLOT( viewBottom() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Text at the &right", this, TQ_SLOT( viewRight() ) ); menu.<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange l&eft to right", this, SLOT( flowEast() ) ); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange t&op to bottom", this, SLOT( flowSouth() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange l&eft to right", this, TQ_SLOT( flowEast() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange t&op to bottom", this, TQ_SLOT( flowSouth() ) ); menu.<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&Truncate item text", this, SLOT( itemTextTruncate() ) ); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&Wordwrap item text", this, SLOT( itemTextWordWrap() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&Truncate item text", this, TQ_SLOT( itemTextTruncate() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&Wordwrap item text", this, TQ_SLOT( itemTextWordWrap() ) ); menu.<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange items in &grid", this, SLOT( <a href="ntqiconview.html#arrangeItemsInGrid">arrangeItemsInGrid</a>() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange items in &grid", this, TQ_SLOT( <a href="ntqiconview.html#arrangeItemsInGrid">arrangeItemsInGrid</a>() ) ); menu.<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Sort &ascending", this, SLOT( sortAscending() ) ); - menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Sort &descending", this, SLOT( sortDescending() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Sort &ascending", this, TQ_SLOT( sortAscending() ) ); + menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Sort &descending", this, TQ_SLOT( sortDescending() ) ); <a name="x875"></a> menu.<a href="ntqwidget.html#setMouseTracking">setMouseTracking</a>( TRUE ); <a name="x866"></a> menu.<a href="ntqpopupmenu.html#exec">exec</a>( TQCursor::<a href="ntqcursor.html#pos">pos</a>() ); @@ -1220,8 +1220,8 @@ void <a name="f325"></a>FileMainWindow::setup() pathCombo = new <a href="ntqcombobox.html">TQComboBox</a>( TRUE, toolbar ); <a name="x880"></a> pathCombo-><a href="ntqcombobox.html#setAutoCompletion">setAutoCompletion</a>( TRUE ); <a name="x896"></a> toolbar-><a href="ntqtoolbar.html#setStretchableWidget">setStretchableWidget</a>( pathCombo ); -<a name="x877"></a> <a href="ntqobject.html#connect">connect</a>( pathCombo, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT ( changePath( const <a href="ntqstring.html">TQString</a> & ) ) ); +<a name="x877"></a> <a href="ntqobject.html#connect">connect</a>( pathCombo, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT ( changePath( const <a href="ntqstring.html">TQString</a> & ) ) ); <a name="x895"></a> toolbar-><a href="ntqtoolbar.html#addSeparator">addSeparator</a>(); @@ -1229,22 +1229,22 @@ void <a name="f325"></a>FileMainWindow::setup() pix = TQPixmap( cdtoparent_xpm ); upButton = new <a href="ntqtoolbutton.html">TQToolButton</a>( pix, "One directory up", <a href="ntqstring.html#TQString-null">TQString::null</a>, - this, SLOT( cdUp() ), toolbar, "cd up" ); + this, TQ_SLOT( cdUp() ), toolbar, "cd up" ); pix = TQPixmap( newfolder_xpm ); mkdirButton = new <a href="ntqtoolbutton.html">TQToolButton</a>( pix, "New Folder", TQString::null, - this, SLOT( newFolder() ), toolbar, "new folder" ); - - <a href="ntqobject.html#connect">connect</a>( dirlist, SIGNAL( folderSelected( const <a href="ntqstring.html">TQString</a> & ) ), - fileview, SLOT ( setDirectory( const <a href="ntqstring.html">TQString</a> & ) ) ); - <a href="ntqobject.html#connect">connect</a>( fileview, SIGNAL( directoryChanged( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( directoryChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); - <a href="ntqobject.html#connect">connect</a>( fileview, SIGNAL( startReadDir( int ) ), - this, SLOT( slotStartReadDir( int ) ) ); - <a href="ntqobject.html#connect">connect</a>( fileview, SIGNAL( readNextDir() ), - this, SLOT( slotReadNextDir() ) ); - <a href="ntqobject.html#connect">connect</a>( fileview, SIGNAL( readDirDone() ), - this, SLOT( slotReadDirDone() ) ); + this, TQ_SLOT( newFolder() ), toolbar, "new folder" ); + + <a href="ntqobject.html#connect">connect</a>( dirlist, TQ_SIGNAL( folderSelected( const <a href="ntqstring.html">TQString</a> & ) ), + fileview, TQ_SLOT ( setDirectory( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( fileview, TQ_SIGNAL( directoryChanged( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( directoryChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( fileview, TQ_SIGNAL( startReadDir( int ) ), + this, TQ_SLOT( slotStartReadDir( int ) ) ); + <a href="ntqobject.html#connect">connect</a>( fileview, TQ_SIGNAL( readNextDir() ), + this, TQ_SLOT( slotReadNextDir() ) ); + <a href="ntqobject.html#connect">connect</a>( fileview, TQ_SIGNAL( readDirDone() ), + this, TQ_SLOT( slotReadDirDone() ) ); <a href="ntqmainwindow.html#setDockEnabled">setDockEnabled</a>( DockLeft, FALSE ); <a href="ntqmainwindow.html#setDockEnabled">setDockEnabled</a>( DockRight, FALSE ); @@ -1254,14 +1254,14 @@ void <a name="f325"></a>FileMainWindow::setup() progress = new <a href="ntqprogressbar.html">TQProgressBar</a>( <a href="ntqmainwindow.html#statusBar">statusBar</a>() ); <a href="ntqmainwindow.html#statusBar">statusBar</a>()->addWidget( progress, 1, TRUE ); - <a href="ntqobject.html#connect">connect</a>( fileview, SIGNAL( enableUp() ), - this, SLOT( enableUp() ) ); - <a href="ntqobject.html#connect">connect</a>( fileview, SIGNAL( disableUp() ), - this, SLOT( disableUp() ) ); - <a href="ntqobject.html#connect">connect</a>( fileview, SIGNAL( enableMkdir() ), - this, SLOT( enableMkdir() ) ); - <a href="ntqobject.html#connect">connect</a>( fileview, SIGNAL( disableMkdir() ), - this, SLOT( disableMkdir() ) ); + <a href="ntqobject.html#connect">connect</a>( fileview, TQ_SIGNAL( enableUp() ), + this, TQ_SLOT( enableUp() ) ); + <a href="ntqobject.html#connect">connect</a>( fileview, TQ_SIGNAL( disableUp() ), + this, TQ_SLOT( disableUp() ) ); + <a href="ntqobject.html#connect">connect</a>( fileview, TQ_SIGNAL( enableMkdir() ), + this, TQ_SLOT( enableMkdir() ) ); + <a href="ntqobject.html#connect">connect</a>( fileview, TQ_SIGNAL( disableMkdir() ), + this, TQ_SLOT( disableMkdir() ) ); } void <a name="f326"></a>FileMainWindow::setPathCombo() diff --git a/doc/html/forever-example.html b/doc/html/forever-example.html index b8193a0d8..620b56a67 100644 --- a/doc/html/forever-example.html +++ b/doc/html/forever-example.html @@ -119,8 +119,8 @@ private: rectangles = 0; <a href="ntqobject.html#startTimer">startTimer</a>( 0 ); // run continuous timer <a href="ntqtimer.html">TQTimer</a> * counter = new <a href="ntqtimer.html">TQTimer</a>( this ); -<a name="x1054"></a> <a href="ntqobject.html#connect">connect</a>( counter, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), - this, SLOT(updateCaption()) ); +<a name="x1054"></a> <a href="ntqobject.html#connect">connect</a>( counter, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), + this, TQ_SLOT(updateCaption()) ); <a name="x1053"></a> counter-><a href="ntqtimer.html#start">start</a>( 1000 ); } diff --git a/doc/html/ftpclient-example.html b/doc/html/ftpclient-example.html index 3dcedc208..13ad9fae4 100644 --- a/doc/html/ftpclient-example.html +++ b/doc/html/ftpclient-example.html @@ -76,18 +76,18 @@ void FtpMainWindow::init() statusBar()->addWidget( stateFtp, 0, TRUE ); ftp = new <a href="ntqftp.html">TQFtp</a>( this ); -<a name="x748"></a> connect( ftp, SIGNAL(<a href="ntqftp.html#commandStarted">commandStarted</a>(int)), - SLOT(ftp_commandStarted()) ); -<a name="x747"></a> connect( ftp, SIGNAL(<a href="ntqftp.html#commandFinished">commandFinished</a>(int,bool)), - SLOT(ftp_commandFinished()) ); -<a name="x753"></a> connect( ftp, SIGNAL(<a href="ntqftp.html#done">done</a>(bool)), - SLOT(ftp_done(bool)) ); -<a name="x764"></a> connect( ftp, SIGNAL(<a href="ntqftp.html#stateChanged">stateChanged</a>(int)), - SLOT(ftp_stateChanged(int)) ); -<a name="x757"></a> connect( ftp, SIGNAL(<a href="ntqftp.html#listInfo">listInfo</a>(const <a href="ntqurlinfo.html">TQUrlInfo</a> &)), - SLOT(ftp_listInfo(const <a href="ntqurlinfo.html">TQUrlInfo</a> &)) ); -<a name="x761"></a> connect( ftp, SIGNAL(<a href="ntqftp.html#rawCommandReply">rawCommandReply</a>(int, const <a href="ntqstring.html">TQString</a> &)), - SLOT(ftp_rawCommandReply(int, const <a href="ntqstring.html">TQString</a> &)) ); +<a name="x748"></a> connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#commandStarted">commandStarted</a>(int)), + TQ_SLOT(ftp_commandStarted()) ); +<a name="x747"></a> connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#commandFinished">commandFinished</a>(int,bool)), + TQ_SLOT(ftp_commandFinished()) ); +<a name="x753"></a> connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#done">done</a>(bool)), + TQ_SLOT(ftp_done(bool)) ); +<a name="x764"></a> connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#stateChanged">stateChanged</a>(int)), + TQ_SLOT(ftp_stateChanged(int)) ); +<a name="x757"></a> connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#listInfo">listInfo</a>(const <a href="ntqurlinfo.html">TQUrlInfo</a> &)), + TQ_SLOT(ftp_listInfo(const <a href="ntqurlinfo.html">TQUrlInfo</a> &)) ); +<a name="x761"></a> connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#rawCommandReply">rawCommandReply</a>(int, const <a href="ntqstring.html">TQString</a> &)), + TQ_SLOT(ftp_rawCommandReply(int, const <a href="ntqstring.html">TQString</a> &)) ); } void FtpMainWindow::destroy() @@ -122,12 +122,12 @@ void FtpMainWindow::uploadFile() this, "upload progress dialog", TRUE ); -<a name="x752"></a> connect( ftp, SIGNAL(<a href="ntqftp.html#dataTransferProgress">dataTransferProgress</a>(int,int)), -<a name="x770"></a> &progress, SLOT(<a href="ntqprogressdialog.html#setProgress">setProgress</a>(int,int)) ); - connect( ftp, SIGNAL(<a href="ntqftp.html#commandFinished">commandFinished</a>(int,bool)), -<a name="x769"></a> &progress, SLOT(<a href="ntqprogressdialog.html#reset">reset</a>()) ); -<a name="x768"></a> connect( &progress, SIGNAL(<a href="ntqprogressdialog.html#cancelled">cancelled</a>()), -<a name="x744"></a> ftp, SLOT(<a href="ntqftp.html#abort">abort</a>()) ); +<a name="x752"></a> connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#dataTransferProgress">dataTransferProgress</a>(int,int)), +<a name="x770"></a> &progress, TQ_SLOT(<a href="ntqprogressdialog.html#setProgress">setProgress</a>(int,int)) ); + connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#commandFinished">commandFinished</a>(int,bool)), +<a name="x769"></a> &progress, TQ_SLOT(<a href="ntqprogressdialog.html#reset">reset</a>()) ); +<a name="x768"></a> connect( &progress, TQ_SIGNAL(<a href="ntqprogressdialog.html#cancelled">cancelled</a>()), +<a name="x744"></a> ftp, TQ_SLOT(<a href="ntqftp.html#abort">abort</a>()) ); <a href="ntqfileinfo.html">TQFileInfo</a> fi( fileName ); <a name="x759"></a><a name="x743"></a> ftp-><a href="ntqftp.html#put">put</a>( file, fi.<a href="ntqfileinfo.html#fileName">fileName</a>() ); @@ -168,12 +168,12 @@ void FtpMainWindow::downloadFile() this, "download progress dialog", TRUE ); - connect( ftp, SIGNAL(<a href="ntqftp.html#dataTransferProgress">dataTransferProgress</a>(int,int)), - &progress, SLOT(<a href="ntqprogressdialog.html#setProgress">setProgress</a>(int,int)) ); - connect( ftp, SIGNAL(<a href="ntqftp.html#commandFinished">commandFinished</a>(int,bool)), - &progress, SLOT(<a href="ntqprogressdialog.html#reset">reset</a>()) ); - connect( &progress, SIGNAL(<a href="ntqprogressdialog.html#cancelled">cancelled</a>()), - ftp, SLOT(<a href="ntqftp.html#abort">abort</a>()) ); + connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#dataTransferProgress">dataTransferProgress</a>(int,int)), + &progress, TQ_SLOT(<a href="ntqprogressdialog.html#setProgress">setProgress</a>(int,int)) ); + connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#commandFinished">commandFinished</a>(int,bool)), + &progress, TQ_SLOT(<a href="ntqprogressdialog.html#reset">reset</a>()) ); + connect( &progress, TQ_SIGNAL(<a href="ntqprogressdialog.html#cancelled">cancelled</a>()), + ftp, TQ_SLOT(<a href="ntqftp.html#abort">abort</a>()) ); <a name="x755"></a> ftp-><a href="ntqftp.html#get">get</a>( item-><a href="qlistviewitem.html#text">text</a>(0), file ); progress.<a href="ntqdialog.html#exec">exec</a>(); // ### takes a lot of time!!! diff --git a/doc/html/grapher-nsplugin-example.html b/doc/html/grapher-nsplugin-example.html index bcb6acdd6..3058528f4 100644 --- a/doc/html/grapher-nsplugin-example.html +++ b/doc/html/grapher-nsplugin-example.html @@ -190,16 +190,16 @@ private slots: for ( Style s = Pie; styleName[s]; s = Style(s+1)) { stylemenu-><a href="ntqmenudata.html#insertItem">insertItem</a>(styleName[s], s+100); } -<a name="x2767"></a> <a href="ntqobject.html#connect">connect</a>(stylemenu, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), - this, SLOT(setStyleFromMenu(int))); +<a name="x2767"></a> <a href="ntqobject.html#connect">connect</a>(stylemenu, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), + this, TQ_SLOT(setStyleFromMenu(int))); <a href="ntqwidget.html#setStyle">setStyle</a>(Pie); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>("Style", stylemenu); menubar-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); <a href="ntqpopupmenu.html">TQPopupMenu</a>* help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>; - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About plugin...", this, SIGNAL(aboutPlugin()) ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About data...", this, SIGNAL(aboutData()) ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About plugin...", this, TQ_SIGNAL(aboutPlugin()) ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About data...", this, TQ_SIGNAL(aboutData()) ); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>("Help", help); <a name="x2745"></a> menubar-><a href="ntqmenubar.html#hide">hide</a>(); } @@ -532,8 +532,8 @@ int <a name="f573"></a>Grapher::nCols() const <a name="x2775"></a> int ptsize = fontsize ? atoi(fontsize) : graph-><a href="ntqwidget.html#font">font</a>().pointSize(); if (fontfamily) graph-><a href="ntqwidget.html#setFont">setFont</a>(TQFont(fontfamily, ptsize)); - <a href="ntqobject.html#connect">connect</a>(graph, SIGNAL(aboutPlugin()), this, SLOT(aboutPlugin())); - <a href="ntqobject.html#connect">connect</a>(graph, SIGNAL(aboutData()), this, SLOT(aboutData())); + <a href="ntqobject.html#connect">connect</a>(graph, TQ_SIGNAL(aboutPlugin()), this, TQ_SLOT(aboutPlugin())); + <a href="ntqobject.html#connect">connect</a>(graph, TQ_SIGNAL(aboutData()), this, TQ_SLOT(aboutData())); return graph; } diff --git a/doc/html/hello-example.html b/doc/html/hello-example.html index 0cb176c57..53627c5d9 100644 --- a/doc/html/hello-example.html +++ b/doc/html/hello-example.html @@ -100,7 +100,7 @@ private: : <a href="ntqwidget.html">TQWidget</a>(parent,name), t(text), b(0) { <a href="ntqtimer.html">TQTimer</a> *timer = new <a href="ntqtimer.html">TQTimer</a>(this); -<a name="x1640"></a> <a href="ntqobject.html#connect">connect</a>( timer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), SLOT(animate()) ); +<a name="x1640"></a> <a href="ntqobject.html#connect">connect</a>( timer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), TQ_SLOT(animate()) ); <a name="x1639"></a> timer-><a href="ntqtimer.html#start">start</a>( 40 ); <a href="ntqwidget.html#resize">resize</a>( 260, 130 ); @@ -215,7 +215,7 @@ int main( int argc, char **argv ) #ifndef TQT_NO_WIDGET_TOPEXTRA // for TQt/Embedded minimal build h.<a href="ntqwidget.html#setCaption">setCaption</a>( "TQt says hello" ); #endif - TQObject::<a href="ntqobject.html#connect">connect</a>( &h, SIGNAL(clicked()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + TQObject::<a href="ntqobject.html#connect">connect</a>( &h, TQ_SIGNAL(clicked()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a name="x1650"></a> h.<a href="ntqwidget.html#setFont">setFont</a>( TQFont("times",32,TQFont::Bold) ); // default font <a name="x1648"></a> h.<a href="ntqwidget.html#setBackgroundColor">setBackgroundColor</a>( TQt::white ); // default bg color a.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>( &h ); diff --git a/doc/html/helpsystem-example.html b/doc/html/helpsystem-example.html index 028ac9403..6a210e97e 100644 --- a/doc/html/helpsystem-example.html +++ b/doc/html/helpsystem-example.html @@ -368,9 +368,9 @@ so that the system path is used. <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&File", fileMenu ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&Help", helpMenu ); - int fileId = fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "E&xit", this, SLOT(<a href="ntqwidget.html#close">close</a>()) ); + int fileId = fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "E&xit", this, TQ_SLOT(<a href="ntqwidget.html#close">close</a>()) ); - int helpId = helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Open Assistant", this, SLOT(assistantSlot()) ); + int helpId = helpMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Open Assistant", this, TQ_SLOT(assistantSlot()) ); // populate toolbar <a href="ntqtoolbar.html">TQToolBar</a>* toolbar = new <a href="ntqtoolbar.html">TQToolBar</a>( this ); @@ -385,9 +385,9 @@ and the toolbar are populated. which will enter "What's this?" mode when clicked. <pre> //create tooltipgroup <a href="qtooltipgroup.html">TQToolTipGroup</a> * tipGroup = new <a href="qtooltipgroup.html">TQToolTipGroup</a>( this ); - <a name="x2697"></a> <a href="ntqobject.html#connect">connect</a>( tipGroup, SIGNAL(<a href="qtooltipgroup.html#showTip">showTip</a>(const <a href="ntqstring.html">TQString</a>&)), statusBar(), - SLOT(message(const <a href="ntqstring.html">TQString</a>&)) ); - <a name="x2696"></a> <a href="ntqobject.html#connect">connect</a>( tipGroup, SIGNAL(<a href="qtooltipgroup.html#removeTip">removeTip</a>()), statusBar(), SLOT(clear()) ); + <a name="x2697"></a> <a href="ntqobject.html#connect">connect</a>( tipGroup, TQ_SIGNAL(<a href="qtooltipgroup.html#showTip">showTip</a>(const <a href="ntqstring.html">TQString</a>&)), statusBar(), + TQ_SLOT(message(const <a href="ntqstring.html">TQString</a>&)) ); + <a name="x2696"></a> <a href="ntqobject.html#connect">connect</a>( tipGroup, TQ_SIGNAL(<a href="qtooltipgroup.html#removeTip">removeTip</a>()), statusBar(), TQ_SLOT(clear()) ); </pre> <p> A <a href="qtooltipgroup.html">TQToolTipGroup</a> is created and will show and remove tooltips in the statusbar as the tooltips are displayed on the widgets. @@ -422,13 +422,13 @@ Instances of the two WhatsThis subclasses are created for the headers and the table. What's This? help is also added for the menu items. <pre> // connections - <a href="ntqobject.html#connect">connect</a>( assistantButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(assistantSlot()) ); - <a href="ntqobject.html#connect">connect</a>( horizontalWhatsThis, SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&)), assistant, - SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&)) ); - <a href="ntqobject.html#connect">connect</a>( verticalWhatsThis, SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&)), assistant, - SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&)) ); - <a href="ntqobject.html#connect">connect</a>( cellWhatsThis, SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&)), assistant, - SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&)) ); + <a href="ntqobject.html#connect">connect</a>( assistantButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(assistantSlot()) ); + <a href="ntqobject.html#connect">connect</a>( horizontalWhatsThis, TQ_SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&)), assistant, + TQ_SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&)) ); + <a href="ntqobject.html#connect">connect</a>( verticalWhatsThis, TQ_SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&)), assistant, + TQ_SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&)) ); + <a href="ntqobject.html#connect">connect</a>( cellWhatsThis, TQ_SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&)), assistant, + TQ_SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&)) ); } </pre> <p> Signals and slots are connected, so that the relevant pages will diff --git a/doc/html/helpviewer-example.html b/doc/html/helpviewer-example.html index 33bed5d9b..9aaab16de 100644 --- a/doc/html/helpviewer-example.html +++ b/doc/html/helpviewer-example.html @@ -155,26 +155,26 @@ private: <a name="x1030"></a> browser-><a href="ntqtextedit.html#mimeSourceFactory">mimeSourceFactory</a>()->setFilePath( _path ); browser-><a href="ntqframe.html#setFrameStyle">setFrameStyle</a>( TQFrame::Panel | TQFrame::Sunken ); -<a name="x1027"></a> <a href="ntqobject.html#connect">connect</a>( browser, SIGNAL( <a href="ntqtextbrowser.html#sourceChanged">sourceChanged</a>(const <a href="ntqstring.html">TQString</a>& ) ), - this, SLOT( sourceChanged( const <a href="ntqstring.html">TQString</a>&) ) ); +<a name="x1027"></a> <a href="ntqobject.html#connect">connect</a>( browser, TQ_SIGNAL( <a href="ntqtextbrowser.html#sourceChanged">sourceChanged</a>(const <a href="ntqstring.html">TQString</a>& ) ), + this, TQ_SLOT( sourceChanged( const <a href="ntqstring.html">TQString</a>&) ) ); <a href="ntqmainwindow.html#setCentralWidget">setCentralWidget</a>( browser ); if ( !home_.<a href="ntqstring.html#isEmpty">isEmpty</a>() ) <a name="x1025"></a> browser-><a href="ntqtextbrowser.html#setSource">setSource</a>( home_ ); -<a name="x1023"></a> <a href="ntqobject.html#connect">connect</a>( browser, SIGNAL( <a href="ntqtextbrowser.html#highlighted">highlighted</a>( const <a href="ntqstring.html">TQString</a>&) ), - <a href="ntqmainwindow.html#statusBar">statusBar</a>(), SLOT( message( const <a href="ntqstring.html">TQString</a>&)) ); +<a name="x1023"></a> <a href="ntqobject.html#connect">connect</a>( browser, TQ_SIGNAL( <a href="ntqtextbrowser.html#highlighted">highlighted</a>( const <a href="ntqstring.html">TQString</a>&) ), + <a href="ntqmainwindow.html#statusBar">statusBar</a>(), TQ_SLOT( message( const <a href="ntqstring.html">TQString</a>&)) ); <a href="ntqwidget.html#resize">resize</a>( 640,700 ); <a href="ntqpopupmenu.html">TQPopupMenu</a>* file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&New Window"), this, SLOT( newWindow() ), CTRL+Key_N ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&Open File"), this, SLOT( openFile() ), CTRL+Key_O ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&Print"), this, SLOT( print() ), CTRL+Key_P ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&New Window"), this, TQ_SLOT( newWindow() ), CTRL+Key_N ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&Open File"), this, TQ_SLOT( openFile() ), CTRL+Key_O ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&Print"), this, TQ_SLOT( print() ), CTRL+Key_P ); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&Close"), this, SLOT( <a href="ntqwidget.html#close">close</a>() ), CTRL+Key_Q ); -<a name="x980"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_X ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&Close"), this, TQ_SLOT( <a href="ntqwidget.html#close">close</a>() ), CTRL+Key_Q ); +<a name="x980"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, TQ_SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_X ); // The same three icons are used twice each. <a href="ntqiconset.html">TQIconSet</a> icon_back( TQPixmap("back.xpm") ); @@ -183,33 +183,33 @@ private: <a href="ntqpopupmenu.html">TQPopupMenu</a>* go = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); backwardId = go-><a href="ntqmenudata.html#insertItem">insertItem</a>( icon_back, -<a name="x1019"></a> <a href="ntqobject.html#tr">tr</a>("&Backward"), browser, SLOT( <a href="ntqtextbrowser.html#backward">backward</a>() ), +<a name="x1019"></a> <a href="ntqobject.html#tr">tr</a>("&Backward"), browser, TQ_SLOT( <a href="ntqtextbrowser.html#backward">backward</a>() ), CTRL+Key_Left ); forwardId = go-><a href="ntqmenudata.html#insertItem">insertItem</a>( icon_forward, -<a name="x1021"></a> <a href="ntqobject.html#tr">tr</a>("&Forward"), browser, SLOT( <a href="ntqtextbrowser.html#forward">forward</a>() ), +<a name="x1021"></a> <a href="ntqobject.html#tr">tr</a>("&Forward"), browser, TQ_SLOT( <a href="ntqtextbrowser.html#forward">forward</a>() ), CTRL+Key_Right ); -<a name="x1024"></a> go-><a href="ntqmenudata.html#insertItem">insertItem</a>( icon_home, tr("&Home"), browser, SLOT( <a href="ntqtextbrowser.html#home">home</a>() ) ); +<a name="x1024"></a> go-><a href="ntqmenudata.html#insertItem">insertItem</a>( icon_home, tr("&Home"), browser, TQ_SLOT( <a href="ntqtextbrowser.html#home">home</a>() ) ); <a href="ntqpopupmenu.html">TQPopupMenu</a>* help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&About"), this, SLOT( about() ) ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("About &TQt"), this, SLOT( aboutTQt() ) ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&About"), this, TQ_SLOT( about() ) ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("About &TQt"), this, TQ_SLOT( aboutTQt() ) ); hist = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); TQStringList::Iterator it = history.begin(); for ( ; it != history.end(); ++it ) mHistory[ hist-><a href="ntqmenudata.html#insertItem">insertItem</a>( *it ) ] = *it; -<a name="x1004"></a> <a href="ntqobject.html#connect">connect</a>( hist, SIGNAL( <a href="ntqpopupmenu.html#activated">activated</a>( int ) ), - this, SLOT( histChosen( int ) ) ); +<a name="x1004"></a> <a href="ntqobject.html#connect">connect</a>( hist, TQ_SIGNAL( <a href="ntqpopupmenu.html#activated">activated</a>( int ) ), + this, TQ_SLOT( histChosen( int ) ) ); bookm = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - bookm-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>( "Add Bookmark" ), this, SLOT( addBookmark() ) ); + bookm-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) ); bookm-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); TQStringList::Iterator it2 = bookmarks.begin(); for ( ; it2 != bookmarks.end(); ++it2 ) mBookmarks[ bookm-><a href="ntqmenudata.html#insertItem">insertItem</a>( *it2 ) ] = *it2; - <a href="ntqobject.html#connect">connect</a>( bookm, SIGNAL( <a href="ntqpopupmenu.html#activated">activated</a>( int ) ), - this, SLOT( bookmChosen( int ) ) ); + <a href="ntqobject.html#connect">connect</a>( bookm, TQ_SIGNAL( <a href="ntqpopupmenu.html#activated">activated</a>( int ) ), + this, TQ_SLOT( bookmChosen( int ) ) ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( <a href="ntqobject.html#tr">tr</a>("&File"), file ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( <a href="ntqobject.html#tr">tr</a>("&Go"), go ); @@ -220,29 +220,29 @@ private: <a href="ntqmainwindow.html#menuBar">menuBar</a>()->setItemEnabled( forwardId, FALSE); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->setItemEnabled( backwardId, FALSE); -<a name="x1020"></a> <a href="ntqobject.html#connect">connect</a>( browser, SIGNAL( <a href="ntqtextbrowser.html#backwardAvailable">backwardAvailable</a>( bool ) ), - this, SLOT( setBackwardAvailable( bool ) ) ); -<a name="x1022"></a> <a href="ntqobject.html#connect">connect</a>( browser, SIGNAL( <a href="ntqtextbrowser.html#forwardAvailable">forwardAvailable</a>( bool ) ), - this, SLOT( setForwardAvailable( bool ) ) ); +<a name="x1020"></a> <a href="ntqobject.html#connect">connect</a>( browser, TQ_SIGNAL( <a href="ntqtextbrowser.html#backwardAvailable">backwardAvailable</a>( bool ) ), + this, TQ_SLOT( setBackwardAvailable( bool ) ) ); +<a name="x1022"></a> <a href="ntqobject.html#connect">connect</a>( browser, TQ_SIGNAL( <a href="ntqtextbrowser.html#forwardAvailable">forwardAvailable</a>( bool ) ), + this, TQ_SLOT( setForwardAvailable( bool ) ) ); <a href="ntqtoolbar.html">TQToolBar</a>* toolbar = new <a href="ntqtoolbar.html">TQToolBar</a>( this ); <a href="ntqmainwindow.html#addToolBar">addToolBar</a>( toolbar, "Toolbar"); <a href="ntqtoolbutton.html">TQToolButton</a>* button; - button = new <a href="ntqtoolbutton.html">TQToolButton</a>( icon_back, tr("Backward"), "", browser, SLOT(<a href="ntqtextbrowser.html#backward">backward</a>()), toolbar ); -<a name="x1035"></a> <a href="ntqobject.html#connect">connect</a>( browser, SIGNAL( <a href="ntqtextbrowser.html#backwardAvailable">backwardAvailable</a>(bool) ), button, SLOT( <a href="ntqwidget.html#setEnabled">setEnabled</a>(bool) ) ); + button = new <a href="ntqtoolbutton.html">TQToolButton</a>( icon_back, tr("Backward"), "", browser, TQ_SLOT(<a href="ntqtextbrowser.html#backward">backward</a>()), toolbar ); +<a name="x1035"></a> <a href="ntqobject.html#connect">connect</a>( browser, TQ_SIGNAL( <a href="ntqtextbrowser.html#backwardAvailable">backwardAvailable</a>(bool) ), button, TQ_SLOT( <a href="ntqwidget.html#setEnabled">setEnabled</a>(bool) ) ); button-><a href="ntqwidget.html#setEnabled">setEnabled</a>( FALSE ); - button = new <a href="ntqtoolbutton.html">TQToolButton</a>( icon_forward, tr("Forward"), "", browser, SLOT(<a href="ntqtextbrowser.html#forward">forward</a>()), toolbar ); - <a href="ntqobject.html#connect">connect</a>( browser, SIGNAL( <a href="ntqtextbrowser.html#forwardAvailable">forwardAvailable</a>(bool) ), button, SLOT( <a href="ntqwidget.html#setEnabled">setEnabled</a>(bool) ) ); + button = new <a href="ntqtoolbutton.html">TQToolButton</a>( icon_forward, tr("Forward"), "", browser, TQ_SLOT(<a href="ntqtextbrowser.html#forward">forward</a>()), toolbar ); + <a href="ntqobject.html#connect">connect</a>( browser, TQ_SIGNAL( <a href="ntqtextbrowser.html#forwardAvailable">forwardAvailable</a>(bool) ), button, TQ_SLOT( <a href="ntqwidget.html#setEnabled">setEnabled</a>(bool) ) ); button-><a href="ntqwidget.html#setEnabled">setEnabled</a>( FALSE ); - button = new <a href="ntqtoolbutton.html">TQToolButton</a>( icon_home, tr("Home"), "", browser, SLOT(<a href="ntqtextbrowser.html#home">home</a>()), toolbar ); + button = new <a href="ntqtoolbutton.html">TQToolButton</a>( icon_home, tr("Home"), "", browser, TQ_SLOT(<a href="ntqtextbrowser.html#home">home</a>()), toolbar ); <a name="x1033"></a> toolbar-><a href="ntqtoolbar.html#addSeparator">addSeparator</a>(); pathCombo = new <a href="ntqcombobox.html">TQComboBox</a>( TRUE, toolbar ); -<a name="x981"></a> <a href="ntqobject.html#connect">connect</a>( pathCombo, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( pathSelected( const <a href="ntqstring.html">TQString</a> & ) ) ); +<a name="x981"></a> <a href="ntqobject.html#connect">connect</a>( pathCombo, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( pathSelected( const <a href="ntqstring.html">TQString</a> & ) ) ); <a name="x1034"></a> toolbar-><a href="ntqtoolbar.html#setStretchableWidget">setStretchableWidget</a>( pathCombo ); <a href="ntqmainwindow.html#setRightJustification">setRightJustification</a>( TRUE ); <a href="ntqmainwindow.html#setDockEnabled">setDockEnabled</a>( DockLeft, FALSE ); @@ -462,8 +462,8 @@ int main( int argc, char ** argv ) else <a name="x1045"></a> help-><a href="ntqwidget.html#showMaximized">showMaximized</a>(); -<a name="x1039"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), - &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<a name="x1039"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), + &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); return a.<a href="ntqapplication.html#exec">exec</a>(); } diff --git a/doc/html/httpd-example.html b/doc/html/httpd-example.html index f2626a437..0839b8f6e 100644 --- a/doc/html/httpd-example.html +++ b/doc/html/httpd-example.html @@ -81,8 +81,8 @@ public: // works asynchronouslyl, this means that all the communication is done // in the two slots readClient() and discardClient(). <a href="ntqsocket.html">TQSocket</a>* s = new <a href="ntqsocket.html">TQSocket</a>( this ); -<a name="x731"></a> connect( s, SIGNAL(<a href="ntqsocket.html#readyRead">readyRead</a>()), this, SLOT(readClient()) ); -<a name="x729"></a> connect( s, SIGNAL(<a href="ntqsocket.html#delayedCloseFinished">delayedCloseFinished</a>()), this, SLOT(discardClient()) ); +<a name="x731"></a> connect( s, TQ_SIGNAL(<a href="ntqsocket.html#readyRead">readyRead</a>()), this, TQ_SLOT(readClient()) ); +<a name="x729"></a> connect( s, TQ_SIGNAL(<a href="ntqsocket.html#delayedCloseFinished">delayedCloseFinished</a>()), this, TQ_SLOT(discardClient()) ); <a name="x732"></a> s-><a href="ntqsocket.html#setSocket">setSocket</a>( socket ); emit newConnect(); } @@ -142,10 +142,10 @@ public: infoText = new <a href="ntqtextview.html">TQTextView</a>( this ); <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "quit" , this ); - connect( httpd, SIGNAL(newConnect()), SLOT(newConnect()) ); - connect( httpd, SIGNAL(endConnect()), SLOT(endConnect()) ); - connect( httpd, SIGNAL(wroteToClient()), SLOT(wroteToClient()) ); -<a name="x724"></a> connect( quit, SIGNAL(<a href="ntqbutton.html#pressed">pressed</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + connect( httpd, TQ_SIGNAL(newConnect()), TQ_SLOT(newConnect()) ); + connect( httpd, TQ_SIGNAL(endConnect()), TQ_SLOT(endConnect()) ); + connect( httpd, TQ_SIGNAL(wroteToClient()), TQ_SLOT(wroteToClient()) ); +<a name="x724"></a> connect( quit, TQ_SIGNAL(<a href="ntqbutton.html#pressed">pressed</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); } ~HttpInfo() diff --git a/doc/html/i18n-example.html b/doc/html/i18n-example.html index 3ed7e40f5..0163de3b2 100644 --- a/doc/html/i18n-example.html +++ b/doc/html/i18n-example.html @@ -112,7 +112,7 @@ private: <a href="ntqmainwindow.html#setCentralWidget">setCentralWidget</a>(central); <a href="ntqpopupmenu.html">TQPopupMenu</a>* file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>(this); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()), + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()), <a name="x1921"></a> TQAccel::<a href="ntqaccel.html#stringToKey">stringToKey</a>(<a href="ntqobject.html#tr">tr</a>("Ctrl+Q")) ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( <a href="ntqobject.html#tr">tr</a>("&File"), file ); @@ -195,7 +195,7 @@ public: <a name="x1938"></a> vb-><a href="ntqlayout.html#setAutoAdd">setAutoAdd</a>(TRUE); hb = 0; sm = new <a href="ntqsignalmapper.html">TQSignalMapper</a>(this); -<a name="x1946"></a> connect(sm,SIGNAL(<a href="ntqsignalmapper.html#mapped">mapped</a>(int)),this,SLOT(done(int))); +<a name="x1946"></a> connect(sm,TQ_SIGNAL(<a href="ntqsignalmapper.html#mapped">mapped</a>(int)),this,TQ_SLOT(done(int))); } void addButtons( const <a href="ntqstring.html">TQString</a>& cancel=TQString::null, const <a href="ntqstring.html">TQString</a>& ok=TQString::null, @@ -216,7 +216,7 @@ public: hb = new <a href="ntqhbox.html">TQHBox</a>(this); <a href="ntqpushbutton.html">TQPushButton</a> *c = new <a href="ntqpushbutton.html">TQPushButton</a>(text, hb); <a name="x1947"></a> sm-><a href="ntqsignalmapper.html#setMapping">setMapping</a>(c,result); -<a name="x1945"></a> connect(c,SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()),sm,SLOT(<a href="ntqsignalmapper.html#map">map</a>())); +<a name="x1945"></a> connect(c,TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()),sm,TQ_SLOT(<a href="ntqsignalmapper.html#map">map</a>())); } private: @@ -293,7 +293,7 @@ int main( int argc, char** argv ) MyWidget* w = showLang((const char*)qm[i]); if( w == 0 ) exit( 0 ); - TQObject::<a href="ntqobject.html#connect">connect</a>(w, SIGNAL(closed()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>())); + TQObject::<a href="ntqobject.html#connect">connect</a>(w, TQ_SIGNAL(closed()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>())); <a name="x1953"></a> w-><a href="ntqwidget.html#setGeometry">setGeometry</a>(x,y,197,356); w-><a href="ntqwidget.html#show">show</a>(); if ( tight ) { diff --git a/doc/html/i18n.html b/doc/html/i18n.html index 9cd85c5bb..837fb8cc8 100644 --- a/doc/html/i18n.html +++ b/doc/html/i18n.html @@ -263,7 +263,7 @@ your application, translators won't be able to override it. The correct idiom is <p> <pre> <a href="ntqpopupmenu.html">TQPopupMenu</a> *file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( tr("&Quit"), this, SLOT(quit()), + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( tr("&Quit"), this, TQ_SLOT(quit()), TQKeySequence(tr("Ctrl+Q", "File|Quit")) ); </pre> diff --git a/doc/html/iconview-example.html b/doc/html/iconview-example.html index 4454a9678..fe9db0dc3 100644 --- a/doc/html/iconview-example.html +++ b/doc/html/iconview-example.html @@ -101,9 +101,9 @@ int main( int argc, char **argv ) qiconview.<a href="ntqwidget.html#setCaption">setCaption</a>( "TQt Example - Iconview" ); ListenDND listen_dnd( &qiconview ); -<a name="x1460"></a><a name="x1455"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &qiconview, SIGNAL( <a href="ntqiconview.html#dropped">dropped</a>( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem> & ) ), - &listen_dnd, SLOT( dropped( <a href="qdropevent.html">TQDropEvent</a> * ) ) ); -<a name="x1456"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &qiconview, SIGNAL( <a href="ntqiconview.html#moved">moved</a>() ), &listen_dnd, SLOT( moved() ) ); +<a name="x1460"></a><a name="x1455"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &qiconview, TQ_SIGNAL( <a href="ntqiconview.html#dropped">dropped</a>( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem> & ) ), + &listen_dnd, TQ_SLOT( dropped( <a href="qdropevent.html">TQDropEvent</a> * ) ) ); +<a name="x1456"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &qiconview, TQ_SIGNAL( <a href="ntqiconview.html#moved">moved</a>() ), &listen_dnd, TQ_SLOT( moved() ) ); a.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>( &qiconview ); <a name="x1462"></a> qiconview.<a href="ntqwidget.html#show">show</a>(); diff --git a/doc/html/iconview-simple_dd-main-cpp.html b/doc/html/iconview-simple_dd-main-cpp.html index c43a87b98..09ac4629c 100644 --- a/doc/html/iconview-simple_dd-main-cpp.html +++ b/doc/html/iconview-simple_dd-main-cpp.html @@ -204,8 +204,8 @@ int main( int argc, char *argv[] ) // Set up the connection so that we can drop items into the icon view TQObject::<a href="ntqobject.html#connect">connect</a>( -<a name="x2821"></a> iv, SIGNAL(<a href="ntqiconview.html#dropped">dropped</a>(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem>&)), - iv, SLOT(slotNewItem(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem>&))); +<a name="x2821"></a> iv, TQ_SIGNAL(<a href="ntqiconview.html#dropped">dropped</a>(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem>&)), + iv, TQ_SLOT(slotNewItem(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem>&))); // Populate the TQIconView with icons DDIconViewItem *item; diff --git a/doc/html/layout-example.html b/doc/html/layout-example.html index c79f41acd..99519f00f 100644 --- a/doc/html/layout-example.html +++ b/doc/html/layout-example.html @@ -76,7 +76,7 @@ public: <a name="x540"></a> menubar-><a href="ntqmenubar.html#setSeparator">setSeparator</a>( TQMenuBar::InWindowsStyle ); <a href="ntqpopupmenu.html">TQPopupMenu</a>* popup; popup = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - popup-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + popup-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&File", popup ); // ...and tell the layout about it. diff --git a/doc/html/lineedits-example.html b/doc/html/lineedits-example.html index 90455fa78..c450cc8a7 100644 --- a/doc/html/lineedits-example.html +++ b/doc/html/lineedits-example.html @@ -125,9 +125,9 @@ protected slots: <a name="x171"></a> combo1-><a href="ntqcombobox.html#insertItem">insertItem</a>( "Normal" ); combo1-><a href="ntqcombobox.html#insertItem">insertItem</a>( "Password" ); combo1-><a href="ntqcombobox.html#insertItem">insertItem</a>( "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 -<a name="x170"></a> <a href="ntqobject.html#connect">connect</a>( combo1, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), this, SLOT( slotEchoChanged( int ) ) ); +<a name="x170"></a> <a href="ntqobject.html#connect">connect</a>( combo1, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), this, TQ_SLOT( slotEchoChanged( int ) ) ); // insert the first LineEdit lined1 = new <a href="ntqlineedit.html">TQLineEdit</a>( this ); @@ -147,8 +147,8 @@ protected slots: combo2-><a href="ntqcombobox.html#insertItem">insertItem</a>( "No Validator" ); combo2-><a href="ntqcombobox.html#insertItem">insertItem</a>( "Integer Validator" ); combo2-><a href="ntqcombobox.html#insertItem">insertItem</a>( "Double Validator" ); - // ...and again the activated() SIGNAL gets connected with a SLOT - <a href="ntqobject.html#connect">connect</a>( combo2, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), this, SLOT( slotValidatorChanged( int ) ) ); + // ...and again the activated() TQ_SIGNAL gets connected with a TQ_SLOT + <a href="ntqobject.html#connect">connect</a>( combo2, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), this, TQ_SLOT( slotValidatorChanged( int ) ) ); // and the second LineEdit lined2 = new <a href="ntqlineedit.html">TQLineEdit</a>( this ); @@ -168,8 +168,8 @@ protected slots: combo3-><a href="ntqcombobox.html#insertItem">insertItem</a>( "Left" ); combo3-><a href="ntqcombobox.html#insertItem">insertItem</a>( "Centered" ); combo3-><a href="ntqcombobox.html#insertItem">insertItem</a>( "Right" ); - // ...and again the activated() SIGNAL gets connected with a SLOT - <a href="ntqobject.html#connect">connect</a>( combo3, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), this, SLOT( slotAlignmentChanged( int ) ) ); + // ...and again the activated() TQ_SIGNAL gets connected with a TQ_SLOT + <a href="ntqobject.html#connect">connect</a>( combo3, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), this, TQ_SLOT( slotAlignmentChanged( int ) ) ); // and the third lineedit lined3 = new <a href="ntqlineedit.html">TQLineEdit</a>( this ); @@ -192,8 +192,8 @@ protected slots: combo4-><a href="ntqcombobox.html#insertItem">insertItem</a>( "License key" ); // ...this time we use the activated( const <a href="ntqstring.html">TQString</a> & ) signal - <a href="ntqobject.html#connect">connect</a>( combo4, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), - this, SLOT( slotInputMaskChanged( int ) ) ); + <a href="ntqobject.html#connect">connect</a>( combo4, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), + this, TQ_SLOT( slotInputMaskChanged( int ) ) ); // and the fourth lineedit lined4 = new <a href="ntqlineedit.html">TQLineEdit</a>( this ); @@ -211,8 +211,8 @@ protected slots: combo5 = new <a href="ntqcombobox.html">TQComboBox</a>( FALSE, row5 ); combo5-><a href="ntqcombobox.html#insertItem">insertItem</a>( "False" ); combo5-><a href="ntqcombobox.html#insertItem">insertItem</a>( "True" ); - // ...and again the activated() SIGNAL gets connected with a SLOT - <a href="ntqobject.html#connect">connect</a>( combo5, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), this, SLOT( slotReadOnlyChanged( int ) ) ); + // ...and again the activated() TQ_SIGNAL gets connected with a TQ_SLOT + <a href="ntqobject.html#connect">connect</a>( combo5, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( int ) ), this, TQ_SLOT( slotReadOnlyChanged( int ) ) ); // and the last lineedit lined5 = new <a href="ntqlineedit.html">TQLineEdit</a>( this ); @@ -223,7 +223,7 @@ protected slots: } /* - * 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 @@ -248,7 +248,7 @@ void <a name="f220"></a>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 @@ -278,7 +278,7 @@ void <a name="f221"></a>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 @@ -303,7 +303,7 @@ void <a name="f222"></a>LineEdits::slotAlignmentChanged( int i ) } /* - * SLOT slotInputMaskChanged( const <a href="ntqstring.html">TQString</a> &mask ) + * TQ_SLOT slotInputMaskChanged( const <a href="ntqstring.html">TQString</a> &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 @@ -332,7 +332,7 @@ void <a name="f223"></a>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/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html index 897b784ca..4f7e2e97a 100644 --- a/doc/html/linguist-manual-4.html +++ b/doc/html/linguist-manual-4.html @@ -102,7 +102,7 @@ body { background: #ffffff; color: black; } rbh = new TQRadioButton( tr("Enabled", "Hue frame"), this ); </pre> <!-- index Ctrl Key --><p>Ctrl key accelerators are also translatable:</p> -<pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()), +<pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()), <a href="ntqobject.html#tr">tr</a>("Ctrl+Q", "Quit") ); </pre> <p>It is strongly recommended that the two argument form of <tt>tr()</tt> is used for Ctrl key accelerators. The second argument is the only clue the translator has as to the function performed by the accelerator.</p> @@ -336,7 +336,7 @@ TRANSLATIONS = tt2_fr.ts \ <pre> ArrowPad *ap = new ArrowPad( this, "arrow pad" ); </pre> <p>We also call <tt>MainWindow::tr()</tt> twice, once for the menu item and once for the accelerator.</p> -<!-- index Ctrl Key --><!-- index Alt Key --><pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()), +<!-- index Ctrl Key --><!-- index Alt Key --><pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()), <a href="ntqobject.html#tr">tr</a>("Ctrl+Q", "Quit") ); </pre> <p>Note the use of <tt>tr()</tt> to support different keys in other languages. "Ctrl+Q" is a good choice for Quit in English, but a Dutch translator might want to use "Ctrl+A" (for Afsluiten) and a German translator "Strg+E" (for Beenden). When using <tt>tr()</tt> for Ctrl key accelerators, the two argument form should be used with the second argument describing the function that the accelerator performs.</p> @@ -452,11 +452,11 @@ TRANSLATIONS = tt3_pt.ts <pre> <a href="ntqwidget.html#setCaption">setCaption</a>( <a href="ntqobject.html#tr">tr</a>("Troll Print 1.0") ); </pre> <p>We must translate the window's caption.</p> -<pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()), +<pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&xit"), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()), <a href="ntqobject.html#tr">tr</a>("Ctrl+Q", "Quit") ); <a href="ntqpopupmenu.html">TQPopupMenu</a> *help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&About"), this, SLOT(about()), Key_F1 ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("About &TQt"), this, SLOT(aboutTQt()) ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&About"), this, TQ_SLOT(about()), Key_F1 ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("About &TQt"), this, TQ_SLOT(aboutTQt()) ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( <a href="ntqobject.html#tr">tr</a>("&File"), file ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertSeparator(); diff --git a/doc/html/listbox-example.html b/doc/html/listbox-example.html index 1e1a4f870..82fce5b39 100644 --- a/doc/html/listbox-example.html +++ b/doc/html/listbox-example.html @@ -135,7 +135,7 @@ private: <a name="x1428"></a> bg-><a href="ntqbuttongroup.html#insert">insert</a>( b ); <a name="x1425"></a> v-><a href="qboxlayout.html#addWidget">addWidget</a>( b ); <a name="x1440"></a> b-><a href="ntqradiobutton.html#setChecked">setChecked</a>( TRUE ); -<a name="x1426"></a> <a href="ntqobject.html#connect">connect</a>( b, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(setNumCols()) ); +<a name="x1426"></a> <a href="ntqobject.html#connect">connect</a>( b, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(setNumCols()) ); <a href="qhboxlayout.html">TQHBoxLayout</a> * h = new <a href="qhboxlayout.html">TQHBoxLayout</a>; <a name="x1422"></a> v-><a href="qboxlayout.html#addLayout">addLayout</a>( h ); <a name="x1423"></a> h-><a href="qboxlayout.html#addSpacing">addSpacing</a>( 30 ); @@ -151,7 +151,7 @@ private: this ); bg-><a href="ntqbuttongroup.html#insert">insert</a>( b ); v-><a href="qboxlayout.html#addWidget">addWidget</a>( b ); - <a href="ntqobject.html#connect">connect</a>( b, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(setColsByWidth()) ); + <a href="ntqobject.html#connect">connect</a>( b, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(setColsByWidth()) ); v-><a href="qboxlayout.html#addSpacing">addSpacing</a>( 12 ); @@ -160,7 +160,7 @@ private: this ); bg-><a href="ntqbuttongroup.html#insert">insert</a>( b ); v-><a href="qboxlayout.html#addWidget">addWidget</a>( b ); - <a href="ntqobject.html#connect">connect</a>( b, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(setNumRows()) ); + <a href="ntqobject.html#connect">connect</a>( b, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(setNumRows()) ); h = new <a href="qhboxlayout.html">TQHBoxLayout</a>; v-><a href="qboxlayout.html#addLayout">addLayout</a>( h ); h-><a href="qboxlayout.html#addSpacing">addSpacing</a>( 30 ); @@ -177,30 +177,30 @@ private: this ); bg-><a href="ntqbuttongroup.html#insert">insert</a>( b ); v-><a href="qboxlayout.html#addWidget">addWidget</a>( b ); - <a href="ntqobject.html#connect">connect</a>( b, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(setRowsByHeight()) ); + <a href="ntqobject.html#connect">connect</a>( b, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(setRowsByHeight()) ); v-><a href="qboxlayout.html#addSpacing">addSpacing</a>( 12 ); <a href="ntqcheckbox.html">TQCheckBox</a> * cb = new <a href="ntqcheckbox.html">TQCheckBox</a>( "Variable-height rows", this ); <a name="x1429"></a> cb-><a href="ntqcheckbox.html#setChecked">setChecked</a>( TRUE ); -<a name="x1427"></a> <a href="ntqobject.html#connect">connect</a>( cb, SIGNAL(<a href="ntqbutton.html#toggled">toggled</a>(bool)), this, SLOT(setVariableHeight(bool)) ); +<a name="x1427"></a> <a href="ntqobject.html#connect">connect</a>( cb, TQ_SIGNAL(<a href="ntqbutton.html#toggled">toggled</a>(bool)), this, TQ_SLOT(setVariableHeight(bool)) ); v-><a href="qboxlayout.html#addWidget">addWidget</a>( cb ); v-><a href="qboxlayout.html#addSpacing">addSpacing</a>( 6 ); cb = new <a href="ntqcheckbox.html">TQCheckBox</a>( "Variable-width columns", this ); - <a href="ntqobject.html#connect">connect</a>( cb, SIGNAL(<a href="ntqbutton.html#toggled">toggled</a>(bool)), this, SLOT(setVariableWidth(bool)) ); + <a href="ntqobject.html#connect">connect</a>( cb, TQ_SIGNAL(<a href="ntqbutton.html#toggled">toggled</a>(bool)), this, TQ_SLOT(setVariableWidth(bool)) ); v-><a href="qboxlayout.html#addWidget">addWidget</a>( cb ); cb = new <a href="ntqcheckbox.html">TQCheckBox</a>( "Extended-Selection", this ); - <a href="ntqobject.html#connect">connect</a>( cb, SIGNAL(<a href="ntqbutton.html#toggled">toggled</a>(bool)), this, SLOT(setMultiSelection(bool)) ); + <a href="ntqobject.html#connect">connect</a>( cb, TQ_SIGNAL(<a href="ntqbutton.html#toggled">toggled</a>(bool)), this, TQ_SLOT(setMultiSelection(bool)) ); v-><a href="qboxlayout.html#addWidget">addWidget</a>( cb ); <a href="ntqpushbutton.html">TQPushButton</a> *pb = new <a href="ntqpushbutton.html">TQPushButton</a>( "Sort ascending", this ); - <a href="ntqobject.html#connect">connect</a>( pb, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( sortAscending() ) ); + <a href="ntqobject.html#connect">connect</a>( pb, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( sortAscending() ) ); v-><a href="qboxlayout.html#addWidget">addWidget</a>( pb ); pb = new <a href="ntqpushbutton.html">TQPushButton</a>( "Sort descending", this ); - <a href="ntqobject.html#connect">connect</a>( pb, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( sortDescending() ) ); + <a href="ntqobject.html#connect">connect</a>( pb, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( sortDescending() ) ); v-><a href="qboxlayout.html#addWidget">addWidget</a>( pb ); <a name="x1424"></a> v-><a href="qboxlayout.html#addStretch">addStretch</a>( 100 ); @@ -214,8 +214,8 @@ private: rows-><a href="ntqrangecontrol.html#setRange">setRange</a>( 1, 256 ); rows-><a href="ntqspinbox.html#setValue">setValue</a>( 256 ); -<a name="x1445"></a> <a href="ntqobject.html#connect">connect</a>( columns, SIGNAL(<a href="ntqspinbox.html#valueChanged">valueChanged</a>(int)), this, SLOT(setNumCols()) ); - <a href="ntqobject.html#connect">connect</a>( rows, SIGNAL(<a href="ntqspinbox.html#valueChanged">valueChanged</a>(int)), this, SLOT(setNumRows()) ); +<a name="x1445"></a> <a href="ntqobject.html#connect">connect</a>( columns, TQ_SIGNAL(<a href="ntqspinbox.html#valueChanged">valueChanged</a>(int)), this, TQ_SLOT(setNumCols()) ); + <a href="ntqobject.html#connect">connect</a>( rows, TQ_SIGNAL(<a href="ntqspinbox.html#valueChanged">valueChanged</a>(int)), this, TQ_SLOT(setNumRows()) ); } diff --git a/doc/html/listboxcombo-example.html b/doc/html/listboxcombo-example.html index a70a7ce3d..668bff718 100644 --- a/doc/html/listboxcombo-example.html +++ b/doc/html/listboxcombo-example.html @@ -166,8 +166,8 @@ protected: // Create a pushbutton... <a href="ntqpushbutton.html">TQPushButton</a> *arrow1 = new <a href="ntqpushbutton.html">TQPushButton</a>( " -> ", row1 ); - // ...and connect the clicked SIGNAL with the SLOT slotLeft2Right - <a href="ntqobject.html#connect">connect</a>( arrow1, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( slotLeft2Right() ) ); + // ...and connect the clicked TQ_SIGNAL with the TQ_SLOT slotLeft2Right + <a href="ntqobject.html#connect">connect</a>( arrow1, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( slotLeft2Right() ) ); // create an empty single-selection ListBox lb2 = new <a href="ntqlistbox.html">TQListBox</a>( row1 ); @@ -212,12 +212,12 @@ protected: } // Connect the activated SIGNALs of the Comboboxes with SLOTs -<a name="x1398"></a> <a href="ntqobject.html#connect">connect</a>( cb1, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> & ) ), this, SLOT( slotCombo1Activated( const <a href="ntqstring.html">TQString</a> & ) ) ); - <a href="ntqobject.html#connect">connect</a>( cb2, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> & ) ), this, SLOT( slotCombo2Activated( const <a href="ntqstring.html">TQString</a> & ) ) ); +<a name="x1398"></a> <a href="ntqobject.html#connect">connect</a>( cb1, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> & ) ), this, TQ_SLOT( slotCombo1Activated( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( cb2, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> & ) ), this, TQ_SLOT( slotCombo2Activated( const <a href="ntqstring.html">TQString</a> & ) ) ); } /* - * SLOT slotLeft2Right + * TQ_SLOT slotLeft2Right * * Copies all selected items of the first ListBox into the * second ListBox @@ -242,7 +242,7 @@ void <a name="f438"></a>ListBoxCombo::slotLeft2Right() } /* - * SLOT slotCombo1Activated( const <a href="ntqstring.html">TQString</a> &s ) + * TQ_SLOT slotCombo1Activated( const <a href="ntqstring.html">TQString</a> &s ) * * Sets the text of the item which the user just selected * in the first Combobox (and is now the value of s) to @@ -255,7 +255,7 @@ void <a name="f439"></a>ListBoxCombo::slotCombo1Activated( const <a href="ntqstr } /* - * SLOT slotCombo2Activated( const <a href="ntqstring.html">TQString</a> &s ) + * TQ_SLOT slotCombo2Activated( const <a href="ntqstring.html">TQString</a> &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/doc/html/listviews-example.html b/doc/html/listviews-example.html index e7600194a..d22ed98bc 100644 --- a/doc/html/listviews-example.html +++ b/doc/html/listviews-example.html @@ -339,20 +339,20 @@ void <a name="f210"></a>FolderListItem::insertSubFolders( const <a href="ntqobje menu = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( messages ); for( int i = 1; i <= 10; i++ ) menu-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQString( "Context Item %1" ).arg( i ) ); -<a name="x143"></a> <a href="ntqobject.html#connect">connect</a>(messages, SIGNAL( <a href="ntqlistview.html#contextMenuRequested">contextMenuRequested</a>( <a href="qlistviewitem.html">TQListViewItem</a> *, const <a href="ntqpoint.html">TQPoint</a>& , int ) ), - this, SLOT( slotRMB( <a href="qlistviewitem.html">TQListViewItem</a> *, const <a href="ntqpoint.html">TQPoint</a> &, int ) ) ); +<a name="x143"></a> <a href="ntqobject.html#connect">connect</a>(messages, TQ_SIGNAL( <a href="ntqlistview.html#contextMenuRequested">contextMenuRequested</a>( <a href="qlistviewitem.html">TQListViewItem</a> *, const <a href="ntqpoint.html">TQPoint</a>& , int ) ), + this, TQ_SLOT( slotRMB( <a href="qlistviewitem.html">TQListViewItem</a> *, const <a href="ntqpoint.html">TQPoint</a> &, int ) ) ); <a name="x161"></a> vsplitter-><a href="ntqsplitter.html#setResizeMode">setResizeMode</a>( messages, TQSplitter::KeepSize ); message = new <a href="ntqlabel.html">TQLabel</a>( vsplitter ); message-><a href="ntqlabel.html#setAlignment">setAlignment</a>( TQt::AlignTop ); <a name="x163"></a> message-><a href="ntqwidget.html#setBackgroundMode">setBackgroundMode</a>( PaletteBase ); -<a name="x148"></a> <a href="ntqobject.html#connect">connect</a>( folders, SIGNAL( <a href="ntqlistview.html#selectionChanged">selectionChanged</a>( <a href="qlistviewitem.html">TQListViewItem</a>* ) ), - this, SLOT( slotFolderChanged( <a href="qlistviewitem.html">TQListViewItem</a>* ) ) ); - <a href="ntqobject.html#connect">connect</a>( messages, SIGNAL( <a href="ntqlistview.html#selectionChanged">selectionChanged</a>() ), - this, SLOT( slotMessageChanged() ) ); -<a name="x144"></a> <a href="ntqobject.html#connect">connect</a>( messages, SIGNAL( <a href="ntqlistview.html#currentChanged">currentChanged</a>( <a href="qlistviewitem.html">TQListViewItem</a> * ) ), - this, SLOT( slotMessageChanged() ) ); +<a name="x148"></a> <a href="ntqobject.html#connect">connect</a>( folders, TQ_SIGNAL( <a href="ntqlistview.html#selectionChanged">selectionChanged</a>( <a href="qlistviewitem.html">TQListViewItem</a>* ) ), + this, TQ_SLOT( slotFolderChanged( <a href="qlistviewitem.html">TQListViewItem</a>* ) ) ); + <a href="ntqobject.html#connect">connect</a>( messages, TQ_SIGNAL( <a href="ntqlistview.html#selectionChanged">selectionChanged</a>() ), + this, TQ_SLOT( slotMessageChanged() ) ); +<a name="x144"></a> <a href="ntqobject.html#connect">connect</a>( messages, TQ_SIGNAL( <a href="ntqlistview.html#currentChanged">currentChanged</a>( <a href="qlistviewitem.html">TQListViewItem</a> * ) ), + this, TQ_SLOT( slotMessageChanged() ) ); <a name="x154"></a> messages-><a href="ntqlistview.html#setSelectionMode">setSelectionMode</a>( TQListView::Extended ); // some preparations diff --git a/doc/html/mail-example.html b/doc/html/mail-example.html index 2b8252117..edee5f5e9 100644 --- a/doc/html/mail-example.html +++ b/doc/html/mail-example.html @@ -127,14 +127,14 @@ private: const <a href="ntqstring.html">TQString</a> &body ) { socket = new <a href="ntqsocket.html">TQSocket</a>( this ); -<a name="x714"></a> <a href="ntqobject.html#connect">connect</a> ( socket, SIGNAL( <a href="ntqsocket.html#readyRead">readyRead</a>() ), - this, SLOT( readyRead() ) ); -<a name="x711"></a> <a href="ntqobject.html#connect">connect</a> ( socket, SIGNAL( <a href="ntqsocket.html#connected">connected</a>() ), - this, SLOT( connected() ) ); +<a name="x714"></a> <a href="ntqobject.html#connect">connect</a> ( socket, TQ_SIGNAL( <a href="ntqsocket.html#readyRead">readyRead</a>() ), + this, TQ_SLOT( readyRead() ) ); +<a name="x711"></a> <a href="ntqobject.html#connect">connect</a> ( socket, TQ_SIGNAL( <a href="ntqsocket.html#connected">connected</a>() ), + this, TQ_SLOT( connected() ) ); <a name="x717"></a><a name="x715"></a> mxLookup = new <a href="ntqdns.html">TQDns</a>( to.<a href="ntqstring.html#mid">mid</a>( to.<a href="ntqstring.html#find">find</a>( '@' )+1 ), TQDns::Mx ); -<a name="x707"></a> <a href="ntqobject.html#connect">connect</a>( mxLookup, SIGNAL(<a href="ntqdns.html#resultsReady">resultsReady</a>()), - this, SLOT(dnsLookupHelper()) ); +<a name="x707"></a> <a href="ntqobject.html#connect">connect</a>( mxLookup, TQ_SIGNAL(<a href="ntqdns.html#resultsReady">resultsReady</a>()), + this, TQ_SLOT(dnsLookupHelper()) ); <a name="x716"></a> message = TQString::<a href="ntqstring.html#fromLatin1">fromLatin1</a>( "From: " ) + from + TQString::<a href="ntqstring.html#fromLatin1">fromLatin1</a>( "\nTo: " ) + to + diff --git a/doc/html/mdi-example.html b/doc/html/mdi-example.html index 50684724d..40f8b098f 100644 --- a/doc/html/mdi-example.html +++ b/doc/html/mdi-example.html @@ -188,12 +188,12 @@ const char * filePrintText = "Click this button to print the file you " openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new <a href="ntqtoolbutton.html">TQToolButton</a>( openIcon, "Open File", <a href="ntqstring.html#TQString-null">TQString::null</a>, - this, SLOT(load()), fileTools, "open file" ); + this, TQ_SLOT(load()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new <a href="ntqtoolbutton.html">TQToolButton</a>( saveIcon, "Save File", TQString::null, - this, SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); #ifndef TQT_NO_PRINTER printer = new <a href="ntqprinter.html">TQPrinter</a>( TQPrinter::HighResolution ); @@ -202,7 +202,7 @@ const char * filePrintText = "Click this button to print the file you " printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new <a href="ntqtoolbutton.html">TQToolButton</a>( printIcon, "Print File", TQString::null, - this, SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); <a name="x2075"></a> TQWhatsThis::<a href="ntqwhatsthis.html#add">add</a>( filePrint, filePrintText ); #endif @@ -214,41 +214,41 @@ const char * filePrintText = "Click this button to print the file you " <a href="ntqpopupmenu.html">TQPopupMenu</a> * file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&File", file ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, SLOT(newDoc()), CTRL+Key_N ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, TQ_SLOT(newDoc()), CTRL+Key_N ); id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( openIcon, "&Open...", - this, SLOT(load()), CTRL+Key_O ); + this, TQ_SLOT(load()), CTRL+Key_O ); <a name="x2035"></a> file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileOpenText ); id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( saveIcon, "&Save", - this, SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText ); - id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &As...", this, SLOT(saveAs()) ); + id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &As...", this, TQ_SLOT(saveAs()) ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText ); #ifndef TQT_NO_PRINTER file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( printIcon, "&Print...", - this, SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, filePrintText ); #endif file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, SLOT(closeWindow()), CTRL+Key_W ); -<a name="x2020"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, TQ_SLOT(closeWindow()), CTRL+Key_W ); +<a name="x2020"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, TQ_SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q ); windowsMenu = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a name="x2049"></a> windowsMenu-><a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE ); -<a name="x2048"></a> <a href="ntqobject.html#connect">connect</a>( windowsMenu, SIGNAL( <a href="ntqpopupmenu.html#aboutToShow">aboutToShow</a>() ), - this, SLOT( windowsMenuAboutToShow() ) ); +<a name="x2048"></a> <a href="ntqobject.html#connect">connect</a>( windowsMenu, TQ_SIGNAL( <a href="ntqpopupmenu.html#aboutToShow">aboutToShow</a>() ), + this, TQ_SLOT( windowsMenuAboutToShow() ) ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&Windows", windowsMenu ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertSeparator(); <a href="ntqpopupmenu.html">TQPopupMenu</a> * help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&Help", help ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, SLOT(about()), Key_F1); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, SLOT(aboutTQt())); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, TQ_SLOT(about()), Key_F1); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, TQ_SLOT(aboutTQt())); help-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this, SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this, TQ_SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1); <a href="ntqvbox.html">TQVBox</a>* vb = new <a href="ntqvbox.html">TQVBox</a>( this ); vb-><a href="ntqframe.html#setFrameStyle">setFrameStyle</a>( TQFrame::StyledPanel | TQFrame::Sunken ); @@ -272,7 +272,7 @@ ApplicationWindow::~ApplicationWindow() MDIWindow* <a name="f536"></a>ApplicationWindow::newDoc() { MDIWindow* w = new MDIWindow( ws, 0, WDestructiveClose ); - <a href="ntqobject.html#connect">connect</a>( w, SIGNAL( message(const <a href="ntqstring.html">TQString</a>&, int) ), statusBar(), SLOT( message(const <a href="ntqstring.html">TQString</a>&, int )) ); + <a href="ntqobject.html#connect">connect</a>( w, TQ_SIGNAL( message(const <a href="ntqstring.html">TQString</a>&, int) ), statusBar(), TQ_SLOT( message(const <a href="ntqstring.html">TQString</a>&, int )) ); w-><a href="ntqwidget.html#setCaption">setCaption</a>("unnamed document"); <a name="x2085"></a> w-><a href="ntqwidget.html#setIcon">setIcon</a>( TQPixmap("document.xpm") ); // show the very first window in maximized mode @@ -344,9 +344,9 @@ void <a name="f543"></a>ApplicationWindow::aboutTQt() void <a name="f544"></a>ApplicationWindow::windowsMenuAboutToShow() { <a name="x2029"></a> windowsMenu-><a href="ntqmenudata.html#clear">clear</a>(); -<a name="x2091"></a> int cascadeId = windowsMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Cascade", ws, SLOT(<a href="ntqworkspace.html#cascade">cascade</a>() ) ); -<a name="x2093"></a> int tileId = windowsMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Tile", ws, SLOT(<a href="ntqworkspace.html#tile">tile</a>() ) ); - int horTileId = windowsMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>("Tile &Horizontally", this, SLOT(tileHorizontal() ) ); +<a name="x2091"></a> int cascadeId = windowsMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Cascade", ws, TQ_SLOT(<a href="ntqworkspace.html#cascade">cascade</a>() ) ); +<a name="x2093"></a> int tileId = windowsMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Tile", ws, TQ_SLOT(<a href="ntqworkspace.html#tile">tile</a>() ) ); + int horTileId = windowsMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>("Tile &Horizontally", this, TQ_SLOT(tileHorizontal() ) ); if ( ws-><a href="ntqworkspace.html#windowList">windowList</a>().isEmpty() ) { <a name="x2033"></a> windowsMenu-><a href="ntqmenudata.html#setItemEnabled">setItemEnabled</a>( cascadeId, FALSE ); windowsMenu-><a href="ntqmenudata.html#setItemEnabled">setItemEnabled</a>( tileId, FALSE ); @@ -356,7 +356,7 @@ void <a name="f544"></a>ApplicationWindow::windowsMenuAboutToShow() TQWidgetList windows = ws-><a href="ntqworkspace.html#windowList">windowList</a>(); <a name="x2054"></a> for ( int i = 0; i < int(windows.count()); ++i ) { <a name="x2053"></a> int id = windowsMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>(windows.at(i)->caption(), - this, SLOT( windowsMenuActivated( int ) ) ); + this, TQ_SLOT( windowsMenuActivated( int ) ) ); <a name="x2034"></a> windowsMenu-><a href="ntqmenudata.html#setItemParameter">setItemParameter</a>( id, i ); <a name="x2032"></a> windowsMenu-><a href="ntqmenudata.html#setItemChecked">setItemChecked</a>( id, ws-><a href="ntqworkspace.html#activeWindow">activeWindow</a>() == windows.at(i) ); } @@ -582,7 +582,7 @@ int main( int argc, char ** argv ) { a.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>(mw); mw-><a href="ntqwidget.html#setCaption">setCaption</a>( "TQt Example - Multiple Documents Interface (MDI)" ); mw-><a href="ntqwidget.html#show">show</a>(); -<a name="x2097"></a><a name="x2096"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<a name="x2097"></a><a name="x2096"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); int res = a.<a href="ntqapplication.html#exec">exec</a>(); return res; } diff --git a/doc/html/menu-example.html b/doc/html/menu-example.html index 891614463..1ae81bcf5 100644 --- a/doc/html/menu-example.html +++ b/doc/html/menu-example.html @@ -227,27 +227,27 @@ private: <a href="ntqpopupmenu.html">TQPopupMenu</a> *print = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( print ); <a name="x1879"></a> print-><a href="ntqpopupmenu.html#insertTearOffHandle">insertTearOffHandle</a>(); -<a name="x1869"></a> print-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Print to printer", this, SLOT(printer()) ); - print-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to &file", this, SLOT(file()) ); - print-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to fa&x", this, SLOT(fax()) ); +<a name="x1869"></a> print-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Print to printer", this, TQ_SLOT(printer()) ); + print-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to &file", this, TQ_SLOT(file()) ); + print-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to fa&x", this, TQ_SLOT(fax()) ); <a name="x1870"></a> print-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - print-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Printer &Setup", this, SLOT(printerSetup()) ); + print-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Printer &Setup", this, TQ_SLOT(printerSetup()) ); <a href="ntqpopupmenu.html">TQPopupMenu</a> *file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( file ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p1, "&Open", this, SLOT(open()), CTRL+Key_O ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p2, "&New", this, SLOT(news()), CTRL+Key_N ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p3, "&Save", this, SLOT(save()), CTRL+Key_S ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, SLOT(closeDoc()), CTRL+Key_W ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p1, "&Open", this, TQ_SLOT(open()), CTRL+Key_O ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p2, "&New", this, TQ_SLOT(news()), CTRL+Key_N ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p3, "&Save", this, TQ_SLOT(save()), CTRL+Key_S ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, TQ_SLOT(closeDoc()), CTRL+Key_W ); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Print", print, CTRL+Key_P ); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "E&xit", tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "E&xit", tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q ); <a href="ntqpopupmenu.html">TQPopupMenu</a> *edit = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( edit ); - int undoID = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Undo", this, SLOT(undo()) ); - int redoID = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Redo", this, SLOT(redo()) ); + int undoID = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Undo", this, TQ_SLOT(undo()) ); + int redoID = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Redo", this, TQ_SLOT(redo()) ); <a name="x1873"></a> edit-><a href="ntqmenudata.html#setItemEnabled">setItemEnabled</a>( undoID, FALSE ); edit-><a href="ntqmenudata.html#setItemEnabled">setItemEnabled</a>( redoID, FALSE ); @@ -255,7 +255,7 @@ private: <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( options ); options-><a href="ntqpopupmenu.html#insertTearOffHandle">insertTearOffHandle</a>(); options-><a href="ntqwidget.html#setCaption">setCaption</a>("Options"); - options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Normal Font", this, SLOT(normal()) ); + options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Normal Font", this, TQ_SLOT(normal()) ); options-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); <a name="x1883"></a> options-><a href="ntqwidget.html#polish">polish</a>(); // adjust system settings @@ -263,12 +263,12 @@ private: <a name="x1860"></a> f.<a href="ntqfont.html#setBold">setBold</a>( TRUE ); boldID = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( new MyMenuItem( "Bold", f ) ); <a name="x1871"></a> options-><a href="ntqmenudata.html#setAccel">setAccel</a>( CTRL+Key_B, boldID ); -<a name="x1868"></a> options-><a href="ntqmenudata.html#connectItem">connectItem</a>( boldID, this, SLOT(bold()) ); +<a name="x1868"></a> options-><a href="ntqmenudata.html#connectItem">connectItem</a>( boldID, this, TQ_SLOT(bold()) ); f = <a href="ntqwidget.html#font">font</a>(); <a name="x1861"></a> f.<a href="ntqfont.html#setUnderline">setUnderline</a>( TRUE ); underlineID = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( new MyMenuItem( "Underline", f ) ); options-><a href="ntqmenudata.html#setAccel">setAccel</a>( CTRL+Key_U, underlineID ); - options-><a href="ntqmenudata.html#connectItem">connectItem</a>( underlineID, this, SLOT(underline()) ); + options-><a href="ntqmenudata.html#connectItem">connectItem</a>( underlineID, this, TQ_SLOT(underline()) ); isBold = FALSE; isUnderline = FALSE; @@ -277,8 +277,8 @@ private: <a href="ntqpopupmenu.html">TQPopupMenu</a> *help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( help ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, SLOT(about()), CTRL+Key_H ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, SLOT(aboutTQt()) ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, TQ_SLOT(about()), CTRL+Key_H ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, TQ_SLOT(aboutTQt()) ); // If we used a TQMainWindow we could use its built-in menuBar(). menu = new <a href="ntqmenubar.html">TQMenuBar</a>( this ); @@ -306,8 +306,8 @@ private: <a name="x1863"></a> label-><a href="ntqframe.html#setLineWidth">setLineWidth</a>( 1 ); label-><a href="ntqlabel.html#setAlignment">setAlignment</a>( AlignCenter ); - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL(explain(const <a href="ntqstring.html">TQString</a>&)), - label, SLOT(<a href="ntqlabel.html#setText">setText</a>(const <a href="ntqstring.html">TQString</a>&)) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL(explain(const <a href="ntqstring.html">TQString</a>&)), + label, TQ_SLOT(<a href="ntqlabel.html#setText">setText</a>(const <a href="ntqstring.html">TQString</a>&)) ); <a href="ntqwidget.html#setMinimumSize">setMinimumSize</a>( 100, 80 ); <a href="ntqwidget.html#setFocusPolicy">setFocusPolicy</a>( TQWidget::ClickFocus ); @@ -322,14 +322,14 @@ private: "Context Menu</b></u></font>", this ); caption-><a href="ntqlabel.html#setAlignment">setAlignment</a>( TQt::AlignCenter ); contextMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( caption ); - contextMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, SLOT(news()), CTRL+Key_N ); - contextMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Open...", this, SLOT(open()), CTRL+Key_O ); - contextMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Save", this, SLOT(save()), CTRL+Key_S ); + contextMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, TQ_SLOT(news()), CTRL+Key_N ); + contextMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Open...", this, TQ_SLOT(open()), CTRL+Key_O ); + contextMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Save", this, TQ_SLOT(save()), CTRL+Key_S ); <a href="ntqpopupmenu.html">TQPopupMenu</a> *submenu = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( submenu ); - submenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Print to printer", this, SLOT(printer()) ); - submenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to &file", this, SLOT(file()) ); - submenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to fa&x", this, SLOT(fax()) ); + submenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Print to printer", this, TQ_SLOT(printer()) ); + submenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to &file", this, TQ_SLOT(file()) ); + submenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to fa&x", this, TQ_SLOT(fax()) ); contextMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Print", submenu ); <a name="x1878"></a><a name="x1859"></a> contextMenu-><a href="ntqpopupmenu.html#exec">exec</a>( TQCursor::<a href="ntqcursor.html#pos">pos</a>() ); delete contextMenu; diff --git a/doc/html/motif-customwidget-example.html b/doc/html/motif-customwidget-example.html index 01e80d33d..26d3e488b 100644 --- a/doc/html/motif-customwidget-example.html +++ b/doc/html/motif-customwidget-example.html @@ -97,7 +97,7 @@ int main( int argc, char **argv ) : <a href="ntqmainwindow.html">TQMainWindow</a>( 0, "mainwindow" ) { <a href="ntqpopupmenu.html">TQPopupMenu</a> *filemenu = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - filemenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&Quit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + filemenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&Quit"), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( <a href="ntqobject.html#tr">tr</a>("&File"), filemenu ); <a href="ntqmainwindow.html#statusBar">statusBar</a>()->message( <a href="ntqobject.html#tr">tr</a>("This is a TQMainWindow with an XmText widget.") ); diff --git a/doc/html/movies-example.html b/doc/html/movies-example.html index dd3967d87..0572b2d87 100644 --- a/doc/html/movies-example.html +++ b/doc/html/movies-example.html @@ -81,9 +81,9 @@ public: setBackgroundMode(NoBackground); // Get the movie to tell use when interesting things happen. -<a name="x500"></a> movie.<a href="ntqmovie.html#connectUpdate">connectUpdate</a>(this, SLOT(movieUpdated(const <a href="ntqrect.html">TQRect</a>&))); -<a name="x498"></a> movie.<a href="ntqmovie.html#connectResize">connectResize</a>(this, SLOT(movieResized(const <a href="ntqsize.html">TQSize</a>&))); -<a name="x499"></a> movie.<a href="ntqmovie.html#connectStatus">connectStatus</a>(this, SLOT(movieStatus(int))); +<a name="x500"></a> movie.<a href="ntqmovie.html#connectUpdate">connectUpdate</a>(this, TQ_SLOT(movieUpdated(const <a href="ntqrect.html">TQRect</a>&))); +<a name="x498"></a> movie.<a href="ntqmovie.html#connectResize">connectResize</a>(this, TQ_SLOT(movieResized(const <a href="ntqsize.html">TQSize</a>&))); +<a name="x499"></a> movie.<a href="ntqmovie.html#connectStatus">connectStatus</a>(this, TQ_SLOT(movieStatus(int))); setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); } @@ -245,13 +245,13 @@ public: <a href="ntqhbox.html">TQHBox</a>* hb = new <a href="ntqhbox.html">TQHBox</a>(this); <a href="ntqpushbutton.html">TQPushButton</a>* btn; btn = new <a href="ntqpushbutton.html">TQPushButton</a>("<<", hb); - <a href="ntqobject.html#connect">connect</a>(btn, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), movie, SLOT(<a href="ntqmovie.html#restart">restart</a>())); + <a href="ntqobject.html#connect">connect</a>(btn, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), movie, TQ_SLOT(<a href="ntqmovie.html#restart">restart</a>())); btn = new <a href="ntqpushbutton.html">TQPushButton</a>("||", hb); - <a href="ntqobject.html#connect">connect</a>(btn, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), movie, SLOT(togglePause())); + <a href="ntqobject.html#connect">connect</a>(btn, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), movie, TQ_SLOT(togglePause())); btn = new <a href="ntqpushbutton.html">TQPushButton</a>(">|", hb); - <a href="ntqobject.html#connect">connect</a>(btn, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), movie, SLOT(<a href="ntqmovie.html#step">step</a>())); + <a href="ntqobject.html#connect">connect</a>(btn, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), movie, TQ_SLOT(<a href="ntqmovie.html#step">step</a>())); btn = new <a href="ntqpushbutton.html">TQPushButton</a>(">>|", hb); - <a href="ntqobject.html#connect">connect</a>(btn, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), movie, SLOT(step10())); + <a href="ntqobject.html#connect">connect</a>(btn, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), movie, TQ_SLOT(step10())); } }; @@ -277,8 +277,8 @@ public slots: //behave as in getOpenFilename <a href="ntqfiledialog.html#setMode">setMode</a>( ExistingFile ); // When a file is selected, show it as a movie. - <a href="ntqobject.html#connect">connect</a>(this, SIGNAL(<a href="ntqfiledialog.html#fileSelected">fileSelected</a>(const <a href="ntqstring.html">TQString</a>&)), - this, SLOT(startMovie(const <a href="ntqstring.html">TQString</a>&))); + <a href="ntqobject.html#connect">connect</a>(this, TQ_SIGNAL(<a href="ntqfiledialog.html#fileSelected">fileSelected</a>(const <a href="ntqstring.html">TQString</a>&)), + this, TQ_SLOT(startMovie(const <a href="ntqstring.html">TQString</a>&))); } @@ -317,7 +317,7 @@ int main(int argc, char **argv) (void)new MovieScreen(argv[arg], TQMovie(argv[arg]), 0, 0, TQt::WDestructiveClose); } - TQObject::<a href="ntqobject.html#connect">connect</a>(tqApp, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>())); + TQObject::<a href="ntqobject.html#connect">connect</a>(tqApp, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>())); } else { // "GUI" mode - open a chooser for movies // diff --git a/doc/html/network.html b/doc/html/network.html index baf1057e8..953b2ac3d 100644 --- a/doc/html/network.html +++ b/doc/html/network.html @@ -146,12 +146,12 @@ TQUrlOperator op; MyClass::MyClass() : <a href="ntqobject.html">TQObject</a>(), op( "ftp://ftp.trolltech.com" ) { - connect( &op, SIGNAL( newChildren( const <a href="ntqvaluelist.html">TQValueList</a><TQUrlInfo> &, TQNetworkOperation * ) ), - this, SLOT( slotInsertEntries( const <a href="ntqvaluelist.html">TQValueList</a><TQUrlInfo> &, TQNetworkOperation * ) ) ); - connect( &op, SIGNAL( start( <a href="qnetworkoperation.html">TQNetworkOperation</a> * ) ), - this, SLOT( slotStart( <a href="qnetworkoperation.html">TQNetworkOperation</a> *) ) ); - connect( &op, SIGNAL( finished( <a href="qnetworkoperation.html">TQNetworkOperation</a> * ) ), - this, SLOT( slotFinished( <a href="qnetworkoperation.html">TQNetworkOperation</a> *) ) ); + connect( &op, TQ_SIGNAL( newChildren( const <a href="ntqvaluelist.html">TQValueList</a><TQUrlInfo> &, TQNetworkOperation * ) ), + this, TQ_SLOT( slotInsertEntries( const <a href="ntqvaluelist.html">TQValueList</a><TQUrlInfo> &, TQNetworkOperation * ) ) ); + connect( &op, TQ_SIGNAL( start( <a href="qnetworkoperation.html">TQNetworkOperation</a> * ) ), + this, TQ_SLOT( slotStart( <a href="qnetworkoperation.html">TQNetworkOperation</a> *) ) ); + connect( &op, TQ_SIGNAL( finished( <a href="qnetworkoperation.html">TQNetworkOperation</a> * ) ), + this, TQ_SLOT( slotFinished( <a href="qnetworkoperation.html">TQNetworkOperation</a> *) ) ); } void MyClass::slotInsertEntries( const <a href="ntqvaluelist.html">TQValueList</a><TQUrlInfo> &info, TQNetworkOperation * ) diff --git a/doc/html/networkprotocol-example.html b/doc/html/networkprotocol-example.html index 12f5c972d..38fe4ece5 100644 --- a/doc/html/networkprotocol-example.html +++ b/doc/html/networkprotocol-example.html @@ -116,16 +116,16 @@ protected slots: { // create the command socket and connect to its signals commandSocket = new <a href="ntqsocket.html">TQSocket</a>( this ); -<a name="x684"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, SIGNAL( <a href="ntqsocket.html#hostFound">hostFound</a>() ), - this, SLOT( hostFound() ) ); -<a name="x681"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, SIGNAL( <a href="ntqsocket.html#connected">connected</a>() ), - this, SLOT( connected() ) ); -<a name="x682"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, SIGNAL( <a href="ntqsocket.html#connectionClosed">connectionClosed</a>() ), - this, SLOT( closed() ) ); -<a name="x687"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, SIGNAL( <a href="ntqsocket.html#readyRead">readyRead</a>() ), - this, SLOT( readyRead() ) ); -<a name="x683"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, SIGNAL( <a href="ntqsocket.html#error">error</a>( int ) ), - this, SLOT( error( int ) ) ); +<a name="x684"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, TQ_SIGNAL( <a href="ntqsocket.html#hostFound">hostFound</a>() ), + this, TQ_SLOT( hostFound() ) ); +<a name="x681"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, TQ_SIGNAL( <a href="ntqsocket.html#connected">connected</a>() ), + this, TQ_SLOT( connected() ) ); +<a name="x682"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, TQ_SIGNAL( <a href="ntqsocket.html#connectionClosed">connectionClosed</a>() ), + this, TQ_SLOT( closed() ) ); +<a name="x687"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, TQ_SIGNAL( <a href="ntqsocket.html#readyRead">readyRead</a>() ), + this, TQ_SLOT( readyRead() ) ); +<a name="x683"></a> <a href="ntqobject.html#connect">connect</a>( commandSocket, TQ_SIGNAL( <a href="ntqsocket.html#error">error</a>( int ) ), + this, TQ_SLOT( error( int ) ) ); } Nntp::~Nntp() diff --git a/doc/html/ntqaccel.html b/doc/html/ntqaccel.html index 9c8f02f4b..b0d2c23ce 100644 --- a/doc/html/ntqaccel.html +++ b/doc/html/ntqaccel.html @@ -92,7 +92,7 @@ Example: <pre> <a href="ntqpushbutton.html">TQPushButton</a> p( "&Exit", parent ); // automatic shortcut ALT+Key_E <a href="ntqpopupmenu.html">TQPopupMenu</a> *fileMenu = new fileMenu( parent ); - fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Undo", parent, SLOT(undo()), CTRL+Key_Z ); + fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Undo", parent, TQ_SLOT(undo()), CTRL+Key_Z ); </pre> <p> A TQAccel contains a list of accelerator items that can be @@ -138,7 +138,7 @@ combination. TQAccel *a = new TQAccel( myWindow ); // create accels for myWindow a-><a href="#connectItem">connectItem</a>( a-><a href="#insertItem">insertItem</a>(Key_P+CTRL), // adds Ctrl+P accelerator myWindow, // connected to myWindow's - SLOT(printDoc()) ); // printDoc() slot + TQ_SLOT(printDoc()) ); // printDoc() slot </pre> <p> <p>See also <a href="qkeyevent.html">TQKeyEvent</a>, <a href="ntqwidget.html#keyPressEvent">TQWidget::keyPressEvent</a>(), <a href="ntqmenudata.html#setAccel">TQMenuData::setAccel</a>(), <a href="ntqbutton.html#accel-prop">TQButton::accel</a>, <a href="ntqlabel.html#setBuddy">TQLabel::setBuddy</a>(), <a href="ntqkeysequence.html">TQKeySequence</a>, <a href="guibooks.html#fowler">GUI Design Handbook: Keyboard Shortcuts</a>, and <a href="misc.html">Miscellaneous Classes</a>. @@ -180,7 +180,7 @@ Removes all accelerator items. </h3> Connects the accelerator item <em>id</em> to the slot <em>member</em> of <em>receiver</em>. <p> <pre> - a->connectItem( 201, mainView, SLOT(quit()) ); + a->connectItem( 201, mainView, TQ_SLOT(quit()) ); </pre> <p> Of course, you can also send a signal as <em>member</em>. @@ -307,7 +307,7 @@ if <em>s</em> is not recognized. translations: <p> <pre> <a href="ntqpopupmenu.html">TQPopupMenu</a> *file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p1, tr("&Open..."), this, SLOT(open()), + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p1, tr("&Open..."), this, TQ_SLOT(open()), TQAccel::<a href="#stringToKey">stringToKey</a>(<a href="ntqobject.html#tr">tr</a>("Ctrl+O", "File|Open")) ); </pre> diff --git a/doc/html/ntqaction.html b/doc/html/ntqaction.html index 909e8b630..68e8f6822 100644 --- a/doc/html/ntqaction.html +++ b/doc/html/ntqaction.html @@ -140,7 +140,7 @@ the action. For example: <pre> fileOpenAction = new TQAction( TQPixmap( fileopen ), "&Open...", CTRL+Key_O, this, "open" ); - <a href="ntqobject.html#connect">connect</a>( fileOpenAction, SIGNAL( <a href="#activated">activated</a>() ) , this, SLOT( choose() ) ); + <a href="ntqobject.html#connect">connect</a>( fileOpenAction, TQ_SIGNAL( <a href="#activated">activated</a>() ) , this, TQ_SLOT( choose() ) ); </pre> <p> We create a "File Save" action with a menu text of "&Save" and <em>Ctrl+S</em> as the keyboard accelerator. We connect the @@ -389,8 +389,8 @@ indicate the state, e.g. <pre> <a href="ntqmainwindow.html">TQMainWindow</a> * window = new <a href="ntqmainwindow.html">TQMainWindow</a>; </pre><pre> TQAction * labelonoffaction = new TQAction( window, "labelonoff" ); -</pre><pre> <a name="x2108"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( labelonoffaction, SIGNAL( <a href="#toggled">toggled</a>( bool ) ), - <a name="x2109"></a> window, SLOT( <a href="ntqmainwindow.html#setUsesTextLabel">setUsesTextLabel</a>( bool ) ) ); +</pre><pre> <a name="x2108"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( labelonoffaction, TQ_SIGNAL( <a href="#toggled">toggled</a>( bool ) ), + <a name="x2109"></a> window, TQ_SLOT( <a href="ntqmainwindow.html#setUsesTextLabel">setUsesTextLabel</a>( bool ) ) ); </pre> <p> <p>See also <a href="#activated">activated</a>(), <a href="#toggleAction-prop">toggleAction</a>, and <a href="#on-prop">on</a>. diff --git a/doc/html/ntqapplication.html b/doc/html/ntqapplication.html index f8e7cad9a..8542c952d 100644 --- a/doc/html/ntqapplication.html +++ b/doc/html/ntqapplication.html @@ -696,10 +696,10 @@ entry in the file menu as shown in the following code example: <p> <pre> // the "Quit" menu entry should try to close all windows <a href="ntqpopupmenu.html">TQPopupMenu</a>* file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, SLOT(<a href="#closeAllWindows">closeAllWindows</a>()), CTRL+Key_Q ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, TQ_SLOT(<a href="#closeAllWindows">closeAllWindows</a>()), CTRL+Key_Q ); // when the last window is closed, the application should quit - <a href="ntqobject.html#connect">connect</a>( tqApp, SIGNAL( <a href="#lastWindowClosed">lastWindowClosed</a>() ), tqApp, SLOT( <a href="#quit">quit</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( tqApp, TQ_SIGNAL( <a href="#lastWindowClosed">lastWindowClosed</a>() ), tqApp, TQ_SLOT( <a href="#quit">quit</a>() ) ); </pre> <p> The windows are closed in random order, until one window does not @@ -1126,7 +1126,7 @@ you also often connect e.g. <a href="ntqbutton.html#clicked">TQButton::clicked</ <p> Example: <pre> <a href="ntqpushbutton.html">TQPushButton</a> *quitButton = new <a href="ntqpushbutton.html">TQPushButton</a>( "Quit" ); - <a href="ntqobject.html#connect">connect</a>( quitButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quitButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="#quit">quit</a>()) ); </pre> <p> <p>See also <a href="#exit">exit</a>(), <a href="#aboutToQuit">aboutToQuit</a>(), <a href="#lastWindowClosed">lastWindowClosed</a>(), and <a href="ntqaction.html">TQAction</a>. diff --git a/doc/html/ntqkeysequence.html b/doc/html/ntqkeysequence.html index b6b93b9c9..ae11016f9 100644 --- a/doc/html/ntqkeysequence.html +++ b/doc/html/ntqkeysequence.html @@ -98,7 +98,7 @@ with commas, e.g. "Alt+X,Ctrl+S,Q". translations: <p> <pre> <a href="ntqpopupmenu.html">TQPopupMenu</a> *file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( tr("&Open..."), this, SLOT(open()), + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( tr("&Open..."), this, TQ_SLOT(open()), <a href="#TQKeySequence">TQKeySequence</a>( tr("Ctrl+O", "File|Open") ) ); </pre> diff --git a/doc/html/ntqmainwindow.html b/doc/html/ntqmainwindow.html index fc0fb1044..178236eb8 100644 --- a/doc/html/ntqmainwindow.html +++ b/doc/html/ntqmainwindow.html @@ -181,7 +181,7 @@ passing the TQMainWindow instance as the parent instead of the <em>this</em> poi <pre> <a href="ntqpopupmenu.html">TQPopupMenu</a> * help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="#menuBar">menuBar</a>()->insertItem( "&Help", help ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, SLOT(about()), Key_F1 ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, TQ_SLOT(about()), Key_F1 ); </pre> <p> Here we've added a new menu with one menu item. The menu has been inserted into the menu bar that TQMainWindow provides by default @@ -193,7 +193,7 @@ will be called when the menu item is clicked. fileTools-><a href="ntqtoolbar.html#setLabel">setLabel</a>( "File Operations" ); </pre><pre> TQToolButton * fileOpen = new <a href="ntqtoolbutton.html">TQToolButton</a>( openIcon, "Open File", <a href="ntqstring.html#TQString-null">TQString::null</a>, - this, SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); </pre> <p> This extract shows the creation of a toolbar with one toolbar button. TQMainWindow supplies four dock areas for toolbars. When a @@ -228,7 +228,7 @@ to the toolbar and menu. <pre> <a href="ntqaction.html">TQAction</a> * fileOpenAction; </pre><pre> fileOpenAction = new <a href="ntqaction.html">TQAction</a>( TQPixmap( fileopen ), "&Open...", CTRL+Key_O, this, "open" ); - <a href="ntqobject.html#connect">connect</a>( fileOpenAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, SLOT( choose() ) ); + <a href="ntqobject.html#connect">connect</a>( fileOpenAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, TQ_SLOT( choose() ) ); </pre> <p> Here we create an action with an icon which will be used in any menu and toolbar that the action is added to. We've also given the @@ -853,7 +853,7 @@ implemented as a main window object's slot. This way it can easily be used for popup menus, for example: <p> <pre> <a href="ntqpopupmenu.html">TQPopupMenu</a> * help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this , SLOT(<a href="#whatsThis">whatsThis</a>()), SHIFT+Key_F1); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this , TQ_SLOT(<a href="#whatsThis">whatsThis</a>()), SHIFT+Key_F1); </pre> <p> <p>See also <a href="ntqwhatsthis.html#enterWhatsThisMode">TQWhatsThis::enterWhatsThisMode</a>(). diff --git a/doc/html/ntqmenubar.html b/doc/html/ntqmenubar.html index 4dde93ad7..143a14a90 100644 --- a/doc/html/ntqmenubar.html +++ b/doc/html/ntqmenubar.html @@ -118,8 +118,8 @@ appropriately whenever the parent is resized. <pre> <a href="ntqpopupmenu.html">TQPopupMenu</a> *file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); -</pre><pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p1, "&Open", this, SLOT(open()), CTRL+Key_O ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p2, "&New", this, SLOT(news()), CTRL+Key_N ); +</pre><pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p1, "&Open", this, TQ_SLOT(open()), CTRL+Key_O ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( p2, "&New", this, TQ_SLOT(news()), CTRL+Key_N ); </pre><pre> menu = new TQMenuBar( this ); </pre><pre> menu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&File", file ); </pre> @@ -268,8 +268,8 @@ connects it to the slot <em>member</em> in the object <em>receiver</em>. <pre> TQMenuBar *mainMenu = new TQMenuBar; <a href="ntqpopupmenu.html">TQPopupMenu</a> *fileMenu = new <a href="ntqpopupmenu.html">TQPopupMenu</a>; - fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "New", myView, SLOT(newFile()), CTRL+Key_N ); - fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Open", myView, SLOT(open()), CTRL+Key_O ); + fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "New", myView, TQ_SLOT(newFile()), CTRL+Key_N ); + fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Open", myView, TQ_SLOT(open()), CTRL+Key_O ); mainMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "File", fileMenu ); </pre> @@ -279,7 +279,7 @@ accelerator key. Use <a href="ntqmenudata.html#connectItem">connectItem</a>() an accelerator. (For translations use a string <a href="ntqkeysequence.html">key sequence</a>.): <pre> - fileMenu->insertItem( <a href="ntqobject.html#tr">tr</a>("Open"), myView, SLOT(open()), + fileMenu->insertItem( <a href="ntqobject.html#tr">tr</a>("Open"), myView, TQ_SLOT(open()), <a href="ntqobject.html#tr">tr</a>("Ctrl+O") ); </pre> diff --git a/doc/html/ntqmenudata.html b/doc/html/ntqmenudata.html index 0343f2cff..698bea5e8 100644 --- a/doc/html/ntqmenudata.html +++ b/doc/html/ntqmenudata.html @@ -292,8 +292,8 @@ connects it to the slot <em>member</em> in the object <em>receiver</em>. <pre> <a href="ntqmenubar.html">TQMenuBar</a> *mainMenu = new <a href="ntqmenubar.html">TQMenuBar</a>; <a href="ntqpopupmenu.html">TQPopupMenu</a> *fileMenu = new <a href="ntqpopupmenu.html">TQPopupMenu</a>; - fileMenu-><a href="#insertItem">insertItem</a>( "New", myView, SLOT(newFile()), CTRL+Key_N ); - fileMenu-><a href="#insertItem">insertItem</a>( "Open", myView, SLOT(open()), CTRL+Key_O ); + fileMenu-><a href="#insertItem">insertItem</a>( "New", myView, TQ_SLOT(newFile()), CTRL+Key_N ); + fileMenu-><a href="#insertItem">insertItem</a>( "Open", myView, TQ_SLOT(open()), CTRL+Key_O ); mainMenu-><a href="#insertItem">insertItem</a>( "File", fileMenu ); </pre> @@ -303,7 +303,7 @@ accelerator key. Use <a href="#connectItem">connectItem</a>() and <a href="#setA accelerator. (For translations use a string <a href="ntqkeysequence.html">key sequence</a>.): <pre> - fileMenu->insertItem( tr("Open"), myView, SLOT(open()), + fileMenu->insertItem( tr("Open"), myView, TQ_SLOT(open()), tr("Ctrl+O") ); </pre> diff --git a/doc/html/ntqobject.html b/doc/html/ntqobject.html index 06ecf97e6..e1233374a 100644 --- a/doc/html/ntqobject.html +++ b/doc/html/ntqobject.html @@ -279,21 +279,21 @@ definition lacks the <a href="metaobjects.html#TQ_OBJECT">TQ_OBJECT</a> macro. Connects <em>signal</em> from the <em>sender</em> object to <em>member</em> in object <em>receiver</em>, and returns TRUE if the connection succeeds; otherwise returns FALSE. -<p> You must use the SIGNAL() and SLOT() macros when specifying the <em>signal</em> +<p> You must use the TQ_SIGNAL() and TQ_SLOT() macros when specifying the <em>signal</em> and the <em>member</em>, for example: <pre> <a href="ntqlabel.html">TQLabel</a> *label = new <a href="ntqlabel.html">TQLabel</a>; <a href="ntqscrollbar.html">TQScrollBar</a> *scroll = new <a href="ntqscrollbar.html">TQScrollBar</a>; - TQObject::<a href="#connect">connect</a>( scroll, SIGNAL(<a href="ntqscrollbar.html#valueChanged">valueChanged</a>(int)), - label, SLOT(<a href="ntqlabel.html#setNum">setNum</a>(int)) ); + TQObject::<a href="#connect">connect</a>( scroll, TQ_SIGNAL(<a href="ntqscrollbar.html#valueChanged">valueChanged</a>(int)), + label, TQ_SLOT(<a href="ntqlabel.html#setNum">setNum</a>(int)) ); </pre> <p> This example ensures that the label always displays the current scroll bar value. Note that the signal and slots parameters must not contain any variable names, only the type. E.g. the following would not work and return FALSE: -<a href="#connect">TQObject::connect</a>( scroll, SIGNAL(valueChanged(int v)), -label, SLOT(setNum(int v)) ); +<a href="#connect">TQObject::connect</a>( scroll, TQ_SIGNAL(valueChanged(int v)), +label, TQ_SLOT(setNum(int v)) ); <p> A signal can also be connected to another signal: <p> <pre> class MyWidget : public <a href="ntqwidget.html">TQWidget</a> @@ -312,7 +312,7 @@ label, SLOT(setNum(int v)) ); MyWidget::MyWidget() { aButton = new <a href="ntqpushbutton.html">TQPushButton</a>( this ); - <a href="#connect">connect</a>( aButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SIGNAL(myUsefulSignal()) ); + <a href="#connect">connect</a>( aButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SIGNAL(myUsefulSignal()) ); } </pre> @@ -408,12 +408,12 @@ equivalent to the non-static overloaded function <li> Disconnect everything connected to a specific signal: <pre> - <a href="#disconnect">disconnect</a>( myObject, SIGNAL(mySignal()), 0, 0 ); + <a href="#disconnect">disconnect</a>( myObject, TQ_SIGNAL(mySignal()), 0, 0 ); </pre> equivalent to the non-static overloaded function <pre> - myObject->disconnect( SIGNAL(mySignal()) ); + myObject->disconnect( TQ_SIGNAL(mySignal()) ); </pre> <li> Disconnect a specific receiver: diff --git a/doc/html/ntqpopupmenu.html b/doc/html/ntqpopupmenu.html index 470a19a1b..0d48975bd 100644 --- a/doc/html/ntqpopupmenu.html +++ b/doc/html/ntqpopupmenu.html @@ -394,8 +394,8 @@ connects it to the slot <em>member</em> in the object <em>receiver</em>. <pre> <a href="ntqmenubar.html">TQMenuBar</a> *mainMenu = new <a href="ntqmenubar.html">TQMenuBar</a>; TQPopupMenu *fileMenu = new TQPopupMenu; - fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "New", myView, SLOT(newFile()), CTRL+Key_N ); - fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Open", myView, SLOT(open()), CTRL+Key_O ); + fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "New", myView, TQ_SLOT(newFile()), CTRL+Key_N ); + fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Open", myView, TQ_SLOT(open()), CTRL+Key_O ); mainMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( "File", fileMenu ); </pre> @@ -405,7 +405,7 @@ accelerator key. Use <a href="ntqmenudata.html#connectItem">connectItem</a>() an accelerator. (For translations use a string <a href="ntqkeysequence.html">key sequence</a>.): <pre> - fileMenu->insertItem( <a href="ntqobject.html#tr">tr</a>("Open"), myView, SLOT(open()), + fileMenu->insertItem( <a href="ntqobject.html#tr">tr</a>("Open"), myView, TQ_SLOT(open()), <a href="ntqobject.html#tr">tr</a>("Ctrl+O") ); </pre> diff --git a/doc/html/ntqprocess.html b/doc/html/ntqprocess.html index 22afc994b..0f84b5b72 100644 --- a/doc/html/ntqprocess.html +++ b/doc/html/ntqprocess.html @@ -153,8 +153,8 @@ this: proc-><a href="#addArgument">addArgument</a>( "i18n" ); proc-><a href="#addArgument">addArgument</a>( "small_dialog.ui" ); - <a name="x2123"></a> <a href="ntqobject.html#connect">connect</a>( proc, SIGNAL(<a href="#readyReadStdout">readyReadStdout</a>()), - this, SLOT(readFromStdout()) ); + <a name="x2123"></a> <a href="ntqobject.html#connect">connect</a>( proc, TQ_SIGNAL(<a href="#readyReadStdout">readyReadStdout</a>()), + this, TQ_SLOT(readFromStdout()) ); </pre><pre> <a name="x2124"></a> if ( !proc-><a href="#start">start</a>() ) { // error handling </pre><pre> } @@ -347,7 +347,7 @@ tryTerminate(). is to do something like this: <pre> process->tryTerminate(); - TQTimer::<a href="ntqtimer.html#singleShot">singleShot</a>( 5000, process, SLOT( <a href="#kill">kill</a>() ) ); + TQTimer::<a href="ntqtimer.html#singleShot">singleShot</a>( 5000, process, TQ_SLOT( <a href="#kill">kill</a>() ) ); </pre> <p> This tries to terminate the process the nice way. If the process diff --git a/doc/html/ntqprogressdialog.html b/doc/html/ntqprogressdialog.html index 5a8fc4883..37ecab85d 100644 --- a/doc/html/ntqprogressdialog.html +++ b/doc/html/ntqprogressdialog.html @@ -148,9 +148,9 @@ Operation::Operation( <a href="ntqobject.html">TQObject</a> *parent = 0 ) : <a href="ntqobject.html">TQObject</a>( parent ), steps( 0 ) { pd = new TQProgressDialog( "Operation in progress.", "Cancel", 100 ); - <a href="ntqobject.html#connect">connect</a>( pd, SIGNAL(<a href="#canceled">canceled</a>()), this, SLOT(<a href="#cancel">cancel</a>()) ); + <a href="ntqobject.html#connect">connect</a>( pd, TQ_SIGNAL(<a href="#canceled">canceled</a>()), this, TQ_SLOT(<a href="#cancel">cancel</a>()) ); t = new <a href="ntqtimer.html">TQTimer</a>( this ); - <a href="ntqobject.html#connect">connect</a>( t, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), this, SLOT(perform()) ); + <a href="ntqobject.html#connect">connect</a>( t, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), this, TQ_SLOT(perform()) ); t-><a href="ntqtimer.html#start">start</a>( 0 ); } diff --git a/doc/html/ntqstatusbar.html b/doc/html/ntqstatusbar.html index 87200b257..3af2d523a 100644 --- a/doc/html/ntqstatusbar.html +++ b/doc/html/ntqstatusbar.html @@ -92,8 +92,8 @@ message, call <a href="#clear">clear</a>(). There are two variants of message(): that displays the message until the next clear() or message() and one that has a time limit: <p> <pre> - <a href="ntqobject.html#connect">connect</a>( loader, SIGNAL(progressMessage(const <a href="ntqstring.html">TQString</a>&)), - statusBar(), SLOT(<a href="#message">message</a>(const <a href="ntqstring.html">TQString</a>&)) ); + <a href="ntqobject.html#connect">connect</a>( loader, TQ_SIGNAL(progressMessage(const <a href="ntqstring.html">TQString</a>&)), + statusBar(), TQ_SLOT(<a href="#message">message</a>(const <a href="ntqstring.html">TQString</a>&)) ); statusBar()->message("Loading..."); // Initial message loader.loadStuff(); // Emits progress messages diff --git a/doc/html/ntqtimer.html b/doc/html/ntqtimer.html index b04fa1a95..b67890351 100644 --- a/doc/html/ntqtimer.html +++ b/doc/html/ntqtimer.html @@ -71,7 +71,7 @@ parent object is destroyed. <p> Example: <pre> TQTimer *timer = new TQTimer( myObject ); - <a href="ntqobject.html#connect">connect</a>( timer, SIGNAL(<a href="#timeout">timeout</a>()), myObject, SLOT(timerDone()) ); + <a href="ntqobject.html#connect">connect</a>( timer, TQ_SIGNAL(<a href="#timeout">timeout</a>()), myObject, TQ_SLOT(timerDone()) ); timer-><a href="#start">start</a>( 2000, TRUE ); // 2 seconds single-shot timer </pre> @@ -84,7 +84,7 @@ processed. user interface: <pre> TQTimer *t = new TQTimer( myObject ); - <a href="ntqobject.html#connect">connect</a>( t, SIGNAL(<a href="#timeout">timeout</a>()), SLOT(processOneThing()) ); + <a href="ntqobject.html#connect">connect</a>( t, TQ_SIGNAL(<a href="#timeout">timeout</a>()), TQ_SLOT(processOneThing()) ); t-><a href="#start">start</a>( 0, FALSE ); </pre> @@ -147,7 +147,7 @@ to create a local TQTimer object. int main( int argc, char **argv ) { <a href="ntqapplication.html">TQApplication</a> a( argc, argv ); - TQTimer::<a href="#singleShot">singleShot</a>( 10*60*1000, &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + TQTimer::<a href="#singleShot">singleShot</a>( 10*60*1000, &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); ... // create and show your widgets return a.<a href="ntqapplication.html#exec">exec</a>(); } diff --git a/doc/html/popup-example.html b/doc/html/popup-example.html index ec60e3c01..f9dcd5b8f 100644 --- a/doc/html/popup-example.html +++ b/doc/html/popup-example.html @@ -167,9 +167,9 @@ void <a name="f469"></a>FancyPopup::popup( <a href="ntqwidget.html">TQWidget</a> <a name="f470"></a>Frame::Frame(TQWidget* parent, const char* name): <a href="ntqframe.html">TQFrame</a>(parent, name){ button1 = new <a href="ntqpushbutton.html">TQPushButton</a>("Simple Popup", this); - <a href="ntqobject.html#connect">connect</a> ( button1, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), SLOT( button1Clicked() ) ); + <a href="ntqobject.html#connect">connect</a> ( button1, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), TQ_SLOT( button1Clicked() ) ); button2 = new <a href="ntqpushbutton.html">TQPushButton</a>("Fancy Popup", this); -<a name="x1606"></a> <a href="ntqobject.html#connect">connect</a> ( button2, SIGNAL( <a href="ntqbutton.html#pressed">pressed</a>() ), SLOT( button2Pressed() ) ); +<a name="x1606"></a> <a href="ntqobject.html#connect">connect</a> ( button2, TQ_SIGNAL( <a href="ntqbutton.html#pressed">pressed</a>() ), TQ_SLOT( button2Pressed() ) ); <a href="qboxlayout.html">TQBoxLayout</a> * l = new <a href="qhboxlayout.html">TQHBoxLayout</a>( this ); <a name="x1627"></a><a name="x1614"></a> button1-><a href="ntqwidget.html#setMaximumSize">setMaximumSize</a>(button1-><a href="ntqwidget.html#sizeHint">sizeHint</a>()); @@ -189,11 +189,11 @@ void <a name="f469"></a>FancyPopup::popup( <a href="ntqwidget.html">TQWidget</a> popup1-><a href="ntqframe.html#setFrameStyle">setFrameStyle</a>( WinPanel|Raised ); popup1-><a href="ntqwidget.html#resize">resize</a>(150,100); <a href="ntqlineedit.html">TQLineEdit</a> *tmpE = new <a href="ntqlineedit.html">TQLineEdit</a>( popup1 ); -<a name="x1619"></a><a name="x1610"></a> <a href="ntqobject.html#connect">connect</a>( tmpE, SIGNAL( <a href="ntqlineedit.html#returnPressed">returnPressed</a>() ), popup1, SLOT( <a href="ntqwidget.html#hide">hide</a>() ) ); +<a name="x1619"></a><a name="x1610"></a> <a href="ntqobject.html#connect">connect</a>( tmpE, TQ_SIGNAL( <a href="ntqlineedit.html#returnPressed">returnPressed</a>() ), popup1, TQ_SLOT( <a href="ntqwidget.html#hide">hide</a>() ) ); <a name="x1626"></a> tmpE-><a href="ntqwidget.html#setGeometry">setGeometry</a>(10,10, 130, 30); <a name="x1625"></a> tmpE-><a href="ntqwidget.html#setFocus">setFocus</a>(); <a href="ntqpushbutton.html">TQPushButton</a> *tmpB = new <a href="ntqpushbutton.html">TQPushButton</a>("Click me!", popup1); -<a name="x1616"></a> <a href="ntqobject.html#connect">connect</a>( tmpB, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), popup1, SLOT( <a href="ntqwidget.html#close">close</a>() ) ); +<a name="x1616"></a> <a href="ntqobject.html#connect">connect</a>( tmpB, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), popup1, TQ_SLOT( <a href="ntqwidget.html#close">close</a>() ) ); tmpB-><a href="ntqwidget.html#setGeometry">setGeometry</a>(10, 50, 130, 30); // the fancier version uses its own class. It will be shown when @@ -208,7 +208,7 @@ void <a name="f469"></a>FancyPopup::popup( <a href="ntqwidget.html">TQWidget</a> // tmpE = new <a href="ntqlineedit.html">TQLineEdit</a>( popup2 ); // tmpE-><a href="ntqwidget.html#setFocus">setFocus</a>(); -// connect( tmpE, SIGNAL( <a href="ntqlineedit.html#returnPressed">returnPressed</a>() ), popup2, SLOT( <a href="ntqwidget.html#close">close</a>() ) ); +// connect( tmpE, TQ_SIGNAL( <a href="ntqlineedit.html#returnPressed">returnPressed</a>() ), popup2, TQ_SLOT( <a href="ntqwidget.html#close">close</a>() ) ); // tmpE-><a href="ntqwidget.html#setGeometry">setGeometry</a>(10, 10, 130, 30); } diff --git a/doc/html/process-example.html b/doc/html/process-example.html index 0ee3cba54..d543ee68b 100644 --- a/doc/html/process-example.html +++ b/doc/html/process-example.html @@ -82,8 +82,8 @@ private: // Layout output = new <a href="ntqtextview.html">TQTextView</a>( this ); quitButton = new <a href="ntqpushbutton.html">TQPushButton</a>( <a href="ntqobject.html#tr">tr</a>("Quit"), this ); - <a href="ntqobject.html#connect">connect</a>( quitButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), - tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quitButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), + tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a href="ntqwidget.html#resize">resize</a>( 500, 500 ); // TQProcess related code @@ -97,10 +97,10 @@ private: proc-><a href="ntqprocess.html#addArgument">addArgument</a>( "i18n" ); proc-><a href="ntqprocess.html#addArgument">addArgument</a>( "small_dialog.ui" ); -<a name="x100"></a> <a href="ntqobject.html#connect">connect</a>( proc, SIGNAL(<a href="ntqprocess.html#readyReadStdout">readyReadStdout</a>()), - this, SLOT(readFromStdout()) ); -<a name="x98"></a> <a href="ntqobject.html#connect">connect</a>( proc, SIGNAL(<a href="ntqprocess.html#processExited">processExited</a>()), - this, SLOT(scrollToTop()) ); +<a name="x100"></a> <a href="ntqobject.html#connect">connect</a>( proc, TQ_SIGNAL(<a href="ntqprocess.html#readyReadStdout">readyReadStdout</a>()), + this, TQ_SLOT(readFromStdout()) ); +<a name="x98"></a> <a href="ntqobject.html#connect">connect</a>( proc, TQ_SIGNAL(<a href="ntqprocess.html#processExited">processExited</a>()), + this, TQ_SLOT(scrollToTop()) ); <a name="x101"></a> if ( !proc-><a href="ntqprocess.html#start">start</a>() ) { // error handling diff --git a/doc/html/progress-example.html b/doc/html/progress-example.html index 63f2e907f..266f56861 100644 --- a/doc/html/progress-example.html +++ b/doc/html/progress-example.html @@ -190,20 +190,20 @@ public: menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&File", file ); for (int i=first_draw_item; i<=last_draw_item; i++) file-><a href="ntqmenudata.html#insertItem">insertItem</a>( drawItemText(i), i ); -<a name="x67"></a> connect( menubar, SIGNAL(<a href="ntqmenubar.html#activated">activated</a>(int)), this, SLOT(doMenuItem(int)) ); +<a name="x67"></a> connect( menubar, TQ_SIGNAL(<a href="ntqmenubar.html#activated">activated</a>(int)), this, TQ_SLOT(doMenuItem(int)) ); <a name="x69"></a> file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Quit", tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Quit", tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); options = new <a href="ntqpopupmenu.html">TQPopupMenu</a>(); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( options ); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Options", options ); - td_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Timer driven", this, SLOT(timerDriven()) ); - ld_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Loop driven", this, SLOT(loopDriven()) ); + td_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Timer driven", this, TQ_SLOT(timerDriven()) ); + ld_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Loop driven", this, TQ_SLOT(loopDriven()) ); options-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - dl_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Default label", this, SLOT(defaultLabel()) ); - cl_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Custom label", this, SLOT(customLabel()) ); + dl_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Default label", this, TQ_SLOT(defaultLabel()) ); + cl_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Custom label", this, TQ_SLOT(customLabel()) ); options-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - md_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "No minimum duration", this, SLOT(toggleMinimumDuration()) ); + md_id = options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "No minimum duration", this, TQ_SLOT(toggleMinimumDuration()) ); <a name="x81"></a> options-><a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE ); loopDriven(); defaultLabel(); @@ -320,7 +320,7 @@ private: pb = newProgressDialog("Drawing rectangles.\n" "Using timer event.", n, FALSE); pb-><a href="ntqwidget.html#setCaption">setCaption</a>("Please Wait"); -<a name="x82"></a> connect(pb, SIGNAL(<a href="ntqprogressdialog.html#cancelled">cancelled</a>()), this, SLOT(stopDrawing())); +<a name="x82"></a> connect(pb, TQ_SIGNAL(<a href="ntqprogressdialog.html#cancelled">cancelled</a>()), this, TQ_SLOT(stopDrawing())); enableDrawingItems(FALSE); startTimer(0); got_stop = FALSE; diff --git a/doc/html/progressbar-example.html b/doc/html/progressbar-example.html index 02b4b9010..f2dc2d52f 100644 --- a/doc/html/progressbar-example.html +++ b/doc/html/progressbar-example.html @@ -141,11 +141,11 @@ protected slots: <a name="x965"></a> toplayout-><a href="qgridlayout.html#addMultiCellWidget">addMultiCellWidget</a>( progress, 1, 1, 0, 1 ); // connect the clicked() SIGNALs of the pushbuttons to SLOTs -<a name="x962"></a> <a href="ntqobject.html#connect">connect</a>( start, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( slotStart() ) ); - <a href="ntqobject.html#connect">connect</a>( reset, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( slotReset() ) ); +<a name="x962"></a> <a href="ntqobject.html#connect">connect</a>( start, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( slotStart() ) ); + <a href="ntqobject.html#connect">connect</a>( reset, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( slotReset() ) ); - // connect the timeout() SIGNAL of the progress-timer to a SLOT - <a href="ntqobject.html#connect">connect</a>( &timer, SIGNAL( timeout() ), this, SLOT( slotTimeout() ) ); + // connect the timeout() TQ_SIGNAL of the progress-timer to a TQ_SLOT + <a href="ntqobject.html#connect">connect</a>( &timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); // Let's start with normal speed... <a name="x972"></a> normal-><a href="ntqradiobutton.html#setChecked">setChecked</a>( TRUE ); @@ -157,9 +157,9 @@ protected slots: } /* - * 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 */ @@ -197,9 +197,9 @@ void <a name="f347"></a>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 <a name="f348"></a>ProgressBar::slotReset() @@ -222,9 +222,9 @@ void <a name="f348"></a>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/doc/html/qaction-application-example.html b/doc/html/qaction-application-example.html index fd0306274..107e2775d 100644 --- a/doc/html/qaction-application-example.html +++ b/doc/html/qaction-application-example.html @@ -141,12 +141,12 @@ private: <a href="ntqaction.html">TQAction</a> * fileCloseAction, * fileQuitAction; fileNewAction = new <a href="ntqaction.html">TQAction</a>( "&New", CTRL+Key_N, this, "new" ); -<a name="x1123"></a> <a href="ntqobject.html#connect">connect</a>( fileNewAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, - SLOT( newDoc() ) ); +<a name="x1123"></a> <a href="ntqobject.html#connect">connect</a>( fileNewAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, + TQ_SLOT( newDoc() ) ); fileOpenAction = new <a href="ntqaction.html">TQAction</a>( TQPixmap( fileopen ), "&Open...", CTRL+Key_O, this, "open" ); - <a href="ntqobject.html#connect">connect</a>( fileOpenAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, SLOT( choose() ) ); + <a href="ntqobject.html#connect">connect</a>( fileOpenAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, TQ_SLOT( choose() ) ); const char * fileOpenText = "<p><img source=\"fileopen\"> " "Click this button to open a <em>new file</em>. <br>" @@ -158,7 +158,7 @@ private: fileSaveAction = new <a href="ntqaction.html">TQAction</a>( TQPixmap( filesave ), "&Save", CTRL+Key_S, this, "save" ); - <a href="ntqobject.html#connect">connect</a>( fileSaveAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, SLOT( save() ) ); + <a href="ntqobject.html#connect">connect</a>( fileSaveAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , 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" @@ -168,14 +168,14 @@ private: fileSaveAsAction = new <a href="ntqaction.html">TQAction</a>( "Save File As", "Save &As...", 0, this, "save as" ); - <a href="ntqobject.html#connect">connect</a>( fileSaveAsAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, - SLOT( saveAs() ) ); + <a href="ntqobject.html#connect">connect</a>( fileSaveAsAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, + TQ_SLOT( saveAs() ) ); fileSaveAsAction-><a href="ntqaction.html#setWhatsThis">setWhatsThis</a>( fileSaveText ); filePrintAction = new <a href="ntqaction.html">TQAction</a>( "Print File", TQPixmap( fileprint ), "&Print...", CTRL+Key_P, this, "print" ); - <a href="ntqobject.html#connect">connect</a>( filePrintAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, - SLOT( print() ) ); + <a href="ntqobject.html#connect">connect</a>( filePrintAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, + TQ_SLOT( print() ) ); const char * filePrintText = "Click this button to print the file you " "are editing.\n You can also select the Print " @@ -184,13 +184,13 @@ private: fileCloseAction = new <a href="ntqaction.html">TQAction</a>( "Close", "&Close", CTRL+Key_W, this, "close" ); - <a href="ntqobject.html#connect">connect</a>( fileCloseAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, - SLOT( <a href="ntqwidget.html#close">close</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( fileCloseAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , this, + TQ_SLOT( <a href="ntqwidget.html#close">close</a>() ) ); fileQuitAction = new <a href="ntqaction.html">TQAction</a>( "Quit", "&Quit", CTRL+Key_Q, this, "quit" ); -<a name="x1127"></a> <a href="ntqobject.html#connect">connect</a>( fileQuitAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , tqApp, - SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ) ); +<a name="x1127"></a> <a href="ntqobject.html#connect">connect</a>( fileQuitAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ) , tqApp, + TQ_SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ) ); // populate a tool bar with some actions @@ -223,10 +223,10 @@ private: <a href="ntqpopupmenu.html">TQPopupMenu</a> * help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&Help", help ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, SLOT(about()), Key_F1 ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, SLOT(aboutTQt()) ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, TQ_SLOT(about()), Key_F1 ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, TQ_SLOT(aboutTQt()) ); help-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this, SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this, TQ_SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1 ); @@ -421,7 +421,7 @@ int main( int argc, char ** argv ) { ApplicationWindow * mw = new ApplicationWindow(); mw-><a href="ntqwidget.html#setCaption">setCaption</a>( "Document 1" ); <a name="x1178"></a> mw-><a href="ntqwidget.html#show">show</a>(); -<a name="x1179"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<a name="x1179"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); return a.<a href="ntqapplication.html#exec">exec</a>(); } </pre> diff --git a/doc/html/qactiongroup.html b/doc/html/qactiongroup.html index 21aa9d1b3..3a88a9bc8 100644 --- a/doc/html/qactiongroup.html +++ b/doc/html/qactiongroup.html @@ -77,7 +77,7 @@ appearing as separate menu options and toolbar buttons. <pre> TQActionGroup *grp = new TQActionGroup( this ); - <a name="x2112"></a> <a href="ntqobject.html#connect">connect</a>( grp, SIGNAL( <a href="#selected">selected</a>( <a href="ntqaction.html">TQAction</a>* ) ), this, SLOT( textAlign( <a href="ntqaction.html">TQAction</a>* ) ) ); + <a name="x2112"></a> <a href="ntqobject.html#connect">connect</a>( grp, TQ_SIGNAL( <a href="#selected">selected</a>( <a href="ntqaction.html">TQAction</a>* ) ), this, TQ_SLOT( textAlign( <a href="ntqaction.html">TQAction</a>* ) ) ); </pre> <p> Here we create a new action group. Since the action group is exclusive by default, only one of the actions in the group is ever active at any diff --git a/doc/html/qaxbase.html b/doc/html/qaxbase.html index 517c32ab5..5e756fa76 100644 --- a/doc/html/qaxbase.html +++ b/doc/html/qaxbase.html @@ -94,7 +94,7 @@ through its IUnknown implementation. If the COM object implements the IDispatch interface, the properties and methods of that object become available as TQt properties and slots. <p> <pre> - connect( buttonBack, SIGNAL(clicked()), webBrowser, SLOT(GoBack()) ); + connect( buttonBack, TQ_SIGNAL(clicked()), webBrowser, TQ_SLOT(GoBack()) ); </pre> <p> Properties exposed by the object's IDispatch implementation can be @@ -116,8 +116,8 @@ object's IDispatch implementation can be called directly using <p> Outgoing events supported by the COM object are emitted as standard TQt signals. <p> <pre> - connect( webBrowser, SIGNAL(TitleChanged(const <a href="ntqstring.html">TQString</a>&)), - this, SLOT(setCaption(const <a href="ntqstring.html">TQString</a>&)) ); + connect( webBrowser, TQ_SIGNAL(TitleChanged(const <a href="ntqstring.html">TQString</a>&)), + this, TQ_SLOT(setCaption(const <a href="ntqstring.html">TQString</a>&)) ); </pre> <p> TQAxBase transparently converts between COM data types and the @@ -243,7 +243,7 @@ use the TQAxBase API like this: <a href="ntqstring.html">TQString</a> text = object.<a href="ntqobject.html#property">property</a>( "text" ).toString(); object.<a href="ntqobject.html#setProperty">setProperty</a>( "font", TQFont( "Times New Roman", 12 ) ); - connect( this, SIGNAL(clicked(int)), &object, SLOT(showColumn(int)) ); + connect( this, TQ_SIGNAL(clicked(int)), &object, TQ_SLOT(showColumn(int)) ); bool ok = object.<a href="#dynamicCall">dynamicCall</a>( "addColumn(const <a href="ntqstring.html">TQString</a>&)", "Column 1" ).toBool(); <a href="ntqvaluelist.html">TQValueList</a><TQVariant> varlist; diff --git a/doc/html/qaxcontainer-example-qutlook.html b/doc/html/qaxcontainer-example-qutlook.html index e7261e350..899f61961 100644 --- a/doc/html/qaxcontainer-example-qutlook.html +++ b/doc/html/qaxcontainer-example-qutlook.html @@ -144,9 +144,9 @@ to the signals provided by the "Items" COM object. Finally, it calls the <pre> // Get all items if ( defFolder ) { contactItems = defFolder-><a href="qaxbase.html#querySubObject">querySubObject</a>( "Items" ); - <a href="ntqobject.html#connect">connect</a>( contactItems, SIGNAL(ItemAdd(IDispatch*)), this, SLOT(updateOutlook()) ); - <a href="ntqobject.html#connect">connect</a>( contactItems, SIGNAL(ItemChange(IDispatch*)), this, SLOT(updateOutlook()) ); - <a href="ntqobject.html#connect">connect</a>( contactItems, SIGNAL(ItemRemove()), this, SLOT(updateOutlook()) ); + <a href="ntqobject.html#connect">connect</a>( contactItems, TQ_SIGNAL(ItemAdd(IDispatch*)), this, TQ_SLOT(updateOutlook()) ); + <a href="ntqobject.html#connect">connect</a>( contactItems, TQ_SIGNAL(ItemChange(IDispatch*)), this, TQ_SLOT(updateOutlook()) ); + <a href="ntqobject.html#connect">connect</a>( contactItems, TQ_SIGNAL(ItemRemove()), this, TQ_SLOT(updateOutlook()) ); } updateOutlook(); diff --git a/doc/html/qaxcontainer-example-webbrowser.html b/doc/html/qaxcontainer-example-webbrowser.html index 6f60fada9..ab55b5375 100644 --- a/doc/html/qaxcontainer-example-webbrowser.html +++ b/doc/html/qaxcontainer-example-webbrowser.html @@ -50,8 +50,8 @@ already been set up within TQt Designer. <a name="x2516"></a> pb-><a href="ntqwidget.html#hide">hide</a>(); statusBar()->addWidget( pb, 0, TRUE ); - connect( WebBrowser, SIGNAL(ProgressChange(int,int)), this, SLOT(setProgress(int,int)) ); - connect( WebBrowser, SIGNAL(StatusTextChange(const <a href="ntqstring.html">TQString</a>&)), statusBar(), SLOT(message(const <a href="ntqstring.html">TQString</a>&)) ); + connect( WebBrowser, TQ_SIGNAL(ProgressChange(int,int)), this, TQ_SLOT(setProgress(int,int)) ); + connect( WebBrowser, TQ_SIGNAL(StatusTextChange(const <a href="ntqstring.html">TQString</a>&)), statusBar(), TQ_SLOT(message(const <a href="ntqstring.html">TQString</a>&)) ); WebBrowser->dynamicCall( "GoHome()" ); } diff --git a/doc/html/qaxserver-example-simple.html b/doc/html/qaxserver-example-simple.html index 503eb938d..57e7c1d7a 100644 --- a/doc/html/qaxserver-example-simple.html +++ b/doc/html/qaxserver-example-simple.html @@ -59,8 +59,8 @@ and <a href="qaxbindable.html#propertyChanged">TQAxBindable::propertyChanged</a> LCD = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 3, this ); edit = new <a href="ntqlineedit.html">TQLineEdit</a>( this ); - <a name="x2528"></a> connect( slider, SIGNAL( <a href="ntqslider.html#valueChanged">valueChanged</a>( int ) ), this, SLOT( setValue(int) ) ); - <a name="x2523"></a> connect( edit, SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a>&)), this, SLOT(setText(const <a href="ntqstring.html">TQString</a>&)) ); + <a name="x2528"></a> connect( slider, TQ_SIGNAL( <a href="ntqslider.html#valueChanged">valueChanged</a>( int ) ), this, TQ_SLOT( setValue(int) ) ); + <a name="x2523"></a> connect( edit, TQ_SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a>&)), this, TQ_SLOT(setText(const <a href="ntqstring.html">TQString</a>&)) ); vbox-><a href="qboxlayout.html#addWidget">addWidget</a>( slider ); vbox-><a href="qboxlayout.html#addWidget">addWidget</a>( LCD ); diff --git a/doc/html/qdir-example.html b/doc/html/qdir-example.html index 618a7dd0f..4fed687d0 100644 --- a/doc/html/qdir-example.html +++ b/doc/html/qdir-example.html @@ -239,8 +239,8 @@ void <a name="f500"></a>PreviewWidget::previewUrl( const <a href="ntqurl.html">T <a name="x1848"></a> TQToolTip::<a href="ntqtooltip.html#add">add</a>( p, tr( "Bookmarks" ) ); bookmarkMenu = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); -<a name="x1835"></a> <a href="ntqobject.html#connect">connect</a>( bookmarkMenu, SIGNAL( <a href="ntqpopupmenu.html#activated">activated</a>( int ) ), - this, SLOT( bookmarkChosen( int ) ) ); +<a name="x1835"></a> <a href="ntqobject.html#connect">connect</a>( bookmarkMenu, TQ_SIGNAL( <a href="ntqpopupmenu.html#activated">activated</a>( int ) ), + this, TQ_SLOT( bookmarkChosen( int ) ) ); addId = bookmarkMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>( "Add bookmark" ) ); bookmarkMenu-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); @@ -260,16 +260,16 @@ void <a name="f500"></a>PreviewWidget::previewUrl( const <a href="ntqurl.html">T <a href="ntqfiledialog.html#addToolButton">addToolButton</a>( p, TRUE ); - <a href="ntqobject.html#connect">connect</a>( dirView, SIGNAL( folderSelected( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( setDir2( const <a href="ntqstring.html">TQString</a> & ) ) ); - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqfiledialog.html#dirEntered">dirEntered</a>( const <a href="ntqstring.html">TQString</a> & ) ), - dirView, SLOT( <a href="ntqfiledialog.html#setDir">setDir</a>( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( dirView, TQ_SIGNAL( folderSelected( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( setDir2( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqfiledialog.html#dirEntered">dirEntered</a>( const <a href="ntqstring.html">TQString</a> & ) ), + dirView, TQ_SLOT( <a href="ntqfiledialog.html#setDir">setDir</a>( const <a href="ntqstring.html">TQString</a> & ) ) ); <a href="ntqtoolbutton.html">TQToolButton</a> *b = new <a href="ntqtoolbutton.html">TQToolButton</a>( this ); TQToolTip::<a href="ntqtooltip.html#add">add</a>( b, tr( "Go Home!" ) ); b-><a href="ntqbutton.html#setPixmap">setPixmap</a>( TQPixmap( home ) ); - <a href="ntqobject.html#connect">connect</a>( b, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), - this, SLOT( goHome() ) ); + <a href="ntqobject.html#connect">connect</a>( b, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), + this, TQ_SLOT( goHome() ) ); <a href="ntqfiledialog.html#addToolButton">addToolButton</a>( b ); diff --git a/doc/html/qfd-example.html b/doc/html/qfd-example.html index 064e97045..f04dab405 100644 --- a/doc/html/qfd-example.html +++ b/doc/html/qfd-example.html @@ -237,10 +237,10 @@ void <a name="f534"></a>FontRowTable::chooseFont() <a name="x2010"></a> controls-><a href="ntqtoolbar.html#addSeparator">addSeparator</a>(); <a href="ntqpushbutton.html">TQPushButton</a> *fontbutton = new <a href="ntqpushbutton.html">TQPushButton</a>(<a href="ntqobject.html#tr">tr</a>("Font..."), controls); -<a name="x2009"></a> <a href="ntqobject.html#connect">connect</a>(row,SIGNAL(<a href="ntqspinbox.html#valueChanged">valueChanged</a>(int)),table,SLOT(setRow(int))); - <a href="ntqobject.html#connect">connect</a>(fontbutton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), table, SLOT(chooseFont())); - <a href="ntqobject.html#connect">connect</a>(table,SIGNAL(fontInformation(const <a href="ntqstring.html">TQString</a>&)), - <a href="ntqmainwindow.html#statusBar">statusBar</a>(),SLOT(message(const <a href="ntqstring.html">TQString</a>&))); +<a name="x2009"></a> <a href="ntqobject.html#connect">connect</a>(row,TQ_SIGNAL(<a href="ntqspinbox.html#valueChanged">valueChanged</a>(int)),table,TQ_SLOT(setRow(int))); + <a href="ntqobject.html#connect">connect</a>(fontbutton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), table, TQ_SLOT(chooseFont())); + <a href="ntqobject.html#connect">connect</a>(table,TQ_SIGNAL(fontInformation(const <a href="ntqstring.html">TQString</a>&)), + <a href="ntqmainwindow.html#statusBar">statusBar</a>(),TQ_SLOT(message(const <a href="ntqstring.html">TQString</a>&))); table->setRow(0); <a href="ntqmainwindow.html#setCentralWidget">setCentralWidget</a>(table); } diff --git a/doc/html/qmag-example.html b/doc/html/qmag-example.html index 096557030..29b97de49 100644 --- a/doc/html/qmag-example.html +++ b/doc/html/qmag-example.html @@ -135,12 +135,12 @@ static const int timer[] = { zoom = new <a href="ntqcombobox.html">TQComboBox</a>( FALSE, this ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>(zoom); <a name="x1773"></a> zoom-><a href="ntqcombobox.html#insertStrList">insertStrList</a>( zoomfactors, 9 ); -<a name="x1772"></a> <a href="ntqobject.html#connect">connect</a>( zoom, SIGNAL(<a href="ntqcombobox.html#activated">activated</a>(int)), SLOT(setZoom(int)) ); +<a name="x1772"></a> <a href="ntqobject.html#connect">connect</a>( zoom, TQ_SIGNAL(<a href="ntqcombobox.html#activated">activated</a>(int)), TQ_SLOT(setZoom(int)) ); refresh = new <a href="ntqcombobox.html">TQComboBox</a>( FALSE, this ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>(refresh); refresh-><a href="ntqcombobox.html#insertStrList">insertStrList</a>( refreshrates, 9 ); - <a href="ntqobject.html#connect">connect</a>( refresh, SIGNAL(<a href="ntqcombobox.html#activated">activated</a>(int)), SLOT(setRefresh(int)) ); + <a href="ntqobject.html#connect">connect</a>( refresh, TQ_SIGNAL(<a href="ntqcombobox.html#activated">activated</a>(int)), TQ_SLOT(setRefresh(int)) ); for( n=0; n<9; n++) { <a name="x1797"></a> int w2 = zoom-><a href="ntqwidget.html#fontMetrics">fontMetrics</a>().width( zoomfactors[n] ); @@ -158,7 +158,7 @@ static const int timer[] = { saveButton = new <a href="ntqpushbutton.html">TQPushButton</a>( this ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>(saveButton); - <a href="ntqobject.html#connect">connect</a>( saveButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(save()) ); + <a href="ntqobject.html#connect">connect</a>( saveButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(save()) ); <a name="x1771"></a> saveButton-><a href="ntqbutton.html#setText">setText</a>( "Save" ); <a name="x1788"></a> saveButton-><a href="ntqwidget.html#setGeometry">setGeometry</a>( x+w+30+2, 2, 10+saveButton-><a href="ntqwidget.html#fontMetrics">fontMetrics</a>().width("Save"), 20 ); @@ -166,14 +166,14 @@ static const int timer[] = { multiSaveButton = new <a href="ntqpushbutton.html">TQPushButton</a>( this ); <a name="x1790"></a> multiSaveButton-><a href="ntqpushbutton.html#setToggleButton">setToggleButton</a>(TRUE); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>(multiSaveButton); - <a href="ntqobject.html#connect">connect</a>( multiSaveButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(multiSave()) ); + <a href="ntqobject.html#connect">connect</a>( multiSaveButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(multiSave()) ); multiSaveButton-><a href="ntqbutton.html#setText">setText</a>( "MultiSave" ); <a name="x1798"></a> multiSaveButton-><a href="ntqwidget.html#setGeometry">setGeometry</a>( saveButton-><a href="ntqwidget.html#geometry">geometry</a>().right() + 2, 2, 10+multiSaveButton-><a href="ntqwidget.html#fontMetrics">fontMetrics</a>().width("MultiSave"), 20 ); quitButton = new <a href="ntqpushbutton.html">TQPushButton</a>( this ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>(quitButton); - <a href="ntqobject.html#connect">connect</a>( quitButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quitButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); quitButton-><a href="ntqbutton.html#setText">setText</a>( "Quit" ); quitButton-><a href="ntqwidget.html#setGeometry">setGeometry</a>( multiSaveButton-><a href="ntqwidget.html#geometry">geometry</a>().right() + 2, 2, 10+quitButton-><a href="ntqwidget.html#fontMetrics">fontMetrics</a>().width("Quit"), 20 ); diff --git a/doc/html/qmake-manual-7.html b/doc/html/qmake-manual-7.html index acaaf1855..eaa4d911f 100644 --- a/doc/html/qmake-manual-7.html +++ b/doc/html/qmake-manual-7.html @@ -166,7 +166,7 @@ body { background: #ffffff; color: black; } MyObject obj; MyDialog dia; app.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>( &dia ); - dia.connect( dia.aButton, SIGNAL(clicked()), SLOT(<a href="ntqwidget.html#close">close</a>()) ); + dia.connect( dia.aButton, TQ_SIGNAL(clicked()), TQ_SLOT(<a href="ntqwidget.html#close">close</a>()) ); dia.show(); return app.<a href="ntqapplication.html#exec">exec</a>(); diff --git a/doc/html/qtableitem.html b/doc/html/qtableitem.html index bab321940..815f0b3ef 100644 --- a/doc/html/qtableitem.html +++ b/doc/html/qtableitem.html @@ -263,7 +263,7 @@ reimplement <a href="#setContentFromEditor">setContentFromEditor</a>(), and may { // create an editor - a combobox in our case ( (ComboItem*)this )->cb = new <a href="ntqcombobox.html">TQComboBox</a>( <a href="#table">table</a>()->viewport() ); - TQObject::<a href="ntqobject.html#connect">connect</a>( cb, SIGNAL( activated( int ) ), table(), SLOT( doValueChanged() ) ); + TQObject::<a href="ntqobject.html#connect">connect</a>( cb, TQ_SIGNAL( activated( int ) ), table(), TQ_SLOT( doValueChanged() ) ); cb->insertItem( "Yes" ); cb->insertItem( "No" ); // and initialize it diff --git a/doc/html/qtooltipgroup.html b/doc/html/qtooltipgroup.html index 8b83ff63d..cde200e2f 100644 --- a/doc/html/qtooltipgroup.html +++ b/doc/html/qtooltipgroup.html @@ -71,10 +71,10 @@ this status bar. argument to <a href="ntqtooltip.html">TQToolTip</a>'s member functions, for example like this: <p> <pre> TQToolTipGroup * grp = new TQToolTipGroup( this, "tool tip relay" ); - <a href="ntqobject.html#connect">connect</a>( grp, SIGNAL(<a href="#showTip">showTip</a>(const <a href="ntqstring.html">TQString</a>&)), - myLabel, SLOT(setText(const <a href="ntqstring.html">TQString</a>&)) ); - <a href="ntqobject.html#connect">connect</a>( grp, SIGNAL(<a href="#removeTip">removeTip</a>()), - myLabel, SLOT(clear()) ); + <a href="ntqobject.html#connect">connect</a>( grp, TQ_SIGNAL(<a href="#showTip">showTip</a>(const <a href="ntqstring.html">TQString</a>&)), + myLabel, TQ_SLOT(setText(const <a href="ntqstring.html">TQString</a>&)) ); + <a href="ntqobject.html#connect">connect</a>( grp, TQ_SIGNAL(<a href="#removeTip">removeTip</a>()), + myLabel, TQ_SLOT(clear()) ); TQToolTip::<a href="ntqtooltip.html#add">add</a>( giraffeButton, "feed giraffe", grp, "Give the giraffe a meal" ); TQToolTip::<a href="ntqtooltip.html#add">add</a>( gorillaButton, "feed gorilla", diff --git a/doc/html/qwerty-example.html b/doc/html/qwerty-example.html index 5f6350856..8ac0112c6 100644 --- a/doc/html/qwerty-example.html +++ b/doc/html/qwerty-example.html @@ -138,40 +138,40 @@ enum { Uni = 0, MBug = 1, Lat1 = 2, Local = 3, Guess = 4, Codec = 5 }; <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( file ); <a name="x371"></a> m-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&File", file ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, SLOT(newDoc()), ALT+Key_N ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Open...", this, SLOT(load()), ALT+Key_O ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Save...", this, SLOT(save()), ALT+Key_S ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, TQ_SLOT(newDoc()), ALT+Key_N ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Open...", this, TQ_SLOT(load()), ALT+Key_O ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Save...", this, TQ_SLOT(save()), ALT+Key_S ); <a name="x372"></a> file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); open_as = new <a href="ntqpopupmenu.html">TQPopupMenu</a>(); file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Open &As", open_as ); save_as = new <a href="ntqpopupmenu.html">TQPopupMenu</a>(); file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Sa&ve As", save_as ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Add &Encoding", this, SLOT(addEncoding()) ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Add &Encoding", this, TQ_SLOT(addEncoding()) ); #ifndef TQT_NO_PRINTER file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Print...", this, SLOT(print()), ALT+Key_P ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Print...", this, TQ_SLOT(print()), ALT+Key_P ); #endif file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, SLOT(<a href="ntqwidget.html#close">close</a>()),ALT+Key_W ); -<a name="x358"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, SLOT(<a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>()), ALT+Key_Q ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, TQ_SLOT(<a href="ntqwidget.html#close">close</a>()),ALT+Key_W ); +<a name="x358"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, TQ_SLOT(<a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>()), ALT+Key_Q ); -<a name="x386"></a> <a href="ntqobject.html#connect">connect</a>( save_as, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, SLOT(saveAsEncoding(int)) ); - <a href="ntqobject.html#connect">connect</a>( open_as, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, SLOT(openAsEncoding(int)) ); +<a name="x386"></a> <a href="ntqobject.html#connect">connect</a>( save_as, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, TQ_SLOT(saveAsEncoding(int)) ); + <a href="ntqobject.html#connect">connect</a>( open_as, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, TQ_SLOT(openAsEncoding(int)) ); rebuildCodecList(); <a href="ntqpopupmenu.html">TQPopupMenu</a> * edit = new <a href="ntqpopupmenu.html">TQPopupMenu</a>(); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( edit ); m-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Edit", edit ); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "To &Uppercase", this, SLOT(toUpper()), ALT+Key_U ); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "To &Lowercase", this, SLOT(toLower()), ALT+Key_L ); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "To &Uppercase", this, TQ_SLOT(toUpper()), ALT+Key_U ); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "To &Lowercase", this, TQ_SLOT(toLower()), ALT+Key_L ); #ifndef TQT_NO_FONTDIALOG edit-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Select Font" , this, SLOT(<a href="ntqwidget.html#font">font</a>()), ALT+Key_T ); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Select Font" , this, TQ_SLOT(<a href="ntqwidget.html#font">font</a>()), ALT+Key_T ); #endif changed = FALSE; e = new <a href="ntqmultilineedit.html">TQMultiLineEdit</a>( this, "editor" ); -<a name="x400"></a> <a href="ntqobject.html#connect">connect</a>( e, SIGNAL( <a href="ntqtextedit.html#textChanged">textChanged</a>() ), this, SLOT( textChanged() ) ); +<a name="x400"></a> <a href="ntqobject.html#connect">connect</a>( e, TQ_SIGNAL( <a href="ntqtextedit.html#textChanged">textChanged</a>() ), this, TQ_SLOT( textChanged() ) ); // We use Unifont - if you have it installed you'll see all // Unicode character glyphs. @@ -492,7 +492,7 @@ int main( int argc, char **argv ) e-><a href="ntqwidget.html#show">show</a>(); } } -<a name="x416"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<a name="x416"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); return a.<a href="ntqapplication.html#exec">exec</a>(); } </pre> diff --git a/doc/html/rangecontrols-example.html b/doc/html/rangecontrols-example.html index 22b802f99..5c95c39db 100644 --- a/doc/html/rangecontrols-example.html +++ b/doc/html/rangecontrols-example.html @@ -131,7 +131,7 @@ private: <a href="ntqlcdnumber.html">TQLCDNumber</a> *lcd2 = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 2, cell3 ); <a name="x1384"></a> lcd2-><a href="ntqlcdnumber.html#display">display</a>( 33 ); <a name="x1385"></a> lcd2-><a href="ntqlcdnumber.html#setSegmentStyle">setSegmentStyle</a>( TQLCDNumber::Filled ); -<a name="x1386"></a> <a href="ntqobject.html#connect">connect</a>( hslider, SIGNAL( <a href="ntqslider.html#valueChanged">valueChanged</a>( int ) ), lcd2, SLOT( <a href="ntqlcdnumber.html#display">display</a>( int ) ) ); +<a name="x1386"></a> <a href="ntqobject.html#connect">connect</a>( hslider, TQ_SIGNAL( <a href="ntqslider.html#valueChanged">valueChanged</a>( int ) ), lcd2, TQ_SLOT( <a href="ntqlcdnumber.html#display">display</a>( int ) ) ); <a href="ntqhbox.html">TQHBox</a> *cell4 = new <a href="ntqhbox.html">TQHBox</a>( row2 ); cell4-><a href="ntqframe.html#setFrameStyle">setFrameStyle</a>( TQFrame::WinPanel | TQFrame::Sunken ); @@ -139,7 +139,7 @@ private: <a href="ntqslider.html">TQSlider</a> *vslider = new <a href="ntqslider.html">TQSlider</a>( 0, 64, 1, 8, TQt::Vertical, cell4 ); <a href="ntqlcdnumber.html">TQLCDNumber</a> *lcd3 = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 3, cell4 ); lcd3-><a href="ntqlcdnumber.html#display">display</a>( 8 ); - <a href="ntqobject.html#connect">connect</a>( vslider, SIGNAL( <a href="ntqslider.html#valueChanged">valueChanged</a>( int ) ), lcd3, SLOT( <a href="ntqlcdnumber.html#display">display</a>( int ) ) ); + <a href="ntqobject.html#connect">connect</a>( vslider, TQ_SIGNAL( <a href="ntqslider.html#valueChanged">valueChanged</a>( int ) ), lcd3, TQ_SLOT( <a href="ntqlcdnumber.html#display">display</a>( int ) ) ); } </pre> diff --git a/doc/html/regexptester-example.html b/doc/html/regexptester-example.html index b12c40653..19bfb8111 100644 --- a/doc/html/regexptester-example.html +++ b/doc/html/regexptester-example.html @@ -163,9 +163,9 @@ private: languageChange(); - <a href="ntqobject.html#connect">connect</a>(copyPushButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(copy())); - <a href="ntqobject.html#connect">connect</a>(executePushButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(execute())); - <a href="ntqobject.html#connect">connect</a>(quitPushButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(<a href="ntqdialog.html#accept">accept</a>())); + <a href="ntqobject.html#connect">connect</a>(copyPushButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(copy())); + <a href="ntqobject.html#connect">connect</a>(executePushButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(execute())); + <a href="ntqobject.html#connect">connect</a>(quitPushButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(<a href="ntqdialog.html#accept">accept</a>())); execute(); } @@ -282,7 +282,7 @@ int main(int argc, char **argv) <a href="ntqapplication.html">TQApplication</a> app(argc, argv); RegexpTester form; <a name="x2511"></a> form.<a href="ntqdialog.html#show">show</a>(); -<a name="x2512"></a><a name="x2510"></a><a name="x2509"></a> app.<a href="ntqobject.html#connect">connect</a>(&app, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &app, SLOT(<a href="ntqapplication.html#quit">quit</a>())); +<a name="x2512"></a><a name="x2510"></a><a name="x2509"></a> app.<a href="ntqobject.html#connect">connect</a>(&app, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &app, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>())); return app.<a href="ntqapplication.html#exec">exec</a>(); } </pre> diff --git a/doc/html/richtext-example.html b/doc/html/richtext-example.html index 19cc4d3eb..d4b346461 100644 --- a/doc/html/richtext-example.html +++ b/doc/html/richtext-example.html @@ -182,9 +182,9 @@ static const char* sayings[] = { <a name="x466"></a> bPrev-><a href="ntqwidget.html#setEnabled">setEnabled</a>( FALSE ); -<a name="x462"></a> <a href="ntqobject.html#connect">connect</a>( bClose, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), tqApp, SLOT( <a href="ntqapplication.html#quit">quit</a>() ) ); - <a href="ntqobject.html#connect">connect</a>( bPrev, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( prev() ) ); - <a href="ntqobject.html#connect">connect</a>( bNext, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( next() ) ); +<a name="x462"></a> <a href="ntqobject.html#connect">connect</a>( bClose, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), tqApp, TQ_SLOT( <a href="ntqapplication.html#quit">quit</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( bPrev, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( prev() ) ); + <a href="ntqobject.html#connect">connect</a>( bNext, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( next() ) ); num = 0; } diff --git a/doc/html/rot-example.html b/doc/html/rot-example.html index 955d8f0a0..f48686a61 100644 --- a/doc/html/rot-example.html +++ b/doc/html/rot-example.html @@ -100,12 +100,12 @@ private: { left = new <a href="ntqmultilineedit.html">TQMultiLineEdit</a>( this, "left" ); right = new <a href="ntqmultilineedit.html">TQMultiLineEdit</a>( this, "right" ); -<a name="x1375"></a> <a href="ntqobject.html#connect">connect</a>( left, SIGNAL(<a href="ntqtextedit.html#textChanged">textChanged</a>()), this, SLOT(changeRight()) ); - <a href="ntqobject.html#connect">connect</a>( right, SIGNAL(<a href="ntqtextedit.html#textChanged">textChanged</a>()), this, SLOT(changeLeft()) ); +<a name="x1375"></a> <a href="ntqobject.html#connect">connect</a>( left, TQ_SIGNAL(<a href="ntqtextedit.html#textChanged">textChanged</a>()), this, TQ_SLOT(changeRight()) ); + <a href="ntqobject.html#connect">connect</a>( right, TQ_SIGNAL(<a href="ntqtextedit.html#textChanged">textChanged</a>()), this, TQ_SLOT(changeLeft()) ); <a href="ntqpushbutton.html">TQPushButton</a> * quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Quit", this ); <a name="x1379"></a> quit-><a href="ntqwidget.html#setFocusPolicy">setFocusPolicy</a>( NoFocus ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a href="qgridlayout.html">TQGridLayout</a> * l = new <a href="qgridlayout.html">TQGridLayout</a>( this, 2, 2, 5 ); <a name="x1370"></a> l-><a href="qgridlayout.html#addWidget">addWidget</a>( left, 0, 0 ); diff --git a/doc/html/scribble-example.html b/doc/html/scribble-example.html index 5d5066e5c..80ea26bb2 100644 --- a/doc/html/scribble-example.html +++ b/doc/html/scribble-example.html @@ -255,24 +255,24 @@ void <a name="f340"></a>Canvas::clearScreen() <a href="ntqtoolbar.html">TQToolBar</a> *tools = new <a href="ntqtoolbar.html">TQToolBar</a>( this ); - bSave = new <a href="ntqtoolbutton.html">TQToolButton</a>( TQPixmap(), "Save", "Save as PNG image", this, SLOT( slotSave() ), tools ); + bSave = new <a href="ntqtoolbutton.html">TQToolButton</a>( TQPixmap(), "Save", "Save as PNG image", this, TQ_SLOT( slotSave() ), tools ); <a name="x944"></a> bSave-><a href="ntqbutton.html#setText">setText</a>( "Save as..." ); <a name="x943"></a> tools-><a href="ntqtoolbar.html#addSeparator">addSeparator</a>(); - bPColor = new <a href="ntqtoolbutton.html">TQToolButton</a>( TQPixmap(), "Choose Pen Color", "Choose Pen Color", this, SLOT( slotColor() ), tools ); + bPColor = new <a href="ntqtoolbutton.html">TQToolButton</a>( TQPixmap(), "Choose Pen Color", "Choose Pen Color", this, TQ_SLOT( slotColor() ), tools ); bPColor-><a href="ntqbutton.html#setText">setText</a>( "Choose Pen Color..." ); tools-><a href="ntqtoolbar.html#addSeparator">addSeparator</a>(); bPWidth = new <a href="ntqspinbox.html">TQSpinBox</a>( 1, 20, 1, tools ); <a name="x945"></a> TQToolTip::<a href="ntqtooltip.html#add">add</a>( bPWidth, "Choose Pen Width" ); -<a name="x939"></a> <a href="ntqobject.html#connect">connect</a>( bPWidth, SIGNAL( <a href="ntqspinbox.html#valueChanged">valueChanged</a>( int ) ), this, SLOT( slotWidth( int ) ) ); +<a name="x939"></a> <a href="ntqobject.html#connect">connect</a>( bPWidth, TQ_SIGNAL( <a href="ntqspinbox.html#valueChanged">valueChanged</a>( int ) ), this, TQ_SLOT( slotWidth( int ) ) ); <a name="x938"></a> bPWidth-><a href="ntqspinbox.html#setValue">setValue</a>( 3 ); tools-><a href="ntqtoolbar.html#addSeparator">addSeparator</a>(); - bClear = new <a href="ntqtoolbutton.html">TQToolButton</a>( TQPixmap(), "Clear Screen", "Clear Screen", this, SLOT( slotClear() ), tools ); + bClear = new <a href="ntqtoolbutton.html">TQToolButton</a>( TQPixmap(), "Clear Screen", "Clear Screen", this, TQ_SLOT( slotClear() ), tools ); bClear-><a href="ntqbutton.html#setText">setText</a>( "Clear Screen" ); } diff --git a/doc/html/scrollview-example.html b/doc/html/scrollview-example.html index 209d2ace4..c100228e5 100644 --- a/doc/html/scrollview-example.html +++ b/doc/html/scrollview-example.html @@ -83,7 +83,7 @@ public: for (int y=0; y<2000-h; y+=h+10) { if (y == 0) { <a href="ntqbutton.html">TQButton</a>* q=new <a href="ntqpushbutton.html">TQPushButton</a>("Quit", this); - connect(q, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>())); + connect(q, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>())); } else { <a href="ntqstring.html">TQString</a> str; if ( b > 0 ) { @@ -247,14 +247,14 @@ public: <a href="ntqpopupmenu.html">TQPopupMenu</a>* file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( file ); <a name="x634"></a> menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&File", file ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Quit", tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Quit", tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); vp_options = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( vp_options ); <a name="x644"></a> vp_options-><a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE ); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&ScrollView", vp_options ); -<a name="x642"></a> connect( vp_options, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), - this, SLOT(doVPMenuItem(int)) ); +<a name="x642"></a> connect( vp_options, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), + this, TQ_SLOT(doVPMenuItem(int)) ); vauto_id = vp_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Vertical Auto" ); vaoff_id = vp_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Vertical AlwaysOff" ); @@ -271,8 +271,8 @@ public: <a name="x655"></a> BigShrinker *bs = new BigShrinker(0);//(vp-><a href="ntqscrollview.html#viewport">viewport</a>()); <a name="x645"></a> vp-><a href="ntqscrollview.html#addChild">addChild</a>(bs); <a name="x659"></a> bs-><a href="ntqwidget.html#setAcceptDrops">setAcceptDrops</a>(TRUE); - TQObject::<a href="ntqobject.html#connect">connect</a>(bs, SIGNAL(clicked(int,int)), -<a name="x646"></a> vp, SLOT(<a href="ntqscrollview.html#center">center</a>(int,int))); + TQObject::<a href="ntqobject.html#connect">connect</a>(bs, TQ_SIGNAL(clicked(int,int)), +<a name="x646"></a> vp, TQ_SLOT(<a href="ntqscrollview.html#center">center</a>(int,int))); } else { vp = new BigMatrix(this); if ( technique == 3 ) @@ -291,8 +291,8 @@ public: <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( f_options ); f_options-><a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE ); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "F&rame", f_options ); - connect( f_options, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), - this, SLOT(doFMenuItem(int)) ); + connect( f_options, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), + this, TQ_SLOT(doFMenuItem(int)) ); f_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "No Frame", style_id ); f_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Box", style_id|TQFrame::Box ); @@ -313,8 +313,8 @@ public: lw_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( str, lw_id | lw ); } f_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Line Width", lw_options ); - connect( lw_options, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), - this, SLOT(doFMenuItem(int)) ); + connect( lw_options, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), + this, TQ_SLOT(doFMenuItem(int)) ); mlw_options = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( mlw_options ); mlw_options-><a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE ); @@ -324,8 +324,8 @@ public: mlw_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( str, mlw_id | mlw ); } f_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Midline Width", mlw_options ); - connect( mlw_options, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), - this, SLOT(doFMenuItem(int)) ); + connect( mlw_options, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), + this, TQ_SLOT(doFMenuItem(int)) ); mw_options = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar ); <a href="ntqapplication.html#TQ_CHECK_PTR">TQ_CHECK_PTR</a>( mw_options ); mw_options-><a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE ); @@ -335,8 +335,8 @@ public: mw_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( str, mw_id | mw ); } f_options-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Margin Width", mw_options ); - connect( mw_options, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), - this, SLOT(doFMenuItem(int)) ); + connect( mw_options, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), + this, TQ_SLOT(doFMenuItem(int)) ); setVPMenuItems(); setFMenuItems(); @@ -473,7 +473,7 @@ int main( int argc, char **argv ) ve3.<a href="ntqwidget.html#setCaption">setCaption</a>("TQt Example - Scrollviews"); ve3.<a href="ntqwidget.html#show">show</a>(); - TQObject::<a href="ntqobject.html#connect">connect</a>(tqApp, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>())); + TQObject::<a href="ntqobject.html#connect">connect</a>(tqApp, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>())); return a.<a href="ntqapplication.html#exec">exec</a>(); } diff --git a/doc/html/showimg-example.html b/doc/html/showimg-example.html index 91a34091b..04e1957a0 100644 --- a/doc/html/showimg-example.html +++ b/doc/html/showimg-example.html @@ -185,32 +185,32 @@ private slots: <a name="x1327"></a> saveimage-><a href="ntqmenudata.html#insertItem">insertItem</a>( f ); savepixmap-><a href="ntqmenudata.html#insertItem">insertItem</a>( f ); } -<a name="x1341"></a> <a href="ntqobject.html#connect">connect</a>( saveimage, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, SLOT(saveImage(int)) ); - <a href="ntqobject.html#connect">connect</a>( savepixmap, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, SLOT(savePixmap(int)) ); +<a name="x1341"></a> <a href="ntqobject.html#connect">connect</a>( saveimage, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, TQ_SLOT(saveImage(int)) ); + <a href="ntqobject.html#connect">connect</a>( savepixmap, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, TQ_SLOT(savePixmap(int)) ); file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar ); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&File", file ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New window", this, SLOT(newWindow()), CTRL+Key_N ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Open...", this, SLOT(openFile()), CTRL+Key_O ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New window", this, TQ_SLOT(newWindow()), CTRL+Key_N ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Open...", this, TQ_SLOT(openFile()), CTRL+Key_O ); si = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save image", saveimage ); sp = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save pixmap", savepixmap ); <a name="x1328"></a> file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "E&xit", tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "E&xit", tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q ); edit = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar ); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Edit", edit ); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Copy", this, SLOT(copy()), CTRL+Key_C); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Paste", this, SLOT(paste()), CTRL+Key_V); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Copy", this, TQ_SLOT(copy()), CTRL+Key_C); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Paste", this, TQ_SLOT(paste()), CTRL+Key_V); edit-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Horizontal flip", this, SLOT(hFlip()), ALT+Key_H); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Vertical flip", this, SLOT(vFlip()), ALT+Key_V); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Rotate 180", this, SLOT(rot180()), ALT+Key_R); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Horizontal flip", this, TQ_SLOT(hFlip()), ALT+Key_H); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Vertical flip", this, TQ_SLOT(vFlip()), ALT+Key_V); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Rotate 180", this, TQ_SLOT(rot180()), ALT+Key_R); edit-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Text...", this, SLOT(editText())); + edit-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Text...", this, TQ_SLOT(editText())); edit-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - t1 = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &1 bit", this, SLOT(to1Bit()) ); - t8 = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &8 bit", this, SLOT(to8Bit()) ); - t32 = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &32 bit", this, SLOT(to32Bit()) ); + t1 = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &1 bit", this, TQ_SLOT(to1Bit()) ); + t8 = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &8 bit", this, TQ_SLOT(to8Bit()) ); + t32 = edit-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &32 bit", this, TQ_SLOT(to32Bit()) ); options = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar ); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Options", options ); @@ -240,9 +240,9 @@ private slots: <a href="ntqpopupmenu.html">TQPopupMenu</a>* help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar ); menubar-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Help", help ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Help!", this, SLOT(giveHelp()), CTRL+Key_H ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Help!", this, TQ_SLOT(giveHelp()), CTRL+Key_H ); - <a href="ntqobject.html#connect">connect</a>( options, SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, SLOT(doOption(int)) ); + <a href="ntqobject.html#connect">connect</a>( options, TQ_SIGNAL(<a href="ntqpopupmenu.html#activated">activated</a>(int)), this, TQ_SLOT(doOption(int)) ); status = new <a href="ntqlabel.html">TQLabel</a>(this); status-><a href="ntqframe.html#setFrameStyle">setFrameStyle</a>( TQFrame::WinPanel | TQFrame::Sunken ); @@ -865,7 +865,7 @@ int main( int argc, char **argv ) } } - TQObject::<a href="ntqobject.html#connect">connect</a>(tqApp, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>())); + TQObject::<a href="ntqobject.html#connect">connect</a>(tqApp, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>())); return a.<a href="ntqapplication.html#exec">exec</a>(); } diff --git a/doc/html/signalsandslots.html b/doc/html/signalsandslots.html index 4b4059ebc..e8efd185d 100644 --- a/doc/html/signalsandslots.html +++ b/doc/html/signalsandslots.html @@ -147,7 +147,7 @@ signal by using <tt>emit signal(arguments)</tt>. <p> Here is one way to connect two of these objects together: <p> <pre> Foo a, b; - connect(&a, SIGNAL(valueChanged(int)), &b, SLOT(setValue(int))); + connect(&a, TQ_SIGNAL(valueChanged(int)), &b, TQ_SLOT(setValue(int))); b.setValue( 11 ); // a == undefined b == 11 a.setValue( 79 ); // a == 79 b == 79 b.value(); // returns 79 diff --git a/doc/html/simple-application-example.html b/doc/html/simple-application-example.html index f7cac665a..7b452186f 100644 --- a/doc/html/simple-application-example.html +++ b/doc/html/simple-application-example.html @@ -139,17 +139,17 @@ private: openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new <a href="ntqtoolbutton.html">TQToolButton</a>( openIcon, "Open File", <a href="ntqstring.html#TQString-null">TQString::null</a>, - this, SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new <a href="ntqtoolbutton.html">TQToolButton</a>( saveIcon, "Save File", TQString::null, - this, SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new <a href="ntqtoolbutton.html">TQToolButton</a>( printIcon, "Print File", TQString::null, - this, SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); (void)TQWhatsThis::whatsThisButton( fileTools ); @@ -182,41 +182,41 @@ private: <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&File", file ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, SLOT(newDoc()), CTRL+Key_N ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, TQ_SLOT(newDoc()), CTRL+Key_N ); int id; id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( openIcon, "&Open...", - this, SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); <a name="x1554"></a> file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileOpenText ); id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( saveIcon, "&Save", - this, SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText ); - id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &As...", this, SLOT(saveAs()) ); + id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &As...", this, TQ_SLOT(saveAs()) ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText ); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( printIcon, "&Print...", - this, SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, filePrintText ); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, SLOT(<a href="ntqwidget.html#close">close</a>()), CTRL+Key_W ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, TQ_SLOT(<a href="ntqwidget.html#close">close</a>()), CTRL+Key_W ); -<a name="x1544"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q ); +<a name="x1544"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, TQ_SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertSeparator(); <a href="ntqpopupmenu.html">TQPopupMenu</a> * help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&Help", help ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, SLOT(about()), Key_F1 ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, SLOT(aboutTQt()) ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, TQ_SLOT(about()), Key_F1 ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, TQ_SLOT(aboutTQt()) ); help-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this, SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1 ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this, TQ_SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1 ); e = new <a href="ntqtextedit.html">TQTextEdit</a>( this, "editor" ); e-><a href="ntqwidget.html#setFocus">setFocus</a>(); @@ -408,7 +408,7 @@ int main( int argc, char ** argv ) { ApplicationWindow *mw = new ApplicationWindow(); mw-><a href="ntqwidget.html#setCaption">setCaption</a>( "TQt Example - Application" ); <a name="x1598"></a> mw-><a href="ntqwidget.html#show">show</a>(); -<a name="x1599"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<a name="x1599"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); return a.<a href="ntqapplication.html#exec">exec</a>(); } </pre> diff --git a/doc/html/simple-application.html b/doc/html/simple-application.html index a6884cb74..0d51ba899 100644 --- a/doc/html/simple-application.html +++ b/doc/html/simple-application.html @@ -118,7 +118,7 @@ int main( int argc, char ** argv ) { ApplicationWindow *mw = new ApplicationWindow(); mw-><a href="ntqwidget.html#setCaption">setCaption</a>( "TQt Example - Application" ); <a name="x1598"></a> mw-><a href="ntqwidget.html#show">show</a>(); -<a name="x1599"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<a name="x1599"></a> a.<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); return a.<a href="ntqapplication.html#exec">exec</a>(); } </pre> @@ -141,7 +141,7 @@ behave the way X clients are expected to. <p> We create an <em>ApplicationWindow</em> as a top-level widget, set its window system caption to "Document 1", and <em>show()</em> it. <p> <a name="close"></a> -<pre> a.<a href="ntqobject.html#connect">connect</a>( &a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<pre> a.<a href="ntqobject.html#connect">connect</a>( &a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); </pre> <p> When the application's last window is closed, it should quit. Both the signal and the slot are predefined members of <a href="ntqapplication.html">TQApplication</a>. @@ -197,7 +197,7 @@ show "File Operations" as caption. <p> <pre> openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new <a href="ntqtoolbutton.html">TQToolButton</a>( openIcon, "Open File", <a href="ntqstring.html#TQString-null">TQString::null</a>, - this, SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); </pre> <p> Now we create the first tool button for the <em>fileTools</em> toolbar with the appropriate icon and the tool-tip text "Open File". @@ -207,12 +207,12 @@ We use this icon to illustrate our first tool button. <p> <pre> saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new <a href="ntqtoolbutton.html">TQToolButton</a>( saveIcon, "Save File", TQString::null, - this, SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new <a href="ntqtoolbutton.html">TQToolButton</a>( printIcon, "Print File", TQString::null, - this, SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); </pre> <p> In a similar way we create two more tool buttons in this toolbar, each with appropriate icons and tool-tip text. All three buttons are connected @@ -260,21 +260,21 @@ this is not necessary. <p> Next we create a <a href="ntqpopupmenu.html">TQPopupMenu</a> for the <em>File</em> menu and add it to the menu bar. With the ampersand in front of the letter F, we allow the user to use the shortcut <em>Alt+F</em> to pop up this menu. -<p> <pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, SLOT(newDoc()), CTRL+Key_N ); +<p> <pre> file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&New", this, TQ_SLOT(newDoc()), CTRL+Key_N ); </pre> <p> Its first entry is connected to the (yet to be implemented) slot <tt>newDoc()</tt>. When the user chooses this <em>New</em> entry (e.g. by typing the letter N as marked by the ampersand) or uses the <em>Ctrl+N</em> accelerator, a new editor-window will pop up. <p> <pre> int id; id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( openIcon, "&Open...", - this, SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileOpenText ); id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( saveIcon, "&Save", - this, SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText ); - id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &As...", this, SLOT(saveAs()) ); + id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &As...", this, TQ_SLOT(saveAs()) ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText ); </pre> <p> We populate the <em>File</em> menu with three more commands (<em>Open</em>, <em>Save</em> and @@ -286,13 +286,13 @@ example for a shorter and easier approach.) </pre> <p> Then we insert a separator, ... <p> <pre> id = file-><a href="ntqmenudata.html#insertItem">insertItem</a>( printIcon, "&Print...", - this, SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file-><a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, filePrintText ); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, SLOT(<a href="ntqwidget.html#close">close</a>()), CTRL+Key_W ); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Close", this, TQ_SLOT(<a href="ntqwidget.html#close">close</a>()), CTRL+Key_W ); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&Quit", tqApp, TQ_SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q ); </pre> <p> ... the <em>Print</em> command with "What's This?" help, another separator and two more commands (<em>Close</em> and <em>Quit</em>) without "What's This?" and pixmaps. @@ -311,10 +311,10 @@ will be aligned to the right if the windows system style requires it. <p> <pre> <a href="ntqpopupmenu.html">TQPopupMenu</a> * help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&Help", help ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, SLOT(about()), Key_F1 ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, SLOT(aboutTQt()) ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, TQ_SLOT(about()), Key_F1 ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, TQ_SLOT(aboutTQt()) ); help-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this, SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1 ); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &This", this, TQ_SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1 ); </pre> <p> We create a <em>Help</em> menu, add it to the menu bar, and insert a few commands. Depending on the style it will appear on the right hand diff --git a/doc/html/simple-font-demo-example.html b/doc/html/simple-font-demo-example.html index f2624e3fd..29f414131 100644 --- a/doc/html/simple-font-demo-example.html +++ b/doc/html/simple-font-demo-example.html @@ -110,20 +110,20 @@ private: defaultButton = new <a href="ntqpushbutton.html">TQPushButton</a>( "Default", this, "pushbutton1" ); <a name="x2860"></a> defaultButton-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "times" ) ); - <a href="ntqobject.html#connect">connect</a>( defaultButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), - this, SLOT( setDefault() ) ); + <a href="ntqobject.html#connect">connect</a>( defaultButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), + this, TQ_SLOT( setDefault() ) ); sansSerifButton = new <a href="ntqpushbutton.html">TQPushButton</a>( "Sans Serif", this, "pushbutton2" ); sansSerifButton-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Helvetica", 12 ) ); - <a href="ntqobject.html#connect">connect</a>( sansSerifButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), - this, SLOT( setSansSerif() ) ); + <a href="ntqobject.html#connect">connect</a>( sansSerifButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), + this, TQ_SLOT( setSansSerif() ) ); italicsButton = new <a href="ntqpushbutton.html">TQPushButton</a>( "Italics", this, "pushbutton3" ); italicsButton-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "lucida", 12, TQFont::Bold, TRUE ) ); - <a href="ntqobject.html#connect">connect</a>( italicsButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), - this, SLOT( setItalics() ) ); + <a href="ntqobject.html#connect">connect</a>( italicsButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), + this, TQ_SLOT( setItalics() ) ); <a href="ntqwidget.html#layout">layout</a>(); } diff --git a/doc/html/simple_dd-example.html b/doc/html/simple_dd-example.html index 50add5a04..289f8692c 100644 --- a/doc/html/simple_dd-example.html +++ b/doc/html/simple_dd-example.html @@ -275,8 +275,8 @@ int main( int argc, char *argv[] ) // Set up the connection so that we can drop items into the icon view TQObject::<a href="ntqobject.html#connect">connect</a>( -<a name="x2821"></a> iv, SIGNAL(<a href="ntqiconview.html#dropped">dropped</a>(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem>&)), - iv, SLOT(slotNewItem(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem>&))); +<a name="x2821"></a> iv, TQ_SIGNAL(<a href="ntqiconview.html#dropped">dropped</a>(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem>&)), + iv, TQ_SLOT(slotNewItem(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a><TQIconDragItem>&))); // Populate the TQIconView with icons DDIconViewItem *item; diff --git a/doc/html/sound-example.html b/doc/html/sound-example.html index 21cebf2ef..127996086 100644 --- a/doc/html/sound-example.html +++ b/doc/html/sound-example.html @@ -120,15 +120,15 @@ private: } <a href="ntqpopupmenu.html">TQPopupMenu</a> *file = new <a href="ntqpopupmenu.html">TQPopupMenu</a>; -<a name="x2810"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play &1", this, SLOT(doPlay1()), CTRL+Key_1); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play &2", this, SLOT(doPlay2()), CTRL+Key_2); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play from bucket &3", this, SLOT(doPlay3()), CTRL+Key_3); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play from bucket &4", this, SLOT(doPlay4()), CTRL+Key_4); +<a name="x2810"></a> file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play &1", this, TQ_SLOT(doPlay1()), CTRL+Key_1); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play &2", this, TQ_SLOT(doPlay2()), CTRL+Key_2); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play from bucket &3", this, TQ_SLOT(doPlay3()), CTRL+Key_3); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play from bucket &4", this, TQ_SLOT(doPlay4()), CTRL+Key_4); <a name="x2811"></a> file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play 3 and 4 together", this, SLOT(doPlay34())); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play all together", this, SLOT(doPlay1234())); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play 3 and 4 together", this, TQ_SLOT(doPlay34())); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("Play all together", this, TQ_SLOT(doPlay1234())); file-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - file-><a href="ntqmenudata.html#insertItem">insertItem</a>("E&xit", tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>())); + file-><a href="ntqmenudata.html#insertItem">insertItem</a>("E&xit", tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>())); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem("&File", file); } diff --git a/doc/html/sql-overview-custom1-main-cpp.html b/doc/html/sql-overview-custom1-main-cpp.html index 7f4d9a0cf..29142df69 100644 --- a/doc/html/sql-overview-custom1-main-cpp.html +++ b/doc/html/sql-overview-custom1-main-cpp.html @@ -48,8 +48,8 @@ body { background: #ffffff; color: black; } <a name="f16"></a>CustomEdit::CustomEdit( <a href="ntqwidget.html">TQWidget</a> *parent, const char *name ) : <a href="ntqlineedit.html">TQLineEdit</a>( parent, name ) { - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a> &)), - this, SLOT(changed(const <a href="ntqstring.html">TQString</a> &)) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a> &)), + this, TQ_SLOT(changed(const <a href="ntqstring.html">TQString</a> &)) ); } @@ -82,7 +82,7 @@ TQString <a name="f19"></a>CustomEdit::upperLine() const <a href="ntqlineedit.html">TQLineEdit</a> *salaryEdit = new <a href="ntqlineedit.html">TQLineEdit</a>( this ); salaryEdit-><a href="ntqlineedit.html#setAlignment">setAlignment</a>( TQt::AlignRight ); <a href="ntqpushbutton.html">TQPushButton</a> *saveButton = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Save", this ); - <a href="ntqobject.html#connect">connect</a>( saveButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(save()) ); + <a href="ntqobject.html#connect">connect</a>( saveButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(save()) ); <a href="qgridlayout.html">TQGridLayout</a> *grid = new <a href="qgridlayout.html">TQGridLayout</a>( this ); grid-><a href="qgridlayout.html#addWidget">addWidget</a>( forenameLabel, 0, 0 ); diff --git a/doc/html/sql.html b/doc/html/sql.html index b61bcba58..f9b1b8d6f 100644 --- a/doc/html/sql.html +++ b/doc/html/sql.html @@ -1104,8 +1104,8 @@ addition to <a href="ntqsqlform.html">TQSqlForm</a> it offers the slot refresh( can easily be linked together with a <a href="ntqdatatable.html">TQDataTable</a> to display a detailed view of a record: <p> <pre> - connect( myDataTable, SIGNAL( currentChanged( <a href="ntqsqlrecord.html">TQSqlRecord</a>* ) ), - myDataView, SLOT( refresh( <a href="ntqsqlrecord.html">TQSqlRecord</a>* ) ) ); + connect( myDataTable, TQ_SIGNAL( currentChanged( <a href="ntqsqlrecord.html">TQSqlRecord</a>* ) ), + myDataView, TQ_SLOT( refresh( <a href="ntqsqlrecord.html">TQSqlRecord</a>* ) ) ); </pre> <p> <a name="Editing_a_Record"></a> @@ -1146,7 +1146,7 @@ calling <a href="ntqlineedit.html#setAlignment">TQLineEdit::setAlignment</a>() a <p> <pre> <a href="ntqlineedit.html">TQLineEdit</a> *forenameEdit = new <a href="ntqlineedit.html">TQLineEdit</a>( this ); </pre> <p> <pre> <a href="ntqpushbutton.html">TQPushButton</a> *saveButton = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Save", this ); - <a href="ntqobject.html#connect">connect</a>( saveButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, SLOT(save()) ); + <a href="ntqobject.html#connect">connect</a>( saveButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), this, TQ_SLOT(save()) ); </pre> <p> The FormDialog constructor is similar to the one in the previous example. We have changed the forename and surname widgets to @@ -1240,8 +1240,8 @@ to our FormDialog's private data. <pre> CustomEdit::CustomEdit( <a href="ntqwidget.html">TQWidget</a> *parent, const char *name ) : <a href="ntqlineedit.html">TQLineEdit</a>( parent, name ) { - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a> &)), - this, SLOT(changed(const <a href="ntqstring.html">TQString</a> &)) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a> &)), + this, TQ_SLOT(changed(const <a href="ntqstring.html">TQString</a> &)) ); } </pre> <p> In the CustomEdit constructor we use the TQLineEdit constructor and add diff --git a/doc/html/statistics-example.html b/doc/html/statistics-example.html index d34279d06..4bd999d59 100644 --- a/doc/html/statistics-example.html +++ b/doc/html/statistics-example.html @@ -135,8 +135,8 @@ const char* dirs[] = { <a href="ntqtable.html#adjustColumn">adjustColumn</a>( 0 ); // if the user edited something we might need to recalculate the sum - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqtable.html#valueChanged">valueChanged</a>( int, int ) ), - this, SLOT( recalcSum( int, int ) ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqtable.html#valueChanged">valueChanged</a>( int, int ) ), + this, TQ_SLOT( recalcSum( int, int ) ) ); } void <a name="f579"></a>Table::initTable() @@ -236,7 +236,7 @@ void <a name="f580"></a>Table::recalcSum( int, int col ) { // create an editor - a combobox in our case ( (ComboItem*)this )->cb = new <a href="ntqcombobox.html">TQComboBox</a>( <a href="qtableitem.html#table">table</a>()->viewport() ); - TQObject::<a href="ntqobject.html#connect">connect</a>( cb, SIGNAL( activated( int ) ), table(), SLOT( doValueChanged() ) ); + TQObject::<a href="ntqobject.html#connect">connect</a>( cb, TQ_SIGNAL( activated( int ) ), table(), TQ_SLOT( doValueChanged() ) ); cb->insertItem( "Yes" ); cb->insertItem( "No" ); // and initialize it diff --git a/doc/html/t10-lcdrange-cpp.html b/doc/html/t10-lcdrange-cpp.html index a0ec300e3..640d3ca6f 100644 --- a/doc/html/t10-lcdrange-cpp.html +++ b/doc/html/t10-lcdrange-cpp.html @@ -50,10 +50,10 @@ body { background: #ffffff; color: black; } slider = new <a href="ntqslider.html">TQSlider</a>( Horizontal, this, "slider" ); slider-><a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 ); slider-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); <a href="ntqwidget.html#setFocusProxy">setFocusProxy</a>( slider ); } diff --git a/doc/html/t10-main-cpp.html b/doc/html/t10-main-cpp.html index bd7de6d67..fb256a644 100644 --- a/doc/html/t10-main-cpp.html +++ b/doc/html/t10-main-cpp.html @@ -61,7 +61,7 @@ public: <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); LCDRange *angle = new LCDRange( this, "angle" ); angle->setRange( 5, 70 ); @@ -71,15 +71,15 @@ public: CannonField *cannonField = new CannonField( this, "cannonField" ); - <a href="ntqobject.html#connect">connect</a>( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - <a href="ntqobject.html#connect">connect</a>( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); <a href="qgridlayout.html">TQGridLayout</a> *grid = new <a href="qgridlayout.html">TQGridLayout</a>( this, 2, 2, 10 ); grid-><a href="qgridlayout.html#addWidget">addWidget</a>( quit, 0, 0 ); diff --git a/doc/html/t11-cannon-cpp.html b/doc/html/t11-cannon-cpp.html index 88b4a7b13..de38007a6 100644 --- a/doc/html/t11-cannon-cpp.html +++ b/doc/html/t11-cannon-cpp.html @@ -53,8 +53,8 @@ body { background: #ffffff; color: black; } f = 0; timerCount = 0; autoShootTimer = new <a href="ntqtimer.html">TQTimer</a>( this, "movement handler" ); - <a href="ntqobject.html#connect">connect</a>( autoShootTimer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), - this, SLOT(moveShot()) ); + <a href="ntqobject.html#connect">connect</a>( autoShootTimer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), + this, TQ_SLOT(moveShot()) ); shoot_ang = 0; shoot_f = 0; <a href="ntqwidget.html#setPalette">setPalette</a>( TQPalette( TQColor( 250, 250, 200) ) ); diff --git a/doc/html/t11-lcdrange-cpp.html b/doc/html/t11-lcdrange-cpp.html index 53c7bba00..5fef5dfcc 100644 --- a/doc/html/t11-lcdrange-cpp.html +++ b/doc/html/t11-lcdrange-cpp.html @@ -50,10 +50,10 @@ body { background: #ffffff; color: black; } slider = new <a href="ntqslider.html">TQSlider</a>( Horizontal, this, "slider" ); slider-><a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 ); slider-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); <a href="ntqwidget.html#setFocusProxy">setFocusProxy</a>( slider ); } diff --git a/doc/html/t11-main-cpp.html b/doc/html/t11-main-cpp.html index 58d2d5508..b0722f9ad 100644 --- a/doc/html/t11-main-cpp.html +++ b/doc/html/t11-main-cpp.html @@ -61,7 +61,7 @@ public: <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); LCDRange *angle = new LCDRange( this, "angle" ); angle->setRange( 5, 70 ); @@ -71,20 +71,20 @@ public: CannonField *cannonField = new CannonField( this, "cannonField" ); - <a href="ntqobject.html#connect">connect</a>( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - <a href="ntqobject.html#connect">connect</a>( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); <a href="ntqpushbutton.html">TQPushButton</a> *shoot = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Shoot", this, "shoot" ); shoot-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( shoot, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), cannonField, SLOT(shoot()) ); + <a href="ntqobject.html#connect">connect</a>( shoot, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), cannonField, TQ_SLOT(shoot()) ); <a href="qgridlayout.html">TQGridLayout</a> *grid = new <a href="qgridlayout.html">TQGridLayout</a>( this, 2, 2, 10 ); grid-><a href="qgridlayout.html#addWidget">addWidget</a>( quit, 0, 0 ); diff --git a/doc/html/t12-cannon-cpp.html b/doc/html/t12-cannon-cpp.html index cd9ad6675..b43f1c5c0 100644 --- a/doc/html/t12-cannon-cpp.html +++ b/doc/html/t12-cannon-cpp.html @@ -55,8 +55,8 @@ body { background: #ffffff; color: black; } f = 0; timerCount = 0; autoShootTimer = new <a href="ntqtimer.html">TQTimer</a>( this, "movement handler" ); - <a href="ntqobject.html#connect">connect</a>( autoShootTimer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), - this, SLOT(moveShot()) ); + <a href="ntqobject.html#connect">connect</a>( autoShootTimer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), + this, TQ_SLOT(moveShot()) ); shoot_ang = 0; shoot_f = 0; target = TQPoint( 0, 0 ); diff --git a/doc/html/t12-lcdrange-cpp.html b/doc/html/t12-lcdrange-cpp.html index 52cb516c8..defbbb8a9 100644 --- a/doc/html/t12-lcdrange-cpp.html +++ b/doc/html/t12-lcdrange-cpp.html @@ -71,10 +71,10 @@ void <a name="f68"></a>LCDRange::init() label = new <a href="ntqlabel.html">TQLabel</a>( " ", this, "label" ); label-><a href="ntqlabel.html#setAlignment">setAlignment</a>( AlignCenter ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); <a href="ntqwidget.html#setFocusProxy">setFocusProxy</a>( slider ); } diff --git a/doc/html/t12-main-cpp.html b/doc/html/t12-main-cpp.html index cdfc499dc..a779a4a02 100644 --- a/doc/html/t12-main-cpp.html +++ b/doc/html/t12-main-cpp.html @@ -61,7 +61,7 @@ public: <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); LCDRange *angle = new LCDRange( "ANGLE", this, "angle" ); angle->setRange( 5, 70 ); @@ -71,20 +71,20 @@ public: CannonField *cannonField = new CannonField( this, "cannonField" ); - <a href="ntqobject.html#connect">connect</a>( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - <a href="ntqobject.html#connect">connect</a>( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); <a href="ntqpushbutton.html">TQPushButton</a> *shoot = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Shoot", this, "shoot" ); shoot-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( shoot, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), cannonField, SLOT(shoot()) ); + <a href="ntqobject.html#connect">connect</a>( shoot, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), cannonField, TQ_SLOT(shoot()) ); <a href="qgridlayout.html">TQGridLayout</a> *grid = new <a href="qgridlayout.html">TQGridLayout</a>( this, 2, 2, 10 ); grid-><a href="qgridlayout.html#addWidget">addWidget</a>( quit, 0, 0 ); diff --git a/doc/html/t13-cannon-cpp.html b/doc/html/t13-cannon-cpp.html index ba28b19f3..591ab8b01 100644 --- a/doc/html/t13-cannon-cpp.html +++ b/doc/html/t13-cannon-cpp.html @@ -55,8 +55,8 @@ body { background: #ffffff; color: black; } f = 0; timerCount = 0; autoShootTimer = new <a href="ntqtimer.html">TQTimer</a>( this, "movement handler" ); - <a href="ntqobject.html#connect">connect</a>( autoShootTimer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), - this, SLOT(moveShot()) ); + <a href="ntqobject.html#connect">connect</a>( autoShootTimer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), + this, TQ_SLOT(moveShot()) ); shoot_ang = 0; shoot_f = 0; target = TQPoint( 0, 0 ); diff --git a/doc/html/t13-gamebrd-cpp.html b/doc/html/t13-gamebrd-cpp.html index abf0072a3..fa88bd8ce 100644 --- a/doc/html/t13-gamebrd-cpp.html +++ b/doc/html/t13-gamebrd-cpp.html @@ -56,7 +56,7 @@ body { background: #ffffff; color: black; } <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); LCDRange *angle = new LCDRange( "ANGLE", this, "angle" ); angle->setRange( 5, 70 ); @@ -66,33 +66,33 @@ body { background: #ffffff; color: black; } cannonField = new CannonField( this, "cannonField" ); - <a href="ntqobject.html#connect">connect</a>( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - <a href="ntqobject.html#connect">connect</a>( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(hit()), - this, SLOT(hit()) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(missed()), - this, SLOT(missed()) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(hit()), + this, TQ_SLOT(hit()) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(missed()), + this, TQ_SLOT(missed()) ); <a href="ntqpushbutton.html">TQPushButton</a> *shoot = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Shoot", this, "shoot" ); shoot-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( shoot, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(fire()) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(canShoot(bool)), - shoot, SLOT(<a href="ntqwidget.html#setEnabled">setEnabled</a>(bool)) ); + <a href="ntqobject.html#connect">connect</a>( shoot, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(fire()) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(canShoot(bool)), + shoot, TQ_SLOT(<a href="ntqwidget.html#setEnabled">setEnabled</a>(bool)) ); TQPushButton *restart = new <a href="ntqpushbutton.html">TQPushButton</a>( "&New Game", this, "newgame" ); restart->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( restart, SIGNAL(clicked()), this, SLOT(newGame()) ); + <a href="ntqobject.html#connect">connect</a>( restart, TQ_SIGNAL(clicked()), this, TQ_SLOT(newGame()) ); hits = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 2, this, "hits" ); shotsLeft = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 2, this, "shotsleft" ); diff --git a/doc/html/t13-lcdrange-cpp.html b/doc/html/t13-lcdrange-cpp.html index 8a1e929c8..b0def8e3a 100644 --- a/doc/html/t13-lcdrange-cpp.html +++ b/doc/html/t13-lcdrange-cpp.html @@ -71,10 +71,10 @@ void <a name="f88"></a>LCDRange::init() label = new <a href="ntqlabel.html">TQLabel</a>( " ", this, "label" ); label-><a href="ntqlabel.html#setAlignment">setAlignment</a>( AlignCenter ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); <a href="ntqwidget.html#setFocusProxy">setFocusProxy</a>( slider ); diff --git a/doc/html/t14-cannon-cpp.html b/doc/html/t14-cannon-cpp.html index 6c3bd3b73..f7d4bc29a 100644 --- a/doc/html/t14-cannon-cpp.html +++ b/doc/html/t14-cannon-cpp.html @@ -55,8 +55,8 @@ body { background: #ffffff; color: black; } f = 0; timerCount = 0; autoShootTimer = new <a href="ntqtimer.html">TQTimer</a>( this, "movement handler" ); - <a href="ntqobject.html#connect">connect</a>( autoShootTimer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), - this, SLOT(moveShot()) ); + <a href="ntqobject.html#connect">connect</a>( autoShootTimer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), + this, TQ_SLOT(moveShot()) ); shoot_ang = 0; shoot_f = 0; target = TQPoint( 0, 0 ); diff --git a/doc/html/t14-gamebrd-cpp.html b/doc/html/t14-gamebrd-cpp.html index 8b3256dc6..40a7c5f63 100644 --- a/doc/html/t14-gamebrd-cpp.html +++ b/doc/html/t14-gamebrd-cpp.html @@ -58,7 +58,7 @@ body { background: #ffffff; color: black; } <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); LCDRange *angle = new LCDRange( "ANGLE", this, "angle" ); angle->setRange( 5, 70 ); @@ -71,34 +71,34 @@ body { background: #ffffff; color: black; } cannonField = new CannonField( box, "cannonField" ); - <a href="ntqobject.html#connect">connect</a>( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - <a href="ntqobject.html#connect">connect</a>( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(hit()), - this, SLOT(hit()) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(missed()), - this, SLOT(missed()) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(hit()), + this, TQ_SLOT(hit()) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(missed()), + this, TQ_SLOT(missed()) ); <a href="ntqpushbutton.html">TQPushButton</a> *shoot = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Shoot", this, "shoot" ); shoot-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( shoot, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(fire()) ); + <a href="ntqobject.html#connect">connect</a>( shoot, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(fire()) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(canShoot(bool)), - shoot, SLOT(<a href="ntqwidget.html#setEnabled">setEnabled</a>(bool)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(canShoot(bool)), + shoot, TQ_SLOT(<a href="ntqwidget.html#setEnabled">setEnabled</a>(bool)) ); TQPushButton *restart = new <a href="ntqpushbutton.html">TQPushButton</a>( "&New Game", this, "newgame" ); restart->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( restart, SIGNAL(clicked()), this, SLOT(newGame()) ); + <a href="ntqobject.html#connect">connect</a>( restart, TQ_SIGNAL(clicked()), this, TQ_SLOT(newGame()) ); hits = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 2, this, "hits" ); shotsLeft = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 2, this, "shotsleft" ); @@ -108,11 +108,11 @@ body { background: #ffffff; color: black; } <a href="ntqaccel.html">TQAccel</a> *accel = new <a href="ntqaccel.html">TQAccel</a>( this ); accel-><a href="ntqaccel.html#connectItem">connectItem</a>( accel-><a href="ntqaccel.html#insertItem">insertItem</a>( Key_Enter ), - this, SLOT(fire()) ); + this, TQ_SLOT(fire()) ); accel-><a href="ntqaccel.html#connectItem">connectItem</a>( accel-><a href="ntqaccel.html#insertItem">insertItem</a>( Key_Return ), - this, SLOT(fire()) ); + this, TQ_SLOT(fire()) ); accel-><a href="ntqaccel.html#connectItem">connectItem</a>( accel-><a href="ntqaccel.html#insertItem">insertItem</a>( CTRL+Key_Q ), - tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a href="qgridlayout.html">TQGridLayout</a> *grid = new <a href="qgridlayout.html">TQGridLayout</a>( this, 2, 2, 10 ); grid-><a href="qgridlayout.html#addWidget">addWidget</a>( quit, 0, 0 ); diff --git a/doc/html/t14-lcdrange-cpp.html b/doc/html/t14-lcdrange-cpp.html index a110f76e1..86b868506 100644 --- a/doc/html/t14-lcdrange-cpp.html +++ b/doc/html/t14-lcdrange-cpp.html @@ -71,10 +71,10 @@ void <a name="f115"></a>LCDRange::init() label = new <a href="ntqlabel.html">TQLabel</a>( " ", this, "label" ); label-><a href="ntqlabel.html#setAlignment">setAlignment</a>( AlignCenter ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); <a href="ntqwidget.html#setFocusProxy">setFocusProxy</a>( slider ); diff --git a/doc/html/t7-lcdrange-cpp.html b/doc/html/t7-lcdrange-cpp.html index 4850170b3..e38ea6a5c 100644 --- a/doc/html/t7-lcdrange-cpp.html +++ b/doc/html/t7-lcdrange-cpp.html @@ -50,10 +50,10 @@ body { background: #ffffff; color: black; } slider = new <a href="ntqslider.html">TQSlider</a>( Horizontal, this, "slider" ); slider-><a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 ); slider-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); } int <a name="f27"></a>LCDRange::value() const diff --git a/doc/html/t7-main-cpp.html b/doc/html/t7-main-cpp.html index 0e1c46951..8e49a9b60 100644 --- a/doc/html/t7-main-cpp.html +++ b/doc/html/t7-main-cpp.html @@ -61,7 +61,7 @@ public: <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a href="ntqgrid.html">TQGrid</a> *grid = new <a href="ntqgrid.html">TQGrid</a>( 4, this ); @@ -70,8 +70,8 @@ public: for( int c = 0 ; c < 4 ; c++ ) { LCDRange* lr = new LCDRange( grid ); if ( previous ) - <a href="ntqobject.html#connect">connect</a>( lr, SIGNAL(valueChanged(int)), - previous, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( lr, TQ_SIGNAL(valueChanged(int)), + previous, TQ_SLOT(setValue(int)) ); previous = lr; } } diff --git a/doc/html/t8-lcdrange-cpp.html b/doc/html/t8-lcdrange-cpp.html index cde9d1870..665d81caf 100644 --- a/doc/html/t8-lcdrange-cpp.html +++ b/doc/html/t8-lcdrange-cpp.html @@ -50,10 +50,10 @@ body { background: #ffffff; color: black; } slider = new <a href="ntqslider.html">TQSlider</a>( Horizontal, this, "slider" ); slider-><a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 ); slider-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); <a href="ntqwidget.html#setFocusProxy">setFocusProxy</a>( slider ); } diff --git a/doc/html/t8-main-cpp.html b/doc/html/t8-main-cpp.html index 2d89e6bdf..079cf9ba2 100644 --- a/doc/html/t8-main-cpp.html +++ b/doc/html/t8-main-cpp.html @@ -61,7 +61,7 @@ public: <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); LCDRange *angle = new LCDRange( this, "angle" ); angle->setRange( 5, 70 ); @@ -69,10 +69,10 @@ public: CannonField *cannonField = new CannonField( this, "cannonField" ); - <a href="ntqobject.html#connect">connect</a>( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); <a href="qgridlayout.html">TQGridLayout</a> *grid = new <a href="qgridlayout.html">TQGridLayout</a>( this, 2, 2, 10 ); //2x2, 10 pixel border diff --git a/doc/html/t9-lcdrange-cpp.html b/doc/html/t9-lcdrange-cpp.html index daa34eb72..c33e28e70 100644 --- a/doc/html/t9-lcdrange-cpp.html +++ b/doc/html/t9-lcdrange-cpp.html @@ -50,10 +50,10 @@ body { background: #ffffff; color: black; } slider = new <a href="ntqslider.html">TQSlider</a>( Horizontal, this, "slider" ); slider-><a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 ); slider-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); <a href="ntqwidget.html#setFocusProxy">setFocusProxy</a>( slider ); } diff --git a/doc/html/t9-main-cpp.html b/doc/html/t9-main-cpp.html index 12004c195..865cd6252 100644 --- a/doc/html/t9-main-cpp.html +++ b/doc/html/t9-main-cpp.html @@ -61,17 +61,17 @@ public: <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "&Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); LCDRange *angle = new LCDRange( this, "angle" ); angle->setRange( 5, 70 ); CannonField *cannonField = new CannonField( this, "cannonField" ); - <a href="ntqobject.html#connect">connect</a>( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); <a href="qgridlayout.html">TQGridLayout</a> *grid = new <a href="qgridlayout.html">TQGridLayout</a>( this, 2, 2, 10 ); grid-><a href="qgridlayout.html#addWidget">addWidget</a>( quit, 0, 0 ); diff --git a/doc/html/tabdialog-example.html b/doc/html/tabdialog-example.html index 151dc0cc4..85a2ced58 100644 --- a/doc/html/tabdialog-example.html +++ b/doc/html/tabdialog-example.html @@ -106,7 +106,7 @@ protected: setupTab2(); setupTab3(); - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqtabdialog.html#applyButtonPressed">applyButtonPressed</a>() ), tqApp, SLOT( <a href="ntqapplication.html#quit">quit</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqtabdialog.html#applyButtonPressed">applyButtonPressed</a>() ), tqApp, TQ_SLOT( <a href="ntqapplication.html#quit">quit</a>() ) ); } void <a name="f201"></a>TabDialog::setupTab1() diff --git a/doc/html/table-statistics-statistics-cpp.html b/doc/html/table-statistics-statistics-cpp.html index 6702b636b..e4a99c1e8 100644 --- a/doc/html/table-statistics-statistics-cpp.html +++ b/doc/html/table-statistics-statistics-cpp.html @@ -74,8 +74,8 @@ const char* dirs[] = { <a href="ntqtable.html#adjustColumn">adjustColumn</a>( 0 ); // if the user edited something we might need to recalculate the sum - <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqtable.html#valueChanged">valueChanged</a>( int, int ) ), - this, SLOT( recalcSum( int, int ) ) ); + <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqtable.html#valueChanged">valueChanged</a>( int, int ) ), + this, TQ_SLOT( recalcSum( int, int ) ) ); } void <a name="f146"></a>Table::initTable() @@ -175,7 +175,7 @@ void <a name="f147"></a>Table::recalcSum( int, int col ) { // create an editor - a combobox in our case ( (ComboItem*)this )->cb = new <a href="ntqcombobox.html">TQComboBox</a>( <a href="qtableitem.html#table">table</a>()->viewport() ); - TQObject::<a href="ntqobject.html#connect">connect</a>( cb, SIGNAL( activated( int ) ), table(), SLOT( doValueChanged() ) ); + TQObject::<a href="ntqobject.html#connect">connect</a>( cb, TQ_SIGNAL( activated( int ) ), table(), TQ_SLOT( doValueChanged() ) ); cb->insertItem( "Yes" ); cb->insertItem( "No" ); // and initialize it diff --git a/doc/html/themes-example.html b/doc/html/themes-example.html index 08b483a8e..9d0f20900 100644 --- a/doc/html/themes-example.html +++ b/doc/html/themes-example.html @@ -2224,7 +2224,7 @@ private: <a href="qactiongroup.html">TQActionGroup</a> *ag = new <a href="qactiongroup.html">TQActionGroup</a>( this, 0 ); <a name="x320"></a> ag-><a href="qactiongroup.html#setExclusive">setExclusive</a>( TRUE ); <a href="ntqsignalmapper.html">TQSignalMapper</a> *styleMapper = new <a href="ntqsignalmapper.html">TQSignalMapper</a>( this ); -<a name="x335"></a> <a href="ntqobject.html#connect">connect</a>( styleMapper, SIGNAL( <a href="ntqsignalmapper.html#mapped">mapped</a>( const <a href="ntqstring.html">TQString</a>& ) ), this, SLOT( makeStyle( const <a href="ntqstring.html">TQString</a>& ) ) ); +<a name="x335"></a> <a href="ntqobject.html#connect">connect</a>( styleMapper, TQ_SIGNAL( <a href="ntqsignalmapper.html#mapped">mapped</a>( const <a href="ntqstring.html">TQString</a>& ) ), this, TQ_SLOT( makeStyle( const <a href="ntqstring.html">TQString</a>& ) ) ); <a name="x342"></a> <a href="ntqstringlist.html">TQStringList</a> list = TQStyleFactory::<a href="ntqstylefactory.html#keys">keys</a>(); <a name="x341"></a> list.<a href="ntqstringlist.html#sort">sort</a>(); #ifndef TQT_NO_STYLE_WINDOWS @@ -2248,18 +2248,18 @@ private: styleAccel = "&"+styleAccel; } <a name="x319"></a> <a href="ntqaction.html">TQAction</a> *a = new <a href="ntqaction.html">TQAction</a>( styleStr, TQIconSet(), styleAccel, 0, ag, 0, ag-><a href="qactiongroup.html#isExclusive">isExclusive</a>() ); -<a name="x334"></a><a name="x316"></a> <a href="ntqobject.html#connect">connect</a>( a, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), styleMapper, SLOT(<a href="ntqsignalmapper.html#map">map</a>()) ); +<a name="x334"></a><a name="x316"></a> <a href="ntqobject.html#connect">connect</a>( a, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), styleMapper, TQ_SLOT(<a href="ntqsignalmapper.html#map">map</a>()) ); <a name="x336"></a><a name="x317"></a> styleMapper-><a href="ntqsignalmapper.html#setMapping">setMapping</a>( a, a-><a href="ntqaction.html#text">text</a>() ); } <a name="x318"></a> ag-><a href="qactiongroup.html#addTo">addTo</a>(style); style-><a href="ntqmenudata.html#insertSeparator">insertSeparator</a>(); - style-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Quit", tqApp, SLOT( <a href="ntqapplication.html#quit">quit</a>() ), CTRL | Key_Q ); + style-><a href="ntqmenudata.html#insertItem">insertItem</a>("&Quit", tqApp, TQ_SLOT( <a href="ntqapplication.html#quit">quit</a>() ), CTRL | Key_Q ); <a href="ntqpopupmenu.html">TQPopupMenu</a> * help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this ); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertSeparator(); <a href="ntqmainwindow.html#menuBar">menuBar</a>()->insertItem( "&Help", help ); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, SLOT(about()), Key_F1); - help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, SLOT(aboutTQt())); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "&About", this, TQ_SLOT(about()), Key_F1); + help-><a href="ntqmenudata.html#insertItem">insertItem</a>( "About &TQt", this, TQ_SLOT(aboutTQt())); #ifndef TQT_NO_STYLE_WINDOWS <a name="x325"></a> tqApp-><a href="ntqapplication.html#setStyle">setStyle</a>( new NorwegianWoodStyle ); diff --git a/doc/html/tictac-example.html b/doc/html/tictac-example.html index 7a168937e..766da9bf3 100644 --- a/doc/html/tictac-example.html +++ b/doc/html/tictac-example.html @@ -228,7 +228,7 @@ private: TicTacButton *ttb = new TicTacButton( this ); <a name="x45"></a> ttb-><a href="ntqwidget.html#setPalette">setPalette</a>( p ); ttb-><a href="ntqwidget.html#setEnabled">setEnabled</a>( FALSE ); - <a href="ntqobject.html#connect">connect</a>( ttb, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(buttonClicked()) ); + <a href="ntqobject.html#connect">connect</a>( ttb, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(buttonClicked()) ); grid-><a href="qgridlayout.html#addWidget">addWidget</a>( ttb, i%nBoard, i/nBoard ); buttons->insert( i, ttb ); btArray->at(i) = TicTacButton::Blank; // initial button type @@ -275,7 +275,7 @@ void <a name="f191"></a>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. @@ -456,7 +456,7 @@ void <a name="f195"></a>TicTacGameBoard::computerMove() // gameOver() slot board = new TicTacGameBoard( boardSize, this ); - <a href="ntqobject.html#connect">connect</a>( board, SIGNAL(finished()), SLOT(gameOver()) ); + <a href="ntqobject.html#connect">connect</a>( board, TQ_SIGNAL(finished()), TQ_SLOT(gameOver()) ); l-><a href="qboxlayout.html#addWidget">addWidget</a>( board ); // Create a horizontal frame line @@ -477,9 +477,9 @@ void <a name="f195"></a>TicTacGameBoard::computerMove() // to this right slots. newGame = new <a href="ntqpushbutton.html">TQPushButton</a>( "Play!", this ); - <a href="ntqobject.html#connect">connect</a>( newGame, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(newGameClicked()) ); + <a href="ntqobject.html#connect">connect</a>( newGame, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(newGameClicked()) ); quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "Quit", this ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a href="qhboxlayout.html">TQHBoxLayout</a> * b = new <a href="qhboxlayout.html">TQHBoxLayout</a>; <a name="x19"></a> l-><a href="qboxlayout.html#addLayout">addLayout</a>( b ); b-><a href="qboxlayout.html#addWidget">addWidget</a>( newGame ); @@ -490,7 +490,7 @@ void <a name="f195"></a>TicTacGameBoard::computerMove() // -------------------------------------------------------------------------- -// TicTacToe::newGameClicked() - SLOT +// TicTacToe::newGameClicked() - TQ_SLOT // // This slot is activated when the new game button is clicked. // @@ -504,7 +504,7 @@ void <a name="f197"></a>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/doc/html/timers.html b/doc/html/timers.html index 5494efbf9..65e772d77 100644 --- a/doc/html/timers.html +++ b/doc/html/timers.html @@ -57,8 +57,8 @@ inherits <a href="ntqobject.html">TQObject</a> so that it fits well into the own of most GUI programs. The normal way of using it is like this: <pre> <a href="ntqtimer.html">TQTimer</a> * counter = new <a href="ntqtimer.html">TQTimer</a>( this ); - connect( counter, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), - this, SLOT(updateCaption()) ); + connect( counter, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), + this, TQ_SLOT(updateCaption()) ); counter-><a href="ntqtimer.html#start">start</a>( 1000 ); </pre> @@ -70,7 +70,7 @@ it's started. to show the button being pressed down and then (0.1 seconds later) be released when the keyboard is used to "press" a button, for example: <p> <pre> - TQTimer::<a href="ntqtimer.html#singleShot">singleShot</a>( 100, this, SLOT(animateTimeout()) ); + TQTimer::<a href="ntqtimer.html#singleShot">singleShot</a>( 100, this, TQ_SLOT(animateTimeout()) ); </pre> <p> 0.1 seconds after this line of code is executed, the same button's @@ -111,7 +111,7 @@ single-threaded application without blocking the user interface. Mandelbrot::Mandelbrot( <a href="ntqobject.html">TQObject</a> *parent=0, const char *name ) : <a href="ntqobject.html">TQObject</a>( parent, name ) { - <a href="ntqobject.html#connect">connect</a>( &timer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), SLOT(calculate()) ); + <a href="ntqobject.html#connect">connect</a>( &timer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), TQ_SLOT(calculate()) ); ... } diff --git a/doc/html/toggleaction-example.html b/doc/html/toggleaction-example.html index 2065fc1a0..1c043c616 100644 --- a/doc/html/toggleaction-example.html +++ b/doc/html/toggleaction-example.html @@ -58,8 +58,8 @@ int main( int argc, char **argv ) <a name="x2972"></a> labelonoffaction-><a href="ntqaction.html#setAccel">setAccel</a>( TQt::ALT+TQt::Key_L ); <a name="x2973"></a> labelonoffaction-><a href="ntqaction.html#setIconSet">setIconSet</a>( (TQPixmap) labelonoff_xpm ); -<a name="x2976"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( labelonoffaction, SIGNAL( <a href="ntqaction.html#toggled">toggled</a>( bool ) ), -<a name="x2979"></a> window, SLOT( <a href="ntqmainwindow.html#setUsesTextLabel">setUsesTextLabel</a>( bool ) ) ); +<a name="x2976"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( labelonoffaction, TQ_SIGNAL( <a href="ntqaction.html#toggled">toggled</a>( bool ) ), +<a name="x2979"></a> window, TQ_SLOT( <a href="ntqmainwindow.html#setUsesTextLabel">setUsesTextLabel</a>( bool ) ) ); <a name="x2971"></a> labelonoffaction-><a href="ntqaction.html#addTo">addTo</a>( toolbar ); diff --git a/doc/html/toplevel-example.html b/doc/html/toplevel-example.html index 9822093be..0e5682242 100644 --- a/doc/html/toplevel-example.html +++ b/doc/html/toplevel-example.html @@ -188,7 +188,7 @@ modeless dialogs. <a name="x2532"></a> label-><a href="ntqlabel.html#setTextFormat">setTextFormat</a>(RichText); <a name="x2531"></a> label-><a href="ntqlabel.html#setAlignment">setAlignment</a>(WordBreak); <a href="ntqpushbutton.html">TQPushButton</a> *okButton = new <a href="ntqpushbutton.html">TQPushButton</a>( "Close", widget ); - <a name="x2535"></a> connect( okButton, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), widget, SLOT(<a href="ntqwidget.html#close">close</a>()) ); + <a name="x2535"></a> connect( okButton, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), widget, TQ_SLOT(<a href="ntqwidget.html#close">close</a>()) ); <a name="x2537"></a> widget-><a href="ntqwidget.html#move">move</a>( pos() ); </pre>The widget is created if it has not been created yet, or if it was closed (since we use the <tt>WDestructiveClose</tt> flag). Note that the diff --git a/doc/html/tutorial1-02.html b/doc/html/tutorial1-02.html index 0d6ce1088..32972c016 100644 --- a/doc/html/tutorial1-02.html +++ b/doc/html/tutorial1-02.html @@ -55,7 +55,7 @@ int main( int argc, char **argv ) quit.<a href="ntqwidget.html#resize">resize</a>( 75, 30 ); quit.<a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - TQObject::<a href="ntqobject.html#connect">connect</a>( &quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + TQObject::<a href="ntqobject.html#connect">connect</a>( &quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); a.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>( &quit ); quit.<a href="ntqwidget.html#show">show</a>(); @@ -87,7 +87,7 @@ to set right size. <p> Here we choose a new font for the button, an 18-point bold font from the Times family. Note that we create the font on the spot. <p> It is also possible to change the default font (using <a href="ntqapplication.html#setFont">TQApplication::setFont</a>()) for the whole application. -<p> <pre> <a name="x2291"></a><a name="x2290"></a><a name="x2288"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<p> <pre> <a name="x2291"></a><a name="x2290"></a><a name="x2288"></a> TQObject::<a href="ntqobject.html#connect">connect</a>( &quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); </pre> <p> connect() is perhaps <em>the</em> most central feature of TQt. Note that connect() is a static function in <a href="ntqobject.html">TQObject</a>. Do not confuse it diff --git a/doc/html/tutorial1-03.html b/doc/html/tutorial1-03.html index f7f46a23b..109974eff 100644 --- a/doc/html/tutorial1-03.html +++ b/doc/html/tutorial1-03.html @@ -56,7 +56,7 @@ int main( int argc, char **argv ) <a href="ntqpushbutton.html">TQPushButton</a> quit( "Quit", &box ); quit.<a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - TQObject::<a href="ntqobject.html#connect">connect</a>( &quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + TQObject::<a href="ntqobject.html#connect">connect</a>( &quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); a.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>( &box ); box.<a href="ntqwidget.html#show">show</a>(); diff --git a/doc/html/tutorial1-04.html b/doc/html/tutorial1-04.html index 4830ac144..afe97744e 100644 --- a/doc/html/tutorial1-04.html +++ b/doc/html/tutorial1-04.html @@ -63,7 +63,7 @@ public: quit-><a href="ntqwidget.html#setGeometry">setGeometry</a>( 62, 40, 75, 30 ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); } @@ -132,7 +132,7 @@ when you choose to, the child will automatically tell TQt about its imminent death.) <p> The setGeometry() call does the same as move() and resize() did in the previous chapters. -<p> <pre> <a name="x2306"></a><a name="x2304"></a> <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); +<p> <pre> <a name="x2306"></a><a name="x2304"></a> <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); } </pre> <p> Because the MyWidget class doesn't know about the application object, it diff --git a/doc/html/tutorial1-05.html b/doc/html/tutorial1-05.html index b7db3f3be..8de8fa42e 100644 --- a/doc/html/tutorial1-05.html +++ b/doc/html/tutorial1-05.html @@ -62,7 +62,7 @@ public: <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a href="ntqlcdnumber.html">TQLCDNumber</a> *lcd = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 2, this, "lcd" ); @@ -70,7 +70,7 @@ public: slider-><a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 ); slider-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); } int main( int argc, char **argv ) @@ -126,7 +126,7 @@ fashion. This instance is set up to display two digits and to be a child of <p> <a href="ntqslider.html">TQSlider</a> is a classical slider; the user can use the widget to drag something to adjust an integer value in a range. Here we create a horizontal one, set its range to 0-99 (inclusive, see the <a href="ntqrangecontrol.html#setRange">TQSlider::setRange</a>() documentation) and its initial value to 0. -<p> <pre> <a name="x2317"></a><a name="x2314"></a> <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); +<p> <pre> <a name="x2317"></a><a name="x2314"></a> <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); </pre> <p> Here we use the <a href="signalsandslots.html">signal/slot mechanism</a> to connect the slider's valueChanged() signal to the LCD number's diff --git a/doc/html/tutorial1-06.html b/doc/html/tutorial1-06.html index fb8da088d..a920c557a 100644 --- a/doc/html/tutorial1-06.html +++ b/doc/html/tutorial1-06.html @@ -64,7 +64,7 @@ public: <a href="ntqslider.html">TQSlider</a> * slider = new <a href="ntqslider.html">TQSlider</a>( Horizontal, this, "slider" ); slider-><a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 ); slider-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); } class MyWidget : public <a href="ntqvbox.html">TQVBox</a> @@ -80,7 +80,7 @@ public: <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "Quit", this, "quit" ); quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); <a href="ntqgrid.html">TQGrid</a> *grid = new <a href="ntqgrid.html">TQGrid</a>( 4, this ); @@ -119,7 +119,7 @@ constructor. This sort of widget is not very useful, so we'll add some API later <a href="ntqslider.html">TQSlider</a> * slider = new <a href="ntqslider.html">TQSlider</a>( Horizontal, this, "slider" ); <a name="x2325"></a> slider-><a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 ); <a name="x2326"></a> slider-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a name="x2327"></a><a name="x2324"></a> <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a name="x2327"></a><a name="x2324"></a> <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); } </pre> <p> This is lifted straight from the @@ -139,7 +139,7 @@ is renamed. <a href="ntqpushbutton.html">TQPushButton</a> *quit = new <a href="ntqpushbutton.html">TQPushButton</a>( "Quit", this, "quit" ); <a name="x2328"></a> quit-><a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) ); - <a name="x2321"></a> <a href="ntqobject.html#connect">connect</a>( quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + <a name="x2321"></a> <a href="ntqobject.html#connect">connect</a>( quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); </pre> <p> The push button that used to be in what is now LCDRange has been separated so that we can have one "Quit" button and many LCDRange diff --git a/doc/html/tutorial1-07.html b/doc/html/tutorial1-07.html index 8af0bd977..0a5ee023b 100644 --- a/doc/html/tutorial1-07.html +++ b/doc/html/tutorial1-07.html @@ -110,10 +110,10 @@ signal you'll see called <i>something</i>Changed(). <p> This file is mainly lifted from <a href="tutorial1-06.html#main">t6/main.cpp</a>, and only the changes are noted here. -<p> <pre> <a name="x2333"></a> <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - <a name="x2330"></a> lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); +<p> <pre> <a name="x2333"></a> <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + <a name="x2330"></a> lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); </pre> <p> This code is from the LCDRange constructor. <p> The first connect is the same that you have seen in the previous chapter. @@ -158,8 +158,8 @@ outside its legal range. for( int c = 0 ; c < 4 ; c++ ) { LCDRange* lr = new LCDRange( grid ); if ( previous ) - <a href="ntqobject.html#connect">connect</a>( lr, SIGNAL(valueChanged(int)), - previous, SLOT(setValue(int)) ); + <a href="ntqobject.html#connect">connect</a>( lr, TQ_SIGNAL(valueChanged(int)), + previous, TQ_SLOT(setValue(int)) ); previous = lr; } } diff --git a/doc/html/tutorial1-08.html b/doc/html/tutorial1-08.html index bb72603e1..b2b1611b8 100644 --- a/doc/html/tutorial1-08.html +++ b/doc/html/tutorial1-08.html @@ -192,10 +192,10 @@ widget. = new CannonField( this, "cannonField" ); </pre> <p> We create our CannonField. -<p> <pre> <a href="ntqobject.html#connect">connect</a>( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); +<p> <pre> <a href="ntqobject.html#connect">connect</a>( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); </pre> <p> Here we connect the valueChanged() signal of the LCDRange to the setAngle() slot of the CannonField. This will update CannonField's angle diff --git a/doc/html/tutorial1-10.html b/doc/html/tutorial1-10.html index cb4d0ed7d..8a8da0f20 100644 --- a/doc/html/tutorial1-10.html +++ b/doc/html/tutorial1-10.html @@ -189,10 +189,10 @@ is 0, 0). force->setRange( 10, 50 ); </pre> <p> We add a second LCDRange, which will be used to set the force. -<p> <pre> <a href="ntqobject.html#connect">connect</a>( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); +<p> <pre> <a href="ntqobject.html#connect">connect</a>( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); </pre> <p> We connect the <tt>force</tt> widget and the <tt>cannonField</tt> widget, just like we did for the <tt>angle</tt> widget. diff --git a/doc/html/tutorial1-11.html b/doc/html/tutorial1-11.html index 0c2da3bf4..8f7decd9c 100644 --- a/doc/html/tutorial1-11.html +++ b/doc/html/tutorial1-11.html @@ -92,8 +92,8 @@ when the shot was fired. f = 0; timerCount = 0; autoShootTimer = new <a href="ntqtimer.html">TQTimer</a>( this, "movement handler" ); - <a name="x2379"></a> <a href="ntqobject.html#connect">connect</a>( autoShootTimer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), - this, SLOT(moveShot()) ); + <a name="x2379"></a> <a href="ntqobject.html#connect">connect</a>( autoShootTimer, TQ_SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), + this, TQ_SLOT(moveShot()) ); shoot_ang = 0; shoot_f = 0; <a href="ntqwidget.html#setPalette">setPalette</a>( TQPalette( TQColor( 250, 250, 200) ) ); @@ -221,7 +221,7 @@ integer. <p> In the constructor we create and set up the Shoot button exactly like we did with the Quit button. Note that the first argument to the constructor is the button text, and the third is the widget's name. -<p> <pre> <a href="ntqobject.html#connect">connect</a>( shoot, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), cannonField, SLOT(shoot()) ); +<p> <pre> <a href="ntqobject.html#connect">connect</a>( shoot, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), cannonField, TQ_SLOT(shoot()) ); </pre> <p> Connects the clicked() signal of the Shoot button to the shoot() slot of the CannonField. diff --git a/doc/html/tutorial1-12.html b/doc/html/tutorial1-12.html index 9c73cd149..387e594de 100644 --- a/doc/html/tutorial1-12.html +++ b/doc/html/tutorial1-12.html @@ -117,10 +117,10 @@ initialization code. label = new <a href="ntqlabel.html">TQLabel</a>( " ", this, "label" ); <a name="x2383"></a> label-><a href="ntqlabel.html#setAlignment">setAlignment</a>( AlignCenter ); - <a name="x2389"></a> <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - <a name="x2386"></a> lcd, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); - <a href="ntqobject.html#connect">connect</a>( slider, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), - SIGNAL(valueChanged(int)) ); + <a name="x2389"></a> <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + <a name="x2386"></a> lcd, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int)) ); + <a href="ntqobject.html#connect">connect</a>( slider, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), + TQ_SIGNAL(valueChanged(int)) ); <a href="ntqwidget.html#setFocusProxy">setFocusProxy</a>( slider ); } diff --git a/doc/html/tutorial1-13.html b/doc/html/tutorial1-13.html index 102d237b4..4e92f4642 100644 --- a/doc/html/tutorial1-13.html +++ b/doc/html/tutorial1-13.html @@ -256,15 +256,15 @@ class, which was last seen as MyWidget. constructor to use it. (The <em>good</em> programmers at Trolltech never forget this, but I do. Caveat programmor - if "programmor" is Latin, at least. Anyway, back to the code.) -<p> <pre> <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(hit()), - this, SLOT(hit()) ); - <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(missed()), - this, SLOT(missed()) ); +<p> <pre> <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(hit()), + this, TQ_SLOT(hit()) ); + <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(missed()), + this, TQ_SLOT(missed()) ); </pre> <p> This time we want to do something when the shot has hit or missed the target. Thus we connect the hit() and missed() signals of the CannonField to two protected slots with the same names in this class. -<p> <pre> <a href="ntqobject.html#connect">connect</a>( shoot, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(fire()) ); +<p> <pre> <a href="ntqobject.html#connect">connect</a>( shoot, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(fire()) ); </pre> <p> Previously we connected the Shoot button's clicked() signal directly to the CannonField's shoot() slot. This time we want to keep track of @@ -272,8 +272,8 @@ the number of shots fired, so we connect it to a protected slot in this class instead. <p> Notice how easy it is to change the behavior of a program when you are working with self-contained components. -<p> <pre> <a href="ntqobject.html#connect">connect</a>( cannonField, SIGNAL(canShoot(bool)), - <a name="x2416"></a> shoot, SLOT(<a href="ntqwidget.html#setEnabled">setEnabled</a>(bool)) ); +<p> <pre> <a href="ntqobject.html#connect">connect</a>( cannonField, TQ_SIGNAL(canShoot(bool)), + <a name="x2416"></a> shoot, TQ_SLOT(<a href="ntqwidget.html#setEnabled">setEnabled</a>(bool)) ); </pre> <p> We also use the cannonField's canShoot() signal to enable or disable the Shoot button appropriately. @@ -281,7 +281,7 @@ the Shoot button appropriately. = new <a href="ntqpushbutton.html">TQPushButton</a>( "&New Game", this, "newgame" ); restart->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - <a href="ntqobject.html#connect">connect</a>( restart, SIGNAL(clicked()), this, SLOT(newGame()) ); + <a href="ntqobject.html#connect">connect</a>( restart, TQ_SIGNAL(clicked()), this, TQ_SLOT(newGame()) ); </pre> <p> We create, set up, and connect the New Game button as we have done with the other buttons. Clicking this button will activate the diff --git a/doc/html/tutorial1-14.html b/doc/html/tutorial1-14.html index c5a94dbc5..094c8081c 100644 --- a/doc/html/tutorial1-14.html +++ b/doc/html/tutorial1-14.html @@ -210,9 +210,9 @@ box, the effect is that the <a href="ntqvbox.html">TQVBox</a> will put a frame a CannonField. <p> <pre> <a href="ntqaccel.html">TQAccel</a> *accel = new <a href="ntqaccel.html">TQAccel</a>( this ); <a name="x2438"></a><a name="x2437"></a> accel-><a href="ntqaccel.html#connectItem">connectItem</a>( accel-><a href="ntqaccel.html#insertItem">insertItem</a>( Key_Enter ), - this, SLOT(fire()) ); + this, TQ_SLOT(fire()) ); accel-><a href="ntqaccel.html#connectItem">connectItem</a>( accel-><a href="ntqaccel.html#insertItem">insertItem</a>( Key_Return ), - this, SLOT(fire()) ); + this, TQ_SLOT(fire()) ); </pre> <p> Here we create and set up an accelerator. An accelerator is an object that intercepts keyboard events to an application and calls slots if @@ -226,7 +226,7 @@ key Ctrl+Q is pressed. Because Enter is sometimes Return and there are even keyboards with <em>both</em> keys, we make both Enter and Return invoke fire(). <p> <pre> accel-><a href="ntqaccel.html#connectItem">connectItem</a>( accel-><a href="ntqaccel.html#insertItem">insertItem</a>( CTRL+Key_Q ), - tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); + tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) ); </pre> <p> And then we set up Ctrl+Q to do the same thing as Alt+Q. Some people are more used to Ctrl+Q (and anyway it shows how do do it). diff --git a/doc/html/tutorial2-05.html b/doc/html/tutorial2-05.html index 35a797c40..ade4d2572 100644 --- a/doc/html/tutorial2-05.html +++ b/doc/html/tutorial2-05.html @@ -163,7 +163,7 @@ toolbar buttons stay in sync and saves duplicating code. <p> <pre> fileNewAction = new <a href="ntqaction.html">TQAction</a>( "New Chart", TQPixmap( file_new ), "&New", CTRL+Key_N, this, "new" ); - <a href="ntqobject.html#connect">connect</a>( fileNewAction, SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, SLOT( fileNew() ) ); + <a href="ntqobject.html#connect">connect</a>( fileNewAction, TQ_SIGNAL( <a href="ntqaction.html#activated">activated</a>() ), this, TQ_SLOT( fileNew() ) ); </pre> <p> When we construct an action we give it a name, an optional icon, a menu text, and an accelerator short-cut key (or 0 if no accelerator is @@ -257,8 +257,8 @@ the settings. We attempt to read each possible file entry ("File1" to "File9"), and add each non-empty entry to the list of recently used files. If there are one or more recently used files we update the File menu by calling updateRecentFilesMenu(); (we'll review this later on). -<p> <pre> <a href="ntqobject.html#connect">connect</a>( chartGroup, SIGNAL( <a href="qactiongroup.html#selected">selected</a>(TQAction*) ), - this, SLOT( updateChartType(TQAction*) ) ); +<p> <pre> <a href="ntqobject.html#connect">connect</a>( chartGroup, TQ_SIGNAL( <a href="qactiongroup.html#selected">selected</a>(TQAction*) ), + this, TQ_SLOT( updateChartType(TQAction*) ) ); </pre> <p> Now that we have set the chart type (when we read it in as a user setting) it is safe to connect the chart group to our @@ -442,7 +442,7 @@ opened files list and call fileSave() (covered in <a href="tutorial2-07.html">Fi if ( i < int(m_recentFiles.count()) ) fileMenu-><a href="ntqmenudata.html#insertItem">insertItem</a>( TQString( "&%1 %2" ). arg( i + 1 ).arg( m_recentFiles[i] ), - this, SLOT( fileOpenRecent(int) ), + this, TQ_SLOT( fileOpenRecent(int) ), 0, i ); } } diff --git a/doc/html/tutorial2-08.html b/doc/html/tutorial2-08.html index 1e30c2c5b..315b025ca 100644 --- a/doc/html/tutorial2-08.html +++ b/doc/html/tutorial2-08.html @@ -170,15 +170,15 @@ key an accelerator for the Cancel button. </pre> <p> We add the buttonBox layout to the tableButtonBox and the layout is complete. -<p> <pre> <a name="x2612"></a> <a href="ntqobject.html#connect">connect</a>( table, SIGNAL( <a href="ntqtable.html#clicked">clicked</a>(int,int,int,const <a href="ntqpoint.html">TQPoint</a>&) ), - this, SLOT( setColor(int,int) ) ); - <a name="x2613"></a> <a href="ntqobject.html#connect">connect</a>( table, SIGNAL( <a href="ntqtable.html#currentChanged">currentChanged</a>(int,int) ), - this, SLOT( currentChanged(int,int) ) ); - <a name="x2626"></a> <a href="ntqobject.html#connect">connect</a>( table, SIGNAL( <a href="ntqtable.html#valueChanged">valueChanged</a>(int,int) ), - this, SLOT( valueChanged(int,int) ) ); - <a name="x2596"></a> <a href="ntqobject.html#connect">connect</a>( colorPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( setColor() ) ); - <a href="ntqobject.html#connect">connect</a>( okPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( <a href="ntqdialog.html#accept">accept</a>() ) ); - <a href="ntqobject.html#connect">connect</a>( cancelPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( <a href="ntqdialog.html#reject">reject</a>() ) ); +<p> <pre> <a name="x2612"></a> <a href="ntqobject.html#connect">connect</a>( table, TQ_SIGNAL( <a href="ntqtable.html#clicked">clicked</a>(int,int,int,const <a href="ntqpoint.html">TQPoint</a>&) ), + this, TQ_SLOT( setColor(int,int) ) ); + <a name="x2613"></a> <a href="ntqobject.html#connect">connect</a>( table, TQ_SIGNAL( <a href="ntqtable.html#currentChanged">currentChanged</a>(int,int) ), + this, TQ_SLOT( currentChanged(int,int) ) ); + <a name="x2626"></a> <a href="ntqobject.html#connect">connect</a>( table, TQ_SIGNAL( <a href="ntqtable.html#valueChanged">valueChanged</a>(int,int) ), + this, TQ_SLOT( valueChanged(int,int) ) ); + <a name="x2596"></a> <a href="ntqobject.html#connect">connect</a>( colorPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( setColor() ) ); + <a href="ntqobject.html#connect">connect</a>( okPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( <a href="ntqdialog.html#accept">accept</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( cancelPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( <a href="ntqdialog.html#reject">reject</a>() ) ); </pre> <p> We now "wire up" the form. <ul> diff --git a/doc/html/tutorial2-09.html b/doc/html/tutorial2-09.html index 4833b6905..8b454dab8 100644 --- a/doc/html/tutorial2-09.html +++ b/doc/html/tutorial2-09.html @@ -185,9 +185,9 @@ create the radio buttons, making "No" the default. <p> The decimal places label and spin box are laid out just like the other horizontal layouts, and the buttons are laid out in a very similar way to the buttons in the set data form. -<p> <pre> <a href="ntqobject.html#connect">connect</a>( fontPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( chooseFont() ) ); - <a href="ntqobject.html#connect">connect</a>( okPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( <a href="ntqdialog.html#accept">accept</a>() ) ); - <a href="ntqobject.html#connect">connect</a>( cancelPushButton, SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, SLOT( <a href="ntqdialog.html#reject">reject</a>() ) ); +<p> <pre> <a href="ntqobject.html#connect">connect</a>( fontPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( chooseFont() ) ); + <a href="ntqobject.html#connect">connect</a>( okPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( <a href="ntqdialog.html#accept">accept</a>() ) ); + <a href="ntqobject.html#connect">connect</a>( cancelPushButton, TQ_SIGNAL( <a href="ntqbutton.html#clicked">clicked</a>() ), this, TQ_SLOT( <a href="ntqdialog.html#reject">reject</a>() ) ); </pre> <p> We only need three connections: <ol type=1> diff --git a/doc/html/wizard-example.html b/doc/html/wizard-example.html index c7b7b7b74..32369a35d 100644 --- a/doc/html/wizard-example.html +++ b/doc/html/wizard-example.html @@ -141,8 +141,8 @@ void <a name="f183"></a>Wizard::setupPage1() <a name="x6"></a> key-><a href="ntqlineedit.html#setMaxLength">setMaxLength</a>( 4 ); <a name="x7"></a> key-><a href="ntqlineedit.html#setValidator">setValidator</a>( new <a href="qintvalidator.html">TQIntValidator</a>( 1000, 9999, key ) ); -<a name="x9"></a> <a href="ntqobject.html#connect">connect</a>( key, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( keyChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); +<a name="x9"></a> <a href="ntqobject.html#connect">connect</a>( key, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( keyChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); <a href="ntqwizard.html#addPage">addPage</a>( page1, "Personal Key" ); @@ -197,12 +197,12 @@ void <a name="f184"></a>Wizard::setupPage2() phone = new <a href="ntqlineedit.html">TQLineEdit</a>( row4 ); email = new <a href="ntqlineedit.html">TQLineEdit</a>( row5 ); - <a href="ntqobject.html#connect">connect</a>( firstName, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); - <a href="ntqobject.html#connect">connect</a>( lastName, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); - <a href="ntqobject.html#connect">connect</a>( email, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( firstName, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( lastName, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( email, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); <a href="ntqwizard.html#addPage">addPage</a>( page2, "Personal Data" ); diff --git a/doc/html/wizard-wizard-cpp.html b/doc/html/wizard-wizard-cpp.html index a18e35217..42d6c737c 100644 --- a/doc/html/wizard-wizard-cpp.html +++ b/doc/html/wizard-wizard-cpp.html @@ -87,8 +87,8 @@ void <a name="f4"></a>Wizard::setupPage1() <a name="x6"></a> key-><a href="ntqlineedit.html#setMaxLength">setMaxLength</a>( 4 ); <a name="x7"></a> key-><a href="ntqlineedit.html#setValidator">setValidator</a>( new <a href="qintvalidator.html">TQIntValidator</a>( 1000, 9999, key ) ); -<a name="x9"></a> <a href="ntqobject.html#connect">connect</a>( key, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( keyChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); +<a name="x9"></a> <a href="ntqobject.html#connect">connect</a>( key, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( keyChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); <a href="ntqwizard.html#addPage">addPage</a>( page1, "Personal Key" ); @@ -143,12 +143,12 @@ void <a name="f5"></a>Wizard::setupPage2() phone = new <a href="ntqlineedit.html">TQLineEdit</a>( row4 ); email = new <a href="ntqlineedit.html">TQLineEdit</a>( row5 ); - <a href="ntqobject.html#connect">connect</a>( firstName, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); - <a href="ntqobject.html#connect">connect</a>( lastName, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); - <a href="ntqobject.html#connect">connect</a>( email, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), - this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( firstName, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( lastName, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); + <a href="ntqobject.html#connect">connect</a>( email, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> & ) ), + this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> & ) ) ); <a href="ntqwizard.html#addPage">addPage</a>( page2, "Personal Data" ); diff --git a/doc/html/xform-example.html b/doc/html/xform-example.html index d6f88907d..306d8547f 100644 --- a/doc/html/xform-example.html +++ b/doc/html/xform-example.html @@ -184,16 +184,16 @@ private: <a name="x1250"></a> rotS-><a href="ntqrangecontrol.html#setRange">setRange</a>( -180, 180 ); <a name="x1261"></a> rotS-><a href="ntqslider.html#setValue">setValue</a>( 0 ); -<a name="x1263"></a> <a href="ntqobject.html#connect">connect</a>( rotS, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), SLOT(newMtx()) ); +<a name="x1263"></a> <a href="ntqobject.html#connect">connect</a>( rotS, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), TQ_SLOT(newMtx()) ); shearLCD-><a href="ntqlcdnumber.html#display">display</a>( "0.00" ); shearS-><a href="ntqrangecontrol.html#setRange">setRange</a>( -25, 25 ); shearS-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a href="ntqobject.html#connect">connect</a>( shearS, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), SLOT(newMtx()) ); + <a href="ntqobject.html#connect">connect</a>( shearS, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), TQ_SLOT(newMtx()) ); <a name="x1220"></a> mirror-><a href="ntqbutton.html#setText">setText</a>( <a href="ntqobject.html#tr">tr</a>("Mirror") ); - <a href="ntqobject.html#connect">connect</a>( mirror, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(newMtx()) ); + <a href="ntqobject.html#connect">connect</a>( mirror, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(newMtx()) ); <a href="ntqbuttongroup.html">TQButtonGroup</a> *bg = new <a href="ntqbuttongroup.html">TQButtonGroup</a>(this); <a name="x1267"></a> bg-><a href="ntqwidget.html#hide">hide</a>(); @@ -204,23 +204,23 @@ private: rb_img-><a href="ntqbutton.html#setText">setText</a>( <a href="ntqobject.html#tr">tr</a>("Image") ); <a name="x1249"></a> rb_img-><a href="ntqradiobutton.html#setChecked">setChecked</a>(TRUE); rb_pic-><a href="ntqbutton.html#setText">setText</a>( <a href="ntqobject.html#tr">tr</a>("Picture") ); -<a name="x1221"></a> <a href="ntqobject.html#connect">connect</a>( bg, SIGNAL(<a href="ntqbuttongroup.html#clicked">clicked</a>(int)), SLOT(changeMode(int)) ); +<a name="x1221"></a> <a href="ntqobject.html#connect">connect</a>( bg, TQ_SIGNAL(<a href="ntqbuttongroup.html#clicked">clicked</a>(int)), TQ_SLOT(changeMode(int)) ); fpb-><a href="ntqbutton.html#setText">setText</a>( <a href="ntqobject.html#tr">tr</a>("Select font...") ); - <a href="ntqobject.html#connect">connect</a>( fpb, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), SLOT(selectFont()) ); + <a href="ntqobject.html#connect">connect</a>( fpb, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), TQ_SLOT(selectFont()) ); <a name="x1230"></a> textEd-><a href="ntqlineedit.html#setText">setText</a>( "Troll" ); -<a name="x1231"></a> <a href="ntqobject.html#connect">connect</a>( textEd, SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a>&)), - SLOT(newTxt(const <a href="ntqstring.html">TQString</a>&)) ); +<a name="x1231"></a> <a href="ntqobject.html#connect">connect</a>( textEd, TQ_SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a>&)), + TQ_SLOT(newTxt(const <a href="ntqstring.html">TQString</a>&)) ); magLCD = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 4,optionals_other, "magLCD" ); magLCD-><a href="ntqlcdnumber.html#display">display</a>( "100" ); magS = new <a href="ntqslider.html">TQSlider</a>( TQSlider::Horizontal, optionals_other, "magnifySlider" ); magS-><a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 800 ); - <a href="ntqobject.html#connect">connect</a>( magS, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), SLOT(newMtx()) ); + <a href="ntqobject.html#connect">connect</a>( magS, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), TQ_SLOT(newMtx()) ); magS-><a href="ntqslider.html#setValue">setValue</a>( 0 ); - <a href="ntqobject.html#connect">connect</a>( magS, SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), magLCD, SLOT(<a href="ntqlcdnumber.html#display">display</a>(int))); + <a href="ntqobject.html#connect">connect</a>( magS, TQ_SIGNAL(<a href="ntqslider.html#valueChanged">valueChanged</a>(int)), magLCD, TQ_SLOT(<a href="ntqlcdnumber.html#display">display</a>(int))); <a name="x1266"></a> optionals_text-><a href="ntqwidget.html#adjustSize">adjustSize</a>(); optionals_other-><a href="ntqwidget.html#adjustSize">adjustSize</a>(); @@ -519,13 +519,13 @@ void <a name="f395"></a>XFormCenter::newMode( int m ) <a href="ntqhbox.html#setStretchFactor">setStretchFactor</a>(sx,1); xc-><a href="ntqframe.html#setFrameStyle">setFrameStyle</a>( TQFrame::Panel | TQFrame::Raised ); <a name="x1227"></a> xc-><a href="ntqframe.html#setLineWidth">setLineWidth</a>( 2 ); - <a href="ntqobject.html#connect">connect</a>( xc, SIGNAL(newText(const <a href="ntqstring.html">TQString</a>&)), sx, - SLOT(setText(const <a href="ntqstring.html">TQString</a>&)) ); - <a href="ntqobject.html#connect">connect</a>( xc, SIGNAL(newMatrix(TQWMatrix)), - sx, SLOT(setMatrix(TQWMatrix)) ); - <a href="ntqobject.html#connect">connect</a>( xc, SIGNAL(newFont(const <a href="ntqfont.html">TQFont</a>&)), sx, - SLOT(<a href="ntqwidget.html#setFont">setFont</a>(const <a href="ntqfont.html">TQFont</a>&)) ); - <a href="ntqobject.html#connect">connect</a>( xc, SIGNAL(newMode(int)), SLOT(newMode(int)) ); + <a href="ntqobject.html#connect">connect</a>( xc, TQ_SIGNAL(newText(const <a href="ntqstring.html">TQString</a>&)), sx, + TQ_SLOT(setText(const <a href="ntqstring.html">TQString</a>&)) ); + <a href="ntqobject.html#connect">connect</a>( xc, TQ_SIGNAL(newMatrix(TQWMatrix)), + sx, TQ_SLOT(setMatrix(TQWMatrix)) ); + <a href="ntqobject.html#connect">connect</a>( xc, TQ_SIGNAL(newFont(const <a href="ntqfont.html">TQFont</a>&)), sx, + TQ_SLOT(<a href="ntqwidget.html#setFont">setFont</a>(const <a href="ntqfont.html">TQFont</a>&)) ); + <a href="ntqobject.html#connect">connect</a>( xc, TQ_SIGNAL(newMode(int)), TQ_SLOT(newMode(int)) ); sx->setText( "Troll" ); newMode( Image ); sx->setMatrix(xc->matrix()); diff --git a/doc/i18n.doc b/doc/i18n.doc index 7af9251b2..6ff7ce4a6 100644 --- a/doc/i18n.doc +++ b/doc/i18n.doc @@ -271,7 +271,7 @@ it. The correct idiom is \code QPopupMenu *file = new QPopupMenu( this ); - file->insertItem( tr("&Quit"), this, SLOT(quit()), + file->insertItem( tr("&Quit"), this, TQ_SLOT(quit()), QKeySequence(tr("Ctrl+Q", "File|Quit")) ); \endcode diff --git a/doc/man/man3/tqaccel.3qt b/doc/man/man3/tqaccel.3qt index 3b06cbbf5..423ecd6da 100644 --- a/doc/man/man3/tqaccel.3qt +++ b/doc/man/man3/tqaccel.3qt @@ -110,7 +110,7 @@ In most cases, you will not need to use this class directly. Use the QAction cla .br QPopupMenu *fileMenu = new fileMenu( parent ); .br - fileMenu->insertItem( "Undo", parent, SLOT(undo()), CTRL+Key_Z ); + fileMenu->insertItem( "Undo", parent, TQ_SLOT(undo()), CTRL+Key_Z ); .br .fi .PP @@ -147,7 +147,7 @@ Example: .br myWindow, // connected to myWindow's .br - SLOT(printDoc()) ); // printDoc() slot + TQ_SLOT(printDoc()) ); // printDoc() slot .br .fi .PP @@ -176,7 +176,7 @@ Connects the accelerator item \fIid\fR to the slot \fImember\fR of \fIreceiver\f .PP .nf .br - a->connectItem( 201, mainView, SLOT(quit()) ); + a->connectItem( 201, mainView, TQ_SLOT(quit()) ); .br .fi .PP @@ -280,7 +280,7 @@ This function is typically used with tr(), so that accelerator keys can be repla .br QPopupMenu *file = new QPopupMenu( this ); .br - file->insertItem( p1, tr("&Open..."), this, SLOT(open()), + file->insertItem( p1, tr("&Open..."), this, TQ_SLOT(open()), .br QAccel::stringToKey(tr("Ctrl+O", "File|Open")) ); .br diff --git a/doc/man/man3/tqaction.3qt b/doc/man/man3/tqaction.3qt index abdbe40a0..7ccc0982e 100644 --- a/doc/man/man3/tqaction.3qt +++ b/doc/man/man3/tqaction.3qt @@ -196,7 +196,7 @@ Once a QAction has been created it should be added to the relevant menu and tool .br CTRL+Key_O, this, "open" ); .br - connect( fileOpenAction, SIGNAL( activated() ) , this, SLOT( choose() ) ); + connect( fileOpenAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( choose() ) ); .fi .PP We create a "File Save" action with a menu text of "&Save" and \fICtrl+S\fR as the keyboard accelerator. We connect the fileSaveAction's activated() signal to our own save() slot. Note that at this point there is no menu or toolbar action, we'll add them next: @@ -400,9 +400,9 @@ To trigger a user command depending on whether a toggle action has been switched .PP .nf .br - TQObject::connect( labelonoffaction, SIGNAL( toggled( bool ) ), + TQObject::connect( labelonoffaction, TQ_SIGNAL( toggled( bool ) ), .br - window, SLOT( setUsesTextLabel( bool ) ) ); + window, TQ_SLOT( setUsesTextLabel( bool ) ) ); .fi .PP See also activated(), toggleAction, and on. diff --git a/doc/man/man3/tqactiongroup.3qt b/doc/man/man3/tqactiongroup.3qt index f6ba0909d..7ef50bdc9 100644 --- a/doc/man/man3/tqactiongroup.3qt +++ b/doc/man/man3/tqactiongroup.3qt @@ -77,7 +77,7 @@ Here's an example from examples/textedit: .br QActionGroup *grp = new QActionGroup( this ); .br - connect( grp, SIGNAL( selected( QAction* ) ), this, SLOT( textAlign( QAction* ) ) ); + connect( grp, TQ_SIGNAL( selected( QAction* ) ), this, TQ_SLOT( textAlign( QAction* ) ) ); .fi .PP Here we create a new action group. Since the action group is exclusive by default, only one of the actions in the group is ever active at any one time. We then connect the group's selected() signal to our textAlign() slot. diff --git a/doc/man/man3/tqapplication.3qt b/doc/man/man3/tqapplication.3qt index 56a54638b..e2efca127 100644 --- a/doc/man/man3/tqapplication.3qt +++ b/doc/man/man3/tqapplication.3qt @@ -792,12 +792,12 @@ This function is particularly useful for applications with many top-level window .br QPopupMenu* file = new QPopupMenu( this ); .br - file->insertItem( "&Quit", tqApp, SLOT(closeAllWindows()), CTRL+Key_Q ); + file->insertItem( "&Quit", tqApp, TQ_SLOT(closeAllWindows()), CTRL+Key_Q ); .br .br // when the last window is closed, the application should quit .br - connect( tqApp, SIGNAL( lastWindowClosed() ), tqApp, SLOT( quit() ) ); + connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), tqApp, TQ_SLOT( quit() ) ); .br .fi .PP @@ -1131,7 +1131,7 @@ Example: .br QPushButton *quitButton = new QPushButton( "Quit" ); .br - connect( quitButton, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quitButton, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); .br .fi .PP diff --git a/doc/man/man3/tqaxbase.3qt b/doc/man/man3/tqaxbase.3qt index 8b365f36c..7d8a68b73 100644 --- a/doc/man/man3/tqaxbase.3qt +++ b/doc/man/man3/tqaxbase.3qt @@ -120,7 +120,7 @@ QAxBase is an abstract class that cannot be used directly, and is instantiated t .PP .nf .br - connect( buttonBack, SIGNAL(clicked()), webBrowser, SLOT(GoBack()) ); + connect( buttonBack, TQ_SIGNAL(clicked()), webBrowser, TQ_SLOT(GoBack()) ); .br .fi .PP @@ -146,9 +146,9 @@ Outgoing events supported by the COM object are emitted as standard TQt signals. .PP .nf .br - connect( webBrowser, SIGNAL(TitleChanged(const TQString&)), + connect( webBrowser, TQ_SIGNAL(TitleChanged(const TQString&)), .br - this, SLOT(setCaption(const TQString&)) ); + this, TQ_SLOT(setCaption(const TQString&)) ); .br .fi .PP @@ -203,7 +203,7 @@ use the QAxBase API like this: object.setProperty( "font", QFont( "Times New Roman", 12 ) ); .br .br - connect( this, SIGNAL(clicked(int)), &object, SLOT(showColumn(int)) ); + connect( this, TQ_SIGNAL(clicked(int)), &object, TQ_SLOT(showColumn(int)) ); .br bool ok = object.dynamicCall( "addColumn(const TQString&)", "Column 1" ).toBool(); .br diff --git a/doc/man/man3/tqkeysequence.3qt b/doc/man/man3/tqkeysequence.3qt index 5e975930c..37dd4ac1e 100644 --- a/doc/man/man3/tqkeysequence.3qt +++ b/doc/man/man3/tqkeysequence.3qt @@ -92,7 +92,7 @@ This contructor is typically used with tr(), so that accelerator keys can be rep .br QPopupMenu *file = new QPopupMenu( this ); .br - file->insertItem( tr("&Open..."), this, SLOT(open()), + file->insertItem( tr("&Open..."), this, TQ_SLOT(open()), .br QKeySequence( tr("Ctrl+O", "File|Open") ) ); .br diff --git a/doc/man/man3/tqmainwindow.3qt b/doc/man/man3/tqmainwindow.3qt index 050367e30..0d5dda868 100644 --- a/doc/man/man3/tqmainwindow.3qt +++ b/doc/man/man3/tqmainwindow.3qt @@ -287,7 +287,7 @@ When subclassing we add the menu items and toolbars in the subclass's constructo menuBar()->insertItem( "&Help", help ); .br .br - help->insertItem( "&About", this, SLOT(about()), Key_F1 ); + help->insertItem( "&About", this, TQ_SLOT(about()), Key_F1 ); .fi .PP Here we've added a new menu with one menu item. The menu has been inserted into the menu bar that QMainWindow provides by default and which is accessible through the menuBar() function. The slot will be called when the menu item is clicked. @@ -305,7 +305,7 @@ Here we've added a new menu with one menu item. The menu has been inserted into .br = new QToolButton( openIcon, "Open File", TQString::null, .br - this, SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); .fi .PP This extract shows the creation of a toolbar with one toolbar button. QMainWindow supplies four dock areas for toolbars. When a toolbar is created as a child of a QMainWindow (or derived class) instance it will be placed in a dock area (the Top dock area by default). The slot will be called when the toolbar button is clicked. Any dock window can be added to a dock area either using addDockWindow(), or by creating a dock window with the QMainWindow as the parent. @@ -336,7 +336,7 @@ Often we want to synchronize a toolbar button with a menu item. For example, if .br CTRL+Key_O, this, "open" ); .br - connect( fileOpenAction, SIGNAL( activated() ) , this, SLOT( choose() ) ); + connect( fileOpenAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( choose() ) ); .fi .PP Here we create an action with an icon which will be used in any menu and toolbar that the action is added to. We've also given the action a menu name, '&Open', and a keyboard shortcut. The connection that we have made will be used when the user clicks either the menu item \fIor\fR the toolbar button. @@ -751,7 +751,7 @@ This is the same as QWhatsThis::enterWhatsThisMode(), but implemented as a main .br QPopupMenu * help = new QPopupMenu( this ); .br - help->insertItem( "What's &This", this , SLOT(whatsThis()), SHIFT+Key_F1); + help->insertItem( "What's &This", this , TQ_SLOT(whatsThis()), SHIFT+Key_F1); .br .fi .PP diff --git a/doc/man/man3/tqmenubar.3qt b/doc/man/man3/tqmenubar.3qt index 22d7106fd..42289d798 100644 --- a/doc/man/man3/tqmenubar.3qt +++ b/doc/man/man3/tqmenubar.3qt @@ -170,9 +170,9 @@ Example of creating a menu bar with menu items (from menu/menu.cpp): .PP .nf .br - file->insertItem( p1, "&Open", this, SLOT(open()), CTRL+Key_O ); + file->insertItem( p1, "&Open", this, TQ_SLOT(open()), CTRL+Key_O ); .br - file->insertItem( p2, "&New", this, SLOT(news()), CTRL+Key_N ); + file->insertItem( p2, "&New", this, TQ_SLOT(news()), CTRL+Key_N ); .fi .PP .nf @@ -294,9 +294,9 @@ Example: .br QPopupMenu *fileMenu = new QPopupMenu; .br - fileMenu->insertItem( "New", myView, SLOT(newFile()), CTRL+Key_N ); + fileMenu->insertItem( "New", myView, TQ_SLOT(newFile()), CTRL+Key_N ); .br - fileMenu->insertItem( "Open", myView, SLOT(open()), CTRL+Key_O ); + fileMenu->insertItem( "Open", myView, TQ_SLOT(open()), CTRL+Key_O ); .br mainMenu->insertItem( "File", fileMenu ); .br @@ -308,7 +308,7 @@ If you need to translate accelerators, use tr() with the text and accelerator. ( .PP .nf .br - fileMenu->insertItem( tr("Open"), myView, SLOT(open()), + fileMenu->insertItem( tr("Open"), myView, TQ_SLOT(open()), .br tr("Ctrl+O") ); .br diff --git a/doc/man/man3/tqmenudata.3qt b/doc/man/man3/tqmenudata.3qt index 60115fc33..cbc1f5277 100644 --- a/doc/man/man3/tqmenudata.3qt +++ b/doc/man/man3/tqmenudata.3qt @@ -334,9 +334,9 @@ Example: .br QPopupMenu *fileMenu = new QPopupMenu; .br - fileMenu->insertItem( "New", myView, SLOT(newFile()), CTRL+Key_N ); + fileMenu->insertItem( "New", myView, TQ_SLOT(newFile()), CTRL+Key_N ); .br - fileMenu->insertItem( "Open", myView, SLOT(open()), CTRL+Key_O ); + fileMenu->insertItem( "Open", myView, TQ_SLOT(open()), CTRL+Key_O ); .br mainMenu->insertItem( "File", fileMenu ); .br @@ -348,7 +348,7 @@ If you need to translate accelerators, use tr() with the text and accelerator. ( .PP .nf .br - fileMenu->insertItem( tr("Open"), myView, SLOT(open()), + fileMenu->insertItem( tr("Open"), myView, TQ_SLOT(open()), .br tr("Ctrl+O") ); .br diff --git a/doc/man/man3/tqobject.3qt b/doc/man/man3/tqobject.3qt index 0d64d9bc3..1ed6f43e7 100644 --- a/doc/man/man3/tqobject.3qt +++ b/doc/man/man3/tqobject.3qt @@ -298,7 +298,7 @@ Example: sql/overview/custom1/main.cpp. .SH "bool TQObject::connect ( const TQObject * sender, const char * signal, const TQObject * receiver, const char * member )\fC [static]\fR" Connects \fIsignal\fR from the \fIsender\fR object to \fImember\fR in object \fIreceiver\fR, and returns TRUE if the connection succeeds; otherwise returns FALSE. .PP -You must use the SIGNAL() and SLOT() macros when specifying the \fIsignal\fR and the \fImember\fR, for example: +You must use the TQ_SIGNAL() and TQ_SLOT() macros when specifying the \fIsignal\fR and the \fImember\fR, for example: .PP .nf .br @@ -306,13 +306,13 @@ You must use the SIGNAL() and SLOT() macros when specifying the \fIsignal\fR and .br QScrollBar *scroll = new QScrollBar; .br - TQObject::connect( scroll, SIGNAL(valueChanged(int)), + TQObject::connect( scroll, TQ_SIGNAL(valueChanged(int)), .br - label, SLOT(setNum(int)) ); + label, TQ_SLOT(setNum(int)) ); .br .fi .PP -This example ensures that the label always displays the current scroll bar value. Note that the signal and slots parameters must not contain any variable names, only the type. E.g. the following would not work and return FALSE: TQObject::connect( scroll, SIGNAL(valueChanged(int v)), label, SLOT(setNum(int v)) ); +This example ensures that the label always displays the current scroll bar value. Note that the signal and slots parameters must not contain any variable names, only the type. E.g. the following would not work and return FALSE: TQObject::connect( scroll, TQ_SIGNAL(valueChanged(int v)), label, TQ_SLOT(setNum(int v)) ); .PP A signal can also be connected to another signal: .PP @@ -347,7 +347,7 @@ A signal can also be connected to another signal: .br aButton = new QPushButton( this ); .br - connect( aButton, SIGNAL(clicked()), SIGNAL(myUsefulSignal()) ); + connect( aButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(myUsefulSignal()) ); .br } .br @@ -429,14 +429,14 @@ Disconnect everything connected to a specific signal: .IP .nf .br - disconnect( myObject, SIGNAL(mySignal()), 0, 0 ); + disconnect( myObject, TQ_SIGNAL(mySignal()), 0, 0 ); .br .fi equivalent to the non-static overloaded function .IP .nf .br - myObject->disconnect( SIGNAL(mySignal()) ); + myObject->disconnect( TQ_SIGNAL(mySignal()) ); .br .fi .IP 3 diff --git a/doc/man/man3/tqpopupmenu.3qt b/doc/man/man3/tqpopupmenu.3qt index d8dfa0b33..05df91223 100644 --- a/doc/man/man3/tqpopupmenu.3qt +++ b/doc/man/man3/tqpopupmenu.3qt @@ -422,9 +422,9 @@ Example: .br QPopupMenu *fileMenu = new QPopupMenu; .br - fileMenu->insertItem( "New", myView, SLOT(newFile()), CTRL+Key_N ); + fileMenu->insertItem( "New", myView, TQ_SLOT(newFile()), CTRL+Key_N ); .br - fileMenu->insertItem( "Open", myView, SLOT(open()), CTRL+Key_O ); + fileMenu->insertItem( "Open", myView, TQ_SLOT(open()), CTRL+Key_O ); .br mainMenu->insertItem( "File", fileMenu ); .br @@ -436,7 +436,7 @@ If you need to translate accelerators, use tr() with the text and accelerator. ( .PP .nf .br - fileMenu->insertItem( tr("Open"), myView, SLOT(open()), + fileMenu->insertItem( tr("Open"), myView, TQ_SLOT(open()), .br tr("Ctrl+O") ); .br diff --git a/doc/man/man3/tqprocess.3qt b/doc/man/man3/tqprocess.3qt index 11572e376..24eb27ca3 100644 --- a/doc/man/man3/tqprocess.3qt +++ b/doc/man/man3/tqprocess.3qt @@ -178,9 +178,9 @@ A code snippet for this with the QProcess class might look like this: proc->addArgument( "small_dialog.ui" ); .br .br - connect( proc, SIGNAL(readyReadStdout()), + connect( proc, TQ_SIGNAL(readyReadStdout()), .br - this, SLOT(readFromStdout()) ); + this, TQ_SLOT(readFromStdout()) ); .fi .PP .nf @@ -339,7 +339,7 @@ The nice way to end a process and to be sure that it is finished, is to do somet .br process->tryTerminate(); .br - QTimer::singleShot( 5000, process, SLOT( kill() ) ); + QTimer::singleShot( 5000, process, TQ_SLOT( kill() ) ); .br .fi .PP diff --git a/doc/man/man3/tqprogressdialog.3qt b/doc/man/man3/tqprogressdialog.3qt index 3bfd25acf..0b8e9f2e2 100644 --- a/doc/man/man3/tqprogressdialog.3qt +++ b/doc/man/man3/tqprogressdialog.3qt @@ -189,11 +189,11 @@ Operation::Operation( TQObject *parent = 0 ) .br pd = new QProgressDialog( "Operation in progress.", "Cancel", 100 ); .br - connect( pd, SIGNAL(canceled()), this, SLOT(cancel()) ); + connect( pd, TQ_SIGNAL(canceled()), this, TQ_SLOT(cancel()) ); .br t = new QTimer( this ); .br - connect( t, SIGNAL(timeout()), this, SLOT(perform()) ); + connect( t, TQ_SIGNAL(timeout()), this, TQ_SLOT(perform()) ); .br t->start( 0 ); .br diff --git a/doc/man/man3/tqstatusbar.3qt b/doc/man/man3/tqstatusbar.3qt index e24daa92a..1e0cc38c7 100644 --- a/doc/man/man3/tqstatusbar.3qt +++ b/doc/man/man3/tqstatusbar.3qt @@ -87,9 +87,9 @@ To display a \fItemporary\fR message, call message() (perhaps by connecting a su .PP .nf .br - connect( loader, SIGNAL(progressMessage(const TQString&)), + connect( loader, TQ_SIGNAL(progressMessage(const TQString&)), .br - statusBar(), SLOT(message(const TQString&)) ); + statusBar(), TQ_SLOT(message(const TQString&)) ); .br .br statusBar()->message("Loading..."); // Initial message diff --git a/doc/man/man3/tqtableitem.3qt b/doc/man/man3/tqtableitem.3qt index adc770799..c6d85cbd7 100644 --- a/doc/man/man3/tqtableitem.3qt +++ b/doc/man/man3/tqtableitem.3qt @@ -258,7 +258,7 @@ If you reimplement this function you'll almost certainly need to reimplement set .br ( (ComboItem*)this )->cb = new QComboBox( table()->viewport() ); .br - TQObject::connect( cb, SIGNAL( activated( int ) ), table(), SLOT( doValueChanged() ) ); + TQObject::connect( cb, TQ_SIGNAL( activated( int ) ), table(), TQ_SLOT( doValueChanged() ) ); .br cb->insertItem( "Yes" ); .br diff --git a/doc/man/man3/tqtimer.3qt b/doc/man/man3/tqtimer.3qt index c690bbede..14a67dc74 100644 --- a/doc/man/man3/tqtimer.3qt +++ b/doc/man/man3/tqtimer.3qt @@ -62,7 +62,7 @@ Example: .br QTimer *timer = new QTimer( myObject ); .br - connect( timer, SIGNAL(timeout()), myObject, SLOT(timerDone()) ); + connect( timer, TQ_SIGNAL(timeout()), myObject, TQ_SLOT(timerDone()) ); .br timer->start( 2000, TRUE ); // 2 seconds single-shot timer .br @@ -78,7 +78,7 @@ This can be used to do heavy work while providing a snappy user interface: .br QTimer *t = new QTimer( myObject ); .br - connect( t, SIGNAL(timeout()), SLOT(processOneThing()) ); + connect( t, TQ_SIGNAL(timeout()), TQ_SLOT(processOneThing()) ); .br t->start( 0, FALSE ); .br @@ -130,7 +130,7 @@ Example: .br QApplication a( argc, argv ); .br - QTimer::singleShot( 10*60*1000, &a, SLOT(quit()) ); + QTimer::singleShot( 10*60*1000, &a, TQ_SLOT(quit()) ); .br ... // create and show your widgets .br diff --git a/doc/man/man3/tqtooltipgroup.3qt b/doc/man/man3/tqtooltipgroup.3qt index 5f54a0b3a..64f9d45b0 100644 --- a/doc/man/man3/tqtooltipgroup.3qt +++ b/doc/man/man3/tqtooltipgroup.3qt @@ -66,13 +66,13 @@ QToolTipGroup has practically no API; it is only used as an argument to QToolTip .br QToolTipGroup * grp = new QToolTipGroup( this, "tool tip relay" ); .br - connect( grp, SIGNAL(showTip(const TQString&)), + connect( grp, TQ_SIGNAL(showTip(const TQString&)), .br - myLabel, SLOT(setText(const TQString&)) ); + myLabel, TQ_SLOT(setText(const TQString&)) ); .br - connect( grp, SIGNAL(removeTip()), + connect( grp, TQ_SIGNAL(removeTip()), .br - myLabel, SLOT(clear()) ); + myLabel, TQ_SLOT(clear()) ); .br QToolTip::add( giraffeButton, "feed giraffe", .br diff --git a/doc/network.doc b/doc/network.doc index e542afe59..f37a911d8 100644 --- a/doc/network.doc +++ b/doc/network.doc @@ -166,12 +166,12 @@ QUrlOperator op; MyClass::MyClass() : TQObject(), op( "ftp://ftp.trolltech.com" ) { - connect( &op, SIGNAL( newChildren( const QValueList<QUrlInfo> &, QNetworkOperation * ) ), - this, SLOT( slotInsertEntries( const QValueList<QUrlInfo> &, QNetworkOperation * ) ) ); - connect( &op, SIGNAL( start( QNetworkOperation * ) ), - this, SLOT( slotStart( QNetworkOperation *) ) ); - connect( &op, SIGNAL( finished( QNetworkOperation * ) ), - this, SLOT( slotFinished( QNetworkOperation *) ) ); + connect( &op, TQ_SIGNAL( newChildren( const QValueList<QUrlInfo> &, QNetworkOperation * ) ), + this, TQ_SLOT( slotInsertEntries( const QValueList<QUrlInfo> &, QNetworkOperation * ) ) ); + connect( &op, TQ_SIGNAL( start( QNetworkOperation * ) ), + this, TQ_SLOT( slotStart( QNetworkOperation *) ) ); + connect( &op, TQ_SIGNAL( finished( QNetworkOperation * ) ), + this, TQ_SLOT( slotFinished( QNetworkOperation *) ) ); } void MyClass::slotInsertEntries( const QValueList<QUrlInfo> &info, QNetworkOperation * ) diff --git a/doc/object.doc b/doc/object.doc index f38389d02..e28036f6d 100644 --- a/doc/object.doc +++ b/doc/object.doc @@ -118,8 +118,8 @@ inherits \l TQObject so that it fits well into the ownership structure of most GUI programs. The normal way of using it is like this: \code QTimer * counter = new QTimer( this ); - connect( counter, SIGNAL(timeout()), - this, SLOT(updateCaption()) ); + connect( counter, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateCaption()) ); counter->start( 1000 ); \endcode @@ -133,7 +133,7 @@ to show the button being pressed down and then (0.1 seconds later) be released when the keyboard is used to "press" a button, for example: \code - QTimer::singleShot( 100, this, SLOT(animateTimeout()) ); + QTimer::singleShot( 100, this, TQ_SLOT(animateTimeout()) ); \endcode 0.1 seconds after this line of code is executed, the same button's @@ -176,7 +176,7 @@ single-threaded application without blocking the user interface. Mandelbrot::Mandelbrot( TQObject *parent=0, const char *name ) : TQObject( parent, name ) { - connect( &timer, SIGNAL(timeout()), SLOT(calculate()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(calculate()) ); ... } diff --git a/doc/signalsandslots.doc b/doc/signalsandslots.doc index d3c5c7c22..f3fc24259 100644 --- a/doc/signalsandslots.doc +++ b/doc/signalsandslots.doc @@ -173,7 +173,7 @@ Here is one way to connect two of these objects together: \code Foo a, b; - connect(&a, SIGNAL(valueChanged(int)), &b, SLOT(setValue(int))); + connect(&a, TQ_SIGNAL(valueChanged(int)), &b, TQ_SLOT(setValue(int))); b.setValue( 11 ); // a == undefined b == 11 a.setValue( 79 ); // a == 79 b == 79 b.value(); // returns 79 diff --git a/doc/sql.doc b/doc/sql.doc index d39d48298..9754cf178 100644 --- a/doc/sql.doc +++ b/doc/sql.doc @@ -893,8 +893,8 @@ can easily be linked together with a \l QDataTable to display a detailed view of a record: \code - connect( myDataTable, SIGNAL( currentChanged( QSqlRecord* ) ), - myDataView, SLOT( refresh( QSqlRecord* ) ) ); + connect( myDataTable, TQ_SIGNAL( currentChanged( QSqlRecord* ) ), + myDataView, TQ_SLOT( refresh( QSqlRecord* ) ) ); \endcode \target Editing_a_Record diff --git a/doc/tutorial2.doc b/doc/tutorial2.doc index c8ab98555..efe2b1d8b 100644 --- a/doc/tutorial2.doc +++ b/doc/tutorial2.doc @@ -628,7 +628,7 @@ We hold the list of recently opened files in a string list. \quotefile chart/chartform.cpp \skipto ::updateRecentFilesMenu() -\printuntil SLOT +\printuntil TQ_SLOT \printline \printline \printline diff --git a/examples/aclock/aclock.cpp b/examples/aclock/aclock.cpp index cc312da01..e492529ef 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 0edd623c2..ecd70cdd0 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 ca75f8c25..fd3df5054 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 810de04c1..5da1a685c 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 51e67f73b..82a2c81ae 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 b74f36e4d..80c36dc05 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 11b93a8e0..09176d316 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 d67a5149d..455bcc425 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 faf5eb0c2..442af1206 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 2ec343d84..2ae71486b 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 7e78c7ceb..24744693b 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 92c720d7b..aad94c54d 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 c9106dc3b..483003754 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 21ba4b51d..543783c30 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 d13d20979..7de1e2b06 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 08b11fc30..a75043ed4 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 c6ccf72e4..b22f6ffcb 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 7ca28c828..7cc6a44af 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 fe65c4911..89cac969a 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 e04be6317..690a1054a 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 0cd5006a3..a263b8b1a 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 b99e93aca..257609f13 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 925fdf139..4458e18bd 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 5c75b9483..b0d490e78 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 3010d4105..8d7541fcb 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 973bc6c7c..c2a22ea14 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 7aa86c4e7..9e673a386 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 833caa179..01bb90add 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 c564f21b6..5e203ed16 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 9c04a4b64..0e12751ea 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 01c6b9bd8..93e6826cc 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 743ae88ea..37c51c80f 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 18c5b60ca..7257e6ed0 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 2af77d594..3a618b60f 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 4d5ab2016..5fc1e0f7b 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 98579af15..0bcaef440 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 2d2791ed5..d2d6f2edb 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 1c735a9b6..ed636bd1f 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 990449ad4..2e60808c5 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 e21dfef61..24e5af910 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 a1782cf05..a1f5f9edb 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 95fd3773b..22608f099 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 4ca9039ef..88ed7cb94 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 acf769b6e..f632cfc28 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 cb64166b4..95b2786f2 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 7bdbad8af..140a9333f 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 d09840c2b..7a8738524 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 700547ef5..8e8e8661a 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 6e78b8bf6..2562e2be3 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 f7f3593c5..f7ed6eeb8 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 3093e89a9..16d3b53c5 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 e40f96bec..bc2ff2699 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 c1be353b7..c24f7d508 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 38568e761..6e778c62d 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 be09f0a8f..6f0a018b6 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 537ad1a9e..cf06c806d 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 1344db998..66680f852 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 6ec40009f..138ffa53b 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 e7e206be5..07fd5d76c 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 14e1b583b..8997ddaae 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 da2b0b9ed..3fa2ec737 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 e5b70cb10..45c4553ee 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 9db13ff18..53e7e9289 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 cda1f571a..aba0fef02 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 e2b04e4a8..3d974cb50 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 8f3cde07c..ded8b2600 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 28e0bd37a..09942bcc3 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 7bff123b4..c1d05b6c5 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 a405fd8ba..d71de6590 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 992880dd3..c3101639f 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 aa1535013..aed848388 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 cee25929a..51f690126 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 3a288fc0d..e9a34b281 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 1fe31dda4..833718ada 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 3c24e03d9..070b8a7cd 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 e7cbc2c55..4bd7b6423 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 76072217c..914d56855 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 ac1f01678..68e0a3c7a 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 11b9d2273..95e33e260 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 9176fe4bd..d93c61af8 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 3f59ecd18..11cb675a6 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 2b3761b12..585994a7b 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 d95482ff2..118783902 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 b02d0d171..3a591c225 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 973cd4d53..78b0fcefb 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 4438c4c4f..25fd14b0a 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 aceb71ccb..5c3c73c98 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 d12867e37..190f50de2 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 47fc24903..dfe2d70a7 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 1f13f72fe..b2cf108b0 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 9fcd73b38..a580e879b 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 fa371f657..b5705df6a 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 c5b29d70a..90a1c0d45 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 ab1441749..28dbc48a9 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 1dd9260d7..e423cc7ec 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 1d372e4b9..c52c8373b 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 caa581784..e9743515f 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 066af1f36..b166017aa 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 e3d17d87f..dfcc5d684 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 f031044b1..3f80d8881 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 f44853ddc..29d6e1b5a 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 5f950b337..2abdabfb7 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 1d68c04b3..a0f5d69a3 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 52545f57e..4ef1a1d97 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 f2808e902..fd508ca1c 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 808444c7c..adde6e2e3 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 2d5420bdc..115a27420 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 dd2b107f4..e3cfece57 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 c67c19387..7726ba4cb 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 adf247a76..457425073 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 1f72181d7..07bf2d447 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 41fd5eb33..19fc9fec6 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 bd624b4ab..84941cbec 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 fc5816a74..e3df48d70 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 f07bf4a26..afa86f3dc 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 20294997b..fdc6402f6 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 88111945f..7eee9c990 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 7f182f850..23004dfd6 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 85dec7171..913b75dc0 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 03e4fa276..988df2385 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 210c25150..5e68c55e3 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 d012f1c14..860e6dd45 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 ad5c8699f..40cb686a8 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 d9632d6e0..60f73402b 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()); diff --git a/extensions/nsplugin/examples/grapher/grapher.cpp b/extensions/nsplugin/examples/grapher/grapher.cpp index d1a4239a0..328a6b359 100644 --- a/extensions/nsplugin/examples/grapher/grapher.cpp +++ b/extensions/nsplugin/examples/grapher/grapher.cpp @@ -117,16 +117,16 @@ Graph::Graph( GraphModel& mdl ) : for ( Style s = Pie; styleName[s]; s = Style(s+1)) { stylemenu->insertItem(styleName[s], s+100); } - connect(stylemenu, SIGNAL(activated(int)), - this, SLOT(setStyleFromMenu(int))); + connect(stylemenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(setStyleFromMenu(int))); setStyle(Pie); menubar->insertItem("Style", stylemenu); menubar->insertSeparator(); TQPopupMenu* help = new TQPopupMenu; - help->insertItem( "About plugin...", this, SIGNAL(aboutPlugin()) ); - help->insertItem( "About data...", this, SIGNAL(aboutData()) ); + help->insertItem( "About plugin...", this, TQ_SIGNAL(aboutPlugin()) ); + help->insertItem( "About data...", this, TQ_SIGNAL(aboutData()) ); menubar->insertItem("Help", help); menubar->hide(); } @@ -459,8 +459,8 @@ TQNPWidget* Grapher::newWindow() int ptsize = fontsize ? atoi(fontsize) : graph->font().pointSize(); if (fontfamily) graph->setFont(TQFont(fontfamily, ptsize)); - connect(graph, SIGNAL(aboutPlugin()), this, SLOT(aboutPlugin())); - connect(graph, SIGNAL(aboutData()), this, SLOT(aboutData())); + connect(graph, TQ_SIGNAL(aboutPlugin()), this, TQ_SLOT(aboutPlugin())); + connect(graph, TQ_SIGNAL(aboutData()), this, TQ_SLOT(aboutData())); return graph; } diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp index 2d971691e..4ff19772f 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -290,14 +290,14 @@ void TQMultiInputContext::changeInputMethod( TQString key ) const char *method; if ( beIndirectlyConnected ) { - method = SLOT(imEventReceived(TQObject *,TQIMEvent *)); + method = TQ_SLOT(imEventReceived(TQObject *,TQIMEvent *)); } else { - method = SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)); + method = TQ_SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)); } - connect( _slave, SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), + connect( _slave, TQ_SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), this, method ); - connect( _slave, SIGNAL(deletionRequested()), - this, SLOT(destroyInputContext()) ); + connect( _slave, TQ_SIGNAL(deletionRequested()), + this, TQ_SLOT(destroyInputContext()) ); if ( cachedFocus ) { _slave->setFocus(); @@ -364,8 +364,8 @@ TQPopupMenu *TQMultiInputContext::createImSelPopup() } } - TQObject::connect( popup, SIGNAL(activated(int)), - this, SLOT(changeInputMethodWithMenuId(int)) ); + TQObject::connect( popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(changeInputMethodWithMenuId(int)) ); return popup; } diff --git a/qmake/examples/precompile/main.cpp b/qmake/examples/precompile/main.cpp index 80fc704d4..3bdad9540 100644 --- a/qmake/examples/precompile/main.cpp +++ b/qmake/examples/precompile/main.cpp @@ -11,7 +11,7 @@ int main(int argc, char **argv) MyObject obj; MyDialog dia; app.setMainWidget( &dia ); - dia.connect( dia.aButton, SIGNAL(clicked()), SLOT(close()) ); + dia.connect( dia.aButton, TQ_SIGNAL(clicked()), TQ_SLOT(close()) ); dia.show(); return app.exec(); diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp index e947ccfe4..88c0c7960 100644 --- a/src/canvas/qcanvas.cpp +++ b/src/canvas/qcanvas.cpp @@ -989,7 +989,7 @@ void TQCanvas::setAdvancePeriod(int ms) if ( update_timer ) delete update_timer; update_timer = new TQTimer(this); - connect(update_timer,SIGNAL(timeout()),this,SLOT(advance())); + connect(update_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(advance())); update_timer->start(ms); } } @@ -1010,7 +1010,7 @@ void TQCanvas::setUpdatePeriod(int ms) if ( update_timer ) delete update_timer; update_timer = new TQTimer(this); - connect(update_timer,SIGNAL(timeout()),this,SLOT(update())); + connect(update_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); update_timer->start(ms); } } @@ -3535,7 +3535,7 @@ TQCanvasView::TQCanvasView(TQWidget* parent, const char* name, WFlags f) : d = new TQCanvasViewData; viewing = 0; setCanvas(0); - connect(this,SIGNAL(contentsMoving(int,int)),this,SLOT(cMoving(int,int))); + connect(this,TQ_SIGNAL(contentsMoving(int,int)),this,TQ_SLOT(cMoving(int,int))); } /*! @@ -3551,7 +3551,7 @@ TQCanvasView::TQCanvasView(TQCanvas* canvas, TQWidget* parent, const char* name, viewing = 0; setCanvas(canvas); - connect(this,SIGNAL(contentsMoving(int,int)),this,SLOT(cMoving(int,int))); + connect(this,TQ_SIGNAL(contentsMoving(int,int)),this,TQ_SLOT(cMoving(int,int))); } /*! @@ -3584,7 +3584,7 @@ void TQCanvasView::setCanvas(TQCanvas* canvas) } viewing=canvas; if (viewing) { - connect(viewing,SIGNAL(resized()), this, SLOT(updateContentsSize())); + connect(viewing,TQ_SIGNAL(resized()), this, TQ_SLOT(updateContentsSize())); viewing->addView(this); } if ( d ) // called by d'tor diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp index 12efeb3f9..addbd1bf8 100644 --- a/src/dialogs/qcolordialog.cpp +++ b/src/dialogs/qcolordialog.cpp @@ -1085,10 +1085,10 @@ TQColorShower::TQColorShower( TQWidget *parent, const char *name ) lab = new TQColorShowLabel( this ); lab->setMinimumWidth( 60 ); //### gl->addMultiCellWidget(lab, 0,-1,0,0); - connect( lab, SIGNAL( colorDropped(TQRgb) ), - this, SIGNAL( newCol(TQRgb) ) ); - connect( lab, SIGNAL( colorDropped(TQRgb) ), - this, SLOT( setRgb(TQRgb) ) ); + connect( lab, TQ_SIGNAL( colorDropped(TQRgb) ), + this, TQ_SIGNAL( newCol(TQRgb) ) ); + connect( lab, TQ_SIGNAL( colorDropped(TQRgb) ), + this, TQ_SLOT( setRgb(TQRgb) ) ); hEd = new TQColNumLineEdit( this, "qt_hue_edit" ); hEd->setValidator( val360 ); @@ -1141,14 +1141,14 @@ TQColorShower::TQColorShower( TQWidget *parent, const char *name ) alphaEd->hide(); alphaLab->hide(); - connect( hEd, SIGNAL(textChanged(const TQString&)), this, SLOT(hsvEd()) ); - connect( sEd, SIGNAL(textChanged(const TQString&)), this, SLOT(hsvEd()) ); - connect( vEd, SIGNAL(textChanged(const TQString&)), this, SLOT(hsvEd()) ); + connect( hEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(hsvEd()) ); + connect( sEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(hsvEd()) ); + connect( vEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(hsvEd()) ); - connect( rEd, SIGNAL(textChanged(const TQString&)), this, SLOT(rgbEd()) ); - connect( gEd, SIGNAL(textChanged(const TQString&)), this, SLOT(rgbEd()) ); - connect( bEd, SIGNAL(textChanged(const TQString&)), this, SLOT(rgbEd()) ); - connect( alphaEd, SIGNAL(textChanged(const TQString&)), this, SLOT(rgbEd()) ); + connect( rEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rgbEd()) ); + connect( gEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rgbEd()) ); + connect( bEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rgbEd()) ); + connect( alphaEd, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rgbEd()) ); } void TQColorShower::showCurrentColor() @@ -1325,7 +1325,7 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : standard->setCellHeight( 24 ); TQLabel * lab = new TQLabel( standard, TQColorDialog::tr( "&Basic colors"), dialog, "qt_basiccolors_lbl" ); - connect( standard, SIGNAL(selected(int,int)), SLOT(newStandard(int,int))); + connect( standard, TQ_SIGNAL(selected(int,int)), TQ_SLOT(newStandard(int,int))); leftLay->addWidget( lab ); leftLay->addWidget( standard ); @@ -1337,7 +1337,7 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : custom->setCellHeight( 24 ); custom->setAcceptDrops( TRUE ); - connect( custom, SIGNAL(selected(int,int)), SLOT(newCustom(int,int))); + connect( custom, TQ_SIGNAL(selected(int,int)), TQ_SLOT(newCustom(int,int))); lab = new TQLabel( custom, TQColorDialog::tr( "&Custom colors") , dialog, "qt_custcolors_lbl" ); leftLay->addWidget( lab ); leftLay->addWidget( custom ); @@ -1372,13 +1372,13 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : lp->setFixedWidth( 20 ); //### pickLay->addWidget( lp ); - connect( cp, SIGNAL(newCol(int,int)), lp, SLOT(setCol(int,int)) ); - connect( lp, SIGNAL(newHsv(int,int,int)), this, SLOT(newHsv(int,int,int)) ); + connect( cp, TQ_SIGNAL(newCol(int,int)), lp, TQ_SLOT(setCol(int,int)) ); + connect( lp, TQ_SIGNAL(newHsv(int,int,int)), this, TQ_SLOT(newHsv(int,int,int)) ); rightLay->addStretch(); cs = new TQColorShower( dialog, "qt_colorshower" ); - connect( cs, SIGNAL(newCol(TQRgb)), this, SLOT(newColorTypedIn(TQRgb))); + connect( cs, TQ_SIGNAL(newCol(TQRgb)), this, TQ_SLOT(newColorTypedIn(TQRgb))); rightLay->addWidget( cs ); TQHBoxLayout *buttons; @@ -1389,10 +1389,10 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : TQPushButton *ok, *cancel; ok = new TQPushButton( TQColorDialog::tr("OK"), dialog, "qt_ok_btn" ); - connect( ok, SIGNAL(clicked()), dialog, SLOT(accept()) ); + connect( ok, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) ); ok->setDefault(TRUE); cancel = new TQPushButton( TQColorDialog::tr("Cancel"), dialog, "qt_cancel_btn" ); - connect( cancel, SIGNAL(clicked()), dialog, SLOT(reject()) ); + connect( cancel, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) ); buttons->addWidget( ok ); buttons->addWidget( cancel ); buttons->addStretch(); @@ -1402,7 +1402,7 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : TQColorDialog::tr("&Add to Custom Colors"), dialog, "qt_add_btn" ); rightLay->addWidget( addCusBt ); - connect( addCusBt, SIGNAL(clicked()), this, SLOT(addCustom()) ); + connect( addCusBt, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCustom()) ); } } diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index 3e3d77c3e..7df3bbea9 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -468,7 +468,7 @@ void TQDialog::done( int r ) bool isMain = tqApp->mainWidget() == this; bool checkLastWindowClosed = isTopLevel() && !isPopup(); if ( checkLastWindowClosed - && tqApp->receivers(SIGNAL(lastWindowClosed())) ) { + && tqApp->receivers(TQ_SIGNAL(lastWindowClosed())) ) { /* if there is no non-withdrawn top level window left (except the desktop, popups, or dialogs with parents), we emit the lastWindowClosed signal */ diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index 13b55a1e1..5fe1b9bf6 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -172,7 +172,7 @@ TQErrorMessage::TQErrorMessage( TQWidget * parent, const char * name ) again->setChecked( TRUE ); grid->addWidget( again, 1, 1, AlignTop + AlignAuto ); ok = new TQPushButton( tr( "&OK" ), this, "ok" ); - connect( ok, SIGNAL(clicked()), this, SLOT(accept()) ); + connect( ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); ok->setFocus(); grid->addMultiCellWidget( ok, 2, 2, 0, 1, AlignCenter ); grid->setColStretch( 1, 42 ); diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 835742d2a..e323f1110 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -634,7 +634,7 @@ public: TQRenameEdit( TQWidget *parent ) : TQLineEdit( parent, "qt_rename_edit" ), doRenameAlreadyEmitted(FALSE) { - connect( this, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) ); + connect( this, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); } protected: @@ -792,8 +792,8 @@ TQFDProgressAnimation::TQFDProgressAnimation( TQWidget *parent ) step = -1; next(); timer = new TQTimer( this ); - connect( timer, SIGNAL( timeout() ), - this, SLOT( next() ) ); + connect( timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( next() ) ); } void TQFDProgressAnimation::start() @@ -892,8 +892,8 @@ TQFDProgressDialog::TQFDProgressDialog( TQWidget *parent, const TQString &fn, in "qt_cancel_btn" ); b->setFixedSize( b->sizeHint() ); layout->addWidget( b ); - connect( b, SIGNAL( clicked() ), - this, SIGNAL( cancelled() ) ); + connect( b, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( cancelled() ) ); animation->start(); } @@ -1182,16 +1182,16 @@ TQFileListBox::TQFileListBox( TQWidget *parent, TQFileDialog *dlg ) box->hide(); box->setBackgroundMode( PaletteBase ); renameTimer = new TQTimer( this ); - connect( lined, SIGNAL( doRename() ), - this, SLOT (rename() ) ); - connect( lined, SIGNAL( cancelRename() ), - this, SLOT( cancelRename() ) ); - connect( renameTimer, SIGNAL( timeout() ), - this, SLOT( doubleClickTimeout() ) ); - connect( changeDirTimer, SIGNAL( timeout() ), - this, SLOT( changeDirDuringDrag() ) ); - connect( this, SIGNAL( contentsMoving(int,int) ), - this, SLOT( contentsMoved(int,int) ) ); + connect( lined, TQ_SIGNAL( doRename() ), + this, TQ_SLOT (rename() ) ); + connect( lined, TQ_SIGNAL( cancelRename() ), + this, TQ_SLOT( cancelRename() ) ); + connect( renameTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doubleClickTimeout() ) ); + connect( changeDirTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( changeDirDuringDrag() ) ); + connect( this, TQ_SIGNAL( contentsMoving(int,int) ), + this, TQ_SLOT( contentsMoved(int,int) ) ); viewport()->setAcceptDrops( TRUE ); dragItem = 0; } @@ -1322,8 +1322,8 @@ void TQFileListBox::viewportMouseMoveEvent( TQMouseEvent *e ) if ( lined->parentWidget()->isVisible() ) cancelRename(); - connect( drag, SIGNAL( destroyed() ), - this, SLOT( dragObjDestroyed() ) ); + connect( drag, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( dragObjDestroyed() ) ); drag->drag(); mousePressed = FALSE; @@ -1583,21 +1583,21 @@ TQFileDialogTQFileListView::TQFileDialogTQFileListView( TQWidget *parent, TQFile box->hide(); box->setBackgroundMode( PaletteBase ); renameTimer = new TQTimer( this ); - connect( lined, SIGNAL( doRename() ), - this, SLOT (rename() ) ); - connect( lined, SIGNAL( cancelRename() ), - this, SLOT( cancelRename() ) ); + connect( lined, TQ_SIGNAL( doRename() ), + this, TQ_SLOT (rename() ) ); + connect( lined, TQ_SIGNAL( cancelRename() ), + this, TQ_SLOT( cancelRename() ) ); header()->setMovingEnabled( FALSE ); - connect( renameTimer, SIGNAL( timeout() ), - this, SLOT( doubleClickTimeout() ) ); - connect( changeDirTimer, SIGNAL( timeout() ), - this, SLOT( changeDirDuringDrag() ) ); - disconnect( header(), SIGNAL( sectionClicked(int) ), - this, SLOT( changeSortColumn(int) ) ); - connect( header(), SIGNAL( sectionClicked(int) ), - this, SLOT( changeSortColumn2(int) ) ); - connect( this, SIGNAL( contentsMoving(int,int) ), - this, SLOT( contentsMoved(int,int) ) ); + connect( renameTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doubleClickTimeout() ) ); + connect( changeDirTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( changeDirDuringDrag() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked(int) ), + this, TQ_SLOT( changeSortColumn(int) ) ); + connect( header(), TQ_SIGNAL( sectionClicked(int) ), + this, TQ_SLOT( changeSortColumn2(int) ) ); + connect( this, TQ_SIGNAL( contentsMoving(int,int) ), + this, TQ_SLOT( contentsMoved(int,int) ) ); viewport()->setAcceptDrops( TRUE ); sortcolumn = 0; @@ -1750,8 +1750,8 @@ void TQFileDialogTQFileListView::viewportMouseMoveEvent( TQMouseEvent *e ) if ( lined->isVisible() ) cancelRename(); - connect( drag, SIGNAL( destroyed() ), - this, SLOT( dragObjDestroyed() ) ); + connect( drag, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( dragObjDestroyed() ) ); drag->drag(); mousePressed = FALSE; @@ -2475,32 +2475,32 @@ void TQFileDialog::init() #if defined(Q_WS_WIN) d->oldPermissionLookup = qt_ntfs_permission_lookup; #endif - connect( d->mimeTypeTimer, SIGNAL( timeout() ), - this, SLOT( doMimeTypeLookup() ) ); + connect( d->mimeTypeTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doMimeTypeLookup() ) ); d->url = TQUrlOperator( ::toRootIfNotExists( TQDir::currentDirPath() ) ); d->oldUrl = d->url; d->currListChildren = 0; - connect( &d->url, SIGNAL( start(TQNetworkOperation*) ), - this, SLOT( urlStart(TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( urlFinished(TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - this, SLOT( insertEntry(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( removed(TQNetworkOperation*) ), - this, SLOT( removeEntry(TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), - this, SLOT( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( itemChanged(TQNetworkOperation*) ), - this, SLOT( itemChanged(TQNetworkOperation*) ) ); - connect( &d->url, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - this, SLOT( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( start(TQNetworkOperation*) ), + this, TQ_SLOT( urlStart(TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( urlFinished(TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + this, TQ_SLOT( insertEntry(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( removed(TQNetworkOperation*) ), + this, TQ_SLOT( removeEntry(TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), + this, TQ_SLOT( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + this, TQ_SLOT( itemChanged(TQNetworkOperation*) ) ); + connect( &d->url, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + this, TQ_SLOT( dataTransferProgress(int,int,TQNetworkOperation*) ) ); nameEdit = new TQLineEdit( this, "name/filter editor" ); nameEdit->setMaxLength( 255 ); //_POSIX_MAX_PATH - connect( nameEdit, SIGNAL(textChanged(const TQString&)), - this, SLOT(fileNameEditDone()) ); + connect( nameEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(fileNameEditDone()) ); nameEdit->installEventFilter( this ); d->splitter = new TQSplitter( this, "qt_splitter" ); @@ -2521,16 +2521,16 @@ void TQFileDialog::init() files->setMinimumSize( 50, 25 + 2*fm.lineSpacing() ); - connect( files, SIGNAL( selectionChanged() ), - this, SLOT( detailViewSelectionChanged() ) ); - connect( files, SIGNAL(currentChanged(TQListViewItem*)), - this, SLOT(updateFileNameEdit(TQListViewItem*)) ); - connect( files, SIGNAL(doubleClicked(TQListViewItem*)), - this, SLOT(selectDirectoryOrFile(TQListViewItem*)) ); - connect( files, SIGNAL(returnPressed(TQListViewItem*)), - this, SLOT(selectDirectoryOrFile(TQListViewItem*)) ); - connect( files, SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), - this, SLOT(popupContextMenu(TQListViewItem*,const TQPoint&,int)) ); + connect( files, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( detailViewSelectionChanged() ) ); + connect( files, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(updateFileNameEdit(TQListViewItem*)) ); + connect( files, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(selectDirectoryOrFile(TQListViewItem*)) ); + connect( files, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(selectDirectoryOrFile(TQListViewItem*)) ); + connect( files, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(popupContextMenu(TQListViewItem*,const TQPoint&,int)) ); files->installEventFilter( this ); files->viewport()->installEventFilter( this ); @@ -2539,14 +2539,14 @@ void TQFileDialog::init() d->moreFiles->setRowMode( TQListBox::FitToHeight ); d->moreFiles->setVariableWidth( TRUE ); - connect( d->moreFiles, SIGNAL(selected(TQListBoxItem*)), - this, SLOT(selectDirectoryOrFile(TQListBoxItem*)) ); - connect( d->moreFiles, SIGNAL( selectionChanged() ), - this, SLOT( listBoxSelectionChanged() ) ); - connect( d->moreFiles, SIGNAL(highlighted(TQListBoxItem*)), - this, SLOT(updateFileNameEdit(TQListBoxItem*)) ); - connect( d->moreFiles, SIGNAL( rightButtonPressed(TQListBoxItem*,const TQPoint&) ), - this, SLOT( popupContextMenu(TQListBoxItem*,const TQPoint&) ) ); + connect( d->moreFiles, TQ_SIGNAL(selected(TQListBoxItem*)), + this, TQ_SLOT(selectDirectoryOrFile(TQListBoxItem*)) ); + connect( d->moreFiles, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( listBoxSelectionChanged() ) ); + connect( d->moreFiles, TQ_SIGNAL(highlighted(TQListBoxItem*)), + this, TQ_SLOT(updateFileNameEdit(TQListBoxItem*)) ); + connect( d->moreFiles, TQ_SIGNAL( rightButtonPressed(TQListBoxItem*,const TQPoint&) ), + this, TQ_SLOT( popupContextMenu(TQListBoxItem*,const TQPoint&) ) ); d->moreFiles->installEventFilter( this ); d->moreFiles->viewport()->installEventFilter( this ); @@ -2554,9 +2554,9 @@ void TQFileDialog::init() okB = new TQPushButton( tr("&OK"), this, "OK" ); //### Or "Save (see other "OK") okB->setDefault( TRUE ); okB->setEnabled( FALSE ); - connect( okB, SIGNAL(clicked()), this, SLOT(okClicked()) ); + connect( okB, TQ_SIGNAL(clicked()), this, TQ_SLOT(okClicked()) ); cancelB = new TQPushButton( tr("Cancel") , this, "Cancel" ); - connect( cancelB, SIGNAL(clicked()), this, SLOT(cancelClicked()) ); + connect( cancelB, TQ_SIGNAL(clicked()), this, TQ_SLOT(cancelClicked()) ); d->paths = new TQComboBox( TRUE, this, "directory history/editor" ); d->paths->setDuplicatesEnabled( FALSE ); @@ -2576,8 +2576,8 @@ void TQFileDialog::init() d->paths->insertItem( *openFolderIcon, TQDir::homeDirPath() ); } - connect( d->paths, SIGNAL(activated(const TQString&)), - this, SLOT(setDir(const TQString&)) ); + connect( d->paths, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(setDir(const TQString&)) ); d->paths->installEventFilter( this ); TQObjectList *ol = d->paths->queryList( "TQLineEdit" ); @@ -2589,10 +2589,10 @@ void TQFileDialog::init() d->types = new TQComboBox( TRUE, this, "file types" ); d->types->setDuplicatesEnabled( FALSE ); d->types->setEditable( FALSE ); - connect( d->types, SIGNAL(activated(const TQString&)), - this, SLOT(setFilter(const TQString&)) ); - connect( d->types, SIGNAL(activated(const TQString&)), - this, SIGNAL(filterSelected(const TQString&)) ); + connect( d->types, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(setFilter(const TQString&)) ); + connect( d->types, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SIGNAL(filterSelected(const TQString&)) ); d->pathL = new TQLabel( d->paths, tr("Look &in:"), this, "qt_looin_lbl" ); d->fileL = new TQLabel( nameEdit, tr("File &name:"), this, "qt_filename_lbl" ); @@ -2601,7 +2601,7 @@ void TQFileDialog::init() d->goBack = new TQToolButton( this, "go back" ); d->goBack->setEnabled( FALSE ); d->goBack->setFocusPolicy( TabFocus ); - connect( d->goBack, SIGNAL( clicked() ), this, SLOT( goBack() ) ); + connect( d->goBack, TQ_SIGNAL( clicked() ), this, TQ_SLOT( goBack() ) ); #ifndef TQT_NO_TOOLTIP TQToolTip::add( d->goBack, tr( "Back" ) ); #endif @@ -2613,8 +2613,8 @@ void TQFileDialog::init() TQToolTip::add( d->cdToParent, tr( "One directory up" ) ); #endif d->cdToParent->setIconSet( *cdToParentIcon ); - connect( d->cdToParent, SIGNAL(clicked()), - this, SLOT(cdUpClicked()) ); + connect( d->cdToParent, TQ_SIGNAL(clicked()), + this, TQ_SLOT(cdUpClicked()) ); d->newFolder = new TQToolButton( this, "new folder" ); d->newFolder->setFocusPolicy( TabFocus ); @@ -2622,17 +2622,17 @@ void TQFileDialog::init() TQToolTip::add( d->newFolder, tr( "Create New Folder" ) ); #endif d->newFolder->setIconSet( *newFolderIcon ); - connect( d->newFolder, SIGNAL(clicked()), - this, SLOT(newFolderClicked()) ); + connect( d->newFolder, TQ_SIGNAL(clicked()), + this, TQ_SLOT(newFolderClicked()) ); d->modeButtons = new TQButtonGroup( 0, "invisible group" ); - connect( d->modeButtons, SIGNAL(destroyed()), - this, SLOT(modeButtonsDestroyed()) ); + connect( d->modeButtons, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(modeButtonsDestroyed()) ); d->modeButtons->setExclusive( TRUE ); - connect( d->modeButtons, SIGNAL(clicked(int)), - d->stack, SLOT(raiseWidget(int)) ); - connect( d->modeButtons, SIGNAL(clicked(int)), - this, SLOT(changeMode(int)) ); + connect( d->modeButtons, TQ_SIGNAL(clicked(int)), + d->stack, TQ_SLOT(raiseWidget(int)) ); + connect( d->modeButtons, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(changeMode(int)) ); d->mcView = new TQToolButton( this, "mclistbox view" ); d->mcView->setFocusPolicy( TabFocus ); @@ -2683,14 +2683,14 @@ void TQFileDialog::init() d->previewContents->setToggleButton( TRUE ); d->modeButtons->insert( d->previewContents ); - connect( d->detailView, SIGNAL( clicked() ), - d->moreFiles, SLOT( cancelRename() ) ); - connect( d->detailView, SIGNAL( clicked() ), - files, SLOT( cancelRename() ) ); - connect( d->mcView, SIGNAL( clicked() ), - d->moreFiles, SLOT( cancelRename() ) ); - connect( d->mcView, SIGNAL( clicked() ), - files, SLOT( cancelRename() ) ); + connect( d->detailView, TQ_SIGNAL( clicked() ), + d->moreFiles, TQ_SLOT( cancelRename() ) ); + connect( d->detailView, TQ_SIGNAL( clicked() ), + files, TQ_SLOT( cancelRename() ) ); + connect( d->mcView, TQ_SIGNAL( clicked() ), + d->moreFiles, TQ_SLOT( cancelRename() ) ); + connect( d->mcView, TQ_SIGNAL( clicked() ), + files, TQ_SLOT( cancelRename() ) ); d->stack->raiseWidget( d->moreFiles ); d->mcView->setOn( TRUE ); @@ -2814,8 +2814,8 @@ void TQFileDialog::init() d->preview->hide(); nameEdit->setFocus(); - connect( nameEdit, SIGNAL( returnPressed() ), - this, SLOT( fileNameEditReturnPressed() ) ); + connect( nameEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( fileNameEditReturnPressed() ) ); } /*! @@ -5438,7 +5438,7 @@ bool TQFileDialog::eventFilter( TQObject * o, TQEvent * e ) return TRUE; } else if ( o == files && e->type() == TQEvent::FocusOut && files->currentItem() ) { } else if ( o == files && e->type() == TQEvent::KeyPress ) { - TQTimer::singleShot( 0, this, SLOT(fixupNameEdit()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(fixupNameEdit()) ); } else if ( o == nameEdit && e->type() == TQEvent::KeyPress && d->mode != AnyFile ) { if ( ( nameEdit->cursorPosition() == (int)nameEdit->text().length() || nameEdit->hasSelectedText() ) && isprint(((TQKeyEvent *)e)->ascii()) ) { @@ -5931,8 +5931,8 @@ void TQFileDialog::dataTransferProgress( int bytesDone, int bytesTotal, TQNetwor if ( bytesDone < bytesTotal) { d->ignoreStop = FALSE; d->progressDia = new TQFDProgressDialog( this, label, bytesTotal ); - connect( d->progressDia, SIGNAL( cancelled() ), - this, SLOT( stopCopy() ) ); + connect( d->progressDia, TQ_SIGNAL( cancelled() ), + this, TQ_SLOT( stopCopy() ) ); d->progressDia->show(); } else return; @@ -6319,7 +6319,7 @@ void TQFileDialog::stopCopy() d->url.stop(); if ( d->progressDia ) { d->ignoreStop = TRUE; - TQTimer::singleShot( 100, this, SLOT( removeProgressDia() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( removeProgressDia() ) ); } d->url.blockSignals( FALSE ); } diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp index 9e1094aa5..3f713d9e0 100644 --- a/src/dialogs/qfontdialog.cpp +++ b/src/dialogs/qfontdialog.cpp @@ -215,21 +215,21 @@ TQFontDialog::TQFontDialog( TQWidget *parent, const char *name, d->size = 0; d->smoothScalable = FALSE; - connect( d->scriptCombo, SIGNAL(activated(int)), - SLOT(scriptHighlighted(int)) ); - connect( d->familyList, SIGNAL(highlighted(int)), - SLOT(familyHighlighted(int)) ); - connect( d->styleList, SIGNAL(highlighted(int)), - SLOT(styleHighlighted(int)) ); - connect( d->sizeList, SIGNAL(highlighted(const TQString&)), - SLOT(sizeHighlighted(const TQString&)) ); - connect( d->sizeEdit, SIGNAL(textChanged(const TQString&)), - SLOT(sizeChanged(const TQString&)) ); - - connect( d->strikeout, SIGNAL(clicked()), - SLOT(updateSample()) ); - connect( d->underline, SIGNAL(clicked()), - SLOT(updateSample()) ); + connect( d->scriptCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(scriptHighlighted(int)) ); + connect( d->familyList, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(familyHighlighted(int)) ); + connect( d->styleList, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(styleHighlighted(int)) ); + connect( d->sizeList, TQ_SIGNAL(highlighted(const TQString&)), + TQ_SLOT(sizeHighlighted(const TQString&)) ); + connect( d->sizeEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(sizeChanged(const TQString&)) ); + + connect( d->strikeout, TQ_SIGNAL(clicked()), + TQ_SLOT(updateSample()) ); + connect( d->underline, TQ_SIGNAL(clicked()), + TQ_SLOT(updateSample()) ); (void)d->familyList->sizeHint(); (void)d->styleList->sizeHint(); @@ -288,7 +288,7 @@ TQFontDialog::TQFontDialog( TQWidget *parent, const char *name, d->ok = new TQPushButton( okt, this, "accept font selection" ); buttonBox->addWidget( d->ok ); if ( modal ) - connect( d->ok, SIGNAL(clicked()), SLOT(accept()) ); + connect( d->ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); d->ok->setDefault( TRUE ); buttonBox->addSpacing( 12 ); @@ -296,7 +296,7 @@ TQFontDialog::TQFontDialog( TQWidget *parent, const char *name, TQString cancelt = modal ? tr("Cancel") : tr("Close"); d->cancel = new TQPushButton( cancelt, this, "cancel/close" ); buttonBox->addWidget( d->cancel ); - connect( d->cancel, SIGNAL(clicked()), SLOT(reject()) ); + connect( d->cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); resize( 500, 360 ); diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp index 1569d7e73..ee6c15e75 100644 --- a/src/dialogs/qinputdialog.cpp +++ b/src/dialogs/qinputdialog.cpp @@ -160,13 +160,13 @@ TQInputDialog::TQInputDialog( const TQString &label, TQWidget* parent, hbox->addWidget( d->ok ); hbox->addWidget( cancel ); - connect( d->lineEdit, SIGNAL( returnPressed() ), - this, SLOT( tryAccept() ) ); - connect( d->lineEdit, SIGNAL( textChanged(const TQString&) ), - this, SLOT( textChanged(const TQString&) ) ); + connect( d->lineEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( tryAccept() ) ); + connect( d->lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( textChanged(const TQString&) ) ); - connect( d->ok, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( cancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); + connect( d->ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( cancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); TQSize sh = sizeHint().expandedTo( TQSize(400, 10) ); setType( type ); diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp index d4c410b4b..a17fad136 100644 --- a/src/dialogs/qmessagebox.cpp +++ b/src/dialogs/qmessagebox.cpp @@ -681,7 +681,7 @@ void TQMessageBox::init( int button0, int button1, int button2 ) } mbd->pb[i]->setAutoDefault( TRUE ); mbd->pb[i]->setFocusPolicy( TQWidget::StrongFocus ); - connect( mbd->pb[i], SIGNAL(clicked()), SLOT(buttonClicked()) ); + connect( mbd->pb[i], TQ_SIGNAL(clicked()), TQ_SLOT(buttonClicked()) ); } } resizeButtons(); diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp index 48b180cdc..105862173 100644 --- a/src/dialogs/qprintdialog.cpp +++ b/src/dialogs/qprintdialog.cpp @@ -932,8 +932,8 @@ TQPrintDialog::TQPrintDialog( TQPrinter *prn, TQWidget *parent, const char *name tll->activate(); - connect( d->ok, SIGNAL(clicked()), SLOT(okClicked()) ); - connect( cancel, SIGNAL(clicked()), SLOT(reject()) ); + connect( d->ok, TQ_SIGNAL(clicked()), TQ_SLOT(okClicked()) ); + connect( cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); TQSize ms( minimumSize() ); TQSize ss( TQApplication::desktop()->screenGeometry( pos() ).size() ); @@ -988,8 +988,8 @@ TQGroupBox * TQPrintDialog::setupPrinterSettings() d->colorMode = new TQButtonGroup( this ); d->colorMode->hide(); - connect( d->colorMode, SIGNAL(clicked(int)), - this, SLOT(colorModeSelected(int)) ); + connect( d->colorMode, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(colorModeSelected(int)) ); TQRadioButton *rb; rb = new TQRadioButton( tr( "Print in color if available" ), @@ -1013,8 +1013,8 @@ TQGroupBox * TQPrintDialog::setupDestination() d->printerOrFile = new TQButtonGroup( this ); d->printerOrFile->hide(); - connect( d->printerOrFile, SIGNAL(clicked(int)), - this, SLOT(printerOrFileSelected(int)) ); + connect( d->printerOrFile, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(printerOrFileSelected(int)) ); // printer radio button, list TQRadioButton * rb = new TQRadioButton( tr( "Print to printer:" ), g, @@ -1156,8 +1156,8 @@ TQGroupBox * TQPrintDialog::setupDestination() horiz->addSpacing( 19 ); d->fileName = new TQLineEdit( g, "file name" ); - connect( d->fileName, SIGNAL( textChanged(const TQString&) ), - this, SLOT( fileNameEditChanged(const TQString&) ) ); + connect( d->fileName, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( fileNameEditChanged(const TQString&) ) ); horiz->addWidget( d->fileName, 1 ); horiz->addSpacing( 6 ); d->browse = new TQPushButton( tr("Browse..."), g, "browse files" ); @@ -1165,8 +1165,8 @@ TQGroupBox * TQPrintDialog::setupDestination() #ifdef TQT_NO_FILEDIALOG d->browse->setEnabled( FALSE ); #endif - connect( d->browse, SIGNAL(clicked()), - this, SLOT(browseClicked()) ); + connect( d->browse, TQ_SIGNAL(clicked()), + this, TQ_SLOT(browseClicked()) ); horiz->addWidget( d->browse ); d->fileName->setEnabled( FALSE ); @@ -1192,13 +1192,13 @@ TQGroupBox * TQPrintDialog::setupOptions() d->printRange = new TQButtonGroup( this ); d->printRange->hide(); - connect( d->printRange, SIGNAL(clicked(int)), - this, SLOT(printRangeSelected(int)) ); + connect( d->printRange, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(printRangeSelected(int)) ); d->pageOrder = new TQButtonGroup( this ); d->pageOrder->hide(); - connect( d->pageOrder, SIGNAL(clicked(int)), - this, SLOT(pageOrderSelected(int)) ); + connect( d->pageOrder, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(pageOrderSelected(int)) ); d->printAllButton = new TQRadioButton( tr("Print all"), g, "print all" ); d->printRange->insert( d->printAllButton, 0 ); @@ -1224,8 +1224,8 @@ TQGroupBox * TQPrintDialog::setupOptions() d->firstPage = new TQPrintDialogSpinBox( 1, 9999, 1, g, "first page" ); d->firstPage->setValue( 1 ); horiz->addWidget( d->firstPage, 1 ); - connect( d->firstPage, SIGNAL(valueChanged(int)), - this, SLOT(setFirstPage(int)) ); + connect( d->firstPage, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(setFirstPage(int)) ); horiz = new TQBoxLayout( TQBoxLayout::LeftToRight ); tll->addLayout( horiz ); @@ -1237,8 +1237,8 @@ TQGroupBox * TQPrintDialog::setupOptions() d->lastPage = new TQPrintDialogSpinBox( 1, 9999, 1, g, "last page" ); d->lastPage->setValue( 9999 ); horiz->addWidget( d->lastPage, 1 ); - connect( d->lastPage, SIGNAL(valueChanged(int)), - this, SLOT(setLastPage(int)) ); + connect( d->lastPage, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(setLastPage(int)) ); lay->addSpacing( 25 ); tll = new TQBoxLayout( lay, TQBoxLayout::Down ); @@ -1268,8 +1268,8 @@ TQGroupBox * TQPrintDialog::setupOptions() d->copies = new TQPrintDialogSpinBox( 1, 99, 1, g, "copies" ); d->copies->setValue( 1 ); horiz->addWidget( d->copies, 1 ); - connect( d->copies, SIGNAL(valueChanged(int)), - this, SLOT(setNumCopies(int)) ); + connect( d->copies, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(setNumCopies(int)) ); TQSize s = d->firstPageLabel->sizeHint() .expandedTo( d->lastPageLabel->sizeHint() ) @@ -1311,8 +1311,8 @@ TQGroupBox * TQPrintDialog::setupPaper() g->addSpace( 8 ); - connect( d->orientationCombo, SIGNAL( activated(int) ), - this, SLOT( orientSelected(int) ) ); + connect( d->orientationCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( orientSelected(int) ) ); // paper size d->sizeCombo = new TQComboBox( FALSE, g ); @@ -1352,8 +1352,8 @@ TQGroupBox * TQPrintDialog::setupPaper() isc( d, tr( "Tabloid (279 x 432 mm)" ), TQPrinter::Tabloid ); isc( d, tr( "US Common #10 Envelope (105 x 241 mm)" ), TQPrinter::Comm10E ); - connect( d->sizeCombo, SIGNAL( activated(int) ), - this, SLOT( paperSizeSelected(int) ) ); + connect( d->sizeCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( paperSizeSelected(int) ) ); return g; } diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp index f7d1e1c5a..6e18f2d7f 100644 --- a/src/dialogs/qprogressdialog.cpp +++ b/src/dialogs/qprogressdialog.cpp @@ -167,9 +167,9 @@ Operation::Operation( TQObject *parent = 0 ) : TQObject( parent ), steps( 0 ) { pd = new TQProgressDialog( "Operation in progress.", "Cancel", 100 ); - connect( pd, SIGNAL(canceled()), this, SLOT(cancel()) ); + connect( pd, TQ_SIGNAL(canceled()), this, TQ_SLOT(cancel()) ); t = new TQTimer( this ); - connect( t, SIGNAL(timeout()), this, SLOT(perform()) ); + connect( t, TQ_SIGNAL(timeout()), this, TQ_SLOT(perform()) ); t->start( 0 ); } @@ -314,10 +314,10 @@ void TQProgressDialog::init( TQWidget *creator, d->autoReset = TRUE; d->forceHide = FALSE; setCancelButtonText( canc ); - connect( this, SIGNAL(canceled()), this, SIGNAL(cancelled()) ); - connect( this, SIGNAL(canceled()), this, SLOT(cancel()) ); + connect( this, TQ_SIGNAL(canceled()), this, TQ_SIGNAL(cancelled()) ); + connect( this, TQ_SIGNAL(canceled()), this, TQ_SLOT(cancel()) ); forceTimer = new TQTimer( this ); - connect( forceTimer, SIGNAL(timeout()), this, SLOT(forceShow()) ); + connect( forceTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(forceShow()) ); layout(); } @@ -410,11 +410,11 @@ void TQProgressDialog::setCancelButton( TQPushButton *cancelButton ) } else { cancelButton->reparent( this, 0, TQPoint(0,0), FALSE ); } - connect( d->cancel, SIGNAL(clicked()), this, SIGNAL(canceled()) ); + connect( d->cancel, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(canceled()) ); #ifndef TQT_NO_ACCEL TQAccel *accel = new TQAccel( this ); accel->connectItem( accel->insertItem(Key_Escape), - d->cancel, SIGNAL(clicked()) ); + d->cancel, TQ_SIGNAL(clicked()) ); #endif } int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp index c577bdc63..e6641dbc6 100644 --- a/src/dialogs/qtabdialog.cpp +++ b/src/dialogs/qtabdialog.cpp @@ -190,17 +190,17 @@ TQTabDialog::TQTabDialog( TQWidget *parent, const char *name, bool modal, TQ_CHECK_PTR( d ); d->tw = new TQTabWidget( this, "tab widget" ); - connect ( d->tw, SIGNAL ( selected(const TQString&) ), this, SIGNAL( selected(const TQString&) ) ); - connect ( d->tw, SIGNAL ( currentChanged(TQWidget*) ), this, SIGNAL( currentChanged(TQWidget*) ) ); + connect ( d->tw, TQ_SIGNAL ( selected(const TQString&) ), this, TQ_SIGNAL( selected(const TQString&) ) ); + connect ( d->tw, TQ_SIGNAL ( currentChanged(TQWidget*) ), this, TQ_SIGNAL( currentChanged(TQWidget*) ) ); d->ok = new TQPushButton( this, "ok" ); TQ_CHECK_PTR( d->ok ); d->ok->setText( tr("OK") ); d->ok->setDefault( TRUE ); - connect( d->ok, SIGNAL(clicked()), - this, SIGNAL(applyButtonPressed()) ); - connect( d->ok, SIGNAL(clicked()), - this, SLOT(accept()) ); + connect( d->ok, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(applyButtonPressed()) ); + connect( d->ok, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accept()) ); } @@ -686,8 +686,8 @@ void TQTabDialog::setApplyButton( const TQString &text ) } else { if ( !d->ab ) { d->ab = new TQPushButton( this, "apply settings" ); - connect( d->ab, SIGNAL(clicked()), - this, SIGNAL(applyButtonPressed()) ); + connect( d->ab, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(applyButtonPressed()) ); setUpLayout(); } d->ab->setText( text ); @@ -730,8 +730,8 @@ void TQTabDialog::setHelpButton( const TQString &text ) } else { if ( !d->hb ) { d->hb = new TQPushButton( this, "give help" ); - connect( d->hb, SIGNAL(clicked()), - this, SIGNAL(helpButtonPressed()) ); + connect( d->hb, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(helpButtonPressed()) ); setUpLayout(); } d->hb->setText( text ); @@ -777,8 +777,8 @@ void TQTabDialog::setDefaultButton( const TQString &text ) } else { if ( !d->db ) { d->db = new TQPushButton( this, "back to default" ); - connect( d->db, SIGNAL(clicked()), - this, SIGNAL(defaultButtonPressed()) ); + connect( d->db, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(defaultButtonPressed()) ); setUpLayout(); } d->db->setText( text ); @@ -826,10 +826,10 @@ void TQTabDialog::setCancelButton( const TQString &text ) } else { if ( !d->cb ) { d->cb = new TQPushButton( this, "cancel dialog" ); - connect( d->cb, SIGNAL(clicked()), - this, SIGNAL(cancelButtonPressed()) ); - connect( d->cb, SIGNAL(clicked()), - this, SLOT(reject()) ); + connect( d->cb, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(cancelButtonPressed()) ); + connect( d->cb, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); setUpLayout(); } d->cb->setText( text ); @@ -1051,8 +1051,8 @@ void TQTabDialog::setOkButton( const TQString &text ) } else { if ( !d->ok ) { d->ok = new TQPushButton( this, "ok" ); - connect( d->ok, SIGNAL(clicked()), - this, SIGNAL(applyButtonPressed()) ); + connect( d->ok, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(applyButtonPressed()) ); setUpLayout(); } d->ok->setText( text ); diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp index a8bba3129..e8a7eeffe 100644 --- a/src/dialogs/qwizard.cpp +++ b/src/dialogs/qwizard.cpp @@ -192,23 +192,23 @@ TQWizard::TQWizard( TQWidget *parent, const char *name, bool modal, d->nextButton->setDefault( TRUE ); - connect( d->backButton, SIGNAL(clicked()), - this, SLOT(back()) ); - connect( d->nextButton, SIGNAL(clicked()), - this, SLOT(next()) ); - connect( d->finishButton, SIGNAL(clicked()), - this, SLOT(accept()) ); - connect( d->cancelButton, SIGNAL(clicked()), - this, SLOT(reject()) ); - connect( d->helpButton, SIGNAL(clicked()), - this, SLOT(help()) ); + connect( d->backButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(back()) ); + connect( d->nextButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(next()) ); + connect( d->finishButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accept()) ); + connect( d->cancelButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); + connect( d->helpButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(help()) ); #ifndef TQT_NO_ACCEL d->accel = new TQAccel( this, "arrow-key accel" ); d->backAccel = d->accel->insertItem( TQt::ALT + TQt::Key_Left ); - d->accel->connectItem( d->backAccel, this, SLOT(back()) ); + d->accel->connectItem( d->backAccel, this, TQ_SLOT(back()) ); d->nextAccel = d->accel->insertItem( TQt::ALT + TQt::Key_Right ); - d->accel->connectItem( d->nextAccel, this, SLOT(next()) ); + d->accel->connectItem( d->nextAccel, this, TQ_SLOT(next()) ); #endif } diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index fac233ce3..ba5e12b88 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -122,29 +122,29 @@ private: \ #endif // macro for naming members -#ifdef METHOD -#undef METHOD +#ifdef TQ_METHOD +#undef TQ_METHOD #endif -#ifdef SLOT -#undef SLOT +#ifdef TQ_SLOT +#undef TQ_SLOT #endif -#ifdef SIGNAL -#undef SIGNAL +#ifdef TQ_SIGNAL +#undef TQ_SIGNAL #endif #if defined(_OLD_CPP_) -#define METHOD(a) "0""a" -#define SLOT(a) "1""a" -#define SIGNAL(a) "2""a" +#define TQ_METHOD(a) "0""a" +#define TQ_SLOT(a) "1""a" +#define TQ_SIGNAL(a) "2""a" #else -#define METHOD(a) "0"#a -#define SLOT(a) "1"#a -#define SIGNAL(a) "2"#a +#define TQ_METHOD(a) "0"#a +#define TQ_SLOT(a) "1"#a +#define TQ_SIGNAL(a) "2"#a #endif -#define TQMETHOD_CODE 0 // member type codes -#define TQSLOT_CODE 1 -#define TQSIGNAL_CODE 2 +#define TQ_METHOD_CODE 0 // member type codes +#define TQ_SLOT_CODE 1 +#define TQ_SIGNAL_CODE 2 class TQObject; class TQMetaObject; diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp index ffd253934..76181cca9 100644 --- a/src/kernel/qaccel.cpp +++ b/src/kernel/qaccel.cpp @@ -73,7 +73,7 @@ \code TQPushButton p( "&Exit", parent ); // automatic shortcut ALT+Key_E TQPopupMenu *fileMenu = new fileMenu( parent ); - fileMenu->insertItem( "Undo", parent, SLOT(undo()), CTRL+Key_Z ); + fileMenu->insertItem( "Undo", parent, TQ_SLOT(undo()), CTRL+Key_Z ); \endcode A TQAccel contains a list of accelerator items that can be @@ -131,7 +131,7 @@ TQAccel *a = new TQAccel( myWindow ); // create accels for myWindow a->connectItem( a->insertItem(Key_P+CTRL), // adds Ctrl+P accelerator myWindow, // connected to myWindow's - SLOT(printDoc()) ); // printDoc() slot + TQ_SLOT(printDoc()) ); // printDoc() slot \endcode \sa TQKeyEvent TQWidget::keyPressEvent() TQMenuData::setAccel() @@ -781,7 +781,7 @@ void TQAccel::setItemEnabled( int id, bool enable ) receiver. \code - a->connectItem( 201, mainView, SLOT(quit()) ); + a->connectItem( 201, mainView, TQ_SLOT(quit()) ); \endcode Of course, you can also send a signal as \a member. @@ -917,7 +917,7 @@ TQString TQAccel::keyToString( TQKeySequence k ) \code TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( p1, tr("&Open..."), this, SLOT(open()), + file->insertItem( p1, tr("&Open..."), this, TQ_SLOT(open()), TQAccel::stringToKey(tr("Ctrl+O", "File|Open")) ); \endcode diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp index d87b8e689..f99543593 100644 --- a/src/kernel/qaccessible.cpp +++ b/src/kernel/qaccessible.cpp @@ -304,7 +304,7 @@ public: void addObject(TQObject *object, TQAccessibleInterface *iface) { insert(object, iface); - connect(object, SIGNAL(destroyed(TQObject*)), this, SLOT(removeObject(TQObject*))); + connect(object, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(removeObject(TQObject*))); } public slots: diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index d67b34dd0..68e81d0f9 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -2318,7 +2318,7 @@ TQFontMetrics TQApplication::fontMetrics() Example: \code TQPushButton *quitButton = new TQPushButton( "Quit" ); - connect( quitButton, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quitButton, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); \endcode \sa exit() aboutToQuit() lastWindowClosed() TQAction @@ -2340,10 +2340,10 @@ void TQApplication::quit() \code // the "Quit" menu entry should try to close all windows TQPopupMenu* file = new TQPopupMenu( this ); - file->insertItem( "&Quit", tqApp, SLOT(closeAllWindows()), CTRL+Key_Q ); + file->insertItem( "&Quit", tqApp, TQ_SLOT(closeAllWindows()), CTRL+Key_Q ); // when the last window is closed, the application should quit - connect( tqApp, SIGNAL( lastWindowClosed() ), tqApp, SLOT( quit() ) ); + connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), tqApp, TQ_SLOT( quit() ) ); \endcode The windows are closed in random order, until one window does not diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index ef52e5a32..e224f17ad 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -6263,7 +6263,7 @@ public: : TQObject(0,0) { TQSocketNotifier* sn = new TQSocketNotifier( socket, TQSocketNotifier::Read, this ); - connect( sn, SIGNAL( activated(int) ), this, SLOT( socketActivated(int) ) ); + connect( sn, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( socketActivated(int) ) ); } public slots: diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp index bf5890ac1..c4811e758 100644 --- a/src/kernel/qasyncio.cpp +++ b/src/kernel/qasyncio.cpp @@ -320,9 +320,9 @@ void TQIODeviceSource::rewind() TQDataPump::TQDataPump(TQDataSource* data_source, TQDataSink* data_sink) : source(data_source), sink(data_sink) { - source->connect(this, SLOT(kickStart())); - sink->connect(this, SLOT(kickStart())); - connect(&timer, SIGNAL(timeout()), this, SLOT(tryToPump())); + source->connect(this, TQ_SLOT(kickStart())); + sink->connect(this, TQ_SLOT(kickStart())); + connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(tryToPump())); timer.start(0, TRUE); } diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp index 803e75e18..5102d094b 100644 --- a/src/kernel/qguardedptr.cpp +++ b/src/kernel/qguardedptr.cpp @@ -199,7 +199,7 @@ TQGuardedPtrPrivate::TQGuardedPtrPrivate( TQObject* o) : TQObject(0, "_ptrpriv" ), obj( o ) { if ( obj ) - connect( obj, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( obj, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); } @@ -212,12 +212,12 @@ void TQGuardedPtrPrivate::reconnect( TQObject *o ) if ( obj == o ) return; if ( obj ) - disconnect( obj, SIGNAL( destroyed() ), - this, SLOT( objectDestroyed() ) ); + disconnect( obj, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( objectDestroyed() ) ); obj = o; if ( obj ) - connect( obj, SIGNAL( destroyed() ), - this, SLOT( objectDestroyed() ) ); + connect( obj, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( objectDestroyed() ) ); } void TQGuardedPtrPrivate::objectDestroyed() diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp index e9fe43134..c679bb52b 100644 --- a/src/kernel/qkeysequence.cpp +++ b/src/kernel/qkeysequence.cpp @@ -227,7 +227,7 @@ TQKeySequence::TQKeySequence() \code TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( tr("&Open..."), this, SLOT(open()), + file->insertItem( tr("&Open..."), this, TQ_SLOT(open()), TQKeySequence( tr("Ctrl+O", "File|Open") ) ); \endcode diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp index 3b98849e1..79218badd 100644 --- a/src/kernel/qmovie.cpp +++ b/src/kernel/qmovie.cpp @@ -234,7 +234,7 @@ TQMoviePrivate::TQMoviePrivate(TQDataSource* src, TQMovie* movie, int bufsize) : { frametimer = new TQTimer(this); pump = src ? new TQDataPump(src, this) : 0; - TQObject::connect(frametimer, SIGNAL(timeout()), this, SLOT(refresh())); + TQObject::connect(frametimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(refresh())); dirty_cache = FALSE; source = src; buffer = 0; @@ -993,7 +993,7 @@ void TQMovie::setSpeed(int percent) */ void TQMovie::connectResize(TQObject* receiver, const char *member) { - TQObject::connect(d, SIGNAL(sizeChanged(const TQSize&)), receiver, member); + TQObject::connect(d, TQ_SIGNAL(sizeChanged(const TQSize&)), receiver, member); } /*! @@ -1002,7 +1002,7 @@ void TQMovie::connectResize(TQObject* receiver, const char *member) */ void TQMovie::disconnectResize(TQObject* receiver, const char *member) { - TQObject::disconnect(d, SIGNAL(sizeChanged(const TQSize&)), receiver, member); + TQObject::disconnect(d, TQ_SIGNAL(sizeChanged(const TQSize&)), receiver, member); } /*! @@ -1017,7 +1017,7 @@ void TQMovie::disconnectResize(TQObject* receiver, const char *member) */ void TQMovie::connectUpdate(TQObject* receiver, const char *member) { - TQObject::connect(d, SIGNAL(areaChanged(const TQRect&)), receiver, member); + TQObject::connect(d, TQ_SIGNAL(areaChanged(const TQRect&)), receiver, member); } /*! @@ -1026,7 +1026,7 @@ void TQMovie::connectUpdate(TQObject* receiver, const char *member) */ void TQMovie::disconnectUpdate(TQObject* receiver, const char *member) { - TQObject::disconnect(d, SIGNAL(areaChanged(const TQRect&)), receiver, member); + TQObject::disconnect(d, TQ_SIGNAL(areaChanged(const TQRect&)), receiver, member); } /*! @@ -1063,7 +1063,7 @@ void TQMovie::disconnectUpdate(TQObject* receiver, const char *member) */ void TQMovie::connectStatus(TQObject* receiver, const char *member) { - TQObject::connect(d, SIGNAL(dataStatus(int)), receiver, member); + TQObject::connect(d, TQ_SIGNAL(dataStatus(int)), receiver, member); } /*! @@ -1072,7 +1072,7 @@ void TQMovie::connectStatus(TQObject* receiver, const char *member) */ void TQMovie::disconnectStatus(TQObject* receiver, const char *member) { - TQObject::disconnect(d, SIGNAL(dataStatus(int)), receiver, member); + TQObject::disconnect(d, TQ_SIGNAL(dataStatus(int)), receiver, member); } diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp index 1adfa9455..27b6dff44 100644 --- a/src/kernel/qnetworkprotocol.cpp +++ b/src/kernel/qnetworkprotocol.cpp @@ -399,38 +399,38 @@ TQNetworkProtocol::TQNetworkProtocol() { d = new TQNetworkProtocolPrivate( this ); - connect( d->opStartTimer, SIGNAL( timeout() ), - this, SLOT( startOps() ) ); - connect( d->removeTimer, SIGNAL( timeout() ), - this, SLOT( removeMe() ) ); + connect( d->opStartTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( startOps() ) ); + connect( d->removeTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( removeMe() ) ); if ( url() ) { - connect( this, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - url(), SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( finished(TQNetworkOperation*) ), - url(), SIGNAL( finished(TQNetworkOperation*) ) ); - connect( this, SIGNAL( start(TQNetworkOperation*) ), - url(), SIGNAL( start(TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); - connect( this, SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), - url(), SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( removed(TQNetworkOperation*) ), - url(), SIGNAL( removed(TQNetworkOperation*) ) ); - connect( this, SIGNAL( itemChanged(TQNetworkOperation*) ), - url(), SIGNAL( itemChanged(TQNetworkOperation*) ) ); - connect( this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - url(), SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - connect( this, SIGNAL( connectionStateChanged(int,const TQString&) ), - url(), SIGNAL( connectionStateChanged(int,const TQString&) ) ); + connect( this, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( finished(TQNetworkOperation*) ), + url(), TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( start(TQNetworkOperation*) ), + url(), TQ_SIGNAL( start(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); + connect( this, TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( removed(TQNetworkOperation*) ), + url(), TQ_SIGNAL( removed(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + url(), TQ_SIGNAL( itemChanged(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + url(), TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ), + url(), TQ_SIGNAL( connectionStateChanged(int,const TQString&) ) ); } - connect( this, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( processNextOperation(TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChild(const TQUrlInfo&,TQNetworkOperation*) ), - this, SLOT( emitNewChildren(const TQUrlInfo&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( processNextOperation(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChild(const TQUrlInfo&,TQNetworkOperation*) ), + this, TQ_SLOT( emitNewChildren(const TQUrlInfo&,TQNetworkOperation*) ) ); } @@ -452,26 +452,26 @@ TQNetworkProtocol::~TQNetworkProtocol() void TQNetworkProtocol::setUrl( TQUrlOperator *u ) { if ( url() ) { - disconnect( this, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - url(), SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( finished(TQNetworkOperation*) ), - url(), SIGNAL( finished(TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( start(TQNetworkOperation*) ), - url(), SIGNAL( start(TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); - disconnect( this, SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), - url(), SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( removed(TQNetworkOperation*) ), - url(), SIGNAL( removed(TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( itemChanged(TQNetworkOperation*) ), - url(), SIGNAL( itemChanged(TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - url(), SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - disconnect( this, SIGNAL( connectionStateChanged(int,const TQString&) ), - url(), SIGNAL( connectionStateChanged(int,const TQString&) ) ); + disconnect( this, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( finished(TQNetworkOperation*) ), + url(), TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( start(TQNetworkOperation*) ), + url(), TQ_SIGNAL( start(TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); + disconnect( this, TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( removed(TQNetworkOperation*) ), + url(), TQ_SIGNAL( removed(TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + url(), TQ_SIGNAL( itemChanged(TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + url(), TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + disconnect( this, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ), + url(), TQ_SIGNAL( connectionStateChanged(int,const TQString&) ) ); } @@ -483,26 +483,26 @@ void TQNetworkProtocol::setUrl( TQUrlOperator *u ) d->url = u; if ( url() ) { - connect( this, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - url(), SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( finished(TQNetworkOperation*) ), - url(), SIGNAL( finished(TQNetworkOperation*) ) ); - connect( this, SIGNAL( start(TQNetworkOperation*) ), - url(), SIGNAL( start(TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), - url(), SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); - connect( this, SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), - url(), SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); - connect( this, SIGNAL( removed(TQNetworkOperation*) ), - url(), SIGNAL( removed(TQNetworkOperation*) ) ); - connect( this, SIGNAL( itemChanged(TQNetworkOperation*) ), - url(), SIGNAL( itemChanged(TQNetworkOperation*) ) ); - connect( this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - url(), SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - connect( this, SIGNAL( connectionStateChanged(int,const TQString&) ), - url(), SIGNAL( connectionStateChanged(int,const TQString&) ) ); + connect( this, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( finished(TQNetworkOperation*) ), + url(), TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( start(TQNetworkOperation*) ), + url(), TQ_SIGNAL( start(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( newChildren(const TQValueList<TQUrlInfo>&,TQNetworkOperation*) ), + url(), TQ_SLOT( addEntry(const TQValueList<TQUrlInfo>&) ) ); + connect( this, TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ), + url(), TQ_SIGNAL( createdDirectory(const TQUrlInfo&,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( removed(TQNetworkOperation*) ), + url(), TQ_SIGNAL( removed(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + url(), TQ_SIGNAL( itemChanged(TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + url(), TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( this, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ), + url(), TQ_SIGNAL( connectionStateChanged(int,const TQString&) ) ); } if ( !d->opInProgress && !d->operationQueue.isEmpty() ) @@ -1018,8 +1018,8 @@ TQNetworkOperation::TQNetworkOperation( TQNetworkProtocol::Operation operation, { d = new TQNetworkOperationPrivate; d->deleteTimer = new TQTimer( this ); - connect( d->deleteTimer, SIGNAL( timeout() ), - this, SLOT( deleteMe() ) ); + connect( d->deleteTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( deleteMe() ) ); d->operation = operation; d->state = TQNetworkProtocol::StWaiting; d->args[ 0 ] = arg0; @@ -1047,8 +1047,8 @@ TQNetworkOperation::TQNetworkOperation( TQNetworkProtocol::Operation operation, { d = new TQNetworkOperationPrivate; d->deleteTimer = new TQTimer( this ); - connect( d->deleteTimer, SIGNAL( timeout() ), - this, SLOT( deleteMe() ) ); + connect( d->deleteTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( deleteMe() ) ); d->operation = operation; d->state = TQNetworkProtocol::StWaiting; d->args[ 0 ] = TQString::null; diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 28a820277..e931cdbe7 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -389,7 +389,7 @@ TQMetaCallEvent::~TQMetaCallEvent() // -// Remove white space from SIGNAL and SLOT names. +// Remove white space from TQ_SIGNAL and TQ_SLOT names. // Internal for TQObject::connect() and TQObject::disconnect() // @@ -1755,14 +1755,14 @@ void TQObject::installEventFilter( const TQObject *obj ) int c = eventFilters->findRef( obj ); if ( c >= 0 ) eventFilters->take( c ); - disconnect( obj, SIGNAL(destroyed(TQObject*)), - this, SLOT(cleanupEventFilter(TQObject*)) ); + disconnect( obj, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(cleanupEventFilter(TQObject*)) ); } else { eventFilters = new TQObjectList; TQ_CHECK_PTR( eventFilters ); } eventFilters->insert( 0, obj ); - connect( obj, SIGNAL(destroyed(TQObject*)), this, SLOT(cleanupEventFilter(TQObject*)) ); + connect( obj, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(cleanupEventFilter(TQObject*)) ); } /*! @@ -1785,8 +1785,8 @@ void TQObject::removeEventFilter( const TQObject *obj ) delete eventFilters; eventFilters = 0; // reset event filter list } - disconnect( obj, SIGNAL(destroyed(TQObject*)), - this, SLOT(cleanupEventFilter(TQObject*)) ); + disconnect( obj, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(cleanupEventFilter(TQObject*)) ); } } @@ -1801,12 +1801,12 @@ static bool check_signal_macro( const TQObject *sender, const char *signal, const char *func, const char *op ) { int sigcode = (int)(*signal) - '0'; - if ( sigcode != TQSIGNAL_CODE ) { - if ( sigcode == TQSLOT_CODE ) + if ( sigcode != TQ_SIGNAL_CODE ) { + if ( sigcode == TQ_SLOT_CODE ) tqWarning( "TQObject::%s: Attempt to %s non-signal %s::%s", func, op, sender->className(), signal+1 ); else - tqWarning( "TQObject::%s: Use the SIGNAL macro to %s %s::%s", + tqWarning( "TQObject::%s: Use the TQ_SIGNAL macro to %s %s::%s", func, op, sender->className(), signal ); return FALSE; } @@ -1816,8 +1816,8 @@ static bool check_signal_macro( const TQObject *sender, const char *signal, static bool check_member_code( int code, const TQObject *object, const char *member, const char *func ) { - if ( code != TQSLOT_CODE && code != TQSIGNAL_CODE ) { - tqWarning( "TQObject::%s: Use the SLOT or SIGNAL macro to " + if ( code != TQ_SLOT_CODE && code != TQ_SIGNAL_CODE ) { + tqWarning( "TQObject::%s: Use the TQ_SLOT or TQ_SIGNAL macro to " "%s %s::%s", func, func, object->className(), member ); return FALSE; } @@ -1829,8 +1829,8 @@ static void err_member_notfound( int code, const TQObject *object, { const char *type = 0; switch ( code ) { - case TQSLOT_CODE: type = "slot"; break; - case TQSIGNAL_CODE: type = "signal"; break; + case TQ_SLOT_CODE: type = "slot"; break; + case TQ_SIGNAL_CODE: type = "signal"; break; } if ( strchr(member,')') == 0 ) // common typing mistake tqWarning( "TQObject::%s: Parentheses expected, %s %s::%s", @@ -1866,10 +1866,10 @@ static void err_info_about_candidates( int code, } const TQMetaData *rm = 0; switch ( code ) { - case TQSLOT_CODE: + case TQ_SLOT_CODE: rm = mo->slot( mo->findSlot( newname, TRUE ), TRUE ); break; - case TQSIGNAL_CODE: + case TQ_SIGNAL_CODE: rm = mo->signal( mo->findSignal( newname, TRUE ), TRUE ); break; } @@ -2031,21 +2031,21 @@ TQCString TQObject::normalizeSignalSlot( const char *signalSlot ) \a receiver, and returns TRUE if the connection succeeds; otherwise returns FALSE. - You must use the SIGNAL() and SLOT() macros when specifying the \a signal + You must use the TQ_SIGNAL() and TQ_SLOT() macros when specifying the \a signal and the \a member, for example: \code TQLabel *label = new TQLabel; TQScrollBar *scroll = new TQScrollBar; - TQObject::connect( scroll, SIGNAL(valueChanged(int)), - label, SLOT(setNum(int)) ); + TQObject::connect( scroll, TQ_SIGNAL(valueChanged(int)), + label, TQ_SLOT(setNum(int)) ); \endcode This example ensures that the label always displays the current scroll bar value. Note that the signal and slots parameters must not contain any variable names, only the type. E.g. the following would not work and return FALSE: - TQObject::connect( scroll, SIGNAL(valueChanged(int v)), - label, SLOT(setNum(int v)) ); + TQObject::connect( scroll, TQ_SIGNAL(valueChanged(int v)), + label, TQ_SLOT(setNum(int v)) ); A signal can also be connected to another signal: @@ -2066,7 +2066,7 @@ TQCString TQObject::normalizeSignalSlot( const char *signalSlot ) MyWidget::MyWidget() { aButton = new TQPushButton( this ); - connect( aButton, SIGNAL(clicked()), SIGNAL(myUsefulSignal()) ); + connect( aButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(myUsefulSignal()) ); } \endcode @@ -2124,8 +2124,8 @@ bool TQObject::connect( const TQObject *sender, const char *signal, if ( signal_index < 0 ) { // no such signal #if defined(QT_CHECK_RANGE) - err_member_notfound( TQSIGNAL_CODE, sender, signal, "connect" ); - err_info_about_candidates( TQSIGNAL_CODE, smeta, signal, "connect" ); + err_member_notfound( TQ_SIGNAL_CODE, sender, signal, "connect" ); + err_info_about_candidates( TQ_SIGNAL_CODE, smeta, signal, "connect" ); err_info_about_objects( "connect", sender, receiver ); #endif return FALSE; @@ -2148,7 +2148,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, TQMetaObject *rmeta = r->metaObject(); int member_index = -1; switch ( membcode ) { // get receiver member - case TQSLOT_CODE: + case TQ_SLOT_CODE: member_index = rmeta->findSlot( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace @@ -2156,7 +2156,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, member_index = rmeta->findSlot( member, TRUE ); } break; - case TQSIGNAL_CODE: + case TQ_SIGNAL_CODE: member_index = rmeta->findSignal( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace @@ -2181,7 +2181,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, r->className(), member ); return FALSE; } else { - const TQMetaData *rm = membcode == TQSLOT_CODE ? + const TQMetaData *rm = membcode == TQ_SLOT_CODE ? rmeta->slot( member_index, TRUE ) : rmeta->signal( member_index, TRUE ); if ( rm ) { @@ -2240,10 +2240,10 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const const TQMetaData *rm = 0; switch ( membcode ) { // get receiver member - case TQSLOT_CODE: + case TQ_SLOT_CODE: rm = rmeta->slot( member_index, TRUE ); break; - case TQSIGNAL_CODE: + case TQ_SIGNAL_CODE: rm = rmeta->signal( member_index, TRUE ); break; } @@ -2312,11 +2312,11 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const \endcode \i Disconnect everything connected to a specific signal: \code - disconnect( myObject, SIGNAL(mySignal()), 0, 0 ); + disconnect( myObject, TQ_SIGNAL(mySignal()), 0, 0 ); \endcode equivalent to the non-static overloaded function \code - myObject->disconnect( SIGNAL(mySignal()) ); + myObject->disconnect( TQ_SIGNAL(mySignal()) ); \endcode \i Disconnect a specific receiver: \code @@ -2376,7 +2376,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, TQMetaObject *rmeta = r->metaObject(); switch ( membcode ) { // get receiver member - case TQSLOT_CODE: + case TQ_SLOT_CODE: member_index = rmeta->findSlot( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace @@ -2384,7 +2384,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, member_index = rmeta->findSlot( member, TRUE ); } break; - case TQSIGNAL_CODE: + case TQ_SIGNAL_CODE: member_index = rmeta->findSignal( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace @@ -2436,7 +2436,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, /* compatibility and safety: If a receiver has several slots * with the same name, disconnect them all*/ bool res = FALSE; - if ( membcode == TQSLOT_CODE && r ) { + if ( membcode == TQ_SLOT_CODE && r ) { TQMetaObject * rmeta = r->metaObject(); do { int mi = rmeta->findSlot( member ); @@ -2780,7 +2780,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) sol->ref(); sol->currentSender = this; } - if ( c->memberType() == TQSIGNAL_CODE ) { + if ( c->memberType() == TQ_SIGNAL_CODE ) { if ((d->disableThreadPostedEvents) || (object->d->disableThreadPostedEvents) || (currentThread && currentThread->threadPostedEventsDisabled()) || @@ -2853,7 +2853,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) sol->ref(); sol->currentSender = this; } - if ( c->memberType() == TQSIGNAL_CODE ) { + if ( c->memberType() == TQ_SIGNAL_CODE ) { if ((d->disableThreadPostedEvents) || (object->d->disableThreadPostedEvents) || (currentThread && currentThread->threadPostedEventsDisabled()) || diff --git a/src/kernel/qobjectcleanuphandler.cpp b/src/kernel/qobjectcleanuphandler.cpp index f9f5d3e2f..8523e4add 100644 --- a/src/kernel/qobjectcleanuphandler.cpp +++ b/src/kernel/qobjectcleanuphandler.cpp @@ -122,7 +122,7 @@ TQObject* TQObjectCleanupHandler::add( TQObject* object ) cleanupObjects = new TQObjectList; cleanupObjects->setAutoDelete( TRUE ); } - connect( object, SIGNAL(destroyed(TQObject*)), this, SLOT(objectDestroyed(TQObject*)) ); + connect( object, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(objectDestroyed(TQObject*)) ); cleanupObjects->insert( 0, object ); return object; } @@ -137,7 +137,7 @@ void TQObjectCleanupHandler::remove( TQObject *object ) return; if ( cleanupObjects->findRef( object ) >= 0 ) { (void) cleanupObjects->take(); - disconnect( object, SIGNAL(destroyed(TQObject*)), this, SLOT(objectDestroyed(TQObject*)) ); + disconnect( object, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(objectDestroyed(TQObject*)) ); } } diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp index 13fb195e3..f052c9cb8 100644 --- a/src/kernel/qprocess.cpp +++ b/src/kernel/qprocess.cpp @@ -130,7 +130,7 @@ \skipto proc = new TQProcess( this ); \printline proc = new TQProcess( this ); \skipto proc->addArgument( "uic" ); - \printuntil this, SLOT(readFromStdout()) ); + \printuntil this, TQ_SLOT(readFromStdout()) ); \skipto if ( !proc->start() ) { \printuntil // error handling \skipto } @@ -621,8 +621,8 @@ bool TQProcess::launch( const TQByteArray& buf, TQStringList *env ) { if ( start( env ) ) { if ( !buf.isEmpty() ) { - connect( this, SIGNAL(wroteToStdin()), - this, SLOT(closeStdinLaunch()) ); + connect( this, TQ_SIGNAL(wroteToStdin()), + this, TQ_SLOT(closeStdinLaunch()) ); writeToStdin( buf ); } else { closeStdin(); @@ -645,8 +645,8 @@ bool TQProcess::launch( const TQString& buf, TQStringList *env ) { if ( start( env ) ) { if ( !buf.isEmpty() ) { - connect( this, SIGNAL(wroteToStdin()), - this, SLOT(closeStdinLaunch()) ); + connect( this, TQ_SIGNAL(wroteToStdin()), + this, TQ_SLOT(closeStdinLaunch()) ); writeToStdin( buf ); } else { closeStdin(); @@ -664,8 +664,8 @@ bool TQProcess::launch( const TQString& buf, TQStringList *env ) */ void TQProcess::closeStdinLaunch() { - disconnect( this, SIGNAL(wroteToStdin()), - this, SLOT(closeStdinLaunch()) ); + disconnect( this, TQ_SIGNAL(wroteToStdin()), + this, TQ_SLOT(closeStdinLaunch()) ); closeStdin(); emit launchFinished(); } @@ -751,8 +751,8 @@ void TQProcess::connectNotify( const char * signal ) tqDebug( "TQProcess::connectNotify(): signal %s has been connected", signal ); #endif if ( !ioRedirection ) - if ( qstrcmp( signal, SIGNAL(readyReadStdout()) )==0 || - qstrcmp( signal, SIGNAL(readyReadStderr()) )==0 + if ( qstrcmp( signal, TQ_SIGNAL(readyReadStdout()) )==0 || + qstrcmp( signal, TQ_SIGNAL(readyReadStderr()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::connectNotify(): set ioRedirection to TRUE" ); @@ -760,14 +760,14 @@ void TQProcess::connectNotify( const char * signal ) setIoRedirection( TRUE ); return; } - if ( !notifyOnExit && qstrcmp( signal, SIGNAL(processExited()) )==0 ) { + if ( !notifyOnExit && qstrcmp( signal, TQ_SIGNAL(processExited()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::connectNotify(): set notifyOnExit to TRUE" ); #endif setNotifyOnExit( TRUE ); return; } - if ( !wroteToStdinConnected && qstrcmp( signal, SIGNAL(wroteToStdin()) )==0 ) { + if ( !wroteToStdinConnected && qstrcmp( signal, TQ_SIGNAL(wroteToStdin()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::connectNotify(): set wroteToStdinConnected to TRUE" ); #endif @@ -781,21 +781,21 @@ void TQProcess::connectNotify( const char * signal ) void TQProcess::disconnectNotify( const char * ) { if ( ioRedirection && - receivers( SIGNAL(readyReadStdout()) ) ==0 && - receivers( SIGNAL(readyReadStderr()) ) ==0 + receivers( TQ_SIGNAL(readyReadStdout()) ) ==0 && + receivers( TQ_SIGNAL(readyReadStderr()) ) ==0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::disconnectNotify(): set ioRedirection to FALSE" ); #endif setIoRedirection( FALSE ); } - if ( notifyOnExit && receivers( SIGNAL(processExited()) ) == 0 ) { + if ( notifyOnExit && receivers( TQ_SIGNAL(processExited()) ) == 0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::disconnectNotify(): set notifyOnExit to FALSE" ); #endif setNotifyOnExit( FALSE ); } - if ( wroteToStdinConnected && receivers( SIGNAL(wroteToStdin()) ) == 0 ) { + if ( wroteToStdinConnected && receivers( TQ_SIGNAL(wroteToStdin()) ) == 0 ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::disconnectNotify(): set wroteToStdinConnected to FALSE" ); #endif diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp index f41923fd2..6d0f27abf 100644 --- a/src/kernel/qprocess_unix.cpp +++ b/src/kernel/qprocess_unix.cpp @@ -277,8 +277,8 @@ TQProcessManager::TQProcessManager() : sn(0) #endif sn = new TQSocketNotifier( sigchldFd[1], TQSocketNotifier::Read, this ); - connect( sn, SIGNAL(activated(int)), - this, SLOT(sigchldHnd(int)) ); + connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(sigchldHnd(int)) ); sn->setEnabled( TRUE ); } @@ -352,7 +352,7 @@ void TQProcessManager::remove( TQProc *p ) void TQProcessManager::cleanup() { if ( procList->count() == 0 ) { - TQTimer::singleShot( 0, this, SLOT(removeMe()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(removeMe()) ); } } @@ -944,8 +944,8 @@ bool TQProcess::start( TQStringList *env ) fcntl(d->proc->socketStdin, F_SETFL, originalFlags | O_NONBLOCK); d->notifierStdin = new TQSocketNotifier( sStdin[1], TQSocketNotifier::Write ); - connect( d->notifierStdin, SIGNAL(activated(int)), - this, SLOT(socketWrite(int)) ); + connect( d->notifierStdin, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(socketWrite(int)) ); // setup notifiers for the sockets if ( !d->stdinBuf.isEmpty() ) { d->notifierStdin->setEnabled( TRUE ); @@ -955,8 +955,8 @@ bool TQProcess::start( TQStringList *env ) ::close( sStdout[1] ); d->proc->socketStdout = sStdout[0]; d->notifierStdout = new TQSocketNotifier( sStdout[0], TQSocketNotifier::Read ); - connect( d->notifierStdout, SIGNAL(activated(int)), - this, SLOT(socketRead(int)) ); + connect( d->notifierStdout, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(socketRead(int)) ); if ( ioRedirection ) d->notifierStdout->setEnabled( TRUE ); } @@ -964,8 +964,8 @@ bool TQProcess::start( TQStringList *env ) ::close( sStderr[1] ); d->proc->socketStderr = sStderr[0]; d->notifierStderr = new TQSocketNotifier( sStderr[0], TQSocketNotifier::Read ); - connect( d->notifierStderr, SIGNAL(activated(int)), - this, SLOT(socketRead(int)) ); + connect( d->notifierStderr, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(socketRead(int)) ); if ( ioRedirection ) d->notifierStderr->setEnabled( TRUE ); } @@ -1028,7 +1028,7 @@ void TQProcess::tryTerminate() const is to do something like this: \code process->tryTerminate(); - TQTimer::singleShot( 5000, process, SLOT( kill() ) ); + TQTimer::singleShot( 5000, process, TQ_SLOT( kill() ) ); \endcode This tries to terminate the process the nice way. If the process diff --git a/src/kernel/qsignal.cpp b/src/kernel/qsignal.cpp index 53b0a62a0..f9c6c233a 100644 --- a/src/kernel/qsignal.cpp +++ b/src/kernel/qsignal.cpp @@ -147,9 +147,9 @@ bool TQSignal::connect( const TQObject *receiver, const char *member ) #ifndef TQT_NO_VARIANT if ( intSignature( member ) ) #endif - return TQObject::connect( (TQObject *)this, SIGNAL(intSignal(int)), receiver, member ); + return TQObject::connect( (TQObject *)this, TQ_SIGNAL(intSignal(int)), receiver, member ); #ifndef TQT_NO_VARIANT - return TQObject::connect( (TQObject *)this, SIGNAL(signal(const TQVariant&)), + return TQObject::connect( (TQObject *)this, TQ_SIGNAL(signal(const TQVariant&)), receiver, member ); #endif } @@ -167,9 +167,9 @@ bool TQSignal::disconnect( const TQObject *receiver, const char *member ) #ifndef TQT_NO_VARIANT if ( intSignature( member ) ) #endif - return TQObject::disconnect( (TQObject *)this, SIGNAL(intSignal(int)), receiver, member ); + return TQObject::disconnect( (TQObject *)this, TQ_SIGNAL(intSignal(int)), receiver, member ); #ifndef TQT_NO_VARIANT - return TQObject::disconnect( (TQObject *)this, SIGNAL(signal(const TQVariant&)), + return TQObject::disconnect( (TQObject *)this, TQ_SIGNAL(signal(const TQVariant&)), receiver, member ); #endif } diff --git a/src/kernel/qsignalmapper.cpp b/src/kernel/qsignalmapper.cpp index ce6f21759..8efd27371 100644 --- a/src/kernel/qsignalmapper.cpp +++ b/src/kernel/qsignalmapper.cpp @@ -158,7 +158,7 @@ TQSignalMapperRec* TQSignalMapper::getRec( const TQObject* sender ) if (!rec) { rec = new TQSignalMapperRec; d->dict.insert( (void*)sender, rec ); - connect( sender, SIGNAL(destroyed()), this, SLOT(removeMapping()) ); + connect( sender, TQ_SIGNAL(destroyed()), this, TQ_SLOT(removeMapping()) ); } return rec; } diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp index e3a727f8b..2eaf0b46b 100644 --- a/src/kernel/qsound_x11.cpp +++ b/src/kernel/qsound_x11.cpp @@ -120,8 +120,8 @@ TQAuServerNAS::TQAuServerNAS(TQObject* parent) : // Ask TQt for async messages... sn=new TQSocketNotifier(AuServerConnectionNumber(nas), TQSocketNotifier::Read); - TQObject::connect(sn, SIGNAL(activated(int)), - this, SLOT(dataReceived())); + TQObject::connect(sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(dataReceived())); } else { sn = 0; } @@ -223,8 +223,8 @@ void TQAuServerNAS::stop(TQSound* s) void TQAuServerNAS::init(TQSound* s) { - connect(s, SIGNAL(destroyed(TQObject *)), - this, SLOT(soundDestroyed(TQObject *))); + connect(s, TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(soundDestroyed(TQObject *))); if ( nas ) { AuBucketID b_id = diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp index 0c70113f4..f7736c028 100644 --- a/src/kernel/qtimer.cpp +++ b/src/kernel/qtimer.cpp @@ -62,7 +62,7 @@ Example: \code TQTimer *timer = new TQTimer( myObject ); - connect( timer, SIGNAL(timeout()), myObject, SLOT(timerDone()) ); + connect( timer, TQ_SIGNAL(timeout()), myObject, TQ_SLOT(timerDone()) ); timer->start( 2000, TRUE ); // 2 seconds single-shot timer \endcode @@ -77,7 +77,7 @@ user interface: \code TQTimer *t = new TQTimer( myObject ); - connect( t, SIGNAL(timeout()), SLOT(processOneThing()) ); + connect( t, TQ_SIGNAL(timeout()), TQ_SLOT(processOneThing()) ); t->start( 0, FALSE ); \endcode @@ -308,7 +308,7 @@ bool TQSingleShotTimer::event( TQEvent * ) int main( int argc, char **argv ) { TQApplication a( argc, argv ); - TQTimer::singleShot( 10*60*1000, &a, SLOT(quit()) ); + TQTimer::singleShot( 10*60*1000, &a, TQ_SLOT(quit()) ); ... // create and show your widgets return a.exec(); } diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp index 1defadc97..ca508c48c 100644 --- a/src/kernel/qurloperator.cpp +++ b/src/kernel/qurloperator.cpp @@ -600,23 +600,23 @@ TQPtrList<TQNetworkOperation> TQUrlOperator::copy( const TQString &from, const T if ( gProt && (gProt->supportedOperations()&TQNetworkProtocol::OpGet) && pProt && (pProt->supportedOperations()&TQNetworkProtocol::OpPut) ) { - connect( gProt, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - this, SLOT( copyGotData(const TQByteArray&,TQNetworkOperation*) ) ); - connect( gProt, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - connect( gProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( continueCopy(TQNetworkOperation*) ) ); - connect( gProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SIGNAL( finished(TQNetworkOperation*) ) ); - connect( gProt, SIGNAL( connectionStateChanged(int,const TQString&) ), - this, SIGNAL( connectionStateChanged(int,const TQString&) ) ); - - connect( pProt, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), - this, SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); - connect( pProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SIGNAL( finished(TQNetworkOperation*) ) ); - connect( pProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( finishedCopy() ) ); + connect( gProt, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + this, TQ_SLOT( copyGotData(const TQByteArray&,TQNetworkOperation*) ) ); + connect( gProt, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( gProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( continueCopy(TQNetworkOperation*) ) ); + connect( gProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + connect( gProt, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ), + this, TQ_SIGNAL( connectionStateChanged(int,const TQString&) ) ); + + connect( pProt, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ), + this, TQ_SIGNAL( dataTransferProgress(int,int,TQNetworkOperation*) ) ); + connect( pProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SIGNAL( finished(TQNetworkOperation*) ) ); + connect( pProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( finishedCopy() ) ); TQNetworkOperation *opGet = new TQNetworkOperation( TQNetworkProtocol::OpGet, frm, TQString::null, TQString::null ); ops.append( opGet ); @@ -935,8 +935,8 @@ void TQUrlOperator::getNetworkProtocol() d->networkProtocol = (TQNetworkProtocol *)p; d->networkProtocol->setUrl( this ); - connect( d->networkProtocol, SIGNAL( itemChanged(TQNetworkOperation*) ), - this, SLOT( slotItemChanged(TQNetworkOperation*) ) ); + connect( d->networkProtocol, TQ_SIGNAL( itemChanged(TQNetworkOperation*) ), + this, TQ_SLOT( slotItemChanged(TQNetworkOperation*) ) ); } /*! @@ -1121,10 +1121,10 @@ void TQUrlOperator::continueCopy( TQNetworkOperation *op ) deleteOperation( rm ); } } - disconnect( gProt, SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), - this, SLOT( copyGotData(const TQByteArray&,TQNetworkOperation*) ) ); - disconnect( gProt, SIGNAL( finished(TQNetworkOperation*) ), - this, SLOT( continueCopy(TQNetworkOperation*) ) ); + disconnect( gProt, TQ_SIGNAL( data(const TQByteArray&,TQNetworkOperation*) ), + this, TQ_SLOT( copyGotData(const TQByteArray&,TQNetworkOperation*) ) ); + disconnect( gProt, TQ_SIGNAL( finished(TQNetworkOperation*) ), + this, TQ_SLOT( continueCopy(TQNetworkOperation*) ) ); } /*! diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index 4885346d7..0e9c606af 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -3203,15 +3203,15 @@ void TQWidget::setFocusProxy( TQWidget * w ) createExtra(); if ( extra->focus_proxy ) { - disconnect( extra->focus_proxy, SIGNAL(destroyed()), - this, SLOT(focusProxyDestroyed()) ); + disconnect( extra->focus_proxy, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(focusProxyDestroyed()) ); extra->focus_proxy = 0; } if ( w ) { setFocusPolicy( w->focusPolicy() ); - connect( w, SIGNAL(destroyed()), - this, SLOT(focusProxyDestroyed()) ); + connect( w, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(focusProxyDestroyed()) ); } extra->focus_proxy = w; } @@ -4338,7 +4338,7 @@ bool TQWidget::close( bool alsoDelete ) if ( !deleted && !isHidden() ) hide(); if ( checkLastWindowClosed - && tqApp->receivers(SIGNAL(lastWindowClosed())) ) { + && tqApp->receivers(TQ_SIGNAL(lastWindowClosed())) ) { /* if there is no non-withdrawn top level window left (except the desktop, popups, or dialogs with parents), we emit the lastWindowClosed signal */ diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 3d64b6fe2..a5919b839 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -2968,10 +2968,10 @@ void TQWidget::changeInputContext( const TQString& identifierName ) TQInputContext *qic = TQInputContextFactory::create( identifierName, icWidget ); *qicp = qic; if ( qic ) { - TQObject::connect( qic, SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), - tqApp, SLOT(postIMEvent(TQObject *,TQIMEvent *)) ); - TQObject::connect( qic, SIGNAL(deletionRequested()), - icWidget, SLOT(destroyInputContext()) ); + TQObject::connect( qic, TQ_SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), + tqApp, TQ_SLOT(postIMEvent(TQObject *,TQIMEvent *)) ); + TQObject::connect( qic, TQ_SIGNAL(deletionRequested()), + icWidget, TQ_SLOT(destroyInputContext()) ); } } @@ -3007,10 +3007,10 @@ void TQWidget::createInputContext() *qicp = qic; if ( qic ) { - TQObject::connect( qic, SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), - tqApp, SLOT(postIMEvent(TQObject *,TQIMEvent *)) ); - TQObject::connect( qic, SIGNAL(deletionRequested()), - icWidget, SLOT(destroyInputContext()) ); + TQObject::connect( qic, TQ_SIGNAL(imEventGenerated(TQObject *,TQIMEvent *)), + tqApp, TQ_SLOT(postIMEvent(TQObject *,TQIMEvent *)) ); + TQObject::connect( qic, TQ_SIGNAL(deletionRequested()), + icWidget, TQ_SLOT(destroyInputContext()) ); } } #endif // TQT_NO_IM diff --git a/src/moc/moc.y b/src/moc/moc.y index 86fd20dea..4b754b7bc 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -2134,7 +2134,7 @@ void registerClassInNamespace() } // -// Remove white space from SIGNAL and SLOT names. +// Remove white space from TQ_SIGNAL and TQ_SLOT names. // This function has been copied from qobject.cpp. // @@ -3138,7 +3138,7 @@ void generateClass() // generate C++ source code for a class fixRightAngles( &argstr ); - fprintf( out, "\n// SIGNAL %s\n", (const char*)f->name ); + fprintf( out, "\n// TQ_SIGNAL %s\n", (const char*)f->name ); fprintf( out, "%s %s::%s(", (const char*) f->type, (const char*)qualifiedClassName(), (const char*)f->name ); diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index 85da933d7..ef980dd34 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -5009,7 +5009,7 @@ void registerClassInNamespace() } // -// Remove white space from SIGNAL and SLOT names. +// Remove white space from TQ_SIGNAL and TQ_SLOT names. // This function has been copied from qobject.cpp. // @@ -6013,7 +6013,7 @@ void generateClass() // generate C++ source code for a class fixRightAngles( &argstr ); - fprintf( out, "\n// SIGNAL %s\n", (const char*)f->name ); + fprintf( out, "\n// TQ_SIGNAL %s\n", (const char*)f->name ); fprintf( out, "%s %s::%s(", (const char*) f->type, (const char*)qualifiedClassName(), (const char*)f->name ); diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp index d259cc0e4..b1eeaa53f 100644 --- a/src/network/qdns.cpp +++ b/src/network/qdns.cpp @@ -942,15 +942,15 @@ TQDnsManager::TQDnsManager() TQTimer * sweepTimer = new TQTimer( this ); sweepTimer->start( 1000 * 60 * 3 ); - connect( sweepTimer, SIGNAL(timeout()), - this, SLOT(cleanCache()) ); + connect( sweepTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(cleanCache()) ); TQSocketNotifier * rn4 = new TQSocketNotifier( ipv4Socket->socket(), TQSocketNotifier::Read, this, "dns IPv4 socket watcher" ); ipv4Socket->setAddressReusable( FALSE ); ipv4Socket->setBlocking( FALSE ); - connect( rn4, SIGNAL(activated(int)), SLOT(answer()) ); + connect( rn4, TQ_SIGNAL(activated(int)), TQ_SLOT(answer()) ); #if !defined (TQT_NO_IPV6) // Don't connect the IPv6 socket notifier if the host does not @@ -963,7 +963,7 @@ TQDnsManager::TQDnsManager() ipv6support = TRUE; ipv6Socket->setAddressReusable( FALSE ); ipv6Socket->setBlocking( FALSE ); - connect( rn6, SIGNAL(activated(int)), SLOT(answer()) ); + connect( rn6, TQ_SIGNAL(activated(int)), TQ_SLOT(answer()) ); } #endif @@ -1169,7 +1169,7 @@ void TQDnsManager::transmitQuery( int i ) tqDebug( "DNS Manager: giving up on query 0x%04x", q->id ); #endif delete q; - TQTimer::singleShot( 0, TQDnsManager::manager(), SLOT(cleanCache()) ); + TQTimer::singleShot( 0, TQDnsManager::manager(), TQ_SLOT(cleanCache()) ); // and don't process anything more return; } @@ -1265,7 +1265,7 @@ void TQDnsManager::transmitQuery( int i ) tqDebug( "DNS Manager: no DNS server found on query 0x%04x", q->id ); #endif delete q; - TQTimer::singleShot( 1000*10, TQDnsManager::manager(), SLOT(cleanCache()) ); + TQTimer::singleShot( 1000*10, TQDnsManager::manager(), TQ_SLOT(cleanCache()) ); // and don't process anything more return; } @@ -1467,9 +1467,9 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) // timeouts: we make sure to use high timeouts // and few tramsissions. query->step = ns->count(); - TQObject::connect( query, SIGNAL(timeout()), + TQObject::connect( query, TQ_SIGNAL(timeout()), TQDnsManager::manager(), - SLOT(retransmit()) ); + TQ_SLOT(retransmit()) ); TQDnsManager::manager()->transmitQuery( query ); } } @@ -1519,8 +1519,8 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) query->t = r->recordType(); query->l = s; query->dns->replace( (void*)r, (void*)r ); - TQObject::connect( query, SIGNAL(timeout()), - TQDnsManager::manager(), SLOT(retransmit()) ); + TQObject::connect( query, TQ_SIGNAL(timeout()), + TQDnsManager::manager(), TQ_SLOT(retransmit()) ); TQDnsManager::manager()->transmitQuery( query ); } else if ( q < m->queries.size() ) { // if we've found an earlier query for the same @@ -1908,8 +1908,8 @@ void TQDns::setStartQueryTimer() { // start the query the next time we enter event loop d->queryTimer = new TQTimer( this ); - connect( d->queryTimer, SIGNAL(timeout()), - this, SLOT(startQuery()) ); + connect( d->queryTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(startQuery()) ); d->queryTimer->start( 0, TRUE ); } } @@ -2278,7 +2278,7 @@ TQString TQDns::canonicalName() const */ void TQDns::connectNotify( const char *signal ) { - if ( d->noEventLoop && qstrcmp(signal,SIGNAL(resultsReady()) )==0 ) { + if ( d->noEventLoop && qstrcmp(signal,TQ_SIGNAL(resultsReady()) )==0 ) { doSynchronousLookup(); } } diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp index f31029321..797392cc4 100644 --- a/src/network/qftp.cpp +++ b/src/network/qftp.cpp @@ -297,16 +297,16 @@ TQFtpDTP::TQFtpDTP( TQFtpPI *p, TQObject *parent, const char *name ) : { clearData(); - connect( &socket, SIGNAL( connected() ), - SLOT( socketConnected() ) ); - connect( &socket, SIGNAL( readyRead() ), - SLOT( socketReadyRead() ) ); - connect( &socket, SIGNAL( error(int) ), - SLOT( socketError(int) ) ); - connect( &socket, SIGNAL( connectionClosed() ), - SLOT( socketConnectionClosed() ) ); - connect( &socket, SIGNAL( bytesWritten(int) ), - SLOT( socketBytesWritten(int) ) ); + connect( &socket, TQ_SIGNAL( connected() ), + TQ_SLOT( socketConnected() ) ); + connect( &socket, TQ_SIGNAL( readyRead() ), + TQ_SLOT( socketReadyRead() ) ); + connect( &socket, TQ_SIGNAL( error(int) ), + TQ_SLOT( socketError(int) ) ); + connect( &socket, TQ_SIGNAL( connectionClosed() ), + TQ_SLOT( socketConnectionClosed() ) ); + connect( &socket, TQ_SIGNAL( bytesWritten(int) ), + TQ_SLOT( socketBytesWritten(int) ) ); } void TQFtpDTP::setData( TQByteArray *ba ) @@ -637,21 +637,21 @@ TQFtpPI::TQFtpPI( TQObject *parent ) : waitForDtpToConnect( FALSE ), waitForDtpToClose( FALSE ) { - connect( &commandSocket, SIGNAL(hostFound()), - SLOT(hostFound()) ); - connect( &commandSocket, SIGNAL(connected()), - SLOT(connected()) ); - connect( &commandSocket, SIGNAL(connectionClosed()), - SLOT(connectionClosed()) ); - connect( &commandSocket, SIGNAL(delayedCloseFinished()), - SLOT(delayedCloseFinished()) ); - connect( &commandSocket, SIGNAL(readyRead()), - SLOT(readyRead()) ); - connect( &commandSocket, SIGNAL(error(int)), - SLOT(error(int)) ); + connect( &commandSocket, TQ_SIGNAL(hostFound()), + TQ_SLOT(hostFound()) ); + connect( &commandSocket, TQ_SIGNAL(connected()), + TQ_SLOT(connected()) ); + connect( &commandSocket, TQ_SIGNAL(connectionClosed()), + TQ_SLOT(connectionClosed()) ); + connect( &commandSocket, TQ_SIGNAL(delayedCloseFinished()), + TQ_SLOT(delayedCloseFinished()) ); + connect( &commandSocket, TQ_SIGNAL(readyRead()), + TQ_SLOT(readyRead()) ); + connect( &commandSocket, TQ_SIGNAL(error(int)), + TQ_SLOT(error(int)) ); - connect( &dtp, SIGNAL(connectState(int)), - SLOT(dtpConnectState(int)) ); + connect( &dtp, TQ_SIGNAL(connectState(int)), + TQ_SLOT(dtpConnectState(int)) ); } void TQFtpPI::connectToHost( const TQString &host, TQ_UINT16 port ) @@ -1251,21 +1251,21 @@ void TQFtp::init() TQFtpPrivate *d = ::d( this ); d->errorString = tr( "Unknown error" ); - connect( &d->pi, SIGNAL(connectState(int)), - SLOT(piConnectState(int)) ); - connect( &d->pi, SIGNAL(finished(const TQString&)), - SLOT(piFinished(const TQString&)) ); - connect( &d->pi, SIGNAL(error(int,const TQString&)), - SLOT(piError(int,const TQString&)) ); - connect( &d->pi, SIGNAL(rawFtpReply(int,const TQString&)), - SLOT(piFtpReply(int,const TQString&)) ); + connect( &d->pi, TQ_SIGNAL(connectState(int)), + TQ_SLOT(piConnectState(int)) ); + connect( &d->pi, TQ_SIGNAL(finished(const TQString&)), + TQ_SLOT(piFinished(const TQString&)) ); + connect( &d->pi, TQ_SIGNAL(error(int,const TQString&)), + TQ_SLOT(piError(int,const TQString&)) ); + connect( &d->pi, TQ_SIGNAL(rawFtpReply(int,const TQString&)), + TQ_SLOT(piFtpReply(int,const TQString&)) ); - connect( &d->pi.dtp, SIGNAL(readyRead()), - SIGNAL(readyRead()) ); - connect( &d->pi.dtp, SIGNAL(dataTransferProgress(int,int)), - SIGNAL(dataTransferProgress(int,int)) ); - connect( &d->pi.dtp, SIGNAL(listInfo(const TQUrlInfo&)), - SIGNAL(listInfo(const TQUrlInfo&)) ); + connect( &d->pi.dtp, TQ_SIGNAL(readyRead()), + TQ_SIGNAL(readyRead()) ); + connect( &d->pi.dtp, TQ_SIGNAL(dataTransferProgress(int,int)), + TQ_SIGNAL(dataTransferProgress(int,int)) ); + connect( &d->pi.dtp, TQ_SIGNAL(listInfo(const TQUrlInfo&)), + TQ_SIGNAL(listInfo(const TQUrlInfo&)) ); } /*! @@ -1963,7 +1963,7 @@ int TQFtp::addCommand( TQFtpCommand *cmd ) if ( d->pending.count() == 1 ) // don't emit the commandStarted() signal before the id is returned - TQTimer::singleShot( 0, this, SLOT(startNextCommand()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startNextCommand()) ); return cmd->id; } @@ -2020,7 +2020,7 @@ void TQFtp::piFinished( const TQString& ) if ( c->command == Close ) { // The order of in which the slots are called is arbitrary, so - // disconnect the SIGNAL-SIGNAL temporary to make sure that we + // disconnect the TQ_SIGNAL-TQ_SIGNAL temporary to make sure that we // don't get the commandFinished() signal before the stateChanged() // signal. if ( d->state != TQFtp::Unconnected ) { @@ -2197,16 +2197,16 @@ bool TQFtp::checkConnection( TQNetworkOperation *op ) { TQFtpPrivate *d = ::d( this ); if ( state() == Unconnected && !d->npWaitForLoginDone ) { - connect( this, SIGNAL(listInfo(const TQUrlInfo&)), - this, SLOT(npListInfo(const TQUrlInfo&)) ); - connect( this, SIGNAL(done(bool)), - this, SLOT(npDone(bool)) ); - connect( this, SIGNAL(stateChanged(int)), - this, SLOT(npStateChanged(int)) ); - connect( this, SIGNAL(dataTransferProgress(int,int)), - this, SLOT(npDataTransferProgress(int,int)) ); - connect( this, SIGNAL(readyRead()), - this, SLOT(npReadyRead()) ); + connect( this, TQ_SIGNAL(listInfo(const TQUrlInfo&)), + this, TQ_SLOT(npListInfo(const TQUrlInfo&)) ); + connect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(npDone(bool)) ); + connect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(npStateChanged(int)) ); + connect( this, TQ_SIGNAL(dataTransferProgress(int,int)), + this, TQ_SLOT(npDataTransferProgress(int,int)) ); + connect( this, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(npReadyRead()) ); d->npWaitForLoginDone = TRUE; switch ( op->operation() ) { @@ -2321,16 +2321,16 @@ void TQFtp::npDone( bool err ) d->npWaitForLoginDone = FALSE; if ( state() == Unconnected ) { - disconnect( this, SIGNAL(listInfo(const TQUrlInfo&)), - this, SLOT(npListInfo(const TQUrlInfo&)) ); - disconnect( this, SIGNAL(done(bool)), - this, SLOT(npDone(bool)) ); - disconnect( this, SIGNAL(stateChanged(int)), - this, SLOT(npStateChanged(int)) ); - disconnect( this, SIGNAL(dataTransferProgress(int,int)), - this, SLOT(npDataTransferProgress(int,int)) ); - disconnect( this, SIGNAL(readyRead()), - this, SLOT(npReadyRead()) ); + disconnect( this, TQ_SIGNAL(listInfo(const TQUrlInfo&)), + this, TQ_SLOT(npListInfo(const TQUrlInfo&)) ); + disconnect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(npDone(bool)) ); + disconnect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(npStateChanged(int)) ); + disconnect( this, TQ_SIGNAL(dataTransferProgress(int,int)), + this, TQ_SLOT(npDataTransferProgress(int,int)) ); + disconnect( this, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(npReadyRead()) ); } // emit the finished() signal at the very end to avoid reentrance problems diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp index 393cc18c0..d08f10f24 100644 --- a/src/network/qhttp.cpp +++ b/src/network/qhttp.cpp @@ -1225,18 +1225,18 @@ void TQHttp::init() d = new TQHttpPrivate; d->errorString = tr( "Unknown error" ); - connect( &d->socket, SIGNAL( connected() ), - this, SLOT( slotConnected() ) ); - connect( &d->socket, SIGNAL( connectionClosed() ), - this, SLOT( slotClosed() ) ); - connect( &d->socket, SIGNAL( delayedCloseFinished() ), - this, SLOT( slotClosed() ) ); - connect( &d->socket, SIGNAL( readyRead() ), - this, SLOT( slotReadyRead() ) ); - connect( &d->socket, SIGNAL( error(int) ), - this, SLOT( slotError(int) ) ); - connect( &d->socket, SIGNAL( bytesWritten(int) ), - this, SLOT( slotBytesWritten(int) ) ); + connect( &d->socket, TQ_SIGNAL( connected() ), + this, TQ_SLOT( slotConnected() ) ); + connect( &d->socket, TQ_SIGNAL( connectionClosed() ), + this, TQ_SLOT( slotClosed() ) ); + connect( &d->socket, TQ_SIGNAL( delayedCloseFinished() ), + this, TQ_SLOT( slotClosed() ) ); + connect( &d->socket, TQ_SIGNAL( readyRead() ), + this, TQ_SLOT( slotReadyRead() ) ); + connect( &d->socket, TQ_SIGNAL( error(int) ), + this, TQ_SLOT( slotError(int) ) ); + connect( &d->socket, TQ_SIGNAL( bytesWritten(int) ), + this, TQ_SLOT( slotBytesWritten(int) ) ); d->idleTimer = startTimer( 0 ); } @@ -1778,7 +1778,7 @@ int TQHttp::addRequest( TQHttpRequest *req ) if ( d->pending.count() == 1 ) // don't emit the requestStarted() signal before the id is returned - TQTimer::singleShot( 0, this, SLOT(startNextRequest()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startNextRequest()) ); return req->id; } @@ -2231,12 +2231,12 @@ int TQHttp::supportedOperations() const */ void TQHttp::operationGet( TQNetworkOperation *op ) { - connect( this, SIGNAL(readyRead(const TQHttpResponseHeader&)), - this, SLOT(clientReply(const TQHttpResponseHeader&)) ); - connect( this, SIGNAL(done(bool)), - this, SLOT(clientDone(bool)) ); - connect( this, SIGNAL(stateChanged(int)), - this, SLOT(clientStateChanged(int)) ); + connect( this, TQ_SIGNAL(readyRead(const TQHttpResponseHeader&)), + this, TQ_SLOT(clientReply(const TQHttpResponseHeader&)) ); + connect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(clientDone(bool)) ); + connect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(clientStateChanged(int)) ); bytesRead = 0; op->setState( StInProgress ); @@ -2251,12 +2251,12 @@ void TQHttp::operationGet( TQNetworkOperation *op ) */ void TQHttp::operationPut( TQNetworkOperation *op ) { - connect( this, SIGNAL(readyRead(const TQHttpResponseHeader&)), - this, SLOT(clientReply(const TQHttpResponseHeader&)) ); - connect( this, SIGNAL(done(bool)), - this, SLOT(clientDone(bool)) ); - connect( this, SIGNAL(stateChanged(int)), - this, SLOT(clientStateChanged(int)) ); + connect( this, TQ_SIGNAL(readyRead(const TQHttpResponseHeader&)), + this, TQ_SLOT(clientReply(const TQHttpResponseHeader&)) ); + connect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(clientDone(bool)) ); + connect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(clientStateChanged(int)) ); bytesRead = 0; op->setState( StInProgress ); @@ -2307,12 +2307,12 @@ void TQHttp::clientReply( const TQHttpResponseHeader &rep ) void TQHttp::clientDone( bool err ) { - disconnect( this, SIGNAL(readyRead(const TQHttpResponseHeader&)), - this, SLOT(clientReply(const TQHttpResponseHeader&)) ); - disconnect( this, SIGNAL(done(bool)), - this, SLOT(clientDone(bool)) ); - disconnect( this, SIGNAL(stateChanged(int)), - this, SLOT(clientStateChanged(int)) ); + disconnect( this, TQ_SIGNAL(readyRead(const TQHttpResponseHeader&)), + this, TQ_SLOT(clientReply(const TQHttpResponseHeader&)) ); + disconnect( this, TQ_SIGNAL(done(bool)), + this, TQ_SLOT(clientDone(bool)) ); + disconnect( this, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(clientStateChanged(int)) ); if ( err ) { TQNetworkOperation *op = operationInProgress(); diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp index 8fd1b7bfb..44728d742 100644 --- a/src/network/qserversocket.cpp +++ b/src/network/qserversocket.cpp @@ -173,8 +173,8 @@ void TQServerSocket::init( const TQHostAddress & address, TQ_UINT16 port, int ba { d->n = new TQSocketNotifier( d->s->socket(), TQSocketNotifier::Read, this, "accepting new connections" ); - connect( d->n, SIGNAL(activated(int)), - this, SLOT(incomingConnection(int)) ); + connect( d->n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(incomingConnection(int)) ); } else { tqWarning( "TQServerSocket: failed to bind or listen to the socket" ); delete d->s; @@ -290,8 +290,8 @@ void TQServerSocket::setSocket( int socket ) d->s = new TQSocketDevice( socket, TQSocketDevice::Stream ); d->n = new TQSocketNotifier( d->s->socket(), TQSocketNotifier::Read, this, "accepting new connections" ); - connect( d->n, SIGNAL(activated(int)), - this, SLOT(incomingConnection(int)) ); + connect( d->n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(incomingConnection(int)) ); } #endif //TQT_NO_NETWORK diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp index a612867be..381a1a8e6 100644 --- a/src/network/qsocket.cpp +++ b/src/network/qsocket.cpp @@ -217,9 +217,9 @@ void TQSocketPrivate::setSocketDevice( TQSocket *q, TQSocketDevice *device ) wsn = new TQSocketNotifier( socket->socket(), TQSocketNotifier::Write, q, "write" ); - TQObject::connect( rsn, SIGNAL(activated(int)), q, SLOT(sn_read()) ); + TQObject::connect( rsn, TQ_SIGNAL(activated(int)), q, TQ_SLOT(sn_read()) ); rsn->setEnabled( FALSE ); - TQObject::connect( wsn, SIGNAL(activated(int)), q, SLOT(sn_write()) ); + TQObject::connect( wsn, TQ_SIGNAL(activated(int)), q, TQ_SLOT(sn_write()) ); wsn->setEnabled( FALSE ); } @@ -424,10 +424,10 @@ void TQSocket::connectToHost( const TQString &host, TQ_UINT16 port ) // try if the address is already available (for faster connecting...) tryConnecting(); if ( d->state == HostLookup ) { - connect( d->dns4, SIGNAL(resultsReady()), - this, SLOT(tryConnecting()) ); - connect( d->dns6, SIGNAL(resultsReady()), - this, SLOT(tryConnecting()) ); + connect( d->dns4, TQ_SIGNAL(resultsReady()), + this, TQ_SLOT(tryConnecting()) ); + connect( d->dns6, TQ_SIGNAL(resultsReady()), + this, TQ_SLOT(tryConnecting()) ); } } @@ -1364,7 +1364,7 @@ void TQSocket::tryConnection() emit connected(); } else { d->state = Idle; - TQTimer::singleShot( 0, this, SLOT(emitErrorConnectionRefused()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitErrorConnectionRefused()) ); return; } } diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp index 6df0cce08..62abd2d45 100644 --- a/src/sql/qdatatable.cpp +++ b/src/sql/qdatatable.cpp @@ -280,8 +280,8 @@ void TQDataTable::init() d->falseTxt = tr( "False" ); d->datefmt = TQt::LocalDate; reset(); - connect( this, SIGNAL( selectionChanged() ), - SLOT( updateCurrentSelection())); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( updateCurrentSelection())); } /*! @@ -865,13 +865,13 @@ void TQDataTable::endEdit( int row, int col, bool, bool ) switch ( d->dat.mode() ) { case TQSql::Insert: if ( accept ) - TQTimer::singleShot( 0, this, SLOT( doInsertCurrent() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( doInsertCurrent() ) ); else endInsert(); break; case TQSql::Update: if ( accept ) - TQTimer::singleShot( 0, this, SLOT( doUpdateCurrent() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( doUpdateCurrent() ) ); else endUpdate(); break; @@ -1652,16 +1652,16 @@ void TQDataTable::loadNextPage() /*! \internal */ void TQDataTable::sliderPressed() { - disconnect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - this, SLOT( loadNextPage() ) ); + disconnect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( loadNextPage() ) ); } /*! \internal */ void TQDataTable::sliderReleased() { loadNextPage(); - connect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - this, SLOT( loadNextPage() ) ); + connect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( loadNextPage() ) ); } /*! @@ -1809,22 +1809,22 @@ void TQDataTable::setSize( TQSqlCursor* sql ) // ### what are the connect/disconnect calls doing here!? move to refresh() if ( sql->driver() && sql->driver()->hasFeature( TQSqlDriver::QuerySize ) ) { setVScrollBarMode( Auto ); - disconnect( verticalScrollBar(), SIGNAL( sliderPressed() ), - this, SLOT( sliderPressed() ) ); - disconnect( verticalScrollBar(), SIGNAL( sliderReleased() ), - this, SLOT( sliderReleased() ) ); - disconnect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - this, SLOT( loadNextPage() ) ); + disconnect( verticalScrollBar(), TQ_SIGNAL( sliderPressed() ), + this, TQ_SLOT( sliderPressed() ) ); + disconnect( verticalScrollBar(), TQ_SIGNAL( sliderReleased() ), + this, TQ_SLOT( sliderReleased() ) ); + disconnect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( loadNextPage() ) ); if ( numRows() != sql->size() ) setNumRows( sql->size() ); } else { setVScrollBarMode( AlwaysOn ); - connect( verticalScrollBar(), SIGNAL( sliderPressed() ), - this, SLOT( sliderPressed() ) ); - connect( verticalScrollBar(), SIGNAL( sliderReleased() ), - this, SLOT( sliderReleased() ) ); - connect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - this, SLOT( loadNextPage() ) ); + connect( verticalScrollBar(), TQ_SIGNAL( sliderPressed() ), + this, TQ_SLOT( sliderPressed() ) ); + connect( verticalScrollBar(), TQ_SIGNAL( sliderReleased() ), + this, TQ_SLOT( sliderReleased() ) ); + connect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( loadNextPage() ) ); setNumRows(0); loadNextPage(); } diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp index 35d22b5d8..b1a25502b 100644 --- a/src/sql/qsqlquery.cpp +++ b/src/sql/qsqlquery.cpp @@ -58,7 +58,7 @@ TQSqlResultShared::TQSqlResultShared( TQSqlResult* result ): sqlResult(result) { if ( result ) - connect( result->driver(), SIGNAL(destroyed()), this, SLOT(slotResultDestroyed()) ); + connect( result->driver(), TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotResultDestroyed()) ); } /*! diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp index 93d389e3b..1d07d5141 100644 --- a/src/table/qtable.cpp +++ b/src/table/qtable.cpp @@ -1272,7 +1272,7 @@ TQWidget *TQComboTableItem::createEditor() const ( (TQComboTableItem*)this )->cb = new TQComboBox( edit, table()->viewport(), "qt_editor_cb" ); cb->insertStringList( entries ); cb->setCurrentItem( current ); - TQObject::connect( cb, SIGNAL( activated(int) ), table(), SLOT( doValueChanged() ) ); + TQObject::connect( cb, TQ_SIGNAL( activated(int) ), table(), TQ_SLOT( doValueChanged() ) ); return cb; } @@ -1538,7 +1538,7 @@ TQWidget *TQCheckTableItem::createEditor() const cb->setChecked( checked ); cb->setText( text() ); cb->setBackgroundColor( table()->viewport()->backgroundColor() ); - TQObject::connect( cb, SIGNAL( toggled(bool) ), table(), SLOT( doValueChanged() ) ); + TQObject::connect( cb, TQ_SIGNAL( toggled(bool) ), table(), TQ_SLOT( doValueChanged() ) ); return cb; } @@ -2076,7 +2076,7 @@ void TQTable::init( int rows, int cols ) d->geomTimer = new TQTimer( this ); d->lastVisCol = 0; d->lastVisRow = 0; - connect( d->geomTimer, SIGNAL( timeout() ), this, SLOT( updateGeometriesSlot() ) ); + connect( d->geomTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateGeometriesSlot() ) ); shouldClearSelection = FALSE; dEnabled = FALSE; roRows.setAutoDelete( TRUE ); @@ -2130,25 +2130,25 @@ void TQTable::init( int rows, int cols ) contents.setAutoDelete( FALSE ); // Connect header, table and scrollbars - connect( horizontalScrollBar(), SIGNAL( valueChanged(int) ), - topHeader, SLOT( setOffset(int) ) ); - connect( verticalScrollBar(), SIGNAL( valueChanged(int) ), - leftHeader, SLOT( setOffset(int) ) ); - connect( topHeader, SIGNAL( sectionSizeChanged(int) ), - this, SLOT( columnWidthChanged(int) ) ); - connect( topHeader, SIGNAL( indexChange(int,int,int) ), - this, SLOT( columnIndexChanged(int,int,int) ) ); - connect( topHeader, SIGNAL( sectionClicked(int) ), - this, SLOT( columnClicked(int) ) ); - connect( leftHeader, SIGNAL( sectionSizeChanged(int) ), - this, SLOT( rowHeightChanged(int) ) ); - connect( leftHeader, SIGNAL( indexChange(int,int,int) ), - this, SLOT( rowIndexChanged(int,int,int) ) ); + connect( horizontalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + topHeader, TQ_SLOT( setOffset(int) ) ); + connect( verticalScrollBar(), TQ_SIGNAL( valueChanged(int) ), + leftHeader, TQ_SLOT( setOffset(int) ) ); + connect( topHeader, TQ_SIGNAL( sectionSizeChanged(int) ), + this, TQ_SLOT( columnWidthChanged(int) ) ); + connect( topHeader, TQ_SIGNAL( indexChange(int,int,int) ), + this, TQ_SLOT( columnIndexChanged(int,int,int) ) ); + connect( topHeader, TQ_SIGNAL( sectionClicked(int) ), + this, TQ_SLOT( columnClicked(int) ) ); + connect( leftHeader, TQ_SIGNAL( sectionSizeChanged(int) ), + this, TQ_SLOT( rowHeightChanged(int) ) ); + connect( leftHeader, TQ_SIGNAL( indexChange(int,int,int) ), + this, TQ_SLOT( rowIndexChanged(int,int,int) ) ); // Initialize variables autoScrollTimer = new TQTimer( this ); - connect( autoScrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + connect( autoScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); curRow = curCol = 0; topHeader->setSectionState( curCol, TQTableHeader::Bold ); leftHeader->setSectionState( curRow, TQTableHeader::Bold ); @@ -3948,7 +3948,7 @@ void TQTable::contentsMouseReleaseEvent( TQMouseEvent *e ) void TQTable::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(int,int,const TQPoint&)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)) ) ) { e->ignore(); return; } @@ -6527,8 +6527,8 @@ TQTableHeader::TQTableHeader( int i, TQTable *t, states.fill( Normal, -1 ); stretchable.fill( FALSE, -1 ); autoScrollTimer = new TQTimer( this ); - connect( autoScrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + connect( autoScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); #ifndef NO_LINE_WIDGET line1 = new TQWidget( table->viewport(), "qt_line1" ); line1->hide(); @@ -6542,17 +6542,17 @@ TQTableHeader::TQTableHeader( int i, TQTable *t, d = new TQTableHeaderPrivate; d->oldLinePos = -1; //outside, in contents coords #endif - connect( this, SIGNAL( sizeChange(int,int,int) ), - this, SLOT( sectionWidthChanged(int,int,int) ) ); - connect( this, SIGNAL( indexChange(int,int,int) ), - this, SLOT( indexChanged(int,int,int) ) ); + connect( this, TQ_SIGNAL( sizeChange(int,int,int) ), + this, TQ_SLOT( sectionWidthChanged(int,int,int) ) ); + connect( this, TQ_SIGNAL( indexChange(int,int,int) ), + this, TQ_SLOT( indexChanged(int,int,int) ) ); stretchTimer = new TQTimer( this ); widgetStretchTimer = new TQTimer( this ); - connect( stretchTimer, SIGNAL( timeout() ), - this, SLOT( updateStretches() ) ); - connect( widgetStretchTimer, SIGNAL( timeout() ), - this, SLOT( updateWidgetStretches() ) ); + connect( stretchTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateStretches() ) ); + connect( widgetStretchTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateWidgetStretches() ) ); startPos = -1; } diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp index 14bb57433..361ed026e 100644 --- a/src/widgets/qaction.cpp +++ b/src/widgets/qaction.cpp @@ -782,7 +782,7 @@ void TQAction::setAccel( const TQKeySequence& key ) if ( p ) { d->accel = new TQAccel( (TQWidget*)p, this, "qt_action_accel" ); d->accelid = d->accel->insertItem( d->key ); - d->accel->connectItem( d->accelid, this, SLOT( internalActivation() ) ); + d->accel->connectItem( d->accelid, this, TQ_SLOT( internalActivation() ) ); } #if defined(QT_CHECK_STATE) else @@ -1018,12 +1018,12 @@ bool TQAction::addTo( TQWidget* w ) if ( d->iconset ) btn->setIconSet( *d->iconset ); d->update( TQActionPrivate::State | TQActionPrivate::Visibility | TQActionPrivate::EverythingElse ) ; - connect( btn, SIGNAL( clicked() ), this, SIGNAL( activated() ) ); - connect( btn, SIGNAL( toggled(bool) ), this, SLOT( toolButtonToggled(bool) ) ); - connect( btn, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( activated() ) ); + connect( btn, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( toolButtonToggled(bool) ) ); + connect( btn, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); #ifndef TQT_NO_TOOLTIP - connect( &(d->tipGroup), SIGNAL(showTip(const TQString&)), this, SLOT(showStatusText(const TQString&)) ); - connect( &(d->tipGroup), SIGNAL(removeTip()), this, SLOT(clearStatusText()) ); + connect( &(d->tipGroup), TQ_SIGNAL(showTip(const TQString&)), this, TQ_SLOT(showStatusText(const TQString&)) ); + connect( &(d->tipGroup), TQ_SIGNAL(removeTip()), this, TQ_SLOT(clearStatusText()) ); #endif } } else @@ -1039,18 +1039,18 @@ bool TQAction::addTo( TQWidget* w ) else mi->id = mi->popup->insertItem( TQString::fromLatin1("") ); addedTo( mi->popup->indexOf( mi->id ), mi->popup ); - mi->popup->connectItem( mi->id, this, SLOT(internalActivation()) ); + mi->popup->connectItem( mi->id, this, TQ_SLOT(internalActivation()) ); d->menuitems.append( mi ); d->update( TQActionPrivate::State | TQActionPrivate::Visibility | TQActionPrivate::EverythingElse ) ; w->topLevelWidget()->className(); - connect( mi->popup, SIGNAL(highlighted(int)), this, SLOT(menuStatusText(int)) ); - connect( mi->popup, SIGNAL(aboutToHide()), this, SLOT(clearStatusText()) ); - connect( mi->popup, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( mi->popup, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuStatusText(int)) ); + connect( mi->popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(clearStatusText()) ); + connect( mi->popup, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); // Makes only sense when called by TQActionGroup::addTo } else if ( ::tqt_cast<TQComboBox*>(w) ) { TQActionPrivate::ComboItem *ci = new TQActionPrivate::ComboItem; ci->combo = (TQComboBox*)w; - connect( ci->combo, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( ci->combo, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); ci->id = ci->combo->count(); if ( qstrcmp( name(), "qt_separator_action" ) ) { if ( d->iconset ) @@ -1193,7 +1193,7 @@ bool TQAction::removeFrom( TQWidget* w ) ++it; if ( btn->parentWidget() == w ) { d->toolbuttons.removeRef( btn ); - disconnect( btn, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + disconnect( btn, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); delete btn; // no need to disconnect from statusbar } @@ -1206,9 +1206,9 @@ bool TQAction::removeFrom( TQWidget* w ) while ( ( mi = it.current() ) ) { ++it; if ( mi->popup == w ) { - disconnect( mi->popup, SIGNAL(highlighted(int)), this, SLOT(menuStatusText(int)) ); - disconnect( mi->popup, SIGNAL(aboutToHide()), this, SLOT(clearStatusText()) ); - disconnect( mi->popup, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + disconnect( mi->popup, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuStatusText(int)) ); + disconnect( mi->popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(clearStatusText()) ); + disconnect( mi->popup, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); mi->popup->removeItem( mi->id ); d->menuitems.removeRef( mi ); } @@ -1219,7 +1219,7 @@ bool TQAction::removeFrom( TQWidget* w ) while ( ( ci = it.current() ) ) { ++it; if ( ci->combo == w ) { - disconnect( ci->combo, SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + disconnect( ci->combo, TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); d->comboitems.removeRef( ci ); } } @@ -1445,7 +1445,7 @@ TQActionGroup::TQActionGroup( TQObject* parent, const char* name ) d->separatorAction = 0; TQAction::d->d_group = d; - connect( this, SIGNAL(selected(TQAction*)), SLOT(internalToggle(TQAction*)) ); + connect( this, TQ_SIGNAL(selected(TQAction*)), TQ_SLOT(internalToggle(TQAction*)) ); } /*! @@ -1466,7 +1466,7 @@ TQActionGroup::TQActionGroup( TQObject* parent, const char* name, bool exclusive d->separatorAction = 0; TQAction::d->d_group = d; - connect( this, SIGNAL(selected(TQAction*)), SLOT(internalToggle(TQAction*)) ); + connect( this, TQ_SIGNAL(selected(TQAction*)), TQ_SLOT(internalToggle(TQAction*)) ); } /*! @@ -1480,26 +1480,26 @@ TQActionGroup::~TQActionGroup() TQActionGroupPrivate::MenuItem *mi = mit.current(); ++mit; if ( mi->popup ) - mi->popup->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + mi->popup->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } TQPtrListIterator<TQComboBox> cbit( d->comboboxes ); while ( cbit.current() ) { TQComboBox *cb = cbit.current(); ++cbit; - cb->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + cb->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } TQPtrListIterator<TQToolButton> mbit( d->menubuttons ); while ( mbit.current() ) { TQToolButton *mb = mbit.current(); ++mbit; - mb->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + mb->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } TQPtrListIterator<TQPopupMenu> pmit( d->popupmenus ); while ( pmit.current() ) { TQPopupMenu *pm = pmit.current(); ++pmit; - pm->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + pm->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } delete d->separatorAction; @@ -1590,9 +1590,9 @@ void TQActionGroup::add( TQAction* action ) if (!action->d->forceInvisible) action->d->visible = isVisible(); - connect( action, SIGNAL( destroyed() ), this, SLOT( childDestroyed() ) ); - connect( action, SIGNAL( activated() ), this, SIGNAL( activated() ) ); - connect( action, SIGNAL( toggled(bool) ), this, SLOT( childToggled(bool) ) ); + connect( action, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( childDestroyed() ) ); + connect( action, TQ_SIGNAL( activated() ), this, TQ_SIGNAL( activated() ) ); + connect( action, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( childToggled(bool) ) ); for ( TQPtrListIterator<TQComboBox> cb( d->comboboxes ); cb.current(); ++cb ) { action->addTo( cb.current() ); @@ -1663,7 +1663,7 @@ bool TQActionGroup::addTo( TQWidget* w ) TQToolButton* btn = new TQToolButton( (TQToolBar*) w, "qt_actiongroup_btn" ); addedTo( btn, w ); - connect( btn, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); + connect( btn, TQ_SIGNAL(destroyed()), TQ_SLOT(objectDestroyed()) ); d->menubuttons.append( btn ); if ( !iconSet().isNull() ) @@ -1687,9 +1687,9 @@ bool TQActionGroup::addTo( TQWidget* w ) TQWhatsThis::add( btn, defAction->whatsThis() ); #endif - connect( btn, SIGNAL( clicked() ), defAction, SIGNAL( activated() ) ); - connect( btn, SIGNAL( toggled(bool) ), defAction, SLOT( toolButtonToggled(bool) ) ); - connect( btn, SIGNAL( destroyed() ), defAction, SLOT( objectDestroyed() ) ); + connect( btn, TQ_SIGNAL( clicked() ), defAction, TQ_SIGNAL( activated() ) ); + connect( btn, TQ_SIGNAL( toggled(bool) ), defAction, TQ_SLOT( toolButtonToggled(bool) ) ); + connect( btn, TQ_SIGNAL( destroyed() ), defAction, TQ_SLOT( objectDestroyed() ) ); TQPopupMenu *menu = new TQPopupMenu( btn, "qt_actiongroup_menu" ); btn->setPopupDelay( 0 ); @@ -1704,7 +1704,7 @@ bool TQActionGroup::addTo( TQWidget* w ) } else { TQComboBox *box = new TQComboBox( FALSE, w, "qt_actiongroup_combo" ); addedTo( box, w ); - connect( box, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); + connect( box, TQ_SIGNAL(destroyed()), TQ_SLOT(objectDestroyed()) ); d->comboboxes.append( box ); #ifndef TQT_NO_TOOLTIP if ( !!toolTip() ) @@ -1727,8 +1727,8 @@ bool TQActionGroup::addTo( TQWidget* w ) } if ( foundOn ) box->setCurrentItem( onIndex ); - connect( box, SIGNAL(activated(int)), this, SLOT( internalComboBoxActivated(int)) ); - connect( box, SIGNAL(highlighted(int)), this, SLOT( internalComboBoxHighlighted(int)) ); + connect( box, TQ_SIGNAL(activated(int)), this, TQ_SLOT( internalComboBoxActivated(int)) ); + connect( box, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT( internalComboBoxHighlighted(int)) ); d->update( this ); return TRUE; } @@ -1741,7 +1741,7 @@ bool TQActionGroup::addTo( TQWidget* w ) TQPopupMenu *menu = (TQPopupMenu*)w; popup = new TQPopupMenu( w, "qt_actiongroup_menu" ); d->popupmenus.append( popup ); - connect( popup, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); + connect( popup, TQ_SIGNAL(destroyed()), TQ_SLOT(objectDestroyed()) ); int id; if ( !iconSet().isNull() ) { diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp index 90fe7cb0c..3b91b18fb 100644 --- a/src/widgets/qbutton.cpp +++ b/src/widgets/qbutton.cpp @@ -85,7 +85,7 @@ void TQButton::ensureData() if ( !d ) { d = new TQButtonData; TQ_CHECK_PTR( d ); - connect(&d->timer, SIGNAL(timeout()), this, SLOT(autoRepeatTimeout())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoRepeatTimeout())); } } @@ -538,8 +538,8 @@ void TQButton::setAccel( const TQKeySequence& key ) ensureData(); if ( !d->a ) { d->a = new TQAccel( this, "buttonAccel" ); - connect( d->a, SIGNAL( activated(int) ), this, SLOT( animateClick() ) ); - connect( d->a, SIGNAL( activatedAmbiguously(int) ), this, SLOT( setFocus() ) ); + connect( d->a, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( animateClick() ) ); + connect( d->a, TQ_SIGNAL( activatedAmbiguously(int) ), this, TQ_SLOT( setFocus() ) ); } d->a->insertItem( key, 0 ); } @@ -573,7 +573,7 @@ void TQButton::animateClick() buttonDown = TRUE; repaint( FALSE ); emit pressed(); - TQTimer::singleShot( 100, this, SLOT(animateTimeout()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(animateTimeout()) ); } void TQButton::emulateClick() diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp index ec4298675..15495edff 100644 --- a/src/widgets/qbuttongroup.cpp +++ b/src/widgets/qbuttongroup.cpp @@ -268,10 +268,10 @@ int TQButtonGroup::insert( TQButton *button, int id ) button->setGroup(this); buttons->append( bi ); - connect( button, SIGNAL(pressed()) , SLOT(buttonPressed()) ); - connect( button, SIGNAL(released()), SLOT(buttonReleased()) ); - connect( button, SIGNAL(clicked()) , SLOT(buttonClicked()) ); - connect( button, SIGNAL(toggled(bool)) , SLOT(buttonToggled(bool)) ); + connect( button, TQ_SIGNAL(pressed()) , TQ_SLOT(buttonPressed()) ); + connect( button, TQ_SIGNAL(released()), TQ_SLOT(buttonReleased()) ); + connect( button, TQ_SIGNAL(clicked()) , TQ_SLOT(buttonClicked()) ); + connect( button, TQ_SIGNAL(toggled(bool)) , TQ_SLOT(buttonToggled(bool)) ); if ( button->isToggleButton() && !button->isOn() && selected() && (selected()->focusPolicy() & TabFocus) != 0 ) diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp index db1c4b491..b75d23ed8 100644 --- a/src/widgets/qcombobox.cpp +++ b/src/widgets/qcombobox.cpp @@ -521,10 +521,10 @@ TQComboBox::TQComboBox( TQWidget *parent, const char *name ) style().styleHint(TQStyle::SH_GUIStyle) == TQt::MotifStyle ) { d->setPopupMenu( new TQComboBoxPopup( this, "in-combo" ) ); d->popup()->setFont( font() ); - connect( d->popup(), SIGNAL(activated(int)), - SLOT(internalActivate(int)) ); - connect( d->popup(), SIGNAL(highlighted(int)), - SLOT(internalHighlight(int)) ); + connect( d->popup(), TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( d->popup(), TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } else { setUpListBox(); } @@ -1393,7 +1393,7 @@ void TQComboBox::mousePressEvent( TQMouseEvent *e ) } else { popup(); } - TQTimer::singleShot( 200, this, SLOT(internalClickTimeout())); + TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); d->shortClick = TRUE; } } @@ -1562,8 +1562,8 @@ void TQComboBox::popup() TQComboBoxPopup *p = new TQComboBoxPopup( this, "in-combo" ); d->setPopupMenu( p, FALSE ); p->setFont( font() ); - connect( p, SIGNAL(activated(int)), SLOT(internalActivate(int)) ); - connect( p, SIGNAL(highlighted(int)), SLOT(internalHighlight(int)) ); + connect( p, TQ_SIGNAL(activated(int)), TQ_SLOT(internalActivate(int)) ); + connect( p, TQ_SIGNAL(highlighted(int)), TQ_SLOT(internalHighlight(int)) ); } d->popup()->clear(); for(unsigned int i = 0; i < d->listBox()->count(); i++) { @@ -2138,10 +2138,10 @@ void TQComboBox::setListBox( TQListBox * newListBox ) d->listBox()->setLineWidth( 1 ); d->listBox()->resize( 100, 10 ); - connect( d->listBox(), SIGNAL(selected(int)), - SLOT(internalActivate(int)) ); - connect( d->listBox(), SIGNAL(highlighted(int)), - SLOT(internalHighlight(int))); + connect( d->listBox(), TQ_SIGNAL(selected(int)), + TQ_SLOT(internalActivate(int)) ); + connect( d->listBox(), TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int))); } @@ -2268,10 +2268,10 @@ void TQComboBox::setUpListBox() d->listBox()->setLineWidth( 1 ); d->listBox()->resize( 100, 10 ); - connect( d->listBox(), SIGNAL(selected(int)), - SLOT(internalActivate(int)) ); - connect( d->listBox(), SIGNAL(highlighted(int)), - SLOT(internalHighlight(int))); + connect( d->listBox(), TQ_SIGNAL(selected(int)), + TQ_SLOT(internalActivate(int)) ); + connect( d->listBox(), TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int))); } @@ -2301,9 +2301,9 @@ void TQComboBox::setLineEdit( TQLineEdit *edit ) if ( edit->parent() != this ) edit->reparent( this, TQPoint(0,0), FALSE ); - connect (edit, SIGNAL( textChanged(const TQString&) ), - this, SIGNAL( textChanged(const TQString&) ) ); - connect( edit, SIGNAL(returnPressed()), SLOT(returnPressed()) ); + connect (edit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SIGNAL( textChanged(const TQString&) ) ); + connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); edit->setFrame( FALSE ); d->updateLinedGeometry(); diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp index 2989678ac..6454bdf49 100644 --- a/src/widgets/qdatetimeedit.cpp +++ b/src/widgets/qdatetimeedit.cpp @@ -952,10 +952,10 @@ void TQDateEdit::init() d->ed = new TQDateTimeEditor( this, d->controls, "date editor" ); d->controls->setEditWidget( d->ed ); setFocusProxy( d->ed ); - connect( d->controls, SIGNAL( stepUpPressed() ), SLOT( stepUp() ) ); - connect( d->controls, SIGNAL( stepDownPressed() ), SLOT( stepDown() ) ); - connect( this, SIGNAL( valueChanged(const TQDate&) ), - SLOT( updateButtons() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); + connect( this, TQ_SIGNAL( valueChanged(const TQDate&) ), + TQ_SLOT( updateButtons() ) ); d->ed->appendSection( TQNumberSection( 0,4 ) ); d->ed->appendSection( TQNumberSection( 5,7 ) ); d->ed->appendSection( TQNumberSection( 8,10 ) ); @@ -1854,8 +1854,8 @@ void TQTimeEdit::init() d->ed = new TQDateTimeEditor( this, d->controls, "time edit base" ); d->controls->setEditWidget( d->ed ); setFocusProxy( d->ed ); - connect( d->controls, SIGNAL( stepUpPressed() ), SLOT( stepUp() ) ); - connect( d->controls, SIGNAL( stepDownPressed() ), SLOT( stepDown() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); @@ -2728,10 +2728,10 @@ void TQDateTimeEdit::init() de = new TQDateEdit( this, "qt_datetime_dateedit" ); te = new TQTimeEdit( this, "qt_datetime_timeedit" ); d->adv = FALSE; - connect( de, SIGNAL( valueChanged(const TQDate&) ), - this, SLOT( newValue(const TQDate&) ) ); - connect( te, SIGNAL( valueChanged(const TQTime&) ), - this, SLOT( newValue(const TQTime&) ) ); + connect( de, TQ_SIGNAL( valueChanged(const TQDate&) ), + this, TQ_SLOT( newValue(const TQDate&) ) ); + connect( te, TQ_SIGNAL( valueChanged(const TQTime&) ), + this, TQ_SLOT( newValue(const TQTime&) ) ); setFocusProxy( de ); setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp index fd3d5c4c8..8f32fd61d 100644 --- a/src/widgets/qdialogbuttons.cpp +++ b/src/widgets/qdialogbuttons.cpp @@ -68,8 +68,8 @@ TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 b { init(buttons, orient); if(parent && autoConnect) { - TQObject::connect(this, SIGNAL(acceptClicked()), parent, SLOT(accept())); - TQObject::connect(this, SIGNAL(rejectClicked()), parent, SLOT(reject())); + TQObject::connect(this, TQ_SIGNAL(acceptClicked()), parent, TQ_SLOT(accept())); + TQObject::connect(this, TQ_SIGNAL(rejectClicked()), parent, TQ_SLOT(reject())); } } #endif // TQT_NO_DIALOG @@ -242,7 +242,7 @@ TQWidget * TQDialogButtons::createButton(Button b) { TQPushButton *ret = new TQPushButton(this, "qdialog_button"); - TQObject::connect(ret, SIGNAL(clicked()), this, SLOT(handleClicked())); + TQObject::connect(ret, TQ_SIGNAL(clicked()), this, TQ_SLOT(handleClicked())); if(d->text.contains(b)) { ret->setText(d->text[b]); } else { diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp index 769005031..93823706f 100644 --- a/src/widgets/qdockwindow.cpp +++ b/src/widgets/qdockwindow.cpp @@ -392,7 +392,7 @@ TQDockWindowHandle::TQDockWindowHandle( TQDockWindow *dw ) { ctrlDown = FALSE; timer = new TQTimer( this ); - connect( timer, SIGNAL( timeout() ), this, SLOT( minimize() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minimize() ) ); #ifdef Q_WS_WIN setCursor( SizeAllCursor ); #endif @@ -512,8 +512,8 @@ void TQDockWindowHandle::updateGui() #endif closeButton->setPixmap( style().stylePixmap( TQStyle::SP_DockWindowCloseButton, closeButton ) ); closeButton->setFixedSize( 12, 12 ); - connect( closeButton, SIGNAL( clicked() ), - dockWindow, SLOT( hide() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), + dockWindow, TQ_SLOT( hide() ) ); } if ( dockWindow->isCloseEnabled() && dockWindow->area() ) @@ -578,7 +578,7 @@ TQDockWindowTitleBar::TQDockWindowTitleBar( TQDockWindow *dw ) ctrlDown = FALSE; setMouseTracking( TRUE ); setFixedHeight( style().pixelMetric( TQStyle::PM_TitleBarHeight, this ) ); - connect( this, SIGNAL(doClose()), dockWindow, SLOT(hide()) ); + connect( this, TQ_SIGNAL(doClose()), dockWindow, TQ_SLOT(hide()) ); } void TQDockWindowTitleBar::keyPressEvent( TQKeyEvent *e ) @@ -1062,11 +1062,11 @@ void TQDockWindow::init() stretchable[ Horizontal ] = FALSE; stretchable[ Vertical ] = FALSE; - connect( titleBar, SIGNAL( doubleClicked() ), this, SLOT( dock() ) ); - connect( verHandle, SIGNAL( doubleClicked() ), this, SLOT( undock() ) ); - connect( horHandle, SIGNAL( doubleClicked() ), this, SLOT( undock() ) ); - connect( this, SIGNAL( orientationChanged(Orientation) ), - this, SLOT( setOrientation(Orientation) ) ); + connect( titleBar, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( dock() ) ); + connect( verHandle, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( undock() ) ); + connect( horHandle, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( undock() ) ); + connect( this, TQ_SIGNAL( orientationChanged(Orientation) ), + this, TQ_SLOT( setOrientation(Orientation) ) ); } /*! diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp index 40170dbea..d14164831 100644 --- a/src/widgets/qeffects.cpp +++ b/src/widgets/qeffects.cpp @@ -166,7 +166,7 @@ void TQAlphaWidget::run( int time ) show(); setEnabled(FALSE); - connect( &anim, SIGNAL(timeout()), this, SLOT(render())); + connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(render())); anim.start( 1 ); } else { duration = 0; @@ -509,7 +509,7 @@ void TQRollEffect::run( int time ) duration = TQMIN( TQMAX( dist/3, 50 ), 120 ); } - connect( &anim, SIGNAL(timeout()), this, SLOT(scroll())); + connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(scroll())); widget->setWState( WState_Visible ); diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp index 1a8a1d1bb..9a31d397f 100644 --- a/src/widgets/qgroupbox.cpp +++ b/src/widgets/qgroupbox.cpp @@ -253,7 +253,7 @@ void TQGroupBox::setTitle( const TQString &title ) if ( s ) { accel = new TQAccel( this, "automatic focus-change accelerator" ); accel->connectItem( accel->insertItem( s, 0 ), - this, SLOT(fixFocus()) ); + this, TQ_SLOT(fixFocus()) ); } #endif #ifndef TQT_NO_CHECKBOX @@ -846,10 +846,10 @@ void TQGroupBox::setCheckable( bool b ) meAsButtonGroup->remove(d->checkbox); setChecked( TRUE ); setChildrenEnabled( TRUE ); - connect( d->checkbox, SIGNAL( toggled(bool) ), - this, SLOT( setChildrenEnabled(bool) ) ); - connect( d->checkbox, SIGNAL( toggled(bool) ), - this, SIGNAL( toggled(bool) ) ); + connect( d->checkbox, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setChildrenEnabled(bool) ) ); + connect( d->checkbox, TQ_SIGNAL( toggled(bool) ), + this, TQ_SIGNAL( toggled(bool) ) ); updateCheckBoxGeometry(); } d->checkbox->show(); diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp index 8ce8cfb9a..ce41f05bc 100644 --- a/src/widgets/qiconview.cpp +++ b/src/widgets/qiconview.cpp @@ -2789,14 +2789,14 @@ TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f ) d->drawDragShapes = FALSE; d->backrubber = 0; - connect( d->adjustTimer, SIGNAL( timeout() ), - this, SLOT( adjustItems() ) ); - connect( d->updateTimer, SIGNAL( timeout() ), - this, SLOT( slotUpdate() ) ); - connect( d->fullRedrawTimer, SIGNAL( timeout() ), - this, SLOT( updateContents() ) ); - connect( this, SIGNAL( contentsMoving(int,int) ), - this, SLOT( movedContents(int,int) ) ); + connect( d->adjustTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( adjustItems() ) ); + connect( d->updateTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotUpdate() ) ); + connect( d->fullRedrawTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateContents() ) ); + connect( this, TQ_SIGNAL( contentsMoving(int,int) ), + this, TQ_SLOT( movedContents(int,int) ) ); setAcceptDrops( TRUE ); viewport()->setAcceptDrops( TRUE ); @@ -3425,13 +3425,13 @@ void TQIconView::doAutoScroll() !d->scrollTimer ) { d->scrollTimer = new TQTimer( this ); - connect( d->scrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + connect( d->scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->start( 100, FALSE ); } else if ( TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) && d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + disconnect( d->scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; @@ -4473,7 +4473,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) d->backrubber = 0; if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL( timeout() ), this, SLOT( doAutoScroll() ) ); + disconnect( d->scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; @@ -4616,7 +4616,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) void TQIconView::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)) ) ) { e->ignore(); return; } @@ -4664,7 +4664,7 @@ void TQIconView::contentsMouseReleaseEvent( TQMouseEvent *e ) } if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL( timeout() ), this, SLOT( doAutoScroll() ) ); + disconnect( d->scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp index ff647ab28..a9b485af8 100644 --- a/src/widgets/qlabel.cpp +++ b/src/widgets/qlabel.cpp @@ -294,7 +294,7 @@ void TQLabel::setText( const TQString &text ) if ( !accel ) accel = new TQAccel( this, "accel label accel" ); accel->connectItem( accel->insertItem( p ), - this, SLOT(acceleratorSlot()) ); + this, TQ_SLOT(acceleratorSlot()) ); } } #endif @@ -949,7 +949,7 @@ void TQLabel::setBuddy( TQWidget *buddy ) setAlignment( alignment() & ~ShowPrefix ); if ( lbuddy ) - disconnect( lbuddy, SIGNAL(destroyed()), this, SLOT(buddyDied()) ); + disconnect( lbuddy, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDied()) ); lbuddy = buddy; @@ -965,11 +965,11 @@ void TQLabel::setBuddy( TQWidget *buddy ) if ( !accel ) accel = new TQAccel( this, "accel label accel" ); accel->connectItem( accel->insertItem( p ), - this, SLOT(acceleratorSlot()) ); + this, TQ_SLOT(acceleratorSlot()) ); } } - connect( lbuddy, SIGNAL(destroyed()), this, SLOT(buddyDied()) ); + connect( lbuddy, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDied()) ); } @@ -1027,8 +1027,8 @@ void TQLabel::setMovie( const TQMovie& movie ) clearContents(); lmovie = new TQMovie( movie ); - lmovie->connectResize(this, SLOT(movieResized(const TQSize&))); - lmovie->connectUpdate(this, SLOT(movieUpdated(const TQRect&))); + lmovie->connectResize(this, TQ_SLOT(movieResized(const TQSize&))); + lmovie->connectUpdate(this, TQ_SLOT(movieUpdated(const TQRect&))); if ( !lmovie->running() ) // Assume that if the movie is running, updateLabel( osh ); // resize/update signals will come soon enough @@ -1067,8 +1067,8 @@ void TQLabel::clearContents() #endif #ifndef TQT_NO_MOVIE if ( lmovie ) { - lmovie->disconnectResize(this, SLOT(movieResized(const TQSize&))); - lmovie->disconnectUpdate(this, SLOT(movieUpdated(const TQRect&))); + lmovie->disconnectResize(this, TQ_SLOT(movieResized(const TQSize&))); + lmovie->disconnectUpdate(this, TQ_SLOT(movieUpdated(const TQRect&))); delete lmovie; lmovie = 0; } diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index 27f5867c0..41ad01350 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -669,12 +669,12 @@ const TQValidator * TQLineEdit::validator() const void TQLineEdit::setValidator( const TQValidator *v ) { if ( d->validator ) - disconnect( (TQObject*)d->validator, SIGNAL( destroyed() ), - this, SLOT( clearValidator() ) ); + disconnect( (TQObject*)d->validator, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( clearValidator() ) ); d->validator = v; if ( d->validator ) - connect( (TQObject*)d->validator, SIGNAL( destroyed() ), - this, SLOT( clearValidator() ) ); + connect( (TQObject*)d->validator, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( clearValidator() ) ); } @@ -1349,10 +1349,10 @@ void TQLineEditPrivate::copy( bool clipboard ) const { TQString t = q->selectedText(); if ( !t.isEmpty() && echoMode == TQLineEdit::Normal ) { - q->disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), q, 0); + q->disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), q, 0); TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection ); - q->connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), - q, SLOT(clipboardChanged()) ); + q->connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), + q, TQ_SLOT(clipboardChanged()) ); } } diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp index 5ccedf405..3669b3e25 100644 --- a/src/widgets/qlistbox.cpp +++ b/src/widgets/qlistbox.cpp @@ -1022,12 +1022,12 @@ TQListBox::TQListBox( TQWidget *parent, const char *name, WFlags f ) setMouseTracking( TRUE ); viewport()->setMouseTracking( TRUE ); - connect( d->updateTimer, SIGNAL(timeout()), - this, SLOT(refreshSlot()) ); - connect( d->visibleTimer, SIGNAL(timeout()), - this, SLOT(ensureCurrentVisible()) ); - connect( d->resizeTimer, SIGNAL( timeout() ), - this, SLOT( adjustItems() ) ); + connect( d->updateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(refreshSlot()) ); + connect( d->visibleTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(ensureCurrentVisible()) ); + connect( d->resizeTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( adjustItems() ) ); viewport()->setBackgroundMode( PaletteBase ); setBackgroundMode( PaletteBackground, PaletteBase ); viewport()->setFocusProxy( this ); @@ -2312,8 +2312,8 @@ void TQListBox::mouseMoveEvent( TQMouseEvent *e ) if ( ( dx || dy ) && !d->scrollTimer && e->state() == LeftButton && e->button() != LeftButton ) { // start autoscrolling if necessary d->scrollTimer = new TQTimer( this ); - connect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + connect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->start( 100, FALSE ); doAutoScroll(); } else if ( !d->scrollTimer ) { @@ -2423,7 +2423,7 @@ void TQListBox::repaintSelection() void TQListBox::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(TQListBoxItem*,const TQPoint&)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(TQListBoxItem*,const TQPoint&)) ) ) { e->ignore(); return; } diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp index 22c04e03c..599c99439 100644 --- a/src/widgets/qlistview.cpp +++ b/src/widgets/qlistview.cpp @@ -2694,29 +2694,29 @@ void TQListView::init() setMouseTracking( TRUE ); viewport()->setMouseTracking( TRUE ); - connect( d->timer, SIGNAL(timeout()), - this, SLOT(updateContents()) ); - connect( d->dirtyItemTimer, SIGNAL(timeout()), - this, SLOT(updateDirtyItems()) ); - connect( d->visibleTimer, SIGNAL(timeout()), - this, SLOT(makeVisible()) ); - connect( d->renameTimer, SIGNAL(timeout()), - this, SLOT(startRename()) ); - connect( d->autoopenTimer, SIGNAL(timeout()), - this, SLOT(openFocusItem()) ); - - connect( d->h, SIGNAL(sizeChange(int,int,int)), - this, SLOT(handleSizeChange(int,int,int)) ); - connect( d->h, SIGNAL(indexChange(int,int,int)), - this, SLOT(handleIndexChange()) ); - connect( d->h, SIGNAL(sectionClicked(int)), - this, SLOT(changeSortColumn(int)) ); - connect( d->h, SIGNAL(sectionHandleDoubleClicked(int)), - this, SLOT(adjustColumn(int)) ); - connect( horizontalScrollBar(), SIGNAL(sliderMoved(int)), - d->h, SLOT(setOffset(int)) ); - connect( horizontalScrollBar(), SIGNAL(valueChanged(int)), - d->h, SLOT(setOffset(int)) ); + connect( d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateContents()) ); + connect( d->dirtyItemTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateDirtyItems()) ); + connect( d->visibleTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(makeVisible()) ); + connect( d->renameTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(startRename()) ); + connect( d->autoopenTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(openFocusItem()) ); + + connect( d->h, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(handleSizeChange(int,int,int)) ); + connect( d->h, TQ_SIGNAL(indexChange(int,int,int)), + this, TQ_SLOT(handleIndexChange()) ); + connect( d->h, TQ_SIGNAL(sectionClicked(int)), + this, TQ_SLOT(changeSortColumn(int)) ); + connect( d->h, TQ_SIGNAL(sectionHandleDoubleClicked(int)), + this, TQ_SLOT(adjustColumn(int)) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)), + d->h, TQ_SLOT(setOffset(int)) ); + connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), + d->h, TQ_SLOT(setOffset(int)) ); // will access d->r TQListViewPrivate::Root * r = new TQListViewPrivate::Root( this ); @@ -3460,11 +3460,11 @@ void TQListView::setColumnWidth( int column, int w ) int oldw = d->h->sectionSize( column ); if ( column < d->h->count() && oldw != w ) { d->h->resizeSection( column, w ); - disconnect( d->h, SIGNAL(sizeChange(int,int,int)), - this, SLOT(handleSizeChange(int,int,int)) ); + disconnect( d->h, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(handleSizeChange(int,int,int)) ); emit d->h->sizeChange( column, oldw, w); - connect( d->h, SIGNAL(sizeChange(int,int,int)), - this, SLOT(handleSizeChange(int,int,int)) ); + connect( d->h, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(handleSizeChange(int,int,int)) ); updateGeometries(); viewport()->update(); } @@ -4446,7 +4446,7 @@ void TQListView::contentsMousePressEventEx( TQMouseEvent * e ) void TQListView::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)) ) ) { e->ignore(); return; } @@ -4486,8 +4486,8 @@ void TQListView::contentsMouseReleaseEventEx( TQMouseEvent * e ) d->buttonDown = FALSE; // delete and disconnect autoscroll timer, if we have one if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + disconnect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; @@ -4709,8 +4709,8 @@ void TQListView::contentsMouseMoveEvent( TQMouseEvent * e ) // connect the timer if ( needAutoScroll && !d->scrollTimer ) { d->scrollTimer = new TQTimer( this ); - connect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + connect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->start( 100, FALSE ); // call it once manually doAutoScroll( vp ); @@ -4720,8 +4720,8 @@ void TQListView::contentsMouseMoveEvent( TQMouseEvent * e ) if ( !needAutoScroll ) { // if there is a autoscroll timer, delete it if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + disconnect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index f196a1d36..ab9beba9e 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -995,10 +995,10 @@ void TQMainWindow::setStatusBar( TQStatusBar * newStatusBar ) d->sb = newStatusBar; #ifndef TQT_NO_TOOLTIP // ### this code can cause unnecessary creation of a tool tip group - connect( toolTipGroup(), SIGNAL(showTip(const TQString&)), - d->sb, SLOT(message(const TQString&)) ); - connect( toolTipGroup(), SIGNAL(removeTip()), - d->sb, SLOT(clear()) ); + connect( toolTipGroup(), TQ_SIGNAL(showTip(const TQString&)), + d->sb, TQ_SLOT(message(const TQString&)) ); + connect( toolTipGroup(), TQ_SIGNAL(removeTip()), + d->sb, TQ_SLOT(clear()) ); #endif d->sb->installEventFilter( this ); triggerLayout(); @@ -1054,10 +1054,10 @@ void TQMainWindow::setToolTipGroup( TQToolTipGroup * newToolTipGroup ) delete d->ttg; d->ttg = newToolTipGroup; - connect( toolTipGroup(), SIGNAL(showTip(const TQString&)), - statusBar(), SLOT(message(const TQString&)) ); - connect( toolTipGroup(), SIGNAL(removeTip()), - statusBar(), SLOT(clear()) ); + connect( toolTipGroup(), TQ_SIGNAL(showTip(const TQString&)), + statusBar(), TQ_SLOT(message(const TQString&)) ); + connect( toolTipGroup(), TQ_SIGNAL(removeTip()), + statusBar(), TQ_SLOT(clear()) ); } @@ -1148,8 +1148,8 @@ void TQMainWindow::setDockEnabled( TQDockWindow *dw, Dock dock, bool enable ) { if ( d->dockWindows.find( dw ) == -1 ) { d->dockWindows.append( dw ); - connect( dw, SIGNAL( placeChanged(TQDockWindow::Place) ), - this, SLOT( slotPlaceChanged() ) ); + connect( dw, TQ_SIGNAL( placeChanged(TQDockWindow::Place) ), + this, TQ_SLOT( slotPlaceChanged() ) ); } TQString s; s.sprintf( "%p_%d", (void*)dw, (int)dock ); @@ -1247,8 +1247,8 @@ void TQMainWindow::addDockWindow( TQDockWindow *dockWindow, dockWindow->setNewLine( newLine ); if ( d->dockWindows.find( dockWindow ) == -1 ) { d->dockWindows.append( dockWindow ); - connect( dockWindow, SIGNAL( placeChanged(TQDockWindow::Place) ), - this, SLOT( slotPlaceChanged() ) ); + connect( dockWindow, TQ_SIGNAL( placeChanged(TQDockWindow::Place) ), + this, TQ_SLOT( slotPlaceChanged() ) ); dockWindow->installEventFilter( this ); } dockWindow->setOpaqueMoving( d->opaque ); @@ -1414,8 +1414,8 @@ void TQMainWindow::removeDockWindow( TQDockWindow * dockWindow ) dockWindow->hide(); d->dockWindows.removeRef( dockWindow ); - disconnect( dockWindow, SIGNAL( placeChanged(TQDockWindow::Place) ), - this, SLOT( slotPlaceChanged() ) ); + disconnect( dockWindow, TQ_SIGNAL( placeChanged(TQDockWindow::Place) ), + this, TQ_SLOT( slotPlaceChanged() ) ); dockWindow->removeEventFilter( this ); } @@ -1844,7 +1844,7 @@ void TQMainWindow::triggerLayout( bool deleteLayout ) \code TQPopupMenu * help = new TQPopupMenu( this ); - help->insertItem( "What's &This", this , SLOT(whatsThis()), SHIFT+Key_F1); + help->insertItem( "What's &This", this , TQ_SLOT(whatsThis()), SHIFT+Key_F1); \endcode \sa TQWhatsThis::enterWhatsThisMode() @@ -2164,7 +2164,7 @@ TQPopupMenu *TQMainWindow::createDockWindowMenu( DockWindows dockWindows ) const TQPopupMenu *menu = new TQPopupMenu( (TQMainWindow*)this, "qt_customize_menu" ); menu->setCheckable( TRUE ); d->dockWindowModes.replace( menu, dockWindows ); - connect( menu, SIGNAL( aboutToShow() ), this, SLOT( menuAboutToShow() ) ); + connect( menu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( menuAboutToShow() ) ); return menu; } @@ -2203,7 +2203,7 @@ void TQMainWindow::menuAboutToShow() continue; TQString label = dw->caption(); if ( !label.isEmpty() ) { - int id = menu->insertItem( label, dw, SLOT( toggleVisible() ) ); + int id = menu->insertItem( label, dw, TQ_SLOT( toggleVisible() ) ); menu->setItemChecked( id, dw->isVisible() ); empty = FALSE; } @@ -2222,7 +2222,7 @@ void TQMainWindow::menuAboutToShow() continue; TQString label = tb->label(); if ( !label.isEmpty() ) { - int id = menu->insertItem( label, tb, SLOT( toggleVisible() ) ); + int id = menu->insertItem( label, tb, TQ_SLOT( toggleVisible() ) ); menu->setItemChecked( id, tb->isVisible() ); empty = FALSE; } @@ -2238,9 +2238,9 @@ void TQMainWindow::menuAboutToShow() menu->insertSeparator(); if ( dockWindowsMovable() ) - menu->insertItem( tr( "Line up" ), this, SLOT( doLineUp() ) ); + menu->insertItem( tr( "Line up" ), this, TQ_SLOT( doLineUp() ) ); if ( isCustomizable() ) - menu->insertItem( tr( "Customize..." ), this, SLOT( customize() ) ); + menu->insertItem( tr( "Customize..." ), this, TQ_SLOT( customize() ) ); } /*! diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp index d832bcc40..c0051ef6e 100644 --- a/src/widgets/qmenubar.cpp +++ b/src/widgets/qmenubar.cpp @@ -375,7 +375,7 @@ void TQMenuBar::menuContentsChanged() return; pendingDelayedContentsChanges = 1; if( !pendingDelayedStateChanges )// if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQMenuBar::performDelayedContentsChanged() @@ -418,7 +418,7 @@ void TQMenuBar::menuStateChanged() return; pendingDelayedStateChanges = 1; if( !pendingDelayedContentsChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQMenuBar::performDelayedStateChanged() @@ -467,20 +467,20 @@ void TQMenuBar::performDelayedChanges() void TQMenuBar::menuInsPopup( TQPopupMenu *popup ) { - connect( popup, SIGNAL(activatedRedirect(int)), - SLOT(subActivated(int)) ); - connect( popup, SIGNAL(highlightedRedirect(int)), - SLOT(subHighlighted(int)) ); - connect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + connect( popup, TQ_SIGNAL(activatedRedirect(int)), + TQ_SLOT(subActivated(int)) ); + connect( popup, TQ_SIGNAL(highlightedRedirect(int)), + TQ_SLOT(subHighlighted(int)) ); + connect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQMenuBar::menuDelPopup( TQPopupMenu *popup ) { - popup->disconnect( SIGNAL(activatedRedirect(int)) ); - popup->disconnect( SIGNAL(highlightedRedirect(int)) ); - disconnect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + popup->disconnect( TQ_SIGNAL(activatedRedirect(int)) ); + popup->disconnect( TQ_SIGNAL(highlightedRedirect(int)) ); + disconnect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQMenuBar::frameChanged() @@ -1547,12 +1547,12 @@ void TQMenuBar::setupAccelerators() autoaccel = new TQAccel( this ); TQ_CHECK_PTR( autoaccel ); autoaccel->setIgnoreWhatsThis( TRUE ); - connect( autoaccel, SIGNAL(activated(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(activatedAmbiguously(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(destroyed()), - SLOT(accelDestroyed()) ); + connect( autoaccel, TQ_SIGNAL(activated(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(activatedAmbiguously(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(destroyed()), + TQ_SLOT(accelDestroyed()) ); } autoaccel->insertItem( i, mi->id() ); } diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp index 98bc2bf1e..720cba9e0 100644 --- a/src/widgets/qmenudata.cpp +++ b/src/widgets/qmenudata.cpp @@ -361,8 +361,8 @@ void TQMenuData::removePopup( TQPopupMenu *popup ) \code TQMenuBar *mainMenu = new TQMenuBar; TQPopupMenu *fileMenu = new TQPopupMenu; - fileMenu->insertItem( "New", myView, SLOT(newFile()), CTRL+Key_N ); - fileMenu->insertItem( "Open", myView, SLOT(open()), CTRL+Key_O ); + fileMenu->insertItem( "New", myView, TQ_SLOT(newFile()), CTRL+Key_N ); + fileMenu->insertItem( "Open", myView, TQ_SLOT(open()), CTRL+Key_O ); mainMenu->insertItem( "File", fileMenu ); \endcode @@ -373,7 +373,7 @@ void TQMenuData::removePopup( TQPopupMenu *popup ) accelerator. (For translations use a string \link TQKeySequence key sequence\endlink.): \code - fileMenu->insertItem( tr("Open"), myView, SLOT(open()), + fileMenu->insertItem( tr("Open"), myView, TQ_SLOT(open()), tr("Ctrl+O") ); \endcode diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index 051ef6d0b..5e327d200 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -115,9 +115,9 @@ static void popupSubMenuLater( int msec, TQPopupMenu * receiver ) { tqAddPostRoutine( cleanup ); } - singleSingleShot->disconnect( SIGNAL(timeout()) ); - TQObject::connect( singleSingleShot, SIGNAL(timeout()), - receiver, SLOT(subMenuTimer()) ); + singleSingleShot->disconnect( TQ_SIGNAL(timeout()) ); + TQObject::connect( singleSingleShot, TQ_SIGNAL(timeout()), + receiver, TQ_SLOT(subMenuTimer()) ); singleSingleShot->start( msec, TRUE ); } @@ -380,7 +380,7 @@ void TQPopupMenu::menuContentsChanged() return; pendingDelayedContentsChanges = 1; if( !pendingDelayedStateChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQPopupMenu::performDelayedContentsChanged() @@ -417,7 +417,7 @@ void TQPopupMenu::menuStateChanged() return; pendingDelayedStateChanges = 1; if( !pendingDelayedContentsChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQPopupMenu::performDelayedStateChanged() @@ -443,20 +443,20 @@ void TQPopupMenu::performDelayedChanges() void TQPopupMenu::menuInsPopup( TQPopupMenu *popup ) { - connect( popup, SIGNAL(activatedRedirect(int)), - SLOT(subActivated(int)) ); - connect( popup, SIGNAL(highlightedRedirect(int)), - SLOT(subHighlighted(int)) ); - connect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + connect( popup, TQ_SIGNAL(activatedRedirect(int)), + TQ_SLOT(subActivated(int)) ); + connect( popup, TQ_SIGNAL(highlightedRedirect(int)), + TQ_SLOT(subHighlighted(int)) ); + connect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQPopupMenu::menuDelPopup( TQPopupMenu *popup ) { - popup->disconnect( SIGNAL(activatedRedirect(int)) ); - popup->disconnect( SIGNAL(highlightedRedirect(int)) ); - disconnect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + popup->disconnect( TQ_SIGNAL(activatedRedirect(int)) ); + popup->disconnect( TQ_SIGNAL(highlightedRedirect(int)) ); + disconnect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } @@ -803,7 +803,7 @@ void TQPopupMenu::hideAllPopups() { TQMenuData *top = this; // find top level popup if ( !preventAnimation ) - TQTimer::singleShot( 10, this, SLOT(allowAnimation()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(allowAnimation()) ); preventAnimation = TRUE; if ( !isPopup() ) @@ -831,7 +831,7 @@ void TQPopupMenu::hideAllPopups() void TQPopupMenu::hidePopups() { if ( !preventAnimation ) - TQTimer::singleShot( 10, this, SLOT(allowAnimation()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(allowAnimation()) ); preventAnimation = TRUE; TQMenuItemListIt it(*mitems); @@ -1270,12 +1270,12 @@ void TQPopupMenu::updateAccel( TQWidget *parent ) // create an autoaccel in any case, even if we might not use // it immediately. Maybe the user needs it later. autoaccel = new TQAccel( parent, this ); - connect( autoaccel, SIGNAL(activated(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(activatedAmbiguously(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(destroyed()), - SLOT(accelDestroyed()) ); + connect( autoaccel, TQ_SIGNAL(activated(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(activatedAmbiguously(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(destroyed()), + TQ_SLOT(accelDestroyed()) ); if ( accelDisabled ) autoaccel->setEnabled( FALSE ); } @@ -1768,8 +1768,8 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e ) (d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollDown && e->pos().y() >= height()-sh)) { if(!d->scroll.scrolltimer) { d->scroll.scrolltimer = new TQTimer(this, "popup scroll timer"); - TQObject::connect( d->scroll.scrolltimer, SIGNAL(timeout()), - this, SLOT(subScrollTimer()) ); + TQObject::connect( d->scroll.scrolltimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(subScrollTimer()) ); } if(!d->scroll.scrolltimer->isActive()) d->scroll.scrolltimer->start(40); @@ -2497,11 +2497,11 @@ void TQPopupMenu::connectModal( TQPopupMenu* receiver, bool doConnect ) connectModalRecursionSafety = doConnect; if ( doConnect ) - connect( this, SIGNAL(activated(int)), - receiver, SLOT(modalActivation(int)) ); + connect( this, TQ_SIGNAL(activated(int)), + receiver, TQ_SLOT(modalActivation(int)) ); else - disconnect( this, SIGNAL(activated(int)), - receiver, SLOT(modalActivation(int)) ); + disconnect( this, TQ_SIGNAL(activated(int)), + receiver, TQ_SLOT(modalActivation(int)) ); TQMenuItemListIt it(*mitems); TQMenuItem *mi; @@ -2716,7 +2716,7 @@ public: int TQPopupMenu::insertTearOffHandle( int id, int index ) { int myid = insertItem( new TQTearOffMenuItem, id, index ); - connectItem( myid, this, SLOT( toggleTearOff() ) ); + connectItem( myid, this, TQ_SLOT( toggleTearOff() ) ); TQMenuData::d->aInt = myid; return myid; } @@ -2735,8 +2735,8 @@ void TQPopupMenu::toggleTearOff() } else { // create a tear off menu TQPopupMenu* p = new TQPopupMenu( parentWidget(), "tear off menu" ); - connect( p, SIGNAL( activated(int) ), this, SIGNAL( activated(int) ) ); - connect( p, SIGNAL( highlighted(int) ), this, SIGNAL( highlighted(int) ) ); + connect( p, TQ_SIGNAL( activated(int) ), this, TQ_SIGNAL( activated(int) ) ); + connect( p, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( highlighted(int) ) ); #ifndef TQT_NO_WIDGET_TOPEXTRA p->setCaption( caption() ); #endif diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp index 469eb802c..b9c1924ce 100644 --- a/src/widgets/qpushbutton.cpp +++ b/src/widgets/qpushbutton.cpp @@ -657,7 +657,7 @@ void TQPushButton::setPopup( TQPopupMenu* popup ) if ( !d ) d = new TQPushButtonPrivate; if ( popup && !d->popup ) - connect( this, SIGNAL( pressed() ), this, SLOT( popupPressed() ) ); + connect( this, TQ_SIGNAL( pressed() ), this, TQ_SLOT( popupPressed() ) ); d->popup = popup; setIsMenuButton( popup != 0 ); diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp index b234f1f29..f9850b2f8 100644 --- a/src/widgets/qscrollbar.cpp +++ b/src/widgets/qscrollbar.cpp @@ -481,8 +481,8 @@ void TQScrollBar::startAutoRepeat() { if ( !repeater ) { repeater = new TQTimer( this, "auto-repeat timer" ); - connect( repeater, SIGNAL(timeout()), - this, SLOT(doAutoRepeat()) ); + connect( repeater, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoRepeat()) ); } repeater->start( thresholdTime, FALSE ); } diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp index 67bf56fea..c4986c800 100644 --- a/src/widgets/qscrollview.cpp +++ b/src/widgets/qscrollview.cpp @@ -586,25 +586,25 @@ TQScrollView::TQScrollView( TQWidget *parent, const char *name, WFlags f ) : d = new TQScrollViewData( this, flags ); #ifndef TQT_NO_DRAGANDDROP - connect( &d->autoscroll_timer, SIGNAL( timeout() ), - this, SLOT( doDragAutoScroll() ) ); + connect( &d->autoscroll_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doDragAutoScroll() ) ); #endif - connect( d->hbar, SIGNAL( valueChanged(int) ), - this, SLOT( hslide(int) ) ); - connect( d->vbar, SIGNAL( valueChanged(int) ), - this, SLOT( vslide(int) ) ); + connect( d->hbar, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( hslide(int) ) ); + connect( d->vbar, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( vslide(int) ) ); - connect( d->hbar, SIGNAL(sliderPressed()), this, SLOT(hbarIsPressed()) ); - connect( d->hbar, SIGNAL(sliderReleased()), this, SLOT(hbarIsReleased()) ); - connect( d->vbar, SIGNAL(sliderPressed()), this, SLOT(vbarIsPressed()) ); - connect( d->vbar, SIGNAL(sliderReleased()), this, SLOT(vbarIsReleased()) ); + connect( d->hbar, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(hbarIsPressed()) ); + connect( d->hbar, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(hbarIsReleased()) ); + connect( d->vbar, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(vbarIsPressed()) ); + connect( d->vbar, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(vbarIsReleased()) ); d->viewport->installEventFilter( this ); - connect( &d->scrollbar_timer, SIGNAL( timeout() ), - this, SLOT( updateScrollBars() ) ); + connect( &d->scrollbar_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateScrollBars() ) ); setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); setLineWidth( style().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) ); diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp index 883065e0c..55e1589c2 100644 --- a/src/widgets/qslider.cpp +++ b/src/widgets/qslider.cpp @@ -461,7 +461,7 @@ void TQSlider::mousePressEvent( TQMouseEvent *e ) } if ( !timer ) timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } else if ( ( orient == Horizontal && e->pos().x() > r.right() ) //### goodPart || ( orient == Vertical && e->pos().y() > r.bottom() ) ) { @@ -474,7 +474,7 @@ void TQSlider::mousePressEvent( TQMouseEvent *e ) } if ( !timer ) timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } update( sliderRect() ); @@ -713,9 +713,9 @@ void TQSlider::repeatTimeout() Q_ASSERT( timer ); timer->disconnect(); if ( state == TimingDown ) - connect( timer, SIGNAL(timeout()), SLOT(subtractStep()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(subtractStep()) ); else if ( state == TimingUp ) - connect( timer, SIGNAL(timeout()), SLOT(addStep()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(addStep()) ); timer->start( repeatTime, FALSE ); } diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp index a79b18d7e..87e232a4b 100644 --- a/src/widgets/qspinbox.cpp +++ b/src/widgets/qspinbox.cpp @@ -267,8 +267,8 @@ void TQSpinBox::initSpinBox() d = new TQSpinBoxPrivate; d->controls = new TQSpinWidget( this, "controls" ); - connect( d->controls, SIGNAL( stepUpPressed() ), SLOT( stepUp() ) ); - connect( d->controls, SIGNAL( stepDownPressed() ), SLOT( stepDown() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); wrap = FALSE; edited = FALSE; @@ -287,7 +287,7 @@ void TQSpinBox::initSpinBox() updateDisplay(); - connect( vi, SIGNAL(textChanged(const TQString&)), SLOT(textChanged()) ); + connect( vi, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged()) ); } /*! diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/qspinwidget.cpp index 7ea124cc7..839bf872e 100644 --- a/src/widgets/qspinwidget.cpp +++ b/src/widgets/qspinwidget.cpp @@ -87,7 +87,7 @@ TQSpinWidget::TQSpinWidget( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { d = new TQSpinWidgetPrivate(); - connect( &d->auRepTimer, SIGNAL( timeout() ), this, SLOT( timerDone() ) ); + connect( &d->auRepTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timerDone() ) ); setFocusPolicy( StrongFocus ); arrange(); @@ -209,7 +209,7 @@ void TQSpinWidget::timerDone() { // we use a double timer to make it possible for users to do // something with 0-timer on valueChanged. - TQTimer::singleShot( 1, this, SLOT( timerDoneEx() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( timerDoneEx() ) ); } void TQSpinWidget::timerDoneEx() diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp index d3d294d2e..f5830d4b8 100644 --- a/src/widgets/qstatusbar.cpp +++ b/src/widgets/qstatusbar.cpp @@ -80,8 +80,8 @@ one that has a time limit: \code - connect( loader, SIGNAL(progressMessage(const TQString&)), - statusBar(), SLOT(message(const TQString&)) ); + connect( loader, TQ_SIGNAL(progressMessage(const TQString&)), + statusBar(), TQ_SLOT(message(const TQString&)) ); statusBar()->message("Loading..."); // Initial message loader.loadStuff(); // Emits progress messages @@ -377,7 +377,7 @@ void TQStatusBar::message( const TQString &message, int ms ) if ( !d->timer ) { d->timer = new TQTimer( this ); - connect( d->timer, SIGNAL(timeout()), this, SLOT(clear()) ); + connect( d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clear()) ); } if ( ms > 0 ) { d->timer->start( ms ); diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp index e33f0113c..814cc5a96 100644 --- a/src/widgets/qsyntaxhighlighter.cpp +++ b/src/widgets/qsyntaxhighlighter.cpp @@ -82,7 +82,7 @@ TQSyntaxHighlighter::TQSyntaxHighlighter( TQTextEdit *textEdit ) { textEdit->document()->setPreProcessor( new TQSyntaxHighlighterInternal( this ) ); textEdit->document()->invalidate(); - TQTimer::singleShot( 0, textEdit->viewport(), SLOT( update() ) ); + TQTimer::singleShot( 0, textEdit->viewport(), TQ_SLOT( update() ) ); } /*! diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp index 08e5f24f4..33a19d825 100644 --- a/src/widgets/qtabbar.cpp +++ b/src/widgets/qtabbar.cpp @@ -344,16 +344,16 @@ TQTabBar::TQTabBar( TQWidget * parent, const char *name ) d->toolTips = 0; #ifndef TQT_NO_ACCEL d->a = new TQAccel( this, "tab accelerators" ); - connect( d->a, SIGNAL(activated(int)), this, SLOT(setCurrentTab(int)) ); - connect( d->a, SIGNAL(activatedAmbiguously(int)), this, SLOT(setCurrentTab(int)) ); + connect( d->a, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setCurrentTab(int)) ); + connect( d->a, TQ_SIGNAL(activatedAmbiguously(int)), this, TQ_SLOT(setCurrentTab(int)) ); #endif d->s = RoundedAbove; d->scrolls = FALSE; d->leftB = new TQToolButton( LeftArrow, this, "qt_left_btn" ); - connect( d->leftB, SIGNAL( clicked() ), this, SLOT( scrollTabs() ) ); + connect( d->leftB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollTabs() ) ); d->leftB->hide(); d->rightB = new TQToolButton( RightArrow, this, "qt_right_btn" ); - connect( d->rightB, SIGNAL( clicked() ), this, SLOT( scrollTabs() ) ); + connect( d->rightB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollTabs() ) ); d->rightB->hide(); d->btnWidth = style().pixelMetric(TQStyle::PM_TabBarScrollButtonWidth, this); l = new TQPtrList<TQTab>; diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp index 214368814..5f1949099 100644 --- a/src/widgets/qtabwidget.cpp +++ b/src/widgets/qtabwidget.cpp @@ -636,8 +636,8 @@ void TQTabWidget::setTabBar( TQTabBar* tb) delete d->tabs; d->tabs = tb; setFocusProxy( d->tabs ); - connect( d->tabs, SIGNAL(selected(int)), - this, SLOT(showTab(int)) ); + connect( d->tabs, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(showTab(int)) ); setUpLayout(); } diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index fac5ca2b9..1205f46fe 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -956,8 +956,8 @@ void TQTextEdit::init() readonly = TRUE; setReadOnly( FALSE ); setFrameStyle( LineEditPanel | Sunken ); - connect( doc, SIGNAL( minimumWidthChanged(int) ), - this, SLOT( documentWidthChanged(int) ) ); + connect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), + this, TQ_SLOT( documentWidthChanged(int) ) ); mousePressed = FALSE; inDoubleClick = FALSE; @@ -989,28 +989,28 @@ void TQTextEdit::init() cursor = new TQTextCursor( doc ); formatTimer = new TQTimer( this ); - connect( formatTimer, SIGNAL( timeout() ), - this, SLOT( formatMore() ) ); + connect( formatTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( formatMore() ) ); lastFormatted = doc->firstParagraph(); scrollTimer = new TQTimer( this ); - connect( scrollTimer, SIGNAL( timeout() ), - this, SLOT( autoScrollTimerDone() ) ); + connect( scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoScrollTimerDone() ) ); interval = 0; changeIntervalTimer = new TQTimer( this ); - connect( changeIntervalTimer, SIGNAL( timeout() ), - this, SLOT( doChangeInterval() ) ); + connect( changeIntervalTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doChangeInterval() ) ); cursorVisible = TRUE; blinkTimer = new TQTimer( this ); - connect( blinkTimer, SIGNAL( timeout() ), - this, SLOT( blinkCursor() ) ); + connect( blinkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( blinkCursor() ) ); #ifndef TQT_NO_DRAGANDDROP dragStartTimer = new TQTimer( this ); - connect( dragStartTimer, SIGNAL( timeout() ), - this, SLOT( startDrag() ) ); + connect( dragStartTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( startDrag() ) ); #endif d->trippleClickTimer = new TQTimer( this ); @@ -1023,8 +1023,8 @@ void TQTextEdit::init() viewport()->setFocusPolicy( WheelFocus ); setInputMethodEnabled( TRUE ); viewport()->installEventFilter( this ); - connect( this, SIGNAL(horizontalSliderReleased()), this, SLOT(sliderReleased()) ); - connect( this, SIGNAL(verticalSliderReleased()), this, SLOT(sliderReleased()) ); + connect( this, TQ_SIGNAL(horizontalSliderReleased()), this, TQ_SLOT(sliderReleased()) ); + connect( this, TQ_SIGNAL(verticalSliderReleased()), this, TQ_SLOT(sliderReleased()) ); installEventFilter( this ); } @@ -2411,11 +2411,11 @@ void TQTextEdit::copyToClipboard() d->clipboard_mode = TQClipboard::Selection; // don't listen to selection changes - disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); // listen to selection changes - connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), - this, SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(clipboardChanged()) ); d->clipboard_mode = TQClipboard::Clipboard; } @@ -2776,11 +2776,11 @@ void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) d->clipboard_mode = TQClipboard::Selection; // don't listen to selection changes - disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); // listen to selection changes - connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), - this, SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(clipboardChanged()) ); d->clipboard_mode = TQClipboard::Clipboard; } @@ -6135,7 +6135,7 @@ void TQTextEdit::clipboardChanged() { #ifndef TQT_NO_CLIPBOARD // don't listen to selection changes - disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); #endif selectAll(FALSE); } @@ -6186,19 +6186,19 @@ bool TQTextEdit::checkOptimMode() if ( oldMode != d->optimMode ) { if ( d->optimMode ) { d->od = new TQTextEditOptimPrivate; - connect( scrollTimer, SIGNAL( timeout() ), this, SLOT( optimDoAutoScroll() ) ); - disconnect( doc, SIGNAL( minimumWidthChanged(int) ), this, SLOT( documentWidthChanged(int) ) ); - disconnect( scrollTimer, SIGNAL( timeout() ), this, SLOT( autoScrollTimerDone() ) ); - disconnect( formatTimer, SIGNAL( timeout() ), this, SLOT( formatMore() ) ); + connect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( optimDoAutoScroll() ) ); + disconnect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), this, TQ_SLOT( documentWidthChanged(int) ) ); + disconnect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoScrollTimerDone() ) ); + disconnect( formatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( formatMore() ) ); optimSetText( doc->originalText() ); doc->clear(TRUE); delete cursor; cursor = new TQTextCursor( doc ); } else { - disconnect( scrollTimer, SIGNAL( timeout() ), this, SLOT( optimDoAutoScroll() ) ); - connect( doc, SIGNAL( minimumWidthChanged(int) ), this, SLOT( documentWidthChanged(int) ) ); - connect( scrollTimer, SIGNAL( timeout() ), this, SLOT( autoScrollTimerDone() ) ); - connect( formatTimer, SIGNAL( timeout() ), this, SLOT( formatMore() ) ); + disconnect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( optimDoAutoScroll() ) ); + connect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), this, TQ_SLOT( documentWidthChanged(int) ) ); + connect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoScrollTimerDone() ) ); + connect( formatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( formatMore() ) ); setText( optimText() ); delete d->od; d->od = 0; diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp index 79b13a80b..dfff7c763 100644 --- a/src/widgets/qtoolbar.cpp +++ b/src/widgets/qtoolbar.cpp @@ -165,8 +165,8 @@ TQToolBarSeparator::TQToolBarSeparator(Orientation o , TQToolBar *parent, const char* name ) : TQWidget( parent, name ) { - connect( parent, SIGNAL(orientationChanged(Orientation)), - this, SLOT(setOrientation(Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(Orientation)), + this, TQ_SLOT(setOrientation(Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -602,7 +602,7 @@ void TQToolBar::createPopup() { if (!d->extensionPopup) { d->extensionPopup = new TQPopupMenu( this, "qt_dockwidget_internal" ); - connect( d->extensionPopup, SIGNAL( aboutToShow() ), this, SLOT( createPopup() ) ); + connect( d->extensionPopup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( createPopup() ) ); } if (!d->extension) { @@ -654,7 +654,7 @@ void TQToolBar::createPopup() if ( b->popup() && b->popupDelay() <= 0 ) id = d->extensionPopup->insertItem( b->iconSet(), s, b->popup() ); else - id = d->extensionPopup->insertItem( b->iconSet(), s, b, SLOT( emulateClick() ) ) ; + id = d->extensionPopup->insertItem( b->iconSet(), s, b, TQ_SLOT( emulateClick() ) ) ; if ( b->isToggleButton() ) d->extensionPopup->setItemChecked( id, b->isOn() ); if ( !b->isEnabled() ) @@ -665,9 +665,9 @@ void TQToolBar::createPopup() if ( s.isEmpty() ) s = ""; if ( b->pixmap() ) - id = d->extensionPopup->insertItem( *b->pixmap(), s, b, SLOT( emulateClick() ) ); + id = d->extensionPopup->insertItem( *b->pixmap(), s, b, TQ_SLOT( emulateClick() ) ); else - id = d->extensionPopup->insertItem( s, b, SLOT( emulateClick() ) ); + id = d->extensionPopup->insertItem( s, b, TQ_SLOT( emulateClick() ) ); if ( b->isToggleButton() ) d->extensionPopup->setItemChecked( id, b->isOn() ); if ( !b->isEnabled() ) @@ -687,7 +687,7 @@ void TQToolBar::createPopup() TQPopupMenu *cp = new TQPopupMenu(d->extensionPopup); cp->setEnabled(c->isEnabled()); d->extensionPopup->insertItem( s, cp ); - connect( cp, SIGNAL( activated(int) ), c, SLOT( internalActivate(int) ) ); + connect( cp, TQ_SIGNAL( activated(int) ), c, TQ_SLOT( internalActivate(int) ) ); for ( int i = 0; i < c->count(); ++i ) { TQString tmp = c->text( i ); cp->insertItem( tmp, i ); @@ -702,7 +702,7 @@ void TQToolBar::createPopup() TQPopupMenu* sp = new TQPopupMenu(d->extensionPopup); cp->insertItem( tr( "More..." ), sp ); cp = sp; - connect( cp, SIGNAL( activated(int) ), c, SLOT( internalActivate(int) ) ); + connect( cp, TQ_SIGNAL( activated(int) ), c, TQ_SLOT( internalActivate(int) ) ); } } } diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp index 40bfb6de4..d5c906477 100644 --- a/src/widgets/qtoolbox.cpp +++ b/src/widgets/qtoolbox.cpp @@ -349,12 +349,12 @@ int TQToolBox::insertItem( int index, TQWidget *item, const TQIconSet &iconSet, if ( !item ) return -1; - connect(item, SIGNAL(destroyed(TQObject*)), this, SLOT(itemDestroyed(TQObject*))); + connect(item, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(itemDestroyed(TQObject*))); TQToolBoxPrivate::Page c; c.widget = item; c.button = new TQToolBoxButton( this, label.latin1() ); - connect( c.button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) ); + connect( c.button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) ); c.sv = new TQScrollView( this ); c.sv->hide(); @@ -487,7 +487,7 @@ int TQToolBox::removeItem( TQWidget *item ) { int index = indexOf(item); if (index >= 0) { - disconnect(item, SIGNAL(destroyed(TQObject*)), this, SLOT(itemDestroyed(TQObject*))); + disconnect(item, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(itemDestroyed(TQObject*))); item->reparent( this, TQPoint(0,0) ); // destroy internal data itemDestroyed(item); diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index 1316944f0..b2a4443bf 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -147,11 +147,11 @@ TQToolButton::TQToolButton( TQWidget * parent, const char *name ) if ( tb ) { setAutoRaise( TRUE ); if ( tb->mainWindow() ) { - connect( tb->mainWindow(), SIGNAL(pixmapSizeChanged(bool)), - this, SLOT(setUsesBigPixmap(bool)) ); + connect( tb->mainWindow(), TQ_SIGNAL(pixmapSizeChanged(bool)), + this, TQ_SLOT(setUsesBigPixmap(bool)) ); setUsesBigPixmap( tb->mainWindow()->usesBigPixmaps() ); - connect( tb->mainWindow(), SIGNAL(usesTextLabelChanged(bool)), - this, SLOT(setUsesTextLabel(bool)) ); + connect( tb->mainWindow(), TQ_SIGNAL(usesTextLabelChanged(bool)), + this, TQ_SLOT(setUsesTextLabel(bool)) ); setUsesTextLabel( tb->mainWindow()->usesTextLabel() ); } else { setUsesBigPixmap( FALSE ); @@ -237,13 +237,13 @@ TQToolButton::TQToolButton( const TQIconSet& iconSet, const TQString &textLabel, setIconSet( iconSet ); setTextLabel( textLabel ); if ( receiver && slot ) - connect( this, SIGNAL(clicked()), receiver, slot ); + connect( this, TQ_SIGNAL(clicked()), receiver, slot ); if ( parent->mainWindow() ) { - connect( parent->mainWindow(), SIGNAL(pixmapSizeChanged(bool)), - this, SLOT(setUsesBigPixmap(bool)) ); + connect( parent->mainWindow(), TQ_SIGNAL(pixmapSizeChanged(bool)), + this, TQ_SLOT(setUsesBigPixmap(bool)) ); setUsesBigPixmap( parent->mainWindow()->usesBigPixmaps() ); - connect( parent->mainWindow(), SIGNAL(usesTextLabelChanged(bool)), - this, SLOT(setUsesTextLabel(bool)) ); + connect( parent->mainWindow(), TQ_SIGNAL(usesTextLabelChanged(bool)), + this, TQ_SLOT(setUsesTextLabel(bool)) ); setUsesTextLabel( parent->mainWindow()->usesTextLabel() ); } else { setUsesBigPixmap( FALSE ); @@ -749,9 +749,9 @@ TQIconSet TQToolButton::iconSet() const void TQToolButton::setPopup( TQPopupMenu* popup ) { if ( popup && !d->popupTimer ) { - connect( this, SIGNAL( pressed() ), this, SLOT( popupPressed() ) ); + connect( this, TQ_SIGNAL( pressed() ), this, TQ_SLOT( popupPressed() ) ); d->popupTimer = new TQTimer( this ); - connect( d->popupTimer, SIGNAL( timeout() ), this, SLOT( popupTimerDone() ) ); + connect( d->popupTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( popupTimerDone() ) ); } d->popup = popup; diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp index 5d3cae194..118c0da6e 100644 --- a/src/widgets/qtooltip.cpp +++ b/src/widgets/qtooltip.cpp @@ -165,8 +165,8 @@ TQTipManager::TQTipManager() label = 0; preventAnimation = FALSE; isApplicationFilter = FALSE; - connect( &wakeUp, SIGNAL(timeout()), SLOT(showTip()) ); - connect( &fallAsleep, SIGNAL(timeout()), SLOT(hideTip()) ); + connect( &wakeUp, TQ_SIGNAL(timeout()), TQ_SLOT(showTip()) ); + connect( &fallAsleep, TQ_SIGNAL(timeout()), TQ_SLOT(hideTip()) ); removeTimer = new TQTimer( this ); } @@ -225,7 +225,7 @@ void TQTipManager::add( const TQRect &gm, TQWidget *w, delete h; } } else - connect( w, SIGNAL(destroyed()), this, SLOT(clientWidgetDestroyed()) ); + connect( w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(clientWidgetDestroyed()) ); tips->insert( w, t ); @@ -241,10 +241,10 @@ void TQTipManager::add( const TQRect &gm, TQWidget *w, } if ( t->group ) { - disconnect( removeTimer, SIGNAL( timeout() ), - t->group, SIGNAL( removeTip() ) ); - connect( removeTimer, SIGNAL( timeout() ), - t->group, SIGNAL( removeTip() ) ); + disconnect( removeTimer, TQ_SIGNAL( timeout() ), + t->group, TQ_SIGNAL( removeTip() ) ); + connect( removeTimer, TQ_SIGNAL( timeout() ), + t->group, TQ_SIGNAL( removeTip() ) ); } } @@ -288,7 +288,7 @@ void TQTipManager::remove( TQWidget *w, const TQRect & r, bool delayhide ) } if ( (*tips)[ w ] == 0 ) - disconnect( w, SIGNAL(destroyed()), this, SLOT(clientWidgetDestroyed()) ); + disconnect( w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(clientWidgetDestroyed()) ); #if 0 // not needed, leads sometimes to crashes if ( tips->isEmpty() ) { // the manager will be recreated if needed @@ -337,7 +337,7 @@ void TQTipManager::remove( TQWidget *w ) t = d; } - disconnect( w, SIGNAL(destroyed()), this, SLOT(clientWidgetDestroyed()) ); + disconnect( w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(clientWidgetDestroyed()) ); #if 0 if ( tips->isEmpty() ) { delete tipManager; @@ -356,8 +356,8 @@ void TQTipManager::removeFromGroup( TQToolTipGroup *g ) while ( t ) { if ( t->group == g ) { if ( t->group ) - disconnect( removeTimer, SIGNAL( timeout() ), - t->group, SIGNAL( removeTip() ) ); + disconnect( removeTimer, TQ_SIGNAL( timeout() ), + t->group, TQ_SIGNAL( removeTip() ) ); t->group = 0; } t = t->next; @@ -525,7 +525,7 @@ void TQTipManager::showTip() if ( t->geometry != TQRect( -1, -1, -1, -1 ) ) label->resize( t->geometry.size() ); TQ_CHECK_PTR( label ); - connect( label, SIGNAL(destroyed()), SLOT(labelDestroyed()) ); + connect( label, TQ_SIGNAL(destroyed()), TQ_SLOT(labelDestroyed()) ); } // the above deletion and creation of a TQTipLabel causes events to be sent. We had reports that the widget // pointer was 0 after this. This is in principle possible if the wrong kind of events get sent through our event @@ -598,7 +598,7 @@ void TQTipManager::showTip() void TQTipManager::hideTip() { - TQTimer::singleShot( 250, this, SLOT(allowAnimation()) ); + TQTimer::singleShot( 250, this, TQ_SLOT(allowAnimation()) ); preventAnimation = TRUE; if ( label && label->isVisible() ) { @@ -1122,10 +1122,10 @@ void TQToolTip::clear() \code TQToolTipGroup * grp = new TQToolTipGroup( this, "tool tip relay" ); - connect( grp, SIGNAL(showTip(const TQString&)), - myLabel, SLOT(setText(const TQString&)) ); - connect( grp, SIGNAL(removeTip()), - myLabel, SLOT(clear()) ); + connect( grp, TQ_SIGNAL(showTip(const TQString&)), + myLabel, TQ_SLOT(setText(const TQString&)) ); + connect( grp, TQ_SIGNAL(removeTip()), + myLabel, TQ_SLOT(clear()) ); TQToolTip::add( giraffeButton, "feed giraffe", grp, "Give the giraffe a meal" ); TQToolTip::add( gorillaButton, "feed gorilla", diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp index cd87acd5c..de2b19c17 100644 --- a/src/widgets/qwhatsthis.cpp +++ b/src/widgets/qwhatsthis.cpp @@ -252,7 +252,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co #endif if ( widget ) - connect( widget, SIGNAL( destroyed() ), this, SLOT( widgetDestroyed() ) ); + connect( widget, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( widgetDestroyed() ) ); TQRect r; @@ -455,8 +455,8 @@ TQWhatsThisButton::TQWhatsThisButton( TQWidget * parent, const char * name ) setFocusPolicy( NoFocus ); setTextLabel( tr( "What's this?" ) ); wt->buttons->insert( (void *)this, this ); - connect( this, SIGNAL( released() ), - this, SLOT( mouseReleased() ) ); + connect( this, TQ_SIGNAL( released() ), + this, TQ_SLOT( mouseReleased() ) ); } @@ -742,7 +742,7 @@ TQWhatsThisPrivate::WhatsThisItem* TQWhatsThisPrivate::newItem( TQWidget * widge tlw->insert( (void *)t, t ); t->installEventFilter( this ); } - connect( widget, SIGNAL(destroyed()), this, SLOT(cleanupWidget()) ); + connect( widget, TQ_SIGNAL(destroyed()), this, TQ_SLOT(cleanupWidget()) ); return i; } diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp index 7df816511..2ce255c3d 100644 --- a/src/workspace/qworkspace.cpp +++ b/src/workspace/qworkspace.cpp @@ -313,8 +313,8 @@ TQWorkspace::init() d->menuId = -1; d->controlId = -1; - connect( d->popup, SIGNAL( aboutToShow() ), this, SLOT(operationMenuAboutToShow() )); - connect( d->popup, SIGNAL( activated(int) ), this, SLOT( operationMenuActivated(int) ) ); + connect( d->popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT(operationMenuAboutToShow() )); + connect( d->popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( operationMenuActivated(int) ) ); d->popup->insertItem(TQIconSet(style().stylePixmap(TQStyle::SP_TitleBarNormalButton)), tr("&Restore"), 1); d->popup->insertItem(tr("&Move"), 2); d->popup->insertItem(tr("&Size"), 3); @@ -326,10 +326,10 @@ TQWorkspace::init() #ifndef TQT_NO_ACCEL +"\t"+TQAccel::keyToString(CTRL+Key_F4) #endif - , this, SLOT( closeActiveWindow() ) ); + , this, TQ_SLOT( closeActiveWindow() ) ); - connect( d->toolPopup, SIGNAL( aboutToShow() ), this, SLOT(toolMenuAboutToShow() )); - connect( d->toolPopup, SIGNAL( activated(int) ), this, SLOT( operationMenuActivated(int) ) ); + connect( d->toolPopup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT(toolMenuAboutToShow() )); + connect( d->toolPopup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( operationMenuActivated(int) ) ); d->toolPopup->insertItem(tr("&Move"), 2); d->toolPopup->insertItem(tr("&Size"), 3); d->toolPopup->insertItem(tr("Stay on &Top"), 7); @@ -342,29 +342,29 @@ TQWorkspace::init() #ifndef TQT_NO_ACCEL +"\t"+TQAccel::keyToString( CTRL+Key_F4) #endif - , this, SLOT( closeActiveWindow() ) ); + , this, TQ_SLOT( closeActiveWindow() ) ); #ifndef TQT_NO_ACCEL TQAccel* a = new TQAccel( this ); a->connectItem( a->insertItem( ALT + Key_Minus), - this, SLOT( showOperationMenu() ) ); + this, TQ_SLOT( showOperationMenu() ) ); a->connectItem( a->insertItem( CTRL + Key_F6), - this, SLOT( activateNextWindow() ) ); + this, TQ_SLOT( activateNextWindow() ) ); a->connectItem( a->insertItem( CTRL + Key_Tab), - this, SLOT( activateNextWindow() ) ); + this, TQ_SLOT( activateNextWindow() ) ); a->connectItem( a->insertItem( Key_Forward ), - this, SLOT( activateNextWindow() ) ); + this, TQ_SLOT( activateNextWindow() ) ); a->connectItem( a->insertItem( CTRL + SHIFT + Key_F6), - this, SLOT( activatePreviousWindow() ) ); + this, TQ_SLOT( activatePreviousWindow() ) ); a->connectItem( a->insertItem( CTRL + SHIFT + Key_Tab), - this, SLOT( activatePreviousWindow() ) ); + this, TQ_SLOT( activatePreviousWindow() ) ); a->connectItem( a->insertItem( Key_Back ), - this, SLOT( activatePreviousWindow() ) ); + this, TQ_SLOT( activatePreviousWindow() ) ); a->connectItem( a->insertItem( CTRL + Key_F4 ), - this, SLOT( closeActiveWindow() ) ); + this, TQ_SLOT( closeActiveWindow() ) ); #endif setBackgroundMode( PaletteDark ); @@ -434,10 +434,10 @@ void TQWorkspace::childEvent( TQChildEvent * e) TQWorkspaceChild* child = new TQWorkspaceChild( w, this, "qt_workspacechild" ); child->installEventFilter( this ); - connect( child, SIGNAL( popupOperationMenu(const TQPoint&) ), - this, SLOT( popupOperationMenu(const TQPoint&) ) ); - connect( child, SIGNAL( showOperationMenu() ), - this, SLOT( showOperationMenu() ) ); + connect( child, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ), + this, TQ_SLOT( popupOperationMenu(const TQPoint&) ) ); + connect( child, TQ_SIGNAL( showOperationMenu() ), + this, TQ_SLOT( showOperationMenu() ) ); d->windows.append( child ); if ( child->isVisibleTo( this ) ) d->focus.append( child ); @@ -857,7 +857,7 @@ void TQWorkspace::handleUndock(TQDockWindow *w) while(d->dockwindows.remove(o)); d->newdocks.append(o); if(d->newdocks.count() == 1) - TQTimer::singleShot(0, this, SLOT(dockWindowsShow())); + TQTimer::singleShot(0, this, TQ_SLOT(dockWindowsShow())); break; } @@ -1027,7 +1027,7 @@ void TQWorkspace::showEvent( TQShowEvent *e ) TQWidget *w = new TQWidget(NULL, "TQDoesNotExist", WType_Dialog | WStyle_Customize | WStyle_NoBorder); // if(tqApp->mainWidget() == o) -// TQObject::connect(tqApp, SIGNAL(lastWindowClosed()), tqApp, SLOT(quit())); +// TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit())); TQDesktopWidget *dw = TQApplication::desktop(); w->setGeometry(dw->availableGeometry(dw->screenNumber(o))); o->reparent(w, TQPoint(0, 0), TRUE); @@ -1326,7 +1326,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e) else d->newdocks.append(w); if(d->newdocks.count() == 1) - TQTimer::singleShot(0, this, SLOT(dockWindowsShow())); + TQTimer::singleShot(0, this, TQ_SLOT(dockWindowsShow())); } } else if(e->type() == TQEvent::Hide && !e->spontaneous() && !tqstrncmp(o->name(), "TQMagicDock_", 11)) { // d->mainwindow->close(); @@ -1508,8 +1508,8 @@ void TQWorkspace::showMaximizeControls() iconB->setFocusPolicy( NoFocus ); iconB->setIconSet(style().stylePixmap(TQStyle::SP_TitleBarMinButton)); iconB->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT); - connect( iconB, SIGNAL( clicked() ), - this, SLOT( minimizeActiveWindow() ) ); + connect( iconB, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( minimizeActiveWindow() ) ); } TQToolButton* restoreB = new TQToolButton( d->maxcontrols, "restore" ); @@ -1520,8 +1520,8 @@ void TQWorkspace::showMaximizeControls() restoreB->setFocusPolicy( NoFocus ); restoreB->setIconSet( style().stylePixmap(TQStyle::SP_TitleBarNormalButton)); restoreB->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT); - connect( restoreB, SIGNAL( clicked() ), - this, SLOT( normalizeActiveWindow() ) ); + connect( restoreB, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( normalizeActiveWindow() ) ); l->addSpacing( 2 ); TQToolButton* closeB = new TQToolButton( d->maxcontrols, "close" ); @@ -1532,8 +1532,8 @@ void TQWorkspace::showMaximizeControls() closeB->setFocusPolicy( NoFocus ); closeB->setIconSet( style().stylePixmap(TQStyle::SP_TitleBarCloseButton) ); closeB->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT); - connect( closeB, SIGNAL( clicked() ), - this, SLOT( closeActiveWindow() ) ); + connect( closeB, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( closeActiveWindow() ) ); d->maxcontrols->setFixedSize( d->maxcontrols->minimumSizeHint() ); } @@ -2050,24 +2050,24 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *parent, if ( window && window->testWFlags( WStyle_Title ) && parent->windowMode() != TQWorkspace::TopLevel ) { titlebar = new TQTitleBar( window, this, "qt_ws_titlebar" ); - connect( titlebar, SIGNAL( doActivate() ), - this, SLOT( activate() ) ); - connect( titlebar, SIGNAL( doClose() ), - window, SLOT( close() ) ); - connect( titlebar, SIGNAL( doMinimize() ), - this, SLOT( showMinimized() ) ); - connect( titlebar, SIGNAL( doNormal() ), - this, SLOT( showNormal() ) ); - connect( titlebar, SIGNAL( doMaximize() ), - this, SLOT( showMaximized() ) ); - connect( titlebar, SIGNAL( popupOperationMenu(const TQPoint&) ), - this, SIGNAL( popupOperationMenu(const TQPoint&) ) ); - connect( titlebar, SIGNAL( showOperationMenu() ), - this, SIGNAL( showOperationMenu() ) ); - connect( titlebar, SIGNAL( doShade() ), - this, SLOT( showShaded() ) ); - connect( titlebar, SIGNAL( doubleClicked() ), - this, SLOT( titleBarDoubleClicked() ) ); + connect( titlebar, TQ_SIGNAL( doActivate() ), + this, TQ_SLOT( activate() ) ); + connect( titlebar, TQ_SIGNAL( doClose() ), + window, TQ_SLOT( close() ) ); + connect( titlebar, TQ_SIGNAL( doMinimize() ), + this, TQ_SLOT( showMinimized() ) ); + connect( titlebar, TQ_SIGNAL( doNormal() ), + this, TQ_SLOT( showNormal() ) ); + connect( titlebar, TQ_SIGNAL( doMaximize() ), + this, TQ_SLOT( showMaximized() ) ); + connect( titlebar, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ), + this, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ) ); + connect( titlebar, TQ_SIGNAL( showOperationMenu() ), + this, TQ_SIGNAL( showOperationMenu() ) ); + connect( titlebar, TQ_SIGNAL( doShade() ), + this, TQ_SLOT( showShaded() ) ); + connect( titlebar, TQ_SIGNAL( doubleClicked() ), + this, TQ_SLOT( titleBarDoubleClicked() ) ); } setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); @@ -2129,8 +2129,8 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *parent, widgetResizeHandler = new TQWidgetResizeHandler( this, window ); widgetResizeHandler->setSizeProtection( !parent->scrollBarsEnabled() ); - connect( widgetResizeHandler, SIGNAL( activate() ), - this, SLOT( activate() ) ); + connect( widgetResizeHandler, TQ_SIGNAL( activate() ), + this, TQ_SLOT( activate() ) ); if ( !style().styleHint( TQStyle::SH_TitleBar_NoBorder, titlebar ) ) widgetResizeHandler->setExtraHeight( th + contentsRect().y() - 2*frameWidth() ); else @@ -2630,20 +2630,20 @@ TQWidget* TQWorkspaceChild::iconWidget() const that->iconw = tb; iconw->setActive( isActive() ); - connect( iconw, SIGNAL( doActivate() ), - this, SLOT( activate() ) ); - connect( iconw, SIGNAL( doClose() ), - windowWidget(), SLOT( close() ) ); - connect( iconw, SIGNAL( doNormal() ), - this, SLOT( showNormal() ) ); - connect( iconw, SIGNAL( doMaximize() ), - this, SLOT( showMaximized() ) ); - connect( iconw, SIGNAL( popupOperationMenu(const TQPoint&) ), - this, SIGNAL( popupOperationMenu(const TQPoint&) ) ); - connect( iconw, SIGNAL( showOperationMenu() ), - this, SIGNAL( showOperationMenu() ) ); - connect( iconw, SIGNAL( doubleClicked() ), - this, SLOT( titleBarDoubleClicked() ) ); + connect( iconw, TQ_SIGNAL( doActivate() ), + this, TQ_SLOT( activate() ) ); + connect( iconw, TQ_SIGNAL( doClose() ), + windowWidget(), TQ_SLOT( close() ) ); + connect( iconw, TQ_SIGNAL( doNormal() ), + this, TQ_SLOT( showNormal() ) ); + connect( iconw, TQ_SIGNAL( doMaximize() ), + this, TQ_SLOT( showMaximized() ) ); + connect( iconw, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ), + this, TQ_SIGNAL( popupOperationMenu(const TQPoint&) ) ); + connect( iconw, TQ_SIGNAL( showOperationMenu() ), + this, TQ_SIGNAL( showOperationMenu() ) ); + connect( iconw, TQ_SIGNAL( doubleClicked() ), + this, TQ_SLOT( titleBarDoubleClicked() ) ); } #ifndef TQT_NO_WIDGET_TOPEXTRA if ( windowWidget() ) { @@ -2832,9 +2832,9 @@ void TQWorkspace::setScrollBarsEnabled( bool enable ) d->xoffset = d->yoffset = 0; if ( enable ) { d->vbar = new TQScrollBar( Vertical, this, "vertical scrollbar" ); - connect( d->vbar, SIGNAL( valueChanged(int) ), this, SLOT( scrollBarChanged() ) ); + connect( d->vbar, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( scrollBarChanged() ) ); d->hbar = new TQScrollBar( Horizontal, this, "horizontal scrollbar" ); - connect( d->hbar, SIGNAL( valueChanged(int) ), this, SLOT( scrollBarChanged() ) ); + connect( d->hbar, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( scrollBarChanged() ) ); d->corner = new TQWidget( this, "qt_corner" ); updateWorkspace(); } else { diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index 30692ad5e..b0e558d81 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -179,48 +179,48 @@ HelpDialog::HelpDialog( TQWidget *parent, MainWindow *h ) void HelpDialog::initialize() { - connect( tabWidget, SIGNAL( selected(const TQString&) ), - this, SLOT( currentTabChanged(const TQString&) ) ); - connect( listContents, SIGNAL( mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int ) ), - this, SLOT( showTopic(int,TQListViewItem*, const TQPoint &) ) ); - connect( listContents, SIGNAL( currentChanged(TQListViewItem*) ), - this, SLOT( currentContentsChanged(TQListViewItem*) ) ); - connect( listContents, SIGNAL( selectionChanged(TQListViewItem*) ), - this, SLOT( currentContentsChanged(TQListViewItem*) ) ); - connect( listContents, SIGNAL( doubleClicked(TQListViewItem*) ), - this, SLOT( showTopic(TQListViewItem*) ) ); - connect( listContents, SIGNAL( returnPressed(TQListViewItem*) ), - this, SLOT( showTopic(TQListViewItem*) ) ); - connect( listContents, SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - this, SLOT( showItemMenu( TQListViewItem*, const TQPoint& ) ) ); - connect( editIndex, SIGNAL( returnPressed() ), - this, SLOT( showTopic() ) ); - connect( editIndex, SIGNAL( textChanged(const TQString&) ), - this, SLOT( searchInIndex(const TQString&) ) ); - - connect( listIndex, SIGNAL( selectionChanged(TQListBoxItem*) ), - this, SLOT( currentIndexChanged(TQListBoxItem*) ) ); - connect( listIndex, SIGNAL( returnPressed(TQListBoxItem*) ), - this, SLOT( showTopic() ) ); - connect( listIndex, SIGNAL( mouseButtonClicked(int, TQListBoxItem*, const TQPoint &) ), - this, SLOT( showTopic( int, TQListBoxItem *, const TQPoint & ) ) ); - connect( listIndex, SIGNAL( currentChanged(TQListBoxItem*) ), - this, SLOT( currentIndexChanged(TQListBoxItem*) ) ); - connect( listIndex, SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), - this, SLOT( showItemMenu( TQListBoxItem*, const TQPoint& ) ) ); - - connect( listBookmarks, SIGNAL( mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int ) ), - this, SLOT( showTopic(int, TQListViewItem*, const TQPoint &) ) ); - connect( listBookmarks, SIGNAL( returnPressed(TQListViewItem*) ), - this, SLOT( showTopic(TQListViewItem*) ) ); - connect( listBookmarks, SIGNAL( selectionChanged(TQListViewItem*) ), - this, SLOT( currentBookmarkChanged(TQListViewItem*) ) ); - connect( listBookmarks, SIGNAL( currentChanged(TQListViewItem*) ), - this, SLOT( currentBookmarkChanged(TQListViewItem*) ) ); - connect( listBookmarks, SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - this, SLOT( showItemMenu( TQListViewItem*, const TQPoint& ) ) ); - connect( resultBox, SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), - this, SLOT( showItemMenu( TQListBoxItem*, const TQPoint& ) ) ); + connect( tabWidget, TQ_SIGNAL( selected(const TQString&) ), + this, TQ_SLOT( currentTabChanged(const TQString&) ) ); + connect( listContents, TQ_SIGNAL( mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int ) ), + this, TQ_SLOT( showTopic(int,TQListViewItem*, const TQPoint &) ) ); + connect( listContents, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + this, TQ_SLOT( currentContentsChanged(TQListViewItem*) ) ); + connect( listContents, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), + this, TQ_SLOT( currentContentsChanged(TQListViewItem*) ) ); + connect( listContents, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQ_SLOT( showTopic(TQListViewItem*) ) ); + connect( listContents, TQ_SIGNAL( returnPressed(TQListViewItem*) ), + this, TQ_SLOT( showTopic(TQListViewItem*) ) ); + connect( listContents, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( showItemMenu( TQListViewItem*, const TQPoint& ) ) ); + connect( editIndex, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( showTopic() ) ); + connect( editIndex, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( searchInIndex(const TQString&) ) ); + + connect( listIndex, TQ_SIGNAL( selectionChanged(TQListBoxItem*) ), + this, TQ_SLOT( currentIndexChanged(TQListBoxItem*) ) ); + connect( listIndex, TQ_SIGNAL( returnPressed(TQListBoxItem*) ), + this, TQ_SLOT( showTopic() ) ); + connect( listIndex, TQ_SIGNAL( mouseButtonClicked(int, TQListBoxItem*, const TQPoint &) ), + this, TQ_SLOT( showTopic( int, TQListBoxItem *, const TQPoint & ) ) ); + connect( listIndex, TQ_SIGNAL( currentChanged(TQListBoxItem*) ), + this, TQ_SLOT( currentIndexChanged(TQListBoxItem*) ) ); + connect( listIndex, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), + this, TQ_SLOT( showItemMenu( TQListBoxItem*, const TQPoint& ) ) ); + + connect( listBookmarks, TQ_SIGNAL( mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( showTopic(int, TQListViewItem*, const TQPoint &) ) ); + connect( listBookmarks, TQ_SIGNAL( returnPressed(TQListViewItem*) ), + this, TQ_SLOT( showTopic(TQListViewItem*) ) ); + connect( listBookmarks, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), + this, TQ_SLOT( currentBookmarkChanged(TQListViewItem*) ) ); + connect( listBookmarks, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + this, TQ_SLOT( currentBookmarkChanged(TQListViewItem*) ) ); + connect( listBookmarks, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( showItemMenu( TQListViewItem*, const TQPoint& ) ) ); + connect( resultBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), + this, TQ_SLOT( showItemMenu( TQListBoxItem*, const TQPoint& ) ) ); cacheFilesPath = TQDir::homeDirPath() + "/.assistant/"; //### Find a better location for the dbs @@ -230,7 +230,7 @@ void HelpDialog::initialize() listContents->header()->hide(); listContents->header()->setStretchEnabled( TRUE ); framePrepare->hide(); - connect( tqApp, SIGNAL(lastWindowClosed()), SLOT(lastWinClosed()) ); + connect( tqApp, TQ_SIGNAL(lastWindowClosed()), TQ_SLOT(lastWinClosed()) ); termsEdit->setValidator( new SearchValidator( termsEdit ) ); @@ -570,13 +570,13 @@ void HelpDialog::buildContentDict() void HelpDialog::currentTabChanged( const TQString &s ) { if ( stripAmpersand( s ).contains( tr( "Index" ) ) ) - TQTimer::singleShot( 0, this, SLOT( loadIndexFile() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( loadIndexFile() ) ); else if ( stripAmpersand( s ).contains( tr( "Bookmarks" ) ) ) insertBookmarks(); else if ( stripAmpersand( s ).contains( tr( "Contents" ) ) ) - TQTimer::singleShot( 0, this, SLOT( insertContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( insertContents() ) ); else if ( stripAmpersand( s ).contains( tr( "Search" ) ) ) - TQTimer::singleShot( 0, this, SLOT( setupFullTextIndex() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( setupFullTextIndex() ) ); } void HelpDialog::showInitDoneMessage() @@ -936,8 +936,8 @@ void HelpDialog::setupFullTextIndex() fullTextIndex->setDocListFile( cacheFilesPath + "indexdb.doc." + pname ); processEvents(); - connect( fullTextIndex, SIGNAL( indexingProgress( int ) ), - this, SLOT( setIndexingProgress( int ) ) ); + connect( fullTextIndex, TQ_SIGNAL( indexingProgress( int ) ), + this, TQ_SLOT( setIndexingProgress( int ) ) ); TQFile f( cacheFilesPath + "indexdb.dict." + pname ); if ( !f.exists() ) { TQMap<TQString, TQString>::ConstIterator it = titleMap.begin(); diff --git a/tools/assistant/helpwindow.cpp b/tools/assistant/helpwindow.cpp index 266fa972c..175bc577b 100644 --- a/tools/assistant/helpwindow.cpp +++ b/tools/assistant/helpwindow.cpp @@ -59,8 +59,8 @@ HelpWindow::HelpWindow( MainWindow *w, TQWidget *parent, const char *name ) : TQTextBrowser( parent, name ), mw( w ), blockScroll( FALSE ), shiftPressed( FALSE ), newWindow( FALSE ) { - connect(this, SIGNAL(forwardAvailable(bool)), this, SLOT(updateForward(bool))); - connect(this, SIGNAL(backwardAvailable(bool)), this, SLOT(updateBackward(bool))); + connect(this, TQ_SIGNAL(forwardAvailable(bool)), this, TQ_SLOT(updateForward(bool))); + connect(this, TQ_SIGNAL(backwardAvailable(bool)), this, TQ_SLOT(updateBackward(bool))); } void HelpWindow::setSource( const TQString &name ) @@ -116,7 +116,7 @@ void HelpWindow::setSource( const TQString &name ) TQProcess *proc = new TQProcess(this); proc->addArgument( webbrowser ); - TQObject::connect(proc, SIGNAL(processExited()), proc, SLOT(deleteLater())); + TQObject::connect(proc, TQ_SIGNAL(processExited()), proc, TQ_SLOT(deleteLater())); proc->addArgument( name ); proc->start(); return; @@ -146,7 +146,7 @@ void HelpWindow::setSource( const TQString &name ) return; } TQProcess *proc = new TQProcess(this); - TQObject::connect(proc, SIGNAL(processExited()), proc, SLOT(deleteLater())); + TQObject::connect(proc, TQ_SIGNAL(processExited()), proc, TQ_SLOT(deleteLater())); proc->addArgument( pdfbrowser ); proc->addArgument( name ); proc->start(); @@ -206,9 +206,9 @@ TQPopupMenu *HelpWindow::createPopupMenu( const TQPoint& pos ) lastAnchor = ( hsh>=0 ? src.left( hsh ) : src ) + lastAnchor; } m->insertItem( tr("Open Link in New Window\tShift+LMB"), - this, SLOT( openLinkInNewWindow() ) ); + this, TQ_SLOT( openLinkInNewWindow() ) ); m->insertItem( tr("Open Link in New Tab"), - this, SLOT( openLinkInNewPage() ) ); + this, TQ_SLOT( openLinkInNewPage() ) ); } mw->actionNewWindow->addTo( m ); mw->actionOpenPage->addTo( m ); diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp index 7a3428920..c5d142208 100644 --- a/tools/assistant/index.cpp +++ b/tools/assistant/index.cpp @@ -69,8 +69,8 @@ Index::Index( const TQString &dp, const TQString &hp ) { alreadyHaveDocList = FALSE; lastWindowClosed = FALSE; - connect( tqApp, SIGNAL( lastWindowClosed() ), - this, SLOT( setLastWinClosed() ) ); + connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), + this, TQ_SLOT( setLastWinClosed() ) ); } Index::Index( const TQStringList &dl, const TQString &hp ) @@ -79,8 +79,8 @@ Index::Index( const TQStringList &dl, const TQString &hp ) docList = dl; alreadyHaveDocList = TRUE; lastWindowClosed = FALSE; - connect( tqApp, SIGNAL( lastWindowClosed() ), - this, SLOT( setLastWinClosed() ) ); + connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), + this, TQ_SLOT( setLastWinClosed() ) ); } void Index::setLastWinClosed() diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp index d61043eb6..0e0ba4b09 100644 --- a/tools/assistant/lib/qassistantclient.cpp +++ b/tools/assistant/lib/qassistantclient.cpp @@ -151,18 +151,18 @@ TQAssistantClient::TQAssistantClient( const TQString &path, TQObject *parent, co assistantCommand += ".exe"; #endif socket = new TQSocket( this ); - connect( socket, SIGNAL( connected() ), - SLOT( socketConnected() ) ); - connect( socket, SIGNAL( connectionClosed() ), - SLOT( socketConnectionClosed() ) ); - 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( error( int ) ), + TQ_SLOT( socketError( int ) ) ); opened = FALSE; proc = new TQProcess( this ); port = 0; pageBuffer = ""; - connect( proc, SIGNAL( readyReadStderr() ), - this, SLOT( readStdError() ) ); + connect( proc, TQ_SIGNAL( readyReadStderr() ), + this, TQ_SLOT( readStdError() ) ); } /*! @@ -223,8 +223,8 @@ void TQAssistantClient::openAssistant() .arg( proc->arguments().join( " " ) ) ); return; } - connect( proc, SIGNAL( readyReadStdout() ), - this, SLOT( readPort() ) ); + connect( proc, TQ_SIGNAL( readyReadStdout() ), + this, TQ_SLOT( readPort() ) ); } void TQAssistantClient::readPort() @@ -236,8 +236,8 @@ void TQAssistantClient::readPort() return; } socket->connectToHost( host, port ); - disconnect( proc, SIGNAL( readyReadStdout() ), - this, SLOT( readPort() ) ); + disconnect( proc, TQ_SIGNAL( readyReadStdout() ), + this, TQ_SLOT( readPort() ) ); } /*! diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp index ce8ffd2db..b2e2a62df 100644 --- a/tools/assistant/main.cpp +++ b/tools/assistant/main.cpp @@ -92,10 +92,10 @@ private: AssistantSocket::AssistantSocket( int sock, TQObject *parent ) : TQSocket( parent, 0 ) { - 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 ); } @@ -135,8 +135,8 @@ TQ_UINT16 AssistantServer::getPort() const void AssistantServer::newConnection( int socket ) { AssistantSocket *as = new AssistantSocket( socket, this ); - connect( as, SIGNAL( showLinkRequest( const TQString& ) ), - this, SIGNAL( showLinkRequest( const TQString& ) ) ); + connect( as, TQ_SIGNAL( showLinkRequest( const TQString& ) ), + this, TQ_SIGNAL( showLinkRequest( const TQString& ) ) ); emit newConnect(); } @@ -318,8 +318,8 @@ int main( int argc, char ** argv ) as = new AssistantServer(); printf("%d\n", as->port() ); fflush( stdout ); - as->connect( as, SIGNAL( showLinkRequest( const TQString& ) ), - mw, SLOT( showLinkFromClient( const TQString& ) ) ); + as->connect( as, TQ_SIGNAL( showLinkRequest( const TQString& ) ), + mw, TQ_SLOT( showLinkFromClient( const TQString& ) ) ); } if ( max ) @@ -332,7 +332,7 @@ int main( int argc, char ** argv ) else if ( file.isEmpty() ) mw->showLinks( links ); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); int appExec = a.exec(); delete (MainWindow*)mw; diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h index 789b085eb..0afab0aac 100644 --- a/tools/assistant/mainwindow.ui.h +++ b/tools/assistant/mainwindow.ui.h @@ -103,7 +103,7 @@ void MainWindow::init() dw->hide(); tabs->setup(); - TQTimer::singleShot( 0, this, SLOT( setup() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( setup() ) ); #if defined(Q_OS_MACX) // Use the same forward and backward browser shortcuts as Safari and Internet Explorer do // on the Mac. This means that if you have access to one of those cool Intellimice, the thing @@ -122,44 +122,44 @@ void MainWindow::setup() statusBar()->message( tr( "Initializing TQt Assistant..." ) ); setupCompleted = TRUE; helpDock->initialize(); - connect( actionGoPrevious, SIGNAL( activated() ), tabs, SLOT( backward() ) ); - connect( actionGoNext, SIGNAL( activated() ), tabs, SLOT( forward() ) ); - connect( actionEditCopy, SIGNAL( activated() ), tabs, SLOT( copy() ) ); - connect( actionFileExit, SIGNAL( activated() ), tqApp, SLOT( closeAllWindows() ) ); - connect( actionAddBookmark, SIGNAL( activated() ), - helpDock, SLOT( addBookmark() ) ); - connect( helpDock, SIGNAL( showLink( const TQString& ) ), - this, SLOT( showLink( const TQString& ) ) ); - connect( helpDock, SIGNAL( showSearchLink( const TQString&, const TQStringList& ) ), - this, SLOT( showSearchLink( const TQString&, const TQStringList&) ) ); + connect( actionGoPrevious, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( backward() ) ); + connect( actionGoNext, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( forward() ) ); + connect( actionEditCopy, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( copy() ) ); + connect( actionFileExit, TQ_SIGNAL( activated() ), tqApp, TQ_SLOT( closeAllWindows() ) ); + connect( actionAddBookmark, TQ_SIGNAL( activated() ), + helpDock, TQ_SLOT( addBookmark() ) ); + connect( helpDock, TQ_SIGNAL( showLink( const TQString& ) ), + this, TQ_SLOT( showLink( const TQString& ) ) ); + connect( helpDock, TQ_SIGNAL( showSearchLink( const TQString&, const TQStringList& ) ), + this, TQ_SLOT( showSearchLink( const TQString&, const TQStringList&) ) ); - connect( bookmarkMenu, SIGNAL( activated( int ) ), - this, SLOT( showBookmark( int ) ) ); - connect( actionZoomIn, SIGNAL( activated() ), tabs, SLOT( zoomIn() ) ); - connect( actionZoomOut, SIGNAL( activated() ), tabs, SLOT( zoomOut() ) ); + connect( bookmarkMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( showBookmark( int ) ) ); + connect( actionZoomIn, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( zoomIn() ) ); + connect( actionZoomOut, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( zoomOut() ) ); - connect( actionOpenPage, SIGNAL( activated() ), tabs, SLOT( newTab() ) ); - connect( actionClosePage, SIGNAL( activated() ), tabs, SLOT( closeTab() ) ); - connect( actionNextPage, SIGNAL( activated() ), tabs, SLOT( nextTab() ) ); - connect( actionPrevPage, SIGNAL( activated() ), tabs, SLOT( previousTab() ) ); + connect( actionOpenPage, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( newTab() ) ); + connect( actionClosePage, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( closeTab() ) ); + connect( actionNextPage, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( nextTab() ) ); + connect( actionPrevPage, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( previousTab() ) ); #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) TQAccel *acc = new TQAccel( this ); -// acc->connectItem( acc->insertItem( Key_F5 ), browser, SLOT( reload() ) ); - acc->connectItem( acc->insertItem( TQKeySequence("SHIFT+CTRL+=") ), actionZoomIn, SIGNAL(activated()) ); +// acc->connectItem( acc->insertItem( Key_F5 ), browser, TQ_SLOT( reload() ) ); + acc->connectItem( acc->insertItem( TQKeySequence("SHIFT+CTRL+=") ), actionZoomIn, TQ_SIGNAL(activated()) ); #endif TQAccel *a = new TQAccel( this, dw ); a->connectItem( a->insertItem( TQAccel::stringToKey( tr("Ctrl+T") ) ), - helpDock, SLOT( toggleContents() ) ); + helpDock, TQ_SLOT( toggleContents() ) ); a->connectItem( a->insertItem( TQAccel::stringToKey( tr("Ctrl+I") ) ), - helpDock, SLOT( toggleIndex() ) ); + helpDock, TQ_SLOT( toggleIndex() ) ); a->connectItem( a->insertItem( TQAccel::stringToKey( tr("Ctrl+B") ) ), - helpDock, SLOT( toggleBookmarks() ) ); + helpDock, TQ_SLOT( toggleBookmarks() ) ); a->connectItem( a->insertItem( TQAccel::stringToKey( tr("Ctrl+S") ) ), - helpDock, SLOT( toggleSearch() ) ); + helpDock, TQ_SLOT( toggleSearch() ) ); Config *config = Config::configuration(); @@ -205,8 +205,8 @@ void MainWindow::setupGoActions() action->addTo( goActionToolbar ); goActions->append( action ); goActionDocFiles->insert( action, config->indexPage( title ) ); - connect( action, SIGNAL( activated() ), - this, SLOT( showGoActionLink() ) ); + connect( action, TQ_SIGNAL( activated() ), + this, TQ_SLOT( showGoActionLink() ) ); ++addCount; } } diff --git a/tools/assistant/tabbedbrowser.ui.h b/tools/assistant/tabbedbrowser.ui.h index 35ed6a952..2d0a04393 100644 --- a/tools/assistant/tabbedbrowser.ui.h +++ b/tools/assistant/tabbedbrowser.ui.h @@ -81,14 +81,14 @@ HelpWindow *TabbedBrowser::createHelpWindow(const TQString &title) win->setStyleSheet( tabStyleSheet ); win->setMimeSourceFactory( mimeSourceFactory ); tab->addTab(win, reduceLabelLength(title)); - connect( win, SIGNAL( highlighted( const TQString & ) ), - (const TQObject*) (mainWin->statusBar()), SLOT( message( const TQString & ) ) ); - connect( win, SIGNAL( chooseWebBrowser() ), mainWin, SLOT( showWebBrowserSettings() ) ); - connect( win, SIGNAL( backwardAvailable(bool) ), - mainWin, SLOT( backwardAvailable(bool) ) ); - connect( win, SIGNAL( forwardAvailable(bool) ), - mainWin, SLOT( forwardAvailable(bool) ) ); - connect( win, SIGNAL( sourceChanged(const TQString &) ), this, SLOT( sourceChanged() )); + connect( win, TQ_SIGNAL( highlighted( const TQString & ) ), + (const TQObject*) (mainWin->statusBar()), TQ_SLOT( message( const TQString & ) ) ); + connect( win, TQ_SIGNAL( chooseWebBrowser() ), mainWin, TQ_SLOT( showWebBrowserSettings() ) ); + connect( win, TQ_SIGNAL( backwardAvailable(bool) ), + mainWin, TQ_SLOT( backwardAvailable(bool) ) ); + connect( win, TQ_SIGNAL( forwardAvailable(bool) ), + mainWin, TQ_SLOT( forwardAvailable(bool) ) ); + connect( win, TQ_SIGNAL( sourceChanged(const TQString &) ), this, TQ_SLOT( sourceChanged() )); tab->cornerWidget( TQt::TopRight )->setEnabled( tab->count() > 1 ); return win; @@ -141,10 +141,10 @@ void TabbedBrowser::init() mimeSourceFactory->setExtensionType("jpeg", "image/jpeg" ); setMimePath( Config::configuration()->mimePaths() ); - connect( tab, SIGNAL( currentChanged( TQWidget* ) ), - this, SLOT( transferFocus() ) ); - connect( tab, SIGNAL( currentChanged( TQWidget* ) ), - mainWindow(), SLOT( browserTabChanged() ) ); + connect( tab, TQ_SIGNAL( currentChanged( TQWidget* ) ), + this, TQ_SLOT( transferFocus() ) ); + connect( tab, TQ_SIGNAL( currentChanged( TQWidget* ) ), + mainWindow(), TQ_SLOT( browserTabChanged() ) ); TQTabBar *tabBar = (TQTabBar*)tab->child( 0, "TQTabBar", FALSE ); int m = ( tabBar ? style().pixelMetric( TQStyle::PM_TabBarTabVSpace, (TQWidget*)tabBar ) @@ -164,7 +164,7 @@ void TabbedBrowser::init() newTabButton->setAutoRaise( TRUE ); newTabButton->setPixmap( TQPixmap::fromMimeSource( "addtab.png" ) ); newTabButton->setFixedSize( s, s ); - TQObject::connect( newTabButton, SIGNAL( clicked() ), this, SLOT( newTab() ) ); + TQObject::connect( newTabButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newTab() ) ); TQToolTip::add( newTabButton, tr( "Add page" ) ); TQToolButton *closeTabButton = new TQToolButton( this ); @@ -177,7 +177,7 @@ void TabbedBrowser::init() is.setPixmap( disabledPix, TQIconSet::Small, TQIconSet::Disabled ); closeTabButton->setIconSet( is ); closeTabButton->setFixedSize( s, s ); - TQObject::connect( closeTabButton, SIGNAL( clicked() ), this, SLOT( closeTab() ) ); + TQObject::connect( closeTabButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeTab() ) ); TQToolTip::add( closeTabButton, tr( "Close page" ) ); closeTabButton->setEnabled( FALSE ); } @@ -304,7 +304,7 @@ void TabbedBrowser::closeTab() return; HelpWindow *win = currentBrowser(); tab->removePage( win ); - TQTimer::singleShot(0, win, SLOT(deleteLater())); + TQTimer::singleShot(0, win, TQ_SLOT(deleteLater())); tab->cornerWidget( TQt::TopRight )->setEnabled( tab->count() > 1 ); } diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp index dbbc6d208..841ab00d6 100644 --- a/tools/designer/designer/actiondnd.cpp +++ b/tools/designer/designer/actiondnd.cpp @@ -152,8 +152,8 @@ TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Orientation o , TQToolBar const char* name ) : TQWidget( parent, name ) { - connect( parent, SIGNAL(orientationChanged(Orientation)), - this, SLOT(setOrientation(Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(Orientation)), + this, TQ_SLOT(setOrientation(Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -277,7 +277,7 @@ void TQDesignerToolBar::findFormWindow() void TQDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, SIGNAL( destroyed() ), this, SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) { ( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a ); diff --git a/tools/designer/designer/actioneditorimpl.cpp b/tools/designer/designer/actioneditorimpl.cpp index a7ab8d3c1..46d5bd4f4 100644 --- a/tools/designer/designer/actioneditorimpl.cpp +++ b/tools/designer/designer/actioneditorimpl.cpp @@ -59,17 +59,17 @@ ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) buttonConnect->setEnabled( FALSE ); TQPopupMenu *popup = new TQPopupMenu( this ); - popup->insertItem( tr( "New &Action" ), this, SLOT( newAction() ) ); - popup->insertItem( tr( "New Action &Group" ), this, SLOT( newActionGroup() ) ); - popup->insertItem( tr( "New &Dropdown Action Group" ), this, SLOT( newDropDownActionGroup() ) ); + popup->insertItem( tr( "New &Action" ), this, TQ_SLOT( newAction() ) ); + popup->insertItem( tr( "New Action &Group" ), this, TQ_SLOT( newActionGroup() ) ); + popup->insertItem( tr( "New &Dropdown Action Group" ), this, TQ_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, SIGNAL( insertAction() ), this, SLOT( newAction() ) ); - connect( listActions, SIGNAL( insertActionGroup() ), this, SLOT( newActionGroup() ) ); - connect( listActions, SIGNAL( insertDropDownActionGroup() ), this, SLOT( newDropDownActionGroup() ) ); - connect( listActions, SIGNAL( deleteAction() ), this, SLOT( deleteAction() ) ); - connect( listActions, SIGNAL( connectAction() ), this, SLOT( connectionsClicked() ) ); + connect( listActions, TQ_SIGNAL( insertAction() ), this, TQ_SLOT( newAction() ) ); + connect( listActions, TQ_SIGNAL( insertActionGroup() ), this, TQ_SLOT( newActionGroup() ) ); + connect( listActions, TQ_SIGNAL( insertDropDownActionGroup() ), this, TQ_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQ_SIGNAL( deleteAction() ), this, TQ_SLOT( deleteAction() ) ); + connect( listActions, TQ_SIGNAL( connectAction() ), this, TQ_SLOT( connectionsClicked() ) ); } void ActionEditor::closeEvent( TQCloseEvent *e ) @@ -108,8 +108,8 @@ TQAction *ActionEditor::newActionEx() { ActionItem *i = new ActionItem( listActions, (bool)FALSE ); TQAction *a = i->action(); - TQObject::connect( a, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); @@ -164,8 +164,8 @@ void ActionEditor::newAction() else i = new ActionItem( listActions, (bool)FALSE ); TQAction *a = i->action(); - TQObject::connect( a, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); @@ -200,8 +200,8 @@ void ActionEditor::newActionGroup() else i = new ActionItem( listActions, TRUE ); TQAction *ag = i->actionGroup(); - TQObject::connect( ag, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( ag, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->actionGroup() ); MetaDataBase::setPropertyChanged( i->actionGroup(), "usesDropDown", TRUE ); TQString n = "ActionGroup"; @@ -242,10 +242,10 @@ void ActionEditor::setFormWindow( FormWindow *fw ) i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( a, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( a, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject* ) ) ); + TQObject::disconnect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) { insertChildActions( i ); } @@ -273,10 +273,10 @@ void ActionEditor::insertChildActions( ActionItem *i ) i2->setText( 0, a->name() ); i2->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( o, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( o, SIGNAL( destroyed( TQObject * ) ), - this, SLOT( removeConnections( TQObject * ) ) ); + TQObject::disconnect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) insertChildActions( i2 ); } diff --git a/tools/designer/designer/actionlistview.cpp b/tools/designer/designer/actionlistview.cpp index 0bccd671a..62366a774 100644 --- a/tools/designer/designer/actionlistview.cpp +++ b/tools/designer/designer/actionlistview.cpp @@ -41,8 +41,8 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) setShowSortIndicator( TRUE ); setResizeMode( LastColumn ); setRootIsDecorated( TRUE ); - connect( this, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } ActionItem::ActionItem( TQListView *lv, TQAction *ac ) diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp index 4858ec283..df24e8dfd 100644 --- a/tools/designer/designer/command.cpp +++ b/tools/designer/designer/command.cpp @@ -1809,7 +1809,7 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index, action ); toolBar->reInsert(); - TQObject::connect( action, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } else { if ( action->children() ) { TQObjectListIt it( *action->children() ); @@ -1829,11 +1829,11 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index + (i++), ac ); } - TQObject::connect( o, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } toolBar->reInsert(); - TQObject::connect( action, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -1848,7 +1848,7 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); - TQObject::disconnect( action, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); if ( !::tqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { @@ -1863,7 +1863,7 @@ void AddActionToToolBarCommand::unexecute() o->removeEventFilter( toolBar ); toolBar->removeAction( (TQAction*)o ); } - TQObject::disconnect( o, SIGNAL( destroyed() ), toolBar, SLOT( actionRemoved() ) ); + TQObject::disconnect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } } diff --git a/tools/designer/designer/configtoolboxdialog.ui.h b/tools/designer/designer/configtoolboxdialog.ui.h index 7aa13de73..8a46e0d22 100644 --- a/tools/designer/designer/configtoolboxdialog.ui.h +++ b/tools/designer/designer/configtoolboxdialog.ui.h @@ -47,10 +47,10 @@ void ConfigToolboxDialog::init() ListViewDnd *commonDnd = new ListViewDnd( listViewCommon ); commonDnd->setDragMode( ListViewDnd::Both | ListViewDnd::Move | ListViewDnd::Flat ); - TQObject::connect( toolsDnd, SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, SLOT( confirmDrop( TQListViewItem * ) ) ); - TQObject::connect( commonDnd, SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( toolsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( commonDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); TQDict<TQListViewItem> groups; TQAction *a; diff --git a/tools/designer/designer/connectiondialog.ui.h b/tools/designer/designer/connectiondialog.ui.h index 7bd10bc46..010a5c193 100644 --- a/tools/designer/designer/connectiondialog.ui.h +++ b/tools/designer/designer/connectiondialog.ui.h @@ -69,10 +69,10 @@ static TQPixmap *validConnection = 0; void ConnectionDialog::init() { - connect( connectionsTable, SIGNAL( currentChanged( int, int ) ), - this, SLOT( updateEditSlotsButton() ) ); - connect( connectionsTable, SIGNAL( resorted() ), - this, SLOT( updateConnectionContainers() ) ); + connect( connectionsTable, TQ_SIGNAL( currentChanged( int, int ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); + connect( connectionsTable, TQ_SIGNAL( resorted() ), + this, TQ_SLOT( updateConnectionContainers() ) ); buttonEditSlots->setEnabled( FALSE ); if ( !invalidConnection ) { @@ -144,13 +144,13 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject re->setSlot( sl ); sl->setSlot( sl ); - connect( re, SIGNAL( currentReceiverChanged( TQObject * ) ), - this, SLOT( updateEditSlotsButton() ) ); + connect( re, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); ConnectionContainer *c = new ConnectionContainer( this, se, si, re, sl, row ); connections.append( c ); - connect( c, SIGNAL( changed( ConnectionContainer * ) ), - this, SLOT( updateConnectionState( ConnectionContainer * ) ) ); + connect( c, TQ_SIGNAL( changed( ConnectionContainer * ) ), + this, TQ_SLOT( updateConnectionState( ConnectionContainer * ) ) ); connectionsTable->setCurrentCell( row, 0 ); diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp index 24a478656..0c44135a7 100644 --- a/tools/designer/designer/connectionitems.cpp +++ b/tools/designer/designer/connectionitems.cpp @@ -129,26 +129,26 @@ void ConnectionItem::slotChanged( const TQString & ) void ConnectionItem::setSender( SenderItem *i ) { - connect( i, SIGNAL( currentSenderChanged( TQObject * ) ), - this, SLOT( senderChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentSenderChanged( TQObject * ) ), + this, TQ_SLOT( senderChanged( TQObject * ) ) ); } void ConnectionItem::setReceiver( ReceiverItem *i ) { - connect( i, SIGNAL( currentReceiverChanged( TQObject * ) ), - this, SLOT( receiverChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( receiverChanged( TQObject * ) ) ); } void ConnectionItem::setSignal( SignalItem *i ) { - connect( i, SIGNAL( currentSignalChanged( const TQString & ) ), - this, SLOT( signalChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSignalChanged( const TQString & ) ), + this, TQ_SLOT( signalChanged( const TQString & ) ) ); } void ConnectionItem::setSlot( SlotItem *i ) { - connect( i, SIGNAL( currentSlotChanged( const TQString & ) ), - this, SLOT( slotChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSlotChanged( const TQString & ) ), + this, TQ_SLOT( slotChanged( const TQString & ) ) ); } void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg, @@ -252,8 +252,8 @@ TQWidget *SenderItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const TQString & ) ), - this, SLOT( senderChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( senderChanged( const TQString & ) ) ); return cb; } @@ -309,8 +309,8 @@ TQWidget *ReceiverItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const TQString & ) ), - this, SLOT( receiverChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( receiverChanged( const TQString & ) ) ); return cb; } @@ -378,8 +378,8 @@ TQWidget *SignalItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const TQString & ) ), - this, SIGNAL( currentSignalChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSignalChanged( const TQString & ) ) ); return cb; } @@ -509,8 +509,8 @@ TQWidget *SlotItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, SIGNAL( activated( const TQString & ) ), - this, SIGNAL( currentSlotChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSlotChanged( const TQString & ) ) ); return cb; } diff --git a/tools/designer/designer/connectionitems.h b/tools/designer/designer/connectionitems.h index 40878c442..e3db9790a 100644 --- a/tools/designer/designer/connectionitems.h +++ b/tools/designer/designer/connectionitems.h @@ -177,10 +177,10 @@ public: i2->setConnection( this ); i3->setConnection( this ); i4->setConnection( this ); - connect( i1, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); - connect( i2, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); - connect( i3, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); - connect( i4, SIGNAL( changed() ), this, SLOT( somethingChanged() ) ); + connect( i1, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i2, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i3, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i4, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); } bool isModified() const { return mod; } diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp index 955d0ba17..13524966c 100644 --- a/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/tools/designer/designer/customwidgeteditorimpl.cpp @@ -61,10 +61,10 @@ CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); checkTimer = new TQTimer( this ); - connect( checkTimer, SIGNAL( timeout() ), - this, SLOT( checkWidgetName() ) ); + connect( checkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( checkWidgetName() ) ); editClass->setEnabled( FALSE ); editHeader->setEnabled( FALSE ); diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp index 60ad7d345..29c216cd1 100644 --- a/tools/designer/designer/dbconnectionsimpl.cpp +++ b/tools/designer/designer/dbconnectionsimpl.cpp @@ -59,7 +59,7 @@ static bool blockChanges = FALSE; DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : DatabaseConnectionBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); connectionWidget = new DatabaseConnectionWidget( grp ); grpLayout->addWidget( connectionWidget, 0, 0 ); #ifndef TQT_NO_SQL diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp index e00cf67cd..c6ac96c70 100644 --- a/tools/designer/designer/designerappiface.cpp +++ b/tools/designer/designer/designerappiface.cpp @@ -140,13 +140,13 @@ void DesignerInterfaceImpl::updateFunctionList() void DesignerInterfaceImpl::onProjectChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, SIGNAL( projectChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( projectChanged() ), receiver, slot ); } void DesignerInterfaceImpl::onFormChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, SIGNAL( formWindowChanged() ), receiver, slot ); - TQObject::connect( mainWindow, SIGNAL( editorChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( formWindowChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( editorChanged() ), receiver, slot ); } bool DesignerInterfaceImpl::singleProjectMode() const @@ -963,7 +963,7 @@ void DesignerFormWindowImpl::setSignalList( const TQStringList &lst ) void DesignerFormWindowImpl::onModificationChange( TQObject *receiver, const char *slot ) { - TQObject::connect( formWindow, SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); + TQObject::connect( formWindow, TQ_SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); } void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name ) diff --git a/tools/designer/designer/editfunctionsimpl.cpp b/tools/designer/designer/editfunctionsimpl.cpp index 49f173285..dc2f625e0 100644 --- a/tools/designer/designer/editfunctionsimpl.cpp +++ b/tools/designer/designer/editfunctionsimpl.cpp @@ -54,7 +54,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); id = 0; functList.clear(); @@ -113,9 +113,9 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) // Connect listview signal to signal-relay TQObject::connect( functionListView, - SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "functionName" TQObjectList *l = parent->queryList( "TQLineEdit", "functionName" ); @@ -124,9 +124,9 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } diff --git a/tools/designer/designer/formfile.cpp b/tools/designer/designer/formfile.cpp index 4f88b29e5..de82ebc72 100644 --- a/tools/designer/designer/formfile.cpp +++ b/tools/designer/designer/formfile.cpp @@ -99,7 +99,7 @@ void FormFile::setFormWindow( FormWindow *f ) if ( fw ) fw->setFormFile( this ); parseCode( cod, FALSE ); - TQTimer::singleShot( 0, this, SLOT( notifyFormWindowChange() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( notifyFormWindowChange() ) ); } void FormFile::setEditor( SourceEditor *e ) diff --git a/tools/designer/designer/formsettingsimpl.cpp b/tools/designer/designer/formsettingsimpl.cpp index 684649182..88ddef415 100644 --- a/tools/designer/designer/formsettingsimpl.cpp +++ b/tools/designer/designer/formsettingsimpl.cpp @@ -50,7 +50,7 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) : FormSettingsBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw ); if ( info.classNameChanged && !info.className.isEmpty() ) editClassName->setText( info.className ); diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp index e529432ad..9e02b2b1d 100644 --- a/tools/designer/designer/formwindow.cpp +++ b/tools/designer/designer/formwindow.cpp @@ -173,29 +173,29 @@ void FormWindow::init() setFocusPolicy( ClickFocus ); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer( this, "checkSelectionsTimer" ); - connect( checkSelectionsTimer, SIGNAL( timeout() ), - this, SLOT( invalidCheckedSelections() ) ); + connect( checkSelectionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( invalidCheckedSelections() ) ); updatePropertiesTimer = new TQTimer( this ); - connect( updatePropertiesTimer, SIGNAL( timeout() ), - this, SLOT( updatePropertiesTimerDone() ) ); + connect( updatePropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updatePropertiesTimerDone() ) ); showPropertiesTimer = new TQTimer( this ); - connect( showPropertiesTimer, SIGNAL( timeout() ), - this, SLOT( showPropertiesTimerDone() ) ); + connect( showPropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( showPropertiesTimerDone() ) ); selectionChangedTimer = new TQTimer( this ); - connect( selectionChangedTimer, SIGNAL( timeout() ), - this, SLOT( selectionChangedTimerDone() ) ); + connect( selectionChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( selectionChangedTimerDone() ) ); windowsRepaintWorkaroundTimer = new TQTimer( this ); - connect( windowsRepaintWorkaroundTimer, SIGNAL( timeout() ), - this, SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); + connect( windowsRepaintWorkaroundTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); insertParent = 0; - connect( &commands, SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); + connect( &commands, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); propShowBlocked = FALSE; setIcon( TQPixmap::fromMimeSource( "designer_form.png" ) ); - connect( &commands, SIGNAL( modificationChanged( bool ) ), - this, SLOT( modificationChanged( bool ) ) ); + connect( &commands, TQ_SIGNAL( modificationChanged( bool ) ), + this, TQ_SLOT( modificationChanged( bool ) ) ); buffer = 0; TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this ); @@ -2221,7 +2221,7 @@ void FormWindow::editConnections() ConnectionDialog dlg( mainwindow ); mainWindow()->statusBar()->message( tr( "Edit connections...") ); dlg.addConnection( startWidget, endWidget, TQString::null, TQString::null ); - TQTimer::singleShot( 0, &dlg, SLOT(ensureConnectionVisible()) ); + TQTimer::singleShot( 0, &dlg, TQ_SLOT(ensureConnectionVisible()) ); dlg.exec(); } @@ -2752,7 +2752,7 @@ void FormWindow::setFormFile( FormFile *f ) { ff = f; if ( ff ) - connect( this, SIGNAL( modificationChanged(bool, const TQString&) ), ff, SLOT( formWindowChangedSomehow() ) ); + connect( this, TQ_SIGNAL( modificationChanged(bool, const TQString&) ), ff, TQ_SLOT( formWindowChangedSomehow() ) ); } bool FormWindow::canBeBuddy( const TQWidget *w ) const diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp index c365a4d3a..4e5c11276 100644 --- a/tools/designer/designer/hierarchyview.cpp +++ b/tools/designer/designer/hierarchyview.cpp @@ -191,20 +191,20 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), SIGNAL( sectionClicked( int ) ), - this, SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, SIGNAL( clicked( TQListViewItem * ) ), - this, SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem * ) ), - this, SLOT( objectDoubleClicked( TQListViewItem * ) ) ); - connect( this, SIGNAL( returnPressed( TQListViewItem * ) ), - this, SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), - this, SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( objectDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } deselect = TRUE; setColumnWidthMode( 1, Manual ); @@ -610,8 +610,8 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) if ( !tabWidgetMenu ) tabWidgetMenu = formWindow->mainWindow()->setupTabWidgetHierarchyMenu( - this, SLOT( addTabPage() ), - SLOT( removeTabPage() ) ); + this, TQ_SLOT( addTabPage() ), + TQ_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } @@ -679,8 +679,8 @@ FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw ) { header()->hide(); removeColumn( 1 ); - connect( this, SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); popupOpen = FALSE; } @@ -1260,7 +1260,7 @@ HierarchyView::HierarchyView( TQWidget *parent ) ClassBrowser cb( ciface->createClassBrowser( this ), ciface ); addTab( cb.lv, tr( "Class Declarations" ) ); setTabToolTip( cb.lv, tr( "List of all classes and its declarations of the current source file" ) ); - ciface->onClick( this, SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); + ciface->onClick( this, TQ_SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); classBrowsers->insert( *it, cb ); setTabEnabled( cb.lv, FALSE ); } @@ -1348,7 +1348,7 @@ void HierarchyView::showClasses( SourceEditor *se ) return; lastSourceEditor = se; - TQTimer::singleShot( 100, this, SLOT( showClassesTimeout() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( showClassesTimeout() ) ); } void HierarchyView::showClassesTimeout() diff --git a/tools/designer/designer/iconvieweditorimpl.cpp b/tools/designer/designer/iconvieweditorimpl.cpp index 73723e8f1..a98f7dd80 100644 --- a/tools/designer/designer/iconvieweditorimpl.cpp +++ b/tools/designer/designer/iconvieweditorimpl.cpp @@ -45,7 +45,7 @@ IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; itemText->setText( "" ); diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp index a0f6d1c41..c4f9aa819 100644 --- a/tools/designer/designer/layout.cpp +++ b/tools/designer/designer/layout.cpp @@ -149,8 +149,8 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, SIGNAL( destroyed() ), - this, SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ), TQMIN( startPoint.y(), w->y() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) ); diff --git a/tools/designer/designer/listboxeditorimpl.cpp b/tools/designer/designer/listboxeditorimpl.cpp index 08d4560ab..e1bfb45a8 100644 --- a/tools/designer/designer/listboxeditorimpl.cpp +++ b/tools/designer/designer/listboxeditorimpl.cpp @@ -48,7 +48,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; itemText->setText( "" ); @@ -70,8 +70,8 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow ListBoxDnd *editorDnd = new ListBoxDnd( preview ); editorDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( editorDnd, SIGNAL( dropped( TQListBoxItem * ) ), - editorDnd, SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( editorDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + editorDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); ListBoxRename *editorRename = new ListBoxRename( preview ); @@ -81,9 +81,9 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow while ( (obj = it.current()) != 0 ) { ++it; TQObject::connect( editorRename, - SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; diff --git a/tools/designer/designer/listboxrename.cpp b/tools/designer/designer/listboxrename.cpp index c78f64618..9cf1e4e38 100644 --- a/tools/designer/designer/listboxrename.cpp +++ b/tools/designer/designer/listboxrename.cpp @@ -55,8 +55,8 @@ ListBoxRename::ListBoxRename( TQListBox * eventSource, const char * name ) ed->hide(); ed->setFrame( FALSE ); - TQObject::connect( ed, SIGNAL( returnPressed() ), - this, SLOT( renameClickedItem() ) ); + TQObject::connect( ed, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( renameClickedItem() ) ); } bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) @@ -70,7 +70,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) if ( clickedItem && clickedItem->isSelected() && (clickedItem == src->itemAt( pos )) ) { - TQTimer::singleShot( 500, this, SLOT( showLineEdit() ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( showLineEdit() ) ); activity = FALSE; // no drags or clicks for 500 ms before we start the renaming } else { // new item clicked activity = TRUE; diff --git a/tools/designer/designer/listvieweditorimpl.cpp b/tools/designer/designer/listvieweditorimpl.cpp index c65ac833d..b8cef9064 100644 --- a/tools/designer/designer/listvieweditorimpl.cpp +++ b/tools/designer/designer/listvieweditorimpl.cpp @@ -54,7 +54,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); itemText->setEnabled( FALSE ); itemChoosePixmap->setEnabled( FALSE ); itemDeletePixmap->setEnabled( FALSE ); @@ -76,8 +76,8 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw // Clamp on drag and drop to TQListView ListViewDnd *itemsDnd = new ListViewDnd( itemsPreview ); itemsDnd->setDragMode( ListViewDnd::Internal | ListViewDnd::Move ); - TQObject::connect( itemsDnd, SIGNAL( dropped( TQListViewItem * ) ), - itemsDnd, SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( itemsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + itemsDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); // Enable rename for all TQListViewItems TQListViewItemIterator it = ((TQListView *)itemsPreview)->firstChild(); @@ -86,9 +86,9 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw // Connect listview signal to signal-relay TQObject::connect( itemsPreview, - SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "itemText" TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); @@ -97,24 +97,24 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; // Clamp on drag and drop to TQListBox ListBoxDnd *columnsDnd = new ListBoxDnd( colPreview ); columnsDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( columnsDnd, SIGNAL( dropped( TQListBoxItem * ) ), - columnsDnd, SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( columnsDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + columnsDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); // Clamp on rename to TQListBox ListBoxRename *columnsRename = new ListBoxRename( colPreview ); TQObject::connect( columnsRename, - SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), this, - SLOT( columnTextChanged( const TQString & ) ) ); + TQ_SLOT( columnTextChanged( const TQString & ) ) ); // Find TQLineEdit "colText" and connect l = parent->queryList( "TQLineEdit", "colText" ); @@ -122,9 +122,9 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw while ( (obj = columnsLineEditIt.current()) != 0 ) { ++columnsLineEditIt; TQObject::connect( columnsRename, - SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index cf72b728b..93d0eeac5 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -174,12 +174,12 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl savePluginPaths = FALSE; updateFunctionsTimer = new TQTimer( this ); - connect( updateFunctionsTimer, SIGNAL( timeout() ), - this, SLOT( doFunctionsChanged() ) ); + connect( updateFunctionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doFunctionsChanged() ) ); autoSaveTimer = new TQTimer( this ); - connect( autoSaveTimer, SIGNAL( timeout() ), - this, SLOT( fileSaveAll() ) ); + connect( autoSaveTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( fileSaveAll() ) ); set_splash_status( "Loading Plugins..." ); setupPluginManagers(); @@ -234,8 +234,8 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl setupRMBMenus(); - connect( this, SIGNAL( projectChanged() ), this, SLOT( emitProjectSignals() ) ); - connect( this, SIGNAL( hasActiveWindow(bool) ), this, SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( projectChanged() ), this, TQ_SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), this, TQ_SLOT( emitProjectSignals() ) ); emit hasActiveForm( FALSE ); emit hasActiveWindow( FALSE ); @@ -247,8 +247,8 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl as -= TQSize( 30, 30 ); resize( TQSize( 1200, 1000 ).boundedTo( as ) ); - connect( tqApp->clipboard(), SIGNAL( dataChanged() ), - this, SLOT( clipboardChanged() ) ); + connect( tqApp->clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardChanged() ) ); clipboardChanged(); layoutChilds = FALSE; layoutSelected = FALSE; @@ -276,7 +276,7 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl statusBar()->setSizeGripEnabled( TRUE ); set_splash_status( "Initialization Done." ); if ( shStartDialog ) - TQTimer::singleShot( 0, this, SLOT( showStartDialog() )); + TQTimer::singleShot( 0, this, TQ_SLOT( showStartDialog() )); if ( autoSaveEnabled ) autoSaveTimer->start( autoSaveInterval * 1000 ); @@ -331,8 +331,8 @@ void MainWindow::setupMDI() qworkspace = new TQWorkspace( vbox ); qworkspace->setPaletteBackgroundPixmap( TQPixmap::fromMimeSource( "designer_background.png" ) ); qworkspace->setScrollBarsEnabled( TRUE ); - connect( qworkspace, SIGNAL( windowActivated( TQWidget * ) ), - this, SLOT( activeWindowChanged( TQWidget * ) ) ); + connect( qworkspace, TQ_SIGNAL( windowActivated( TQWidget * ) ), + this, TQ_SLOT( activeWindowChanged( TQWidget * ) ) ); lastActiveFormWindow = 0; qworkspace->setAcceptDrops( TRUE ); } @@ -416,7 +416,7 @@ void MainWindow::setupWorkspace() TQCompletionEdit *edit = new TQCompletionEdit( vbox ); TQToolTip::add( edit, tr( "Start typing the buffer you want to switch to here (ALT+B)" ) ); TQAccel *a = new TQAccel( this ); - a->connectItem( a->insertItem( ALT + Key_B ), edit, SLOT( setFocus() ) ); + a->connectItem( a->insertItem( ALT + Key_B ), edit, TQ_SLOT( setFocus() ) ); wspace = new Workspace( vbox, this ); wspace->setBufferEdit( edit ); wspace->setCurrentProject( currentProject ); @@ -1034,7 +1034,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) } lastPressWidget = (TQWidget*)o; if ( passiveInteractor ) - TQTimer::singleShot( 0, formWindow(), SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); if ( currentTool() == CONNECT_TOOL || currentTool() == BUDDY_TOOL ) return TRUE; return !passiveInteractor; @@ -1053,8 +1053,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ( (FormWindow*)w )->handleMouseRelease( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( passiveInteractor ) { - TQTimer::singleShot( 0, this, SLOT( selectionChanged() ) ); - TQTimer::singleShot( 0, formWindow(), SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( selectionChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); } return !passiveInteractor; case TQEvent::MouseMove: @@ -1283,16 +1283,16 @@ void MainWindow::insertFormWindow( FormWindow *fw ) "<p>You can have several forms open, and all open forms are listed " "in the <b>Form List</b>.") ); - connect( fw, SIGNAL( showProperties( TQObject * ) ), - this, SLOT( showProperties( TQObject * ) ) ); - connect( fw, SIGNAL( updateProperties( TQObject * ) ), - this, SLOT( updateProperties( TQObject * ) ) ); - connect( this, SIGNAL( currentToolChanged() ), - fw, SLOT( currentToolChanged() ) ); - connect( fw, SIGNAL( selectionChanged() ), - this, SLOT( selectionChanged() ) ); - connect( fw, SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); + connect( fw, TQ_SIGNAL( showProperties( TQObject * ) ), + this, TQ_SLOT( showProperties( TQObject * ) ) ); + connect( fw, TQ_SIGNAL( updateProperties( TQObject * ) ), + this, TQ_SLOT( updateProperties( TQObject * ) ) ); + connect( this, TQ_SIGNAL( currentToolChanged() ), + fw, TQ_SLOT( currentToolChanged() ) ); + connect( fw, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( selectionChanged() ) ); + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); if ( !mblockNewForms ) { } else { @@ -3566,11 +3566,11 @@ bool MainWindow::openProjectSettings( Project *pro ) continue; dia.tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia.buttonOk, SIGNAL( clicked() ), senderObject, SLOT( emitAcceptSignal() ) ); - connect( senderObject, SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia.buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } @@ -3695,11 +3695,11 @@ void MainWindow::showGUIStuff( bool b ) menubar->removeItem( toolsMenuId ); menubar->removeItem( toolsMenuId + 1 ); menubar->removeItem( toolsMenuId + 2 ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditAccels, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditFunctions, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditConnections, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditSource, SLOT( setEnabled(bool) ) ); - disconnect( this, SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( FALSE ); actionEditSource->setEnabled( FALSE ); actionEditConnections->setEnabled( FALSE ); @@ -3732,11 +3732,11 @@ void MainWindow::showGUIStuff( bool b ) menubar->insertItem( tr( "&Tools" ), toolsMenu, toolsMenuId, toolsMenuIndex ); menubar->insertItem( tr( "&Layout" ), layoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 ); menubar->insertItem( tr( "&Preview" ), previewMenu, toolsMenuId + 2, toolsMenuIndex + 2 ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditAccels, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFunctions, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditConnections, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditSource, SLOT( setEnabled(bool) ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( TRUE ); actionEditSource->setEnabled( TRUE ); actionEditConnections->setEnabled( TRUE ); diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index bae9ed2ee..b9418913a 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -127,101 +127,101 @@ void MainWindow::setupEditActions() actionEditUndo = new TQAction( tr("Undo"), createIconSet( "designer_undo.png" ),tr("&Undo: Not Available"), CTRL + Key_Z, this, 0 ); actionEditUndo->setStatusTip( tr( "Undoes the last action" ) ); actionEditUndo->setWhatsThis( whatsThisFrom( "Edit|Undo" ) ); - connect( actionEditUndo, SIGNAL( activated() ), this, SLOT( editUndo() ) ); + connect( actionEditUndo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editUndo() ) ); actionEditUndo->setEnabled( FALSE ); actionEditRedo = new TQAction( tr( "Redo" ), createIconSet("designer_redo.png"), tr( "&Redo: Not Available" ), CTRL + Key_Y, this, 0 ); actionEditRedo->setStatusTip( tr( "Redoes the last undone operation") ); actionEditRedo->setWhatsThis( whatsThisFrom( "Edit|Redo" ) ); - connect( actionEditRedo, SIGNAL( activated() ), this, SLOT( editRedo() ) ); + connect( actionEditRedo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRedo() ) ); actionEditRedo->setEnabled( FALSE ); actionEditCut = new TQAction( tr( "Cut" ), createIconSet("designer_editcut.png"), tr( "Cu&t" ), CTRL + Key_X, this, 0 ); actionEditCut->setStatusTip( tr( "Cuts the selected widgets and puts them on the clipboard" ) ); actionEditCut->setWhatsThis( whatsThisFrom( "Edit|Cut" ) ); - connect( actionEditCut, SIGNAL( activated() ), this, SLOT( editCut() ) ); + connect( actionEditCut, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCut() ) ); actionEditCut->setEnabled( FALSE ); actionEditCopy = new TQAction( tr( "Copy" ), createIconSet("designer_editcopy.png"), tr( "&Copy" ), CTRL + Key_C, this, 0 ); actionEditCopy->setStatusTip( tr( "Copies the selected widgets to the clipboard" ) ); actionEditCopy->setWhatsThis( whatsThisFrom( "Edit|Copy" ) ); - connect( actionEditCopy, SIGNAL( activated() ), this, SLOT( editCopy() ) ); + connect( actionEditCopy, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCopy() ) ); actionEditCopy->setEnabled( FALSE ); actionEditPaste = new TQAction( tr( "Paste" ), createIconSet("designer_editpaste.png"), tr( "&Paste" ), CTRL + Key_V, this, 0 ); actionEditPaste->setStatusTip( tr( "Pastes the clipboard's contents" ) ); actionEditPaste->setWhatsThis( whatsThisFrom( "Edit|Paste" ) ); - connect( actionEditPaste, SIGNAL( activated() ), this, SLOT( editPaste() ) ); + connect( actionEditPaste, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPaste() ) ); actionEditPaste->setEnabled( FALSE ); actionEditDelete = new TQAction( tr( "Delete" ), TQPixmap(), tr( "&Delete" ), Key_Delete, this, 0 ); actionEditDelete->setStatusTip( tr( "Deletes the selected widgets" ) ); actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) ); - connect( actionEditDelete, SIGNAL( activated() ), this, SLOT( editDelete() ) ); + connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); actionEditDelete->setEnabled( FALSE ); #ifdef Q_WS_MAC TQAction *macDelete = new TQAction( tr( "Delete" ), TQPixmap(), tr( "&Delete" ), Key_Backspace, this, 0 ); - connect( macDelete, SIGNAL( activated() ), this, SLOT( editDelete() ) ); + connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); #endif actionEditSelectAll = new TQAction( tr( "Select All" ), TQPixmap(), tr( "Select &All" ), CTRL + Key_A, this, 0 ); actionEditSelectAll->setStatusTip( tr( "Selects all widgets" ) ); actionEditSelectAll->setWhatsThis( whatsThisFrom( "Edit|Select All" ) ); - connect( actionEditSelectAll, SIGNAL( activated() ), this, SLOT( editSelectAll() ) ); + connect( actionEditSelectAll, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSelectAll() ) ); actionEditSelectAll->setEnabled( TRUE ); actionEditRaise = new TQAction( tr( "Bring to Front" ), createIconSet("designer_editraise.png"), tr( "Bring to &Front" ), 0, this, 0 ); actionEditRaise->setStatusTip( tr( "Raises the selected widgets" ) ); actionEditRaise->setWhatsThis( tr( "Raises the selected widgets" ) ); - connect( actionEditRaise, SIGNAL( activated() ), this, SLOT( editRaise() ) ); + connect( actionEditRaise, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRaise() ) ); actionEditRaise->setEnabled( FALSE ); actionEditLower = new TQAction( tr( "Send to Back" ), createIconSet("designer_editlower.png"), tr( "Send to &Back" ), 0, this, 0 ); actionEditLower->setStatusTip( tr( "Lowers the selected widgets" ) ); actionEditLower->setWhatsThis( tr( "Lowers the selected widgets" ) ); - connect( actionEditLower, SIGNAL( activated() ), this, SLOT( editLower() ) ); + connect( actionEditLower, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLower() ) ); actionEditLower->setEnabled( FALSE ); actionEditAccels = new TQAction( tr( "Check Accelerators" ), TQPixmap(), tr( "Chec&k Accelerators" ), ALT + Key_R, this, 0 ); actionEditAccels->setStatusTip( tr("Checks if the accelerators used in the form are unique") ); actionEditAccels->setWhatsThis( whatsThisFrom( "Edit|Check Accelerator" ) ); - connect( actionEditAccels, SIGNAL( activated() ), this, SLOT( editAccels() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditAccels, SLOT( setEnabled(bool) ) ); + connect( actionEditAccels, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAccels() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); actionEditFunctions = new TQAction( tr( "Slots" ), createIconSet("designer_editslots.png"), tr( "S&lots..." ), 0, this, 0 ); actionEditFunctions->setStatusTip( tr("Opens a dialog for editing slots") ); actionEditFunctions->setWhatsThis( whatsThisFrom( "Edit|Slots" ) ); - connect( actionEditFunctions, SIGNAL( activated() ), this, SLOT( editFunctions() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFunctions, SLOT( setEnabled(bool) ) ); + connect( actionEditFunctions, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFunctions() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); actionEditConnections = new TQAction( tr( "Connections" ), createIconSet("designer_connecttool.png"), tr( "Co&nnections..." ), 0, this, 0 ); actionEditConnections->setStatusTip( tr("Opens a dialog for editing connections") ); actionEditConnections->setWhatsThis( whatsThisFrom( "Edit|Connections" ) ); - connect( actionEditConnections, SIGNAL( activated() ), this, SLOT( editConnections() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditConnections, SLOT( setEnabled(bool) ) ); + connect( actionEditConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editConnections() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); actionEditSource = new TQAction( tr( "Source" ), TQIconSet(), tr( "&Source..." ), CTRL + Key_E, this, 0 ); actionEditSource->setStatusTip( tr("Opens an editor to edit the form's source code") ); actionEditSource->setWhatsThis( whatsThisFrom( "Edit|Source" ) ); - connect( actionEditSource, SIGNAL( activated() ), this, SLOT( editSource() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditSource, SLOT( setEnabled(bool) ) ); + connect( actionEditSource, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSource() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings = new TQAction( tr( "Form Settings" ), TQPixmap(), tr( "&Form Settings..." ), 0, this, 0 ); actionEditFormSettings->setStatusTip( tr("Opens a dialog to change the form's settings") ); actionEditFormSettings->setWhatsThis( whatsThisFrom( "Edit|Form Settings" ) ); - connect( actionEditFormSettings, SIGNAL( activated() ), this, SLOT( editFormSettings() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, SLOT( setEnabled(bool) ) ); + connect( actionEditFormSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFormSettings() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditPreferences = new TQAction( tr( "Preferences" ), TQPixmap(), tr( "Preferences..." ), 0, this, 0 ); actionEditPreferences->setStatusTip( tr("Opens a dialog to change preferences") ); actionEditPreferences->setWhatsThis( whatsThisFrom( "Edit|Preferences" ) ); - connect( actionEditPreferences, SIGNAL( activated() ), this, SLOT( editPreferences() ) ); + connect( actionEditPreferences, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPreferences() ) ); TQToolBar *tb = new TQToolBar( this, "Edit" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -240,7 +240,7 @@ void MainWindow::setupEditActions() #endif TQPopupMenu *menu = new TQPopupMenu( this, "Edit" ); - connect( menu, SIGNAL( aboutToShow() ), this, SLOT( updateEditorUndoRedo() ) ); + connect( menu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( updateEditorUndoRedo() ) ); menubar->insertItem( tr( "&Edit" ), menu ); actionEditUndo->addTo( menu ); actionEditRedo->addTo( menu ); @@ -270,25 +270,25 @@ void MainWindow::setupSearchActions() { actionSearchFind = new TQAction( tr( "Find" ), createIconSet( "designer_searchfind.png" ), tr( "&Find..." ), CTRL + Key_F, this, 0 ); - connect( actionSearchFind, SIGNAL( activated() ), this, SLOT( searchFind() ) ); + connect( actionSearchFind, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchFind() ) ); actionSearchFind->setEnabled( FALSE ); actionSearchFind->setWhatsThis( whatsThisFrom( "Search|Find" ) ); actionSearchIncremetal = new TQAction( tr( "Find Incremental" ), TQIconSet(), tr( "Find &Incremental" ), ALT + Key_I, this, 0 ); - connect( actionSearchIncremetal, SIGNAL( activated() ), this, SLOT( searchIncremetalFindMenu() ) ); + connect( actionSearchIncremetal, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchIncremetalFindMenu() ) ); actionSearchIncremetal->setEnabled( FALSE ); actionSearchIncremetal->setWhatsThis( whatsThisFrom( "Search|Find Incremental" ) ); actionSearchReplace = new TQAction( tr( "Replace" ), TQIconSet(), tr( "&Replace..." ), CTRL + Key_R, this, 0 ); - connect( actionSearchReplace, SIGNAL( activated() ), this, SLOT( searchReplace() ) ); + connect( actionSearchReplace, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchReplace() ) ); actionSearchReplace->setEnabled( FALSE ); actionSearchReplace->setWhatsThis( whatsThisFrom( "Search|Replace" ) ); actionSearchGotoLine = new TQAction( tr( "Goto Line" ), TQIconSet(), tr( "&Goto Line..." ), ALT + Key_G, this, 0 ); - connect( actionSearchGotoLine, SIGNAL( activated() ), this, SLOT( searchGotoLine() ) ); + connect( actionSearchGotoLine, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchGotoLine() ) ); actionSearchGotoLine->setEnabled( FALSE ); actionSearchGotoLine->setWhatsThis( whatsThisFrom( "Search|Goto line" ) ); @@ -299,10 +299,10 @@ void MainWindow::setupSearchActions() actionSearchFind->addTo( tb ); incrementalSearch = new TQLineEdit( tb ); TQToolTip::add( incrementalSearch, tr( "Incremetal Search (Alt+I)" ) ); - connect( incrementalSearch, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( searchIncremetalFind() ) ); - connect( incrementalSearch, SIGNAL( returnPressed() ), - this, SLOT( searchIncremetalFindNext() ) ); + connect( incrementalSearch, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( searchIncremetalFind() ) ); + connect( incrementalSearch, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( searchIncremetalFindNext() ) ); incrementalSearch->setEnabled( FALSE ); TQPopupMenu *menu = new TQPopupMenu( this, "Search" ); @@ -319,56 +319,56 @@ void MainWindow::setupLayoutActions() if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, SIGNAL( selected(TQAction*) ), this, SLOT( toolSelected(TQAction*) ) ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionEditAdjustSize = new TQAction( tr( "Adjust Size" ), createIconSet("designer_adjustsize.png"), tr( "Adjust &Size" ), CTRL + Key_J, this, 0 ); actionEditAdjustSize->setStatusTip(tr("Adjusts the size of the selected widget") ); actionEditAdjustSize->setWhatsThis( whatsThisFrom( "Layout|Adjust Size" ) ); - connect( actionEditAdjustSize, SIGNAL( activated() ), this, SLOT( editAdjustSize() ) ); + connect( actionEditAdjustSize, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAdjustSize() ) ); actionEditAdjustSize->setEnabled( FALSE ); actionEditHLayout = new TQAction( tr( "Lay Out Horizontally" ), createIconSet("designer_edithlayout.png"), tr( "Lay Out &Horizontally" ), CTRL + Key_H, this, 0 ); actionEditHLayout->setStatusTip(tr("Lays out the selected widgets horizontally") ); actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally" ) ); - connect( actionEditHLayout, SIGNAL( activated() ), this, SLOT( editLayoutHorizontal() ) ); + connect( actionEditHLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontal() ) ); actionEditHLayout->setEnabled( FALSE ); actionEditVLayout = new TQAction( tr( "Lay Out Vertically" ), createIconSet("designer_editvlayout.png"), tr( "Lay Out &Vertically" ), CTRL + Key_L, this, 0 ); actionEditVLayout->setStatusTip(tr("Lays out the selected widgets vertically") ); actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically" ) ); - connect( actionEditVLayout, SIGNAL( activated() ), this, SLOT( editLayoutVertical() ) ); + connect( actionEditVLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVertical() ) ); actionEditVLayout->setEnabled( FALSE ); actionEditGridLayout = new TQAction( tr( "Lay Out in a Grid" ), createIconSet("designer_editgrid.png"), tr( "Lay Out in a &Grid" ), CTRL + Key_G, this, 0 ); actionEditGridLayout->setStatusTip(tr("Lays out the selected widgets in a grid") ); actionEditGridLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out in a Grid" ) ); - connect( actionEditGridLayout, SIGNAL( activated() ), this, SLOT( editLayoutGrid() ) ); + connect( actionEditGridLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutGrid() ) ); actionEditGridLayout->setEnabled( FALSE ); actionEditSplitHorizontal = new TQAction( tr( "Lay Out Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"), tr( "Lay Out Horizontally (in S&plitter)" ), 0, this, 0 ); actionEditSplitHorizontal->setStatusTip(tr("Lays out the selected widgets horizontally in a splitter") ); actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally (in Splitter)" ) ); - connect( actionEditSplitHorizontal, SIGNAL( activated() ), this, SLOT( editLayoutHorizontalSplit() ) ); + connect( actionEditSplitHorizontal, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontalSplit() ) ); actionEditSplitHorizontal->setEnabled( FALSE ); actionEditSplitVertical = new TQAction( tr( "Lay Out Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"), tr( "Lay Out Vertically (in Sp&litter)" ), 0, this, 0 ); actionEditSplitVertical->setStatusTip(tr("Lays out the selected widgets vertically in a splitter") ); actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically (in Splitter)" ) ); - connect( actionEditSplitVertical, SIGNAL( activated() ), this, SLOT( editLayoutVerticalSplit() ) ); + connect( actionEditSplitVertical, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVerticalSplit() ) ); actionEditSplitVertical->setEnabled( FALSE ); actionEditBreakLayout = new TQAction( tr( "Break Layout" ), createIconSet("designer_editbreaklayout.png"), tr( "&Break Layout" ), CTRL + Key_B, this, 0 ); actionEditBreakLayout->setStatusTip(tr("Breaks the selected layout") ); actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) ); - connect( actionEditBreakLayout, SIGNAL( activated() ), this, SLOT( editBreakLayout() ) ); + connect( actionEditBreakLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editBreakLayout() ) ); actionEditBreakLayout->setEnabled( FALSE ); int id = WidgetDatabase::idFromClassName( "Spacer" ); @@ -423,8 +423,8 @@ void MainWindow::setupToolActions() if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, SIGNAL( selected(TQAction*) ), - this, SLOT( toolSelected(TQAction*) ) ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), + this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionPointerTool = new TQAction( tr("Pointer"), createIconSet("designer_pointer.png"), @@ -491,8 +491,8 @@ void MainWindow::setupToolActions() "custom widgets") ); actionToolsCustomWidget->setWhatsThis( whatsThisFrom( "Tools|Custom|Edit Custom" "Widgets" ) ); - connect( actionToolsCustomWidget, SIGNAL( activated() ), - this, SLOT( toolsCustomWidget() ) ); + connect( actionToolsCustomWidget, TQ_SIGNAL( activated() ), + this, TQ_SLOT( toolsCustomWidget() ) ); for ( int j = 0; j < WidgetDatabase::numWidgetGroups(); ++j ) { TQString grp = WidgetDatabase::widgetGroup( j ); @@ -604,7 +604,7 @@ void MainWindow::setupToolActions() TQAction *a = new TQAction( tr( "Configure Toolbox" ), tr( "Configure Toolbox..." ), 0, this ); a->setStatusTip( tr( "Opens a dialog to configure the common " "widgets page of the toolbox") ); - connect( a, SIGNAL( activated() ), this, SLOT( toolsConfigure() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( toolsConfigure() ) ); mmenu->insertSeparator(); a->addTo( mmenu ); resetTool(); @@ -632,7 +632,7 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_N ); a->setStatusTip( tr( "Creates a new project, form or source file." ) ); a->setWhatsThis( whatsThisFrom( "File|New" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNew() ) ); a->addTo( tb ); a->addTo( fileMenu ); } else { @@ -651,7 +651,7 @@ void MainWindow::setupFileActions() newForm->setIconSet( createIconSet("designer_form.png") ); newForm->setAccel( CTRL + Key_N ); newForm->setStatusTip( tr( "Creates a new dialog." ) ); - connect( newForm, SIGNAL( activated() ), this, SLOT( fileNewDialog() ) ); + connect( newForm, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewDialog() ) ); TQAction *newFile = new TQAction( a, 0 ); newFile->setText( tr( "New File" ) ); @@ -659,7 +659,7 @@ void MainWindow::setupFileActions() newFile->setIconSet( createIconSet("designer_filenew.png") ); newFile->setAccel( ALT + Key_N ); newFile->setStatusTip( tr( "Creates a new file." ) ); - connect( newFile, SIGNAL( activated() ), this, SLOT( fileNewFile() ) ); + connect( newFile, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewFile() ) ); actionNewFile = newFile; a->addTo( tb ); @@ -675,7 +675,7 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_O ); a->setStatusTip( tr( "Opens an existing project, form or source file ") ); a->setWhatsThis( whatsThisFrom( "File|Open" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileOpen() ) ); if ( !singleProject ) { a->addTo( tb ); a->addTo( fileMenu ); @@ -688,8 +688,8 @@ void MainWindow::setupFileActions() a->setMenuText( tr( "&Close" ) ); a->setStatusTip( tr( "Closes the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Close" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileClose() ) ); - connect( this, SIGNAL( hasActiveWindowOrProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileClose() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); @@ -703,8 +703,8 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_S ); a->setStatusTip( tr( "Saves the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Save" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) ); - connect( this, SIGNAL( hasActiveWindowOrProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSave() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( tb ); a->addTo( fileMenu ); @@ -713,8 +713,8 @@ void MainWindow::setupFileActions() a->setMenuText( tr( "Save &As..." ) ); a->setStatusTip( tr( "Saves the current form with a new filename" ) ); a->setWhatsThis( whatsThisFrom( "File|Save As" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) ); - connect( this, SIGNAL( hasActiveWindow(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAs() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( fileMenu ); @@ -723,8 +723,8 @@ void MainWindow::setupFileActions() a->setMenuText( tr( "Sa&ve All" ) ); a->setStatusTip( tr( "Saves all open documents" ) ); a->setWhatsThis( whatsThisFrom( "File|Save All" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAll() ) ); - connect( this, SIGNAL( hasActiveWindowOrProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAll() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); @@ -735,7 +735,7 @@ void MainWindow::setupFileActions() a->setMenuText( tr( "Create &Template..." ) ); a->setStatusTip( tr( "Creates a new template" ) ); a->setWhatsThis( whatsThisFrom( "File|Create Template" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( fileCreateTemplate() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileCreateTemplate() ) ); if ( !singleProject ) a->addTo( fileMenu ); @@ -750,14 +750,14 @@ void MainWindow::setupFileActions() fileMenu->insertItem( tr( "Recently opened projects" ), recentlyProjectsMenu ); } - connect( recentlyFilesMenu, SIGNAL( aboutToShow() ), - this, SLOT( setupRecentlyFilesMenu() ) ); - connect( recentlyProjectsMenu, SIGNAL( aboutToShow() ), - this, SLOT( setupRecentlyProjectsMenu() ) ); - connect( recentlyFilesMenu, SIGNAL( activated( int ) ), - this, SLOT( recentlyFilesMenuActivated( int ) ) ); - connect( recentlyProjectsMenu, SIGNAL( activated( int ) ), - this, SLOT( recentlyProjectsMenuActivated( int ) ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyFilesMenu() ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyProjectsMenu() ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyFilesMenuActivated( int ) ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyProjectsMenuActivated( int ) ) ); if ( !singleProject ) fileMenu->insertSeparator(); @@ -774,7 +774,7 @@ void MainWindow::setupFileActions() a->setText( tr( "Close" ) ); a->setMenuText( tr( "&Close" ) ); } - connect( a, SIGNAL( activated() ), this, SLOT( fileQuit() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileQuit() ) ); a->addTo( fileMenu ); } @@ -788,8 +788,8 @@ void MainWindow::setupProjectActions() ag->setMenuText( tr( "Active Project" ) ); ag->setExclusive( TRUE ); ag->setUsesDropDown( TRUE ); - connect( ag, SIGNAL( selected( TQAction * ) ), this, SLOT( projectSelected( TQAction * ) ) ); - connect( ag, SIGNAL( selected( TQAction * ) ), this, SIGNAL( projectChanged() ) ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SLOT( projectSelected( TQAction * ) ) ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SIGNAL( projectChanged() ) ); TQAction *a = new TQAction( tr( "<No Project>" ), tr( "<No Project>" ), 0, ag, 0, TRUE ); eProject = new Project( "", tr( "<No Project>" ), projectSettingsPluginManager, TRUE ); projects.insert( a, eProject ); @@ -804,9 +804,9 @@ void MainWindow::setupProjectActions() a = new TQAction( tr( "Add File" ), TQPixmap(), tr( "&Add File..." ), 0, this, 0 ); a->setStatusTip( tr("Adds a file to the current project") ); a->setWhatsThis( whatsThisFrom( "Project|Add File" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( projectInsertFile() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( projectInsertFile() ) ); a->setEnabled( FALSE ); - connect( this, SIGNAL( hasNonDummyProject(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( projectMenu ); @@ -814,9 +814,9 @@ void MainWindow::setupProjectActions() tr( "&Image Collection..." ), 0, this, 0 ); actionEditPixmapCollection->setStatusTip( tr("Opens a dialog for editing the current project's image collection") ); actionEditPixmapCollection->setWhatsThis( whatsThisFrom( "Project|Image Collection" ) ); - connect( actionEditPixmapCollection, SIGNAL( activated() ), this, SLOT( editPixmapCollection() ) ); + connect( actionEditPixmapCollection, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPixmapCollection() ) ); actionEditPixmapCollection->setEnabled( FALSE ); - connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQ_SLOT( setEnabled(bool) ) ); actionEditPixmapCollection->addTo( projectMenu ); #ifndef TQT_NO_SQL @@ -824,9 +824,9 @@ void MainWindow::setupProjectActions() tr( "&Database Connections..." ), 0, this, 0 ); actionEditDatabaseConnections->setStatusTip( tr("Opens a dialog for editing the current project's database connections") ); actionEditDatabaseConnections->setWhatsThis( whatsThisFrom( "Project|Database Connections" ) ); - connect( actionEditDatabaseConnections, SIGNAL( activated() ), this, SLOT( editDatabaseConnections() ) ); + connect( actionEditDatabaseConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDatabaseConnections() ) ); //actionEditDatabaseConnections->setEnabled( FALSE ); - //connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, SLOT( setEnabled(bool) ) ); + //connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) actionEditDatabaseConnections->addTo( projectMenu ); #endif @@ -835,9 +835,9 @@ void MainWindow::setupProjectActions() tr( "&Project Settings..." ), 0, this, 0 ); actionEditProjectSettings->setStatusTip( tr("Opens a dialog to change the project's settings") ); actionEditProjectSettings->setWhatsThis( whatsThisFrom( "Project|Project Settings" ) ); - connect( actionEditProjectSettings, SIGNAL( activated() ), this, SLOT( editProjectSettings() ) ); + connect( actionEditProjectSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editProjectSettings() ) ); actionEditProjectSettings->setEnabled( FALSE ); - connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditProjectSettings->addTo( projectMenu ); } @@ -853,14 +853,14 @@ void MainWindow::setupPreviewActions() a->setAccel( CTRL + Key_T ); a->setStatusTip( tr("Opens a preview") ); a->setWhatsThis( whatsThisFrom( "Preview|Preview Form" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( previewForm() ) ); - connect( this, SIGNAL( hasActiveForm(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( previewForm() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); menu->insertSeparator(); TQSignalMapper *mapper = new TQSignalMapper( this ); - connect( mapper, SIGNAL(mapped(const TQString&)), this, SLOT(previewForm(const TQString&)) ); + connect( mapper, TQ_SIGNAL(mapped(const TQString&)), this, TQ_SLOT(previewForm(const TQString&)) ); TQStringList styles = TQStyleFactory::keys(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString info; @@ -884,8 +884,8 @@ void MainWindow::setupPreviewActions() "<p>Use the preview to test the design and " "signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) ); mapper->setMapping( a, *it ); - connect( a, SIGNAL(activated()), mapper, SLOT(map()) ); - connect( this, SIGNAL( hasActiveForm(bool) ), a, SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL(activated()), mapper, TQ_SLOT(map()) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); } } @@ -899,38 +899,38 @@ void MainWindow::setupWindowActions() actionWindowTile = new TQAction( tr( "Tile" ), tr( "&Tile" ), 0, this ); actionWindowTile->setStatusTip( tr("Tiles the windows so that they are all visible") ); actionWindowTile->setWhatsThis( whatsThisFrom( "Window|Tile" ) ); - connect( actionWindowTile, SIGNAL( activated() ), qworkspace, SLOT( tile() ) ); + connect( actionWindowTile, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( tile() ) ); actionWindowCascade = new TQAction( tr( "Cascade" ), tr( "&Cascade" ), 0, this ); actionWindowCascade->setStatusTip( tr("Cascades the windows so that all their title bars are visible") ); actionWindowCascade->setWhatsThis( whatsThisFrom( "Window|Cascade" ) ); - connect( actionWindowCascade, SIGNAL( activated() ), qworkspace, SLOT( cascade() ) ); + connect( actionWindowCascade, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( cascade() ) ); actionWindowClose = new TQAction( tr( "Close" ), tr( "Cl&ose" ), CTRL + Key_F4, this ); actionWindowClose->setStatusTip( tr( "Closes the active window") ); actionWindowClose->setWhatsThis( whatsThisFrom( "Window|Close" ) ); - connect( actionWindowClose, SIGNAL( activated() ), qworkspace, SLOT( closeActiveWindow() ) ); + connect( actionWindowClose, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeActiveWindow() ) ); actionWindowCloseAll = new TQAction( tr( "Close All" ), tr( "Close Al&l" ), 0, this ); actionWindowCloseAll->setStatusTip( tr( "Closes all form windows") ); actionWindowCloseAll->setWhatsThis( whatsThisFrom( "Window|Close All" ) ); - connect( actionWindowCloseAll, SIGNAL( activated() ), qworkspace, SLOT( closeAllWindows() ) ); + connect( actionWindowCloseAll, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeAllWindows() ) ); actionWindowNext = new TQAction( tr( "Next" ), tr( "Ne&xt" ), CTRL + Key_F6, this ); actionWindowNext->setStatusTip( tr( "Activates the next window" ) ); actionWindowNext->setWhatsThis( whatsThisFrom( "Window|Next" ) ); - connect( actionWindowNext, SIGNAL( activated() ), qworkspace, SLOT( activateNextWindow() ) ); + connect( actionWindowNext, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activateNextWindow() ) ); actionWindowPrevious = new TQAction( tr( "Previous" ), tr( "Pre&vious" ), CTRL + SHIFT + Key_F6, this ); actionWindowPrevious->setStatusTip( tr( "Activates the previous window" ) ); actionWindowPrevious->setWhatsThis( whatsThisFrom( "Window|Previous" ) ); - connect( actionWindowPrevious, SIGNAL( activated() ), qworkspace, SLOT( activatePreviousWindow() ) ); + connect( actionWindowPrevious, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activatePreviousWindow() ) ); } if ( !windowMenu ) { windowMenu = new TQPopupMenu( this, "Window" ); menubar->insertItem( tr( "&Window" ), windowMenu ); - connect( windowMenu, SIGNAL( aboutToShow() ), - this, SLOT( setupWindowActions() ) ); + connect( windowMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupWindowActions() ) ); } else { windowMenu->clear(); } @@ -965,7 +965,7 @@ void MainWindow::setupWindowActions() else itemText += w->caption(); - int id = windowMenu->insertItem( itemText, this, SLOT( windowsMenuActivated( int ) ) ); + int id = windowMenu->insertItem( itemText, this, TQ_SLOT( windowsMenuActivated( int ) ) ); windowMenu->setItemParameter( id, i ); windowMenu->setItemChecked( id, qworkspace->activeWindow() == windows.at( i ) ); } @@ -976,28 +976,28 @@ void MainWindow::setupHelpActions() actionHelpContents = new TQAction( tr( "Contents" ), tr( "&Contents" ), Key_F1, this, 0 ); actionHelpContents->setStatusTip( tr("Opens the online help") ); actionHelpContents->setWhatsThis( whatsThisFrom( "Help|Contents" ) ); - connect( actionHelpContents, SIGNAL( activated() ), this, SLOT( helpContents() ) ); + connect( actionHelpContents, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpContents() ) ); actionHelpManual = new TQAction( tr( "Manual" ), tr( "&Manual" ), CTRL + Key_M, this, 0 ); actionHelpManual->setStatusTip( tr("Opens the TQt Designer manual") ); actionHelpManual->setWhatsThis( whatsThisFrom( "Help|Manual" ) ); - connect( actionHelpManual, SIGNAL( activated() ), this, SLOT( helpManual() ) ); + connect( actionHelpManual, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpManual() ) ); actionHelpAbout = new TQAction( tr("About"), TQPixmap(), tr("&About"), 0, this, 0 ); actionHelpAbout->setStatusTip( tr("Displays information about TQt Designer") ); actionHelpAbout->setWhatsThis( whatsThisFrom( "Help|About" ) ); - connect( actionHelpAbout, SIGNAL( activated() ), this, SLOT( helpAbout() ) ); + connect( actionHelpAbout, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAbout() ) ); actionHelpAboutTQt = new TQAction( tr("About TQt"), TQPixmap(), tr("About &TQt"), 0, this, 0 ); actionHelpAboutTQt->setStatusTip( tr("Displays information about the TQt Toolkit") ); actionHelpAboutTQt->setWhatsThis( whatsThisFrom( "Help|About TQt" ) ); - connect( actionHelpAboutTQt, SIGNAL( activated() ), this, SLOT( helpAboutTQt() ) ); + connect( actionHelpAboutTQt, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAboutTQt() ) ); actionHelpWhatsThis = new TQAction( tr("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ), tr("What's This?"), SHIFT + Key_F1, this, 0 ); actionHelpWhatsThis->setStatusTip( tr("\"What's This?\" context sensitive help") ); actionHelpWhatsThis->setWhatsThis( whatsThisFrom( "Help|What's This?" ) ); - connect( actionHelpWhatsThis, SIGNAL( activated() ), this, SLOT( whatsThis() ) ); + connect( actionHelpWhatsThis, TQ_SIGNAL( activated() ), this, TQ_SLOT( whatsThis() ) ); TQToolBar *tb = new TQToolBar( this, "Help" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -1418,8 +1418,8 @@ void MainWindow::fileCreateTemplate() } dia.editName->setText( tr( "NewTemplate" ) ); - connect( dia.buttonCreate, SIGNAL( clicked() ), - this, SLOT( createNewTemplate() ) ); + connect( dia.buttonCreate, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( createNewTemplate() ) ); dia.exec(); } @@ -1851,7 +1851,7 @@ void MainWindow::editPreferences() statusBar()->message( tr( "Edit preferences..." ) ); Preferences *dia = new Preferences( this, 0, TRUE ); prefDia = dia; - connect( dia->helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( dia->helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia->buttonColor->setEditor( StyledButton::ColorEditor ); dia->buttonPixmap->setEditor( StyledButton::PixmapEditor ); dia->groupBoxGrid->setChecked( sGrid ); @@ -1885,11 +1885,11 @@ void MainWindow::editPreferences() Tab t = *it; dia->tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia->buttonOk, SIGNAL( clicked() ), senderObject, SLOT( emitAcceptSignal() ) ); - connect( senderObject, SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia->buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp index 1d3cd2f87..709ebd596 100644 --- a/tools/designer/designer/multilineeditorimpl.cpp +++ b/tools/designer/designer/multilineeditorimpl.cpp @@ -58,7 +58,7 @@ ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, setAccel( key ); addTo( toolBar ); tag = tagstr; - connect( this, SIGNAL( activated() ), this, SLOT( wasActivated() ) ); + connect( this, TQ_SIGNAL( activated() ), this, TQ_SLOT( wasActivated() ) ); } ToolBarItem::~ToolBarItem() @@ -105,26 +105,26 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget ToolBarItem *it = new ToolBarItem( this, basicToolBar, tr( "Italic" ), "i", TQPixmap::fromMimeSource( "designer_textitalic.png" ), CTRL+Key_I ); it->addTo( stylesMenu ); - connect( it, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( it, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *b = new ToolBarItem( this, basicToolBar, tr( "Bold" ), "b", TQPixmap::fromMimeSource( "designer_textbold.png" ), CTRL+Key_B ); b->addTo( stylesMenu ); - connect( b, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( b, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ul = new ToolBarItem( this, basicToolBar, tr( "Underline" ), "u", TQPixmap::fromMimeSource( "designer_textunderline.png" ), CTRL+Key_U ); ul->addTo( stylesMenu ); - connect( ul, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( ul, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *tt = new ToolBarItem( this, basicToolBar, tr( "Typewriter" ), "tt", TQPixmap::fromMimeSource( "designer_textteletext.png" ) ); tt->addTo( stylesMenu ); - connect( tt, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( tt, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); basicToolBar->addSeparator(); @@ -136,39 +136,39 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget brAction->setText( tr("Break" ) ); brAction->addTo( basicToolBar ); brAction->addTo( layoutMenu ); - connect( brAction, SIGNAL( activated() ) , this, SLOT( insertBR() ) ); + connect( brAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( insertBR() ) ); ToolBarItem *p = new ToolBarItem( this, basicToolBar, tr( "Paragraph" ), "p", TQPixmap::fromMimeSource( "designer_textparagraph.png" ) ); p->addTo( layoutMenu ); - connect( p, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( p, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); layoutMenu->insertSeparator(); basicToolBar->addSeparator(); ToolBarItem *al = new ToolBarItem( this, basicToolBar, tr( "Align left" ), "p align=\"left\"", TQPixmap::fromMimeSource( "designer_textleft.png" ) ); al->addTo( layoutMenu ); - connect( al, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( al, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ac = new ToolBarItem( this, basicToolBar, tr( "Align center" ), "p align=\"center\"", TQPixmap::fromMimeSource( "designer_textcenter.png" ) ); ac->addTo( layoutMenu ); - connect( ac, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( ac, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ar = new ToolBarItem( this, basicToolBar, tr( "Align right" ), "p align=\"right\"", TQPixmap::fromMimeSource( "designer_textright.png" ) ); ar->addTo( layoutMenu ); - connect( ar, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( ar, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *block = new ToolBarItem( this, basicToolBar, tr( "Blockquote" ), "blockquote", TQPixmap::fromMimeSource( "designer_textjustify.png" ) ); block->addTo( layoutMenu ); - connect( block, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( block, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *fontMenu = new TQPopupMenu( this ); @@ -181,33 +181,33 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget fontAction->setText( tr("Font" ) ); fontAction->addTo( fontToolBar ); fontAction->addTo( fontMenu ); - connect( fontAction, SIGNAL( activated() ) , this, SLOT( showFontDialog() ) ); + connect( fontAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( showFontDialog() ) ); ToolBarItem *fp1 = new ToolBarItem( this, fontToolBar, tr( "Fontsize +1" ), "font size=\"+1\"", TQPixmap::fromMimeSource( "designer_textlarger.png" ) ); - connect( fp1, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( fp1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *fm1 = new ToolBarItem( this, fontToolBar, tr( "Fontsize -1" ), "font size=\"-1\"", TQPixmap::fromMimeSource( "designer_textsmaller.png" ) ); - connect( fm1, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( fm1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h1 = new ToolBarItem( this, fontToolBar, tr( "Headline 1" ), "h1", TQPixmap::fromMimeSource( "designer_texth1.png" ) ); - connect( h1, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( h1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h2 = new ToolBarItem( this, fontToolBar, tr( "Headline 2" ), "h2", TQPixmap::fromMimeSource( "designer_texth2.png" ) ); - connect( h2, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( h2, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h3 = new ToolBarItem( this, fontToolBar, tr( "Headline 3" ), "h3", TQPixmap::fromMimeSource( "designer_texth3.png" ) ); - connect( h3, SIGNAL( clicked( const TQString& ) ), - this, SLOT( insertTags( const TQString& ))); + connect( h3, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *optionsMenu = new TQPopupMenu( this ); menuBar->insertItem( tr( "O&ptions" ), optionsMenu ); @@ -219,12 +219,12 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget wrapAction->setText( tr( "Word Wrapping" ) ); wrapAction->addTo( optionsToolBar ); wrapAction->addTo( optionsMenu ); - connect( wrapAction, SIGNAL( toggled( bool ) ), this, SLOT( changeWrapMode( bool ) ) ); + connect( wrapAction, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changeWrapMode( bool ) ) ); oldDoWrap = doWrap; wrapAction->setOn( doWrap ); - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); textEdit->document()->setFormatter( new TQTextFormatterBreakInWords ); textEdit->document()->setUseFormatCollection( FALSE ); textEdit->document()->setPreProcessor( new SyntaxHighlighter_HTML ); diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp index df7b99f2c..378fcabfe 100644 --- a/tools/designer/designer/newformimpl.cpp +++ b/tools/designer/designer/newformimpl.cpp @@ -372,7 +372,7 @@ NewForm::NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ) : NewFormBase( parent, 0, TRUE ) { - connect( helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); projectCombo->insertStringList( projects ); projectCombo->setCurrentText( currentProject ); diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp index 5d069f7ab..89c0b0553 100644 --- a/tools/designer/designer/outputwindow.cpp +++ b/tools/designer/designer/outputwindow.cpp @@ -76,10 +76,10 @@ void OutputWindow::setupError() { errorView = new TQListView( this, "OutputWindow::errorView" ); errorView->setSorting( -1 ); - connect( errorView, SIGNAL( currentChanged( TQListViewItem* ) ), - this, SLOT( currentErrorChanged( TQListViewItem* ) ) ); - connect( errorView, SIGNAL( clicked( TQListViewItem* ) ), - this, SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); if ( MetaDataBase::languages().count() > 1 ) addTab( errorView, tr( "Warnings/Errors" ) ); diff --git a/tools/designer/designer/paletteeditoradvancedimpl.cpp b/tools/designer/designer/paletteeditoradvancedimpl.cpp index f632f8b56..112a42490 100644 --- a/tools/designer/designer/paletteeditoradvancedimpl.cpp +++ b/tools/designer/designer/paletteeditoradvancedimpl.cpp @@ -76,7 +76,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); diff --git a/tools/designer/designer/paletteeditorimpl.cpp b/tools/designer/designer/paletteeditorimpl.cpp index 319f110e6..c23808f35 100644 --- a/tools/designer/designer/paletteeditorimpl.cpp +++ b/tools/designer/designer/paletteeditorimpl.cpp @@ -46,7 +46,7 @@ PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp index fc93bf882..037694e7d 100644 --- a/tools/designer/designer/pixmapchooser.cpp +++ b/tools/designer/designer/pixmapchooser.cpp @@ -164,7 +164,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T } } else { PixmapFunction dia( parent, 0, TRUE ); - TQObject::connect( dia.helpButton, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + TQObject::connect( dia.helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); diff --git a/tools/designer/designer/pixmapcollectioneditor.ui.h b/tools/designer/designer/pixmapcollectioneditor.ui.h index fbdaeeade..3cac8bb71 100644 --- a/tools/designer/designer/pixmapcollectioneditor.ui.h +++ b/tools/designer/designer/pixmapcollectioneditor.ui.h @@ -116,8 +116,8 @@ void PixmapCollectionEditor::setChooserMode( bool c ) buttonCancel->show(); buttonOk->setEnabled( FALSE ); buttonOk->setDefault( TRUE ); - connect( viewPixmaps, SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, SIGNAL( clicked() ) ); - connect( viewPixmaps, SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, SIGNAL( clicked() ) ); + connect( viewPixmaps, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); + connect( viewPixmaps, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); setCaption( tr( "Choose an Image" ) ); } else { buttonClose->show(); diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp index 9d95f54d2..f0903e000 100644 --- a/tools/designer/designer/popupmenueditor.cpp +++ b/tools/designer/designer/popupmenueditor.cpp @@ -110,7 +110,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * par { init(); a = new TQAction( this ); - TQObject::connect( a, SIGNAL( destroyed() ), this, SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); } @@ -152,7 +152,7 @@ PopupMenuEditorItem::~PopupMenuEditorItem() void PopupMenuEditorItem::init() { if ( a ) { - TQObject::connect( a, SIGNAL( destroyed() ), this, SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); if ( m && !isSeparator() ) { s = new PopupMenuEditor( m->formWindow(), m ); TQString n = "popupMenu"; @@ -847,7 +847,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) // Hide the sub menu of the current item, but do it later if ( currentIndex < (int)itemList.count() ) { PopupMenuEditor *s = itemList.at( currentIndex )->s; - TQTimer::singleShot( 0, s, SLOT( hide() ) ); + TQTimer::singleShot( 0, s, TQ_SLOT( hide() ) ); } draggedItem = 0; @@ -884,11 +884,11 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) if ( i ) { dropInPlace( i, e->pos().y() ); - TQTimer::singleShot( 0, this, SLOT( resizeToContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeToContents() ) ); } - TQTimer::singleShot( 0, this, SLOT( showSubMenu() ) ); - TQTimer::singleShot( 0, this, SLOT( setFocus() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showSubMenu() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( setFocus() ) ); dropLine->hide(); e->accept(); } diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp index aadadc82f..02899830a 100644 --- a/tools/designer/designer/project.cpp +++ b/tools/designer/designer/project.cpp @@ -1351,9 +1351,9 @@ void Project::addObject( TQObject *o ) if ( MainWindow::self ) { TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), TQEvent::ChildInserted ); connect( fw, - SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), MainWindow::self, - SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) + TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); } if ( fw->parentWidget() ) { @@ -1527,9 +1527,9 @@ void Project::designerCreated() if ( !fw || fw->mainWindow() ) continue; fw->setMainWindow( MainWindow::self ); - connect( fw, SIGNAL( undoRedoChanged( bool, bool, const TQString &, + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - MainWindow::self, SLOT( updateUndoRedo( bool, bool, + MainWindow::self, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), FALSE ); TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp index 87800fa00..19f6fedeb 100644 --- a/tools/designer/designer/projectsettingsimpl.cpp +++ b/tools/designer/designer/projectsettingsimpl.cpp @@ -61,7 +61,7 @@ ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : ProjectSettingsBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editProjectFile->setFocus(); diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index 8f0cd223b..5058a3618 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -416,8 +416,8 @@ void PropertyItem::createResetButton() hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - TQObject::connect( resetButton, SIGNAL( clicked() ), - listview, SLOT( resetProperty() ) ); + TQObject::connect( resetButton, TQ_SIGNAL( clicked() ), + listview, TQ_SLOT( resetProperty() ) ); TQToolTip::add( resetButton, PropertyEditor::tr( "Reset the property to its default value" ) ); TQWhatsThis::add( resetButton, PropertyEditor::tr( "Click this button to reset the property to its default value" ) ); updateResetButtonState(); @@ -613,18 +613,18 @@ TQLineEdit *PropertyTextItem::lined() button = new TQPushButton( tr("..."), box ); setupStyle( button ); button->setFixedWidth( 20 ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getText() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getText() ) ); lin->setFrame( FALSE ); } - connect( lin, SIGNAL( returnPressed() ), - this, SLOT( setValue() ) ); - connect( lin, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, SIGNAL( returnPressed() ), + connect( lin, TQ_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - SLOT( checkCompressedCommand() ) ); + TQ_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } @@ -782,10 +782,10 @@ TQLineEdit *PropertyDoubleItem::lined() lin = new TQLineEdit( listview->viewport() ); lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, SIGNAL( returnPressed() ), - this, SLOT( setValue() ) ); - connect( lin, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } @@ -864,8 +864,8 @@ TQDateEdit *PropertyDateItem::lined() for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, SIGNAL( valueChanged( const TQDate & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ), + this, TQ_SLOT( setValue() ) ); return lin; } @@ -935,8 +935,8 @@ TQTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new TQTimeEdit( listview->viewport() ); - connect( lin, SIGNAL( valueChanged( const TQTime & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1010,8 +1010,8 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new TQDateTimeEdit( listview->viewport() ); - connect( lin, SIGNAL( valueChanged( const TQDateTime & ) ), - this, SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1088,8 +1088,8 @@ TQComboBox *PropertyBoolItem::combo() comb->hide(); comb->insertItem( tr( "False" ) ); comb->insertItem( tr( "True" ) ); - connect( comb, SIGNAL( activated( int ) ), - this, SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -1185,8 +1185,8 @@ TQSpinBox *PropertyIntItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, SIGNAL( valueChanged( int ) ), - this, SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1281,8 +1281,8 @@ TQSpinBox* PropertyLayoutItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, SIGNAL( valueChanged( int ) ), - this, SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1346,8 +1346,8 @@ TQComboBox *PropertyListItem::combo() return comb; comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, SIGNAL( activated( int ) ), - this, SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { TQObjectList *ol = comb->queryList( "TQLineEdit" ); @@ -1643,8 +1643,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box->setLineWidth( 2 ); pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getPixmap() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() @@ -1746,8 +1746,8 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getColor() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() @@ -1868,8 +1868,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getFont() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() @@ -2268,8 +2268,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, box->setLineWidth( 2 ); palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, SIGNAL( clicked() ), - this, SLOT( getPalette() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { @@ -2375,8 +2375,8 @@ TQComboBox *PropertyCursorItem::combo() comb->insertItem( TQPixmap::fromMimeSource( "designer_hand.png" ), tr("Pointing Hand"), TQObject::PointingHandCursor ); comb->insertItem( TQPixmap::fromMimeSource( "designer_no.png" ), tr("Forbidden"), TQObject::ForbiddenCursor ); - connect( comb, SIGNAL( activated( int ) ), - this, SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -2443,8 +2443,8 @@ PropertyKeysequenceItem::PropertyKeysequenceItem( PropertyList *l, box = new TQHBox( listview->viewport() ); box->hide(); sequence = new TQLineEdit( box ); - connect( sequence, SIGNAL(textChanged( const TQString & )), - this, SLOT(setValue()) ); + connect( sequence, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(setValue()) ); sequence->installEventFilter( this ); } @@ -2644,8 +2644,8 @@ EnumBox::EnumBox( TQWidget *parent, const char *name ) : TQComboBox( parent, name ) { pop = new EnumPopup( this, "popup", TQObject::WType_Popup ); - connect( pop, SIGNAL( hidden() ), this, SLOT( popupHidden() ) ); - connect( pop, SIGNAL( closed() ), this, SLOT( popupClosed() ) ); + connect( pop, TQ_SIGNAL( hidden() ), this, TQ_SLOT( popupHidden() ) ); + connect( pop, TQ_SIGNAL( closed() ), this, TQ_SLOT( popupClosed() ) ); popupShown = FALSE; arrowDown = FALSE; } @@ -2740,14 +2740,14 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) } popup(); - TQTimer::singleShot( 100, this, SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } void EnumBox::keyPressEvent( TQKeyEvent *e ) { if ( e->key() == Key_Space ) { popup(); - TQTimer::singleShot( 100, this, SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } else if ( e->key() == Key_Enter || e->key() == Key_Return ) { popup(); } @@ -2776,8 +2776,8 @@ PropertyEnumItem::PropertyEnumItem( PropertyList *l, box = new EnumBox( listview->viewport() ); box->hide(); box->installEventFilter( listview ); - connect( box, SIGNAL( aboutToShowPopup() ), this, SLOT( insertEnums() ) ); - connect( box, SIGNAL( valueChanged() ), this, SLOT( setValue() ) ); + connect( box, TQ_SIGNAL( aboutToShowPopup() ), this, TQ_SLOT( insertEnums() ) ); + connect( box, TQ_SIGNAL( valueChanged() ), this, TQ_SLOT( setValue() ) ); } PropertyEnumItem::~PropertyEnumItem() @@ -2907,16 +2907,16 @@ PropertyList::PropertyList( PropertyEditor *e ) viewport()->installEventFilter( this ); addColumn( tr( "Property" ) ); addColumn( tr( "Value" ) ); - connect( header(), SIGNAL( sizeChange( int, int, int ) ), - this, SLOT( updateEditorSize() ) ); - disconnect( header(), SIGNAL( sectionClicked( int ) ), - this, SLOT( changeSortColumn( int ) ) ); - connect( header(), SIGNAL( sectionClicked( int ) ), - this, SLOT( toggleSort() ) ); - connect( this, SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), - this, SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem * ) ), - this, SLOT( toggleOpen( TQListViewItem * ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( toggleSort() ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); @@ -3556,7 +3556,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) return TRUE; } } else if ( e->type() == TQEvent::FocusOut && ::tqt_cast<TQLineEdit*>(o) && editor->formWindow() ) { - TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), SLOT( checkCompressedCommand() ) ); + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) ); } else if ( o == viewport() ) { TQMouseEvent *me; PropertyListItem* i; @@ -3908,8 +3908,8 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) header()->hide(); removeColumn( 1 ); setRootIsDecorated( TRUE ); - connect( this, SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); } TQString clean_arguments( const TQString &s ) diff --git a/tools/designer/designer/qcompletionedit.cpp b/tools/designer/designer/qcompletionedit.cpp index febde1052..79cdae62c 100644 --- a/tools/designer/designer/qcompletionedit.cpp +++ b/tools/designer/designer/qcompletionedit.cpp @@ -52,8 +52,8 @@ TQCompletionEdit::TQCompletionEdit( TQWidget *parent, const char *name ) listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, SIGNAL( textChanged( const TQString & ) ), - this, SLOT( textDidChange( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } diff --git a/tools/designer/designer/sourceeditor.cpp b/tools/designer/designer/sourceeditor.cpp index 823a39f00..32df118bf 100644 --- a/tools/designer/designer/sourceeditor.cpp +++ b/tools/designer/designer/sourceeditor.cpp @@ -52,7 +52,7 @@ SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageIn lIface->addRef(); editor = iFace->editor( MainWindow::self->areEditorsReadOnly(), this, MainWindow::self->designerInterface() ); - iFace->onBreakPointChange( MainWindow::self, SLOT( breakPointsChanged() ) ); + iFace->onBreakPointChange( MainWindow::self, TQ_SLOT( breakPointsChanged() ) ); resize( 600, 400 ); setIcon( TQPixmap::fromMimeSource( "designer_filenew.png" ) ); } diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp index 2328360f6..0b5200fdd 100644 --- a/tools/designer/designer/startdialogimpl.cpp +++ b/tools/designer/designer/startdialogimpl.cpp @@ -40,13 +40,13 @@ StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath ) initFileOpen(); showInFuture = TRUE; - connect( buttonHelp, SIGNAL( clicked() ), - MainWindow::self, SLOT( showDialogHelp() ) ); - connect( recentView, SIGNAL( doubleClicked(TQIconViewItem*) ), - this, SLOT( accept() ) ); - connect( recentView, SIGNAL( returnPressed(TQIconViewItem*) ), - this, SLOT( accept() ) ); - connect( fd, SIGNAL( fileSelected() ), this, SLOT( accept() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), + MainWindow::self, TQ_SLOT( showDialogHelp() ) ); + connect( recentView, TQ_SIGNAL( doubleClicked(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( recentView, TQ_SIGNAL( returnPressed(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( fd, TQ_SIGNAL( fileSelected() ), this, TQ_SLOT( accept() ) ); } void StartDialog::accept() diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp index c60c0944d..22096d36e 100644 --- a/tools/designer/designer/styledbutton.cpp +++ b/tools/designer/designer/styledbutton.cpp @@ -51,7 +51,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) setMinimumSize( minimumSizeHint() ); setAcceptDrops( TRUE ); - connect( this, SIGNAL(clicked()), SLOT(onEditor())); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(onEditor())); setEditor( ColorEditor ); } diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp index 34100071e..2a82127fb 100644 --- a/tools/designer/designer/tableeditorimpl.cpp +++ b/tools/designer/designer/tableeditorimpl.cpp @@ -58,7 +58,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f #endif formWindow( fw ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); #ifndef TQT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); diff --git a/tools/designer/designer/timestamp.cpp b/tools/designer/designer/timestamp.cpp index 3996108a8..f9bb3f1b5 100644 --- a/tools/designer/designer/timestamp.cpp +++ b/tools/designer/designer/timestamp.cpp @@ -41,7 +41,7 @@ TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) : TQObject( parent ), filename( f ), autoCheck( FALSE ) { timer = new TQTimer( this ); - connect( timer, SIGNAL( timeout() ), this, SLOT( autoCheckTimeStamp() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoCheckTimeStamp() ) ); update(); } diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp index 4a094105b..7a2e45865 100644 --- a/tools/designer/designer/widgetfactory.cpp +++ b/tools/designer/designer/widgetfactory.cpp @@ -302,8 +302,8 @@ TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *parent, const char *name next->setAutoRaise( TRUE ); next->setAutoRepeat( TRUE ); next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); - connect( prev, SIGNAL( clicked() ), this, SLOT( prevPage() ) ); - connect( next, SIGNAL( clicked() ), this, SLOT( nextPage() ) ); + connect( prev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevPage() ) ); + connect( next, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPage() ) ); updateButtons(); } @@ -865,7 +865,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); MetaDataBase::addEntry( dw ); wiz->addPage( dw, FormWindow::tr( "Page" ) ); - TQTimer::singleShot( 0, wiz, SLOT( next() ) ); + TQTimer::singleShot( 0, wiz, TQ_SLOT( next() ) ); } return wiz; } else if ( className == "Spacer" ) { diff --git a/tools/designer/designer/wizardeditorimpl.cpp b/tools/designer/designer/wizardeditorimpl.cpp index 47468ceab..a04a33f36 100644 --- a/tools/designer/designer/wizardeditorimpl.cpp +++ b/tools/designer/designer/wizardeditorimpl.cpp @@ -46,19 +46,19 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) { - connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); fillListBox(); // Add drag and drop ListBoxDnd *listBoxDnd = new ListBoxDnd( listBox ); listBoxDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( listBoxDnd, SIGNAL( dropped( TQListBoxItem * ) ), - listBoxDnd, SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + listBoxDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, SIGNAL( dragged( TQListBoxItem * ) ), - this, SLOT( itemDragged( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, SIGNAL( dropped( TQListBoxItem * ) ), - this, SLOT( itemDropped( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dragged( TQListBoxItem * ) ), + this, TQ_SLOT( itemDragged( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + this, TQ_SLOT( itemDropped( TQListBoxItem * ) ) ); // Add in-place rename new ListBoxRename( listBox ); diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp index ff0d68688..2a7f194f0 100644 --- a/tools/designer/designer/workspace.cpp +++ b/tools/designer/designer/workspace.cpp @@ -82,8 +82,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) project = p; t = ObjectType; setPixmap( 0, TQPixmap::fromMimeSource( "designer_object.png" ) ); - TQObject::connect( p->fakeFormFileFor( o ), SIGNAL( somethingChanged(FormFile*) ), - listView(), SLOT( update() ) ); + TQObject::connect( p->fakeFormFileFor( o ), TQ_SIGNAL( somethingChanged(FormFile*) ), + listView(), TQ_SLOT( update() ) ); } WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) @@ -94,7 +94,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, TQPixmap::fromMimeSource( "designer_form.png" ) ); - TQObject::connect( ff, SIGNAL( somethingChanged(FormFile*) ), listView(), SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); if ( formFile->supportsCodeFile() ) { (void) new WorkspaceItem( this, formFile, FormSourceType ); } @@ -294,12 +294,12 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw ) #endif addColumn( tr( "Files" ) ); setAllColumnsShowFocus( TRUE ); - connect( this, SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), - this, SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), - connect( this, SIGNAL( doubleClicked( TQListViewItem * ) ), - this, SLOT( itemDoubleClicked( TQListViewItem * ) ) ), - connect( this, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); viewport()->setAcceptDrops( TRUE ); @@ -321,23 +321,23 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, SIGNAL( sourceFileAdded(SourceFile*) ), this, SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, SIGNAL( sourceFileRemoved(SourceFile*) ), this, SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, SIGNAL( formFileAdded(FormFile*) ), this, SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, SIGNAL( formFileRemoved(FormFile*) ), this, SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, SIGNAL( objectAdded(TQObject*) ), this, SLOT( objectAdded(TQObject*) ) ); - disconnect( project, SIGNAL( objectRemoved(TQObject*) ), this, SLOT( objectRemoved(TQObject*) ) ); - disconnect( project, SIGNAL( projectModified() ), this, SLOT( update() ) ); + disconnect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); } project = pro; - connect( project, SIGNAL( sourceFileAdded(SourceFile*) ), this, SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, SIGNAL( sourceFileRemoved(SourceFile*) ), this, SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, SIGNAL( formFileAdded(FormFile*) ), this, SLOT( formFileAdded(FormFile*) ) ); - connect( project, SIGNAL( formFileRemoved(FormFile*) ), this, SLOT( formFileRemoved(FormFile*) ) ); - connect( project, SIGNAL( destroyed(TQObject*) ), this, SLOT( projectDestroyed(TQObject*) ) ); - connect( project, SIGNAL( objectAdded(TQObject*) ), this, SLOT( objectAdded(TQObject*) ) ); - connect( project, SIGNAL( objectRemoved(TQObject*) ), this, SLOT( objectRemoved(TQObject*) ) ); - connect( project, SIGNAL( projectModified() ), this, SLOT( update() ) ); + connect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQ_SIGNAL( destroyed(TQObject*) ), this, TQ_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + connect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -658,8 +658,8 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) void Workspace::setBufferEdit( TQCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, SIGNAL( chosen( const TQString & ) ), - this, SLOT( bufferChosen( const TQString & ) ) ); + connect( bufferEdit, TQ_SIGNAL( chosen( const TQString & ) ), + this, TQ_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp index c49066c0c..90bf4a8dd 100644 --- a/tools/designer/editor/arghintwidget.cpp +++ b/tools/designer/editor/arghintwidget.cpp @@ -180,8 +180,8 @@ ArgHintWidget::ArgHintWidget( TQWidget *parent, const char*name ) hbox->addWidget( ( next = new ArrowButton( this, "editor_right_btn", ArrowButton::Right ) ) ); funcLabel->setBackgroundColor( white ); funcLabel->setAlignment( AlignCenter ); - connect( prev, SIGNAL( clicked() ), this, SLOT( gotoPrev() ) ); - connect( next, SIGNAL( clicked() ), this, SLOT( gotoNext() ) ); + connect( prev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( gotoPrev() ) ); + connect( next, TQ_SIGNAL( clicked() ), this, TQ_SLOT( gotoNext() ) ); updateState(); setFocusPolicy( NoFocus ); prev->setFocusPolicy( NoFocus ); diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp index 77499c8d2..fb7365058 100644 --- a/tools/designer/editor/completion.cpp +++ b/tools/designer/editor/completion.cpp @@ -670,7 +670,7 @@ bool EditorCompletion::doArgumentHint( bool useIndex ) functionLabel->show(); curEditor->setFocus(); } - TQTimer::singleShot( 0, functionLabel, SLOT( relayout() ) ); + TQTimer::singleShot( 0, functionLabel, TQ_SLOT( relayout() ) ); return TRUE; } diff --git a/tools/designer/editor/editor.cpp b/tools/designer/editor/editor.cpp index cba812362..58b5ed90d 100644 --- a/tools/designer/editor/editor.cpp +++ b/tools/designer/editor/editor.cpp @@ -50,8 +50,8 @@ Editor::Editor( const TQString &fn, TQWidget *parent, const char *name ) setVScrollBarMode( TQScrollView::AlwaysOn ); document()->setUseFormatCollection( FALSE ); parenMatcher = new ParenMatcher; - connect( this, SIGNAL( cursorPositionChanged( TQTextCursor * ) ), - this, SLOT( cursorPosChanged( TQTextCursor * ) ) ); + connect( this, TQ_SIGNAL( cursorPositionChanged( TQTextCursor * ) ), + this, TQ_SLOT( cursorPosChanged( TQTextCursor * ) ) ); cfg = new Config; document()->addSelection( Error ); document()->addSelection( Step ); @@ -68,10 +68,10 @@ Editor::Editor( const TQString &fn, TQWidget *parent, const char *name ) accelComment = new TQAccel( this ); accelComment->connectItem( accelComment->insertItem( ALT + Key_C ), - this, SLOT( commentSelection() ) ); + this, TQ_SLOT( commentSelection() ) ); accelUncomment = new TQAccel( this ); accelUncomment->connectItem( accelUncomment->insertItem( ALT + Key_U ), - this, SLOT( uncommentSelection() ) ); + this, TQ_SLOT( uncommentSelection() ) ); editable = TRUE; } @@ -202,8 +202,8 @@ TQPopupMenu *Editor::createPopupMenu( const TQPoint &p ) { TQPopupMenu *menu = TQTextEdit::createPopupMenu( p ); menu->insertSeparator(); - menu->insertItem( tr( "C&omment Code\tAlt+C" ), this, SLOT( commentSelection() ) ); - menu->insertItem( tr( "Unco&mment Code\tAlt+U" ), this, SLOT( uncommentSelection() ) ); + menu->insertItem( tr( "C&omment Code\tAlt+C" ), this, TQ_SLOT( commentSelection() ) ); + menu->insertItem( tr( "Unco&mment Code\tAlt+U" ), this, TQ_SLOT( uncommentSelection() ) ); return menu; } diff --git a/tools/designer/editor/viewmanager.cpp b/tools/designer/editor/viewmanager.cpp index 96c106f03..e3627bf5e 100644 --- a/tools/designer/editor/viewmanager.cpp +++ b/tools/designer/editor/viewmanager.cpp @@ -46,24 +46,24 @@ ViewManager::ViewManager( TQWidget *parent, const char *name ) { TQHBoxLayout *l = new TQHBoxLayout( this ); markerWidget = new MarkerWidget( this, "editor_markerwidget" ); - connect( markerWidget, SIGNAL( markersChanged() ), - this, SIGNAL( markersChanged() ) ); - connect( markerWidget, SIGNAL( collapseFunction( TQTextParagraph * ) ), - this, SIGNAL( collapseFunction( TQTextParagraph * ) ) ); - connect( markerWidget, SIGNAL( expandFunction( TQTextParagraph * ) ), - this, SIGNAL( expandFunction( TQTextParagraph * ) ) ); - connect( markerWidget, SIGNAL( collapse( bool ) ), - this, SIGNAL( collapse( bool ) ) ); - connect( markerWidget, SIGNAL( expand( bool ) ), - this, SIGNAL( expand( bool ) ) ); - connect( markerWidget, SIGNAL( editBreakPoints() ), - this, SIGNAL( editBreakPoints() ) ); - connect( markerWidget, SIGNAL( isBreakpointPossible( bool&, const TQString &, int ) ), - this, SIGNAL( isBreakpointPossible( bool&, const TQString &, int ) ) ); - connect( markerWidget, SIGNAL( showMessage( const TQString & ) ), - this, SLOT( showMessage( const TQString & ) ) ); + connect( markerWidget, TQ_SIGNAL( markersChanged() ), + this, TQ_SIGNAL( markersChanged() ) ); + connect( markerWidget, TQ_SIGNAL( collapseFunction( TQTextParagraph * ) ), + this, TQ_SIGNAL( collapseFunction( TQTextParagraph * ) ) ); + connect( markerWidget, TQ_SIGNAL( expandFunction( TQTextParagraph * ) ), + this, TQ_SIGNAL( expandFunction( TQTextParagraph * ) ) ); + connect( markerWidget, TQ_SIGNAL( collapse( bool ) ), + this, TQ_SIGNAL( collapse( bool ) ) ); + connect( markerWidget, TQ_SIGNAL( expand( bool ) ), + this, TQ_SIGNAL( expand( bool ) ) ); + connect( markerWidget, TQ_SIGNAL( editBreakPoints() ), + this, TQ_SIGNAL( editBreakPoints() ) ); + connect( markerWidget, TQ_SIGNAL( isBreakpointPossible( bool&, const TQString &, int ) ), + this, TQ_SIGNAL( isBreakpointPossible( bool&, const TQString &, int ) ) ); + connect( markerWidget, TQ_SIGNAL( showMessage( const TQString & ) ), + this, TQ_SLOT( showMessage( const TQString & ) ) ); messageTimer = new TQTimer( this ); - connect( messageTimer, SIGNAL( timeout() ), this, SLOT( clearStatusBar() ) ); + connect( messageTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( clearStatusBar() ) ); markerWidget->setFixedWidth( fontMetrics().width( "0000" ) + 20 ); l->addWidget( markerWidget ); layout = new TQVBoxLayout( l ); @@ -73,12 +73,12 @@ void ViewManager::addView( TQWidget *view ) { layout->addWidget( view ); curView = view; - connect( ( (Editor*)curView )->verticalScrollBar(), SIGNAL( valueChanged( int ) ), - markerWidget, SLOT( doRepaint() ) ); - connect( (Editor*)curView, SIGNAL( textChanged() ), - markerWidget, SLOT( doRepaint() ) ); - connect( (Editor*)curView, SIGNAL( clearErrorMarker() ), - this, SLOT( clearErrorMarker() ) ); + connect( ( (Editor*)curView )->verticalScrollBar(), TQ_SIGNAL( valueChanged( int ) ), + markerWidget, TQ_SLOT( doRepaint() ) ); + connect( (Editor*)curView, TQ_SIGNAL( textChanged() ), + markerWidget, TQ_SLOT( doRepaint() ) ); + connect( (Editor*)curView, TQ_SIGNAL( clearErrorMarker() ), + this, TQ_SLOT( clearErrorMarker() ) ); posLabel = new TQLabel( this, "editor_poslabel" ); posLabel->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); posLabel->setText( " Line: 1 Col: 1" ); @@ -86,8 +86,8 @@ void ViewManager::addView( TQWidget *view ) posLabel->setLineWidth( 1 ); posLabel->setFixedHeight( posLabel->fontMetrics().height() ); layout->addWidget( posLabel ); - connect( curView, SIGNAL( cursorPositionChanged( int, int ) ), - this, SLOT( cursorPositionChanged( int, int ) ) ); + connect( curView, TQ_SIGNAL( cursorPositionChanged( int, int ) ), + this, TQ_SLOT( cursorPositionChanged( int, int ) ) ); } TQWidget *ViewManager::currentView() const diff --git a/tools/designer/examples/addressbook/addressbook.ui.h b/tools/designer/examples/addressbook/addressbook.ui.h index 83d177573..93f3d50e5 100644 --- a/tools/designer/examples/addressbook/addressbook.ui.h +++ b/tools/designer/examples/addressbook/addressbook.ui.h @@ -16,14 +16,14 @@ void AddressBook::fileNew() { AddressDetails dia( this, 0, TRUE ); - connect( &dia, SIGNAL( newAddress( const TQString &, + connect( &dia, TQ_SIGNAL( newAddress( const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString & ) ), - this, SLOT( insertAddress( const TQString &, + this, TQ_SLOT( insertAddress( const TQString &, const TQString &, const TQString &, const TQString &, @@ -118,8 +118,8 @@ void AddressBook::fileExit() void AddressBook::editFind() { SearchDialog dia( this, 0, TRUE ); - connect( &dia, SIGNAL( searchAddress( const TQString & ) ), - this, SLOT( searchAddress( const TQString & ) ) ); + connect( &dia, TQ_SIGNAL( searchAddress( const TQString & ) ), + this, TQ_SLOT( searchAddress( const TQString & ) ) ); dia.exec(); } diff --git a/tools/designer/examples/addressbook/main.cpp b/tools/designer/examples/addressbook/main.cpp index 4b80e6d3e..0359e37c0 100644 --- a/tools/designer/examples/addressbook/main.cpp +++ b/tools/designer/examples/addressbook/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char ** argv ) TQApplication a( argc, argv ); AddressBook *w = new AddressBook; w->show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); return a.exec(); } diff --git a/tools/designer/examples/colortool/mainform.ui.h b/tools/designer/examples/colortool/mainform.ui.h index c6343f957..7a0f8a8db 100644 --- a/tools/designer/examples/colortool/mainform.ui.h +++ b/tools/designer/examples/colortool/mainform.ui.h @@ -356,8 +356,8 @@ void MainForm::editFind() { if ( ! findForm ) { findForm = new FindForm( this ); - connect( findForm, SIGNAL( lookfor(const TQString&) ), - this, SLOT( lookfor(const TQString&) ) ); + connect( findForm, TQ_SIGNAL( lookfor(const TQString&) ), + this, TQ_SLOT( lookfor(const TQString&) ) ); } findForm->show(); } diff --git a/tools/designer/examples/credit/creditformbase.cpp b/tools/designer/examples/credit/creditformbase.cpp index 51c5e6a40..372a756d3 100644 --- a/tools/designer/examples/credit/creditformbase.cpp +++ b/tools/designer/examples/credit/creditformbase.cpp @@ -106,10 +106,10 @@ CreditFormBase::CreditFormBase( TQWidget* parent, const char* name, bool modal, // signals and slots connections - connect( okPushButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( cancelPushButton, SIGNAL( clicked() ), this, SLOT( reject() ) ); - connect( creditButtonGroup, SIGNAL( clicked(int) ), this, SLOT( setAmount() ) ); - connect( specialRadioButton, SIGNAL( toggled(bool) ), amountSpinBox, SLOT( setEnabled(bool) ) ); + connect( okPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( cancelPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); + connect( creditButtonGroup, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( setAmount() ) ); + connect( specialRadioButton, TQ_SIGNAL( toggled(bool) ), amountSpinBox, TQ_SLOT( setEnabled(bool) ) ); } /* diff --git a/tools/designer/examples/filechooser/widget/filechooser.cpp b/tools/designer/examples/filechooser/widget/filechooser.cpp index 3b510baf1..4e886829e 100644 --- a/tools/designer/examples/filechooser/widget/filechooser.cpp +++ b/tools/designer/examples/filechooser/widget/filechooser.cpp @@ -13,15 +13,15 @@ FileChooser::FileChooser( TQWidget *parent, const char *name ) lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, SIGNAL( textChanged( const TQString & ) ), - this, SIGNAL( fileNameChanged( const TQString & ) ) ); + connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, SIGNAL( clicked() ), - this, SLOT( chooseFile() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } diff --git a/tools/designer/examples/metric/main.cpp b/tools/designer/examples/metric/main.cpp index 8fe7bf6fc..00ec8c418 100644 --- a/tools/designer/examples/metric/main.cpp +++ b/tools/designer/examples/metric/main.cpp @@ -7,6 +7,6 @@ int main( int argc, char ** argv ) ConversionForm *w = new ConversionForm; w->show(); a.setMainWidget( w ); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); return a.exec(); } diff --git a/tools/designer/examples/multiclip/multiclip.ui.h b/tools/designer/examples/multiclip/multiclip.ui.h index a4287fa44..203fc6906 100644 --- a/tools/designer/examples/multiclip/multiclip.ui.h +++ b/tools/designer/examples/multiclip/multiclip.ui.h @@ -36,9 +36,9 @@ void MulticlipForm::init() currentLineEdit->setFocus(); cb = tqApp->clipboard(); - connect( cb, SIGNAL( dataChanged() ), SLOT( dataChanged() ) ); + connect( cb, TQ_SIGNAL( dataChanged() ), TQ_SLOT( dataChanged() ) ); if ( cb->supportsSelection() ) - connect( cb, SIGNAL( selectionChanged() ), SLOT( selectionChanged() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) ); dataChanged(); } diff --git a/tools/designer/examples/vcr/vcr.cpp b/tools/designer/examples/vcr/vcr.cpp index fd39e1a98..d5b36f4d7 100644 --- a/tools/designer/examples/vcr/vcr.cpp +++ b/tools/designer/examples/vcr/vcr.cpp @@ -99,19 +99,19 @@ Vcr::Vcr( TQWidget *parent, const char *name ) TQPushButton *rewind = new TQPushButton( TQPixmap( rewind_xpm ), 0, this, "vcr_rewind" ); layout->addWidget( rewind ); - connect( rewind, SIGNAL(clicked()), SIGNAL(rewind()) ); + connect( rewind, TQ_SIGNAL(clicked()), TQ_SIGNAL(rewind()) ); TQPushButton *play = new TQPushButton( TQPixmap( play_xpm ), 0, this, "vcr_play" ); layout->addWidget( play ); - connect( play, SIGNAL(clicked()), SIGNAL(play()) ); + connect( play, TQ_SIGNAL(clicked()), TQ_SIGNAL(play()) ); TQPushButton *next = new TQPushButton( TQPixmap( next_xpm ), 0, this, "vcr_next" ); layout->addWidget( next ); - connect( next, SIGNAL(clicked()), SIGNAL(next()) ); + connect( next, TQ_SIGNAL(clicked()), TQ_SIGNAL(next()) ); TQPushButton *stop = new TQPushButton( TQPixmap( stop_xpm ), 0, this, "vcr_stop" ); layout->addWidget( stop ); - connect( stop, SIGNAL(clicked()), SIGNAL(stop()) ); + connect( stop, TQ_SIGNAL(clicked()), TQ_SIGNAL(stop()) ); } diff --git a/tools/designer/plugins/cppeditor/cppeditor.cpp b/tools/designer/plugins/cppeditor/cppeditor.cpp index 13069230c..8b567ab20 100644 --- a/tools/designer/plugins/cppeditor/cppeditor.cpp +++ b/tools/designer/plugins/cppeditor/cppeditor.cpp @@ -108,9 +108,9 @@ TQPopupMenu *CppEditor::createPopupMenu( const TQPoint &p ) { TQPopupMenu *m = Editor::createPopupMenu( p ); m->insertSeparator(); - int adddeclid = m->insertItem( tr( "Add Include File (in Declaration)..." ), this, SLOT( addInclDecl() ) ); - int addimplid = m->insertItem( tr( "Add Include File (in Implementation)..." ), this, SLOT( addInclImpl() ) ); - int addforid = m->insertItem( tr( "Add Forward Declaration..." ), this, SLOT( addForward() ) ); + int adddeclid = m->insertItem( tr( "Add Include File (in Declaration)..." ), this, TQ_SLOT( addInclDecl() ) ); + int addimplid = m->insertItem( tr( "Add Include File (in Implementation)..." ), this, TQ_SLOT( addInclImpl() ) ); + int addforid = m->insertItem( tr( "Add Forward Declaration..." ), this, TQ_SLOT( addForward() ) ); if ( !dIface->currentForm() ) { m->setItemEnabled( adddeclid, FALSE ); m->setItemEnabled( addimplid, FALSE ); diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp index 22e51cf49..7b7747f3b 100644 --- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp @@ -45,8 +45,8 @@ EditorInterfaceImpl::EditorInterfaceImpl() : EditorInterface(), viewManager( 0 ), dIface( 0 ) { updateTimer = new TQTimer( this ); - connect( updateTimer, SIGNAL( timeout() ), - this, SLOT( update() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( update() ) ); } EditorInterfaceImpl::~EditorInterfaceImpl() @@ -82,7 +82,7 @@ TQWidget *EditorInterfaceImpl::editor( bool readonly, CppEditor *e = new CppEditor( TQString::null, viewManager, "editor", dIface ); e->setEditable( !readonly ); e->installEventFilter( this ); - connect( e, SIGNAL( intervalChanged() ), this, SLOT( intervalChanged() ) ); + connect( e, TQ_SIGNAL( intervalChanged() ), this, TQ_SLOT( intervalChanged() ) ); TQApplication::sendPostedEvents( viewManager, TQEvent::ChildInserted ); } return viewManager->currentView(); @@ -93,10 +93,10 @@ void EditorInterfaceImpl::setText( const TQString &txt ) if ( !viewManager || !viewManager->currentView() ) return; CppEditor *e = (CppEditor*)viewManager->currentView(); - disconnect( e, SIGNAL( modificationChanged( bool ) ), this, SLOT( modificationChanged( bool ) ) ); + disconnect( e, TQ_SIGNAL( modificationChanged( bool ) ), this, TQ_SLOT( modificationChanged( bool ) ) ); e->setText( txt ); e->setModified( FALSE ); - connect( e, SIGNAL( modificationChanged( bool ) ), this, SLOT( modificationChanged( bool ) ) ); + connect( e, TQ_SIGNAL( modificationChanged( bool ) ), this, TQ_SLOT( modificationChanged( bool ) ) ); } TQString EditorInterfaceImpl::text() const @@ -334,5 +334,5 @@ void EditorInterfaceImpl::onBreakPointChange( TQObject *receiver, const char *sl { if ( !viewManager ) return; - connect( viewManager, SIGNAL( markersChanged() ), receiver, slot ); + connect( viewManager, TQ_SIGNAL( markersChanged() ), receiver, slot ); } diff --git a/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp index a0b174b72..96a5d217d 100644 --- a/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp @@ -91,8 +91,8 @@ PreferenceInterface::Preference *PreferenceInterfaceImpl::preference() pf->tab = cppEditorSyntax; pf->title = "C++ Editor"; pf->receiver = pf->tab; - pf->init_slot = SLOT( reInit() ); - pf->accept_slot = SLOT( save() ); + pf->init_slot = TQ_SLOT( reInit() ); + pf->accept_slot = TQ_SLOT( save() ); return pf; } diff --git a/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp index 8f042a714..5bbc9bdc5 100644 --- a/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp @@ -69,8 +69,8 @@ ProjectSettingsInterface::ProjectSettings *ProjectSettingsInterfaceImpl::project pf->tab = settingsTab; pf->title = "C++"; pf->receiver = pf->tab; - pf->init_slot = SLOT( reInit( TQUnknownInterface * ) ); - pf->accept_slot = SLOT( save( TQUnknownInterface * ) ); + pf->init_slot = TQ_SLOT( reInit( TQUnknownInterface * ) ); + pf->accept_slot = TQ_SLOT( save( TQUnknownInterface * ) ); return pf; } diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp index a140903f9..fbf6f059d 100644 --- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp @@ -76,7 +76,7 @@ static TQString generateMainCppCode( const TQString &formname, const TQString &i code += " TQApplication a( argc, argv );\n"; code += " " + formname + " w;\n"; code += " w.show();\n"; - code += " a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );\n"; + code += " a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) );\n"; code += " return a.exec();\n"; code += "}\n"; return code; diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index 5da841fe6..adb283a79 100644 --- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -91,7 +91,7 @@ SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, mode = View; } - connect( nextButton(), SIGNAL(clicked()), SLOT(nextPageClicked()) ); + connect( nextButton(), TQ_SIGNAL(clicked()), TQ_SLOT(nextPageClicked()) ); setupPage1(); } diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp index 198f2c089..42ee08cb1 100644 --- a/tools/designer/uic/form.cpp +++ b/tools/designer/uic/form.cpp @@ -1179,8 +1179,8 @@ void Uic::createFormImpl( const TQDomElement &e ) if ( receiver == objName ) receiver = "this"; - out << indent << "connect( " << sender << ", SIGNAL( " << signal << " ), " - << receiver << ", SLOT( " << slot << " ) );" << endl; + out << indent << "connect( " << sender << ", TQ_SIGNAL( " << signal << " ), " + << receiver << ", TQ_SLOT( " << slot << " ) );" << endl; } } else if ( n.tagName() == "tabstops" ) { // setup tab order diff --git a/tools/designer/uilib/test/main.cpp b/tools/designer/uilib/test/main.cpp index 1a8c14a02..f6ccfd757 100644 --- a/tools/designer/uilib/test/main.cpp +++ b/tools/designer/uilib/test/main.cpp @@ -45,6 +45,6 @@ int main( int argc, char ** argv ) if ( !w ) return 0; w->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); + a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/tools/linguist/linguist/finddialog.cpp b/tools/linguist/linguist/finddialog.cpp index c3eee1f6d..3978b974c 100644 --- a/tools/linguist/linguist/finddialog.cpp +++ b/tools/linguist/linguist/finddialog.cpp @@ -58,9 +58,9 @@ FindDialog::FindDialog( bool replace, TQWidget *parent, const char *name, TQPushButton *findNxt = new TQPushButton( tr("&Find Next"), this, "find next" ); findNxt->setDefault( TRUE ); - connect( findNxt, SIGNAL(clicked()), this, SLOT(emitFindNext()) ); + connect( findNxt, TQ_SIGNAL(clicked()), this, TQ_SLOT(emitFindNext()) ); TQPushButton *cancel = new TQPushButton( tr("Cancel"), this, "cancel find" ); - connect( cancel, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); TQVBoxLayout *bl = new TQVBoxLayout( 6, "find button layout" ); bl->addWidget( findNxt ); @@ -79,10 +79,10 @@ FindDialog::FindDialog( bool replace, TQWidget *parent, const char *name, TQPushButton *replace = new TQPushButton( tr("&Replace"), this, "replace" ); - connect( replace, SIGNAL(clicked()), this, SLOT(emitReplace()) ); + connect( replace, TQ_SIGNAL(clicked()), this, TQ_SLOT(emitReplace()) ); TQPushButton *replaceAll = new TQPushButton( tr("Replace &All"), this, "replace all" ); - connect( replaceAll, SIGNAL(clicked()), this, SLOT(emitReplaceAll()) ); + connect( replaceAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(emitReplaceAll()) ); setTabOrder( findNxt, replace ); setTabOrder( replace, replaceAll ); setTabOrder( replaceAll, cancel ); diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp index ea0a6fa7d..5d2a785ea 100644 --- a/tools/linguist/linguist/msgedit.cpp +++ b/tools/linguist/linguist/msgedit.cpp @@ -234,7 +234,7 @@ EditorPage::EditorPage( TQWidget * parent, const char * name ) p = srcText->palette(); p.setColor( TQPalette::Disabled, TQColorGroup::Base, p.active().base() ); srcText->setPalette( p ); - connect( srcText, SIGNAL(textChanged()), SLOT(handleSourceChanges()) ); + connect( srcText, TQ_SIGNAL(textChanged()), TQ_SLOT(handleSourceChanges()) ); cmtText = new TQTextView( this, "comment/context view" ); cmtText->setFrameStyle( TQFrame::NoFrame ); @@ -247,7 +247,7 @@ EditorPage::EditorPage( TQWidget * parent, const char * name ) p.setColor( TQPalette::Active, TQColorGroup::Base, TQColor( 236,245,255 ) ); p.setColor( TQPalette::Inactive, TQColorGroup::Base, TQColor( 236,245,255 ) ); cmtText->setPalette( p ); - connect( cmtText, SIGNAL(textChanged()), SLOT(handleCommentChanges()) ); + connect( cmtText, TQ_SIGNAL(textChanged()), TQ_SLOT(handleCommentChanges()) ); translationMed = new MED( this, "translation editor" ); translationMed->setFrameStyle( TQFrame::NoFrame ); @@ -262,8 +262,8 @@ EditorPage::EditorPage( TQWidget * parent, const char * name ) p = translationMed->palette(); p.setColor( TQPalette::Disabled, TQColorGroup::Base, p.active().base() ); translationMed->setPalette( p ); - connect( translationMed, SIGNAL(textChanged()), - SLOT(handleTranslationChanges()) ); + connect( translationMed, TQ_SIGNAL(textChanged()), + TQ_SLOT(handleTranslationChanges()) ); pageCurl = new PageCurl( this, "page curl" ); @@ -444,8 +444,8 @@ MessageEditor::MessageEditor( MetaTranslator * t, TQWidget * parent, sv->viewport()->setBackgroundMode( PaletteBackground ); editorPage = new EditorPage( sv, "editor page" ); - connect( editorPage, SIGNAL(pageHeightUpdated(int)), - SLOT(updatePageHeight(int)) ); + connect( editorPage, TQ_SIGNAL(pageHeightUpdated(int)), + TQ_SLOT(updatePageHeight(int)) ); editorPage->translationMed->installEventFilter( this ); @@ -487,7 +487,7 @@ MessageEditor::MessageEditor( MetaTranslator * t, TQWidget * parent, vl->addWidget( phraseLv ); accel = new TQAccel( this, "accel" ); - connect( accel, SIGNAL(activated(int)), this, SLOT(guessActivated(int)) ); + connect( accel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(guessActivated(int)) ); for ( int i = 0; i < 9; i++ ) accel->insertItem( CTRL + (Key_1 + i), i + 1 ); @@ -498,29 +498,29 @@ MessageEditor::MessageEditor( MetaTranslator * t, TQWidget * parent, v->addWidget( bottomDock ); // Signals - connect( editorPage->pageCurl, SIGNAL(nextPage()), - SIGNAL(nextUnfinished()) ); - connect( editorPage->pageCurl, SIGNAL(prevPage()), - SIGNAL(prevUnfinished()) ); - - connect( editorPage->translationMed, SIGNAL(textChanged()), - this, SLOT(emitTranslationChanged()) ); - connect( editorPage->translationMed, SIGNAL(textChanged()), - this, SLOT(updateButtons()) ); - connect( editorPage->translationMed, SIGNAL(undoAvailable(bool)), - this, SIGNAL(undoAvailable(bool)) ); - connect( editorPage->translationMed, SIGNAL(redoAvailable(bool)), - this, SIGNAL(redoAvailable(bool)) ); - connect( editorPage->translationMed, SIGNAL(copyAvailable(bool)), - this, SIGNAL(cutAvailable(bool)) ); - connect( editorPage->translationMed, SIGNAL(copyAvailable(bool)), - this, SIGNAL(copyAvailable(bool)) ); - connect( tqApp->clipboard(), SIGNAL(dataChanged()), - this, SLOT(updateCanPaste()) ); - connect( phraseLv, SIGNAL(doubleClicked(TQListViewItem *)), - this, SLOT(insertPhraseInTranslation(TQListViewItem *)) ); - connect( phraseLv, SIGNAL(returnPressed(TQListViewItem *)), - this, SLOT(insertPhraseInTranslationAndLeave(TQListViewItem *)) ); + connect( editorPage->pageCurl, TQ_SIGNAL(nextPage()), + TQ_SIGNAL(nextUnfinished()) ); + connect( editorPage->pageCurl, TQ_SIGNAL(prevPage()), + TQ_SIGNAL(prevUnfinished()) ); + + connect( editorPage->translationMed, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(emitTranslationChanged()) ); + connect( editorPage->translationMed, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(updateButtons()) ); + connect( editorPage->translationMed, TQ_SIGNAL(undoAvailable(bool)), + this, TQ_SIGNAL(undoAvailable(bool)) ); + connect( editorPage->translationMed, TQ_SIGNAL(redoAvailable(bool)), + this, TQ_SIGNAL(redoAvailable(bool)) ); + connect( editorPage->translationMed, TQ_SIGNAL(copyAvailable(bool)), + this, TQ_SIGNAL(cutAvailable(bool)) ); + connect( editorPage->translationMed, TQ_SIGNAL(copyAvailable(bool)), + this, TQ_SIGNAL(copyAvailable(bool)) ); + connect( tqApp->clipboard(), TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(updateCanPaste()) ); + connect( phraseLv, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(insertPhraseInTranslation(TQListViewItem *)) ); + connect( phraseLv, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(insertPhraseInTranslationAndLeave(TQListViewItem *)) ); // What's this TQWhatsThis::add( this, tr("This whole panel allows you to view and edit " diff --git a/tools/linguist/linguist/phrasebookbox.cpp b/tools/linguist/linguist/phrasebookbox.cpp index 382842dc3..cefac1b34 100644 --- a/tools/linguist/linguist/phrasebookbox.cpp +++ b/tools/linguist/linguist/phrasebookbox.cpp @@ -91,18 +91,18 @@ PhraseBookBox::PhraseBookBox( const TQString& filename, bl->addWidget( closeBut ); bl->addStretch( 1 ); - connect( sourceLed, SIGNAL(textChanged(const TQString&)), - this, SLOT(sourceChanged(const TQString&)) ); - connect( targetLed, SIGNAL(textChanged(const TQString&)), - this, SLOT(targetChanged(const TQString&)) ); - connect( definitionLed, SIGNAL(textChanged(const TQString&)), - this, SLOT(definitionChanged(const TQString&)) ); - connect( lv, SIGNAL(selectionChanged(TQListViewItem *)), - this, SLOT(selectionChanged(TQListViewItem *)) ); - connect( newBut, SIGNAL(clicked()), this, SLOT(newPhrase()) ); - connect( removeBut, SIGNAL(clicked()), this, SLOT(removePhrase()) ); - connect( saveBut, SIGNAL(clicked()), this, SLOT(save()) ); - connect( closeBut, SIGNAL(clicked()), this, SLOT(accept()) ); + connect( sourceLed, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(sourceChanged(const TQString&)) ); + connect( targetLed, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(targetChanged(const TQString&)) ); + connect( definitionLed, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(definitionChanged(const TQString&)) ); + connect( lv, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem *)) ); + connect( newBut, TQ_SIGNAL(clicked()), this, TQ_SLOT(newPhrase()) ); + connect( removeBut, TQ_SIGNAL(clicked()), this, TQ_SLOT(removePhrase()) ); + connect( saveBut, TQ_SIGNAL(clicked()), this, TQ_SLOT(save()) ); + connect( closeBut, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); PhraseBook::ConstIterator it; for ( it = phraseBook.begin(); it != phraseBook.end(); ++it ) diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp index 79cac514f..f94cf8b29 100644 --- a/tools/linguist/linguist/trwindow.cpp +++ b/tools/linguist/linguist/trwindow.cpp @@ -190,7 +190,7 @@ Action::Action( TQPopupMenu *pop, const TQString& menuText, TQObject *receiver, setIconSet( s ); } TQAction::addTo( pop ); - connect( this, SIGNAL(activated()), receiver, member ); + connect( this, TQ_SIGNAL(activated()), receiver, member ); } Action::Action( TQPopupMenu *pop, const TQString& menuText, int accel, @@ -300,27 +300,27 @@ TrWindow::TrWindow() foundWhere = 0; foundOffset = 0; - connect( lv, SIGNAL(selectionChanged(TQListViewItem *)), - this, SLOT(showNewScope(TQListViewItem *)) ); + connect( lv, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(showNewScope(TQListViewItem *)) ); - connect( slv, SIGNAL(currentChanged(TQListViewItem *)), - this, SLOT(showNewCurrent(TQListViewItem *)) ); + connect( slv, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(showNewCurrent(TQListViewItem *)) ); - connect( slv, SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), - this, SLOT(showNewCurrent(TQListViewItem *)) ); + connect( slv, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), + this, TQ_SLOT(showNewCurrent(TQListViewItem *)) ); - connect( slv, SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), - this, SLOT(toggleFinished(TQListViewItem *, const TQPoint&, int)) ); + connect( slv, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), + this, TQ_SLOT(toggleFinished(TQListViewItem *, const TQPoint&, int)) ); - connect( me, SIGNAL(translationChanged(const TQString&)), - this, SLOT(updateTranslation(const TQString&)) ); - connect( me, SIGNAL(finished(bool)), this, SLOT(updateFinished(bool)) ); - connect( me, SIGNAL(prevUnfinished()), this, SLOT(prevUnfinished()) ); - connect( me, SIGNAL(nextUnfinished()), this, SLOT(nextUnfinished()) ); - connect( me, SIGNAL(focusSourceList()), this, SLOT(focusSourceList()) ); - connect( me, SIGNAL(focusPhraseList()), this, SLOT(focusPhraseList()) ); - connect( f, SIGNAL(findNext(const TQString&, int, bool)), - this, SLOT(findNext(const TQString&, int, bool)) ); + connect( me, TQ_SIGNAL(translationChanged(const TQString&)), + this, TQ_SLOT(updateTranslation(const TQString&)) ); + connect( me, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(updateFinished(bool)) ); + connect( me, TQ_SIGNAL(prevUnfinished()), this, TQ_SLOT(prevUnfinished()) ); + connect( me, TQ_SIGNAL(nextUnfinished()), this, TQ_SLOT(nextUnfinished()) ); + connect( me, TQ_SIGNAL(focusSourceList()), this, TQ_SLOT(focusSourceList()) ); + connect( me, TQ_SIGNAL(focusPhraseList()), this, TQ_SLOT(focusPhraseList()) ); + connect( f, TQ_SIGNAL(findNext(const TQString&, int, bool)), + this, TQ_SLOT(findNext(const TQString&, int, bool)) ); TQWhatsThis::add( lv, tr("This panel lists the source contexts.") ); @@ -1415,76 +1415,76 @@ void TrWindow::setupMenuBar() m->insertSeparator(); m->insertItem( tr("&Help"), helpp ); - connect( closePhraseBookp, SIGNAL(activated(int)), - this, SLOT(closePhraseBook(int)) ); - connect( closePhraseBookp, SIGNAL(aboutToShow()), - this, SLOT(updateClosePhraseBook()) ); - connect( editPhraseBookp, SIGNAL(activated(int)), - this, SLOT(editPhraseBook(int)) ); - connect( printPhraseBookp, SIGNAL(activated(int)), - this, SLOT(printPhraseBook(int)) ); + connect( closePhraseBookp, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(closePhraseBook(int)) ); + connect( closePhraseBookp, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(updateClosePhraseBook()) ); + connect( editPhraseBookp, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(editPhraseBook(int)) ); + connect( printPhraseBookp, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(printPhraseBook(int)) ); // File menu - openAct = new Action( filep, tr("&Open..."), this, SLOT(open()), + openAct = new Action( filep, tr("&Open..."), this, TQ_SLOT(open()), "fileopen.png", TQAccel::stringToKey(tr("Ctrl+O")) ); filep->insertSeparator(); - saveAct = new Action( filep, tr("&Save"), this, SLOT(save()), + saveAct = new Action( filep, tr("&Save"), this, TQ_SLOT(save()), "filesave.png", TQAccel::stringToKey(tr("Ctrl+S")) ); - saveAsAct = new Action( filep, tr("Save &As..."), this, SLOT(saveAs()) ); - releaseAct = new Action( filep, tr("&Release..."), this, SLOT(release()) ); + saveAsAct = new Action( filep, tr("Save &As..."), this, TQ_SLOT(saveAs()) ); + releaseAct = new Action( filep, tr("&Release..."), this, TQ_SLOT(release()) ); filep->insertSeparator(); - printAct = new Action( filep, tr("&Print..."), this, SLOT(print()), + printAct = new Action( filep, tr("&Print..."), this, TQ_SLOT(print()), "print.png", TQAccel::stringToKey(tr("Ctrl+P")) ); filep->insertSeparator(); recentFilesMenu = new TQPopupMenu( this ); filep->insertItem( tr("Re¢ly opened files"), recentFilesMenu ); - connect( recentFilesMenu, SIGNAL(aboutToShow()), this, - SLOT(setupRecentFilesMenu()) ); - connect( recentFilesMenu, SIGNAL(activated( int )), this, - SLOT(recentFileActivated( int )) ); + connect( recentFilesMenu, TQ_SIGNAL(aboutToShow()), this, + TQ_SLOT(setupRecentFilesMenu()) ); + connect( recentFilesMenu, TQ_SIGNAL(activated( int )), this, + TQ_SLOT(recentFileActivated( int )) ); filep->insertSeparator(); - exitAct = new Action( filep, tr("E&xit"), this, SLOT(close()), + exitAct = new Action( filep, tr("E&xit"), this, TQ_SLOT(close()), TQString::null, TQAccel::stringToKey(tr("Ctrl+Q")) ); // Edit menu - undoAct = new Action( editp, tr("&Undo"), me, SLOT(undo()), + undoAct = new Action( editp, tr("&Undo"), me, TQ_SLOT(undo()), "undo.png", TQAccel::stringToKey(tr("Ctrl+Z")) ); undoAct->setEnabled( FALSE ); - connect( me, SIGNAL(undoAvailable(bool)), undoAct, SLOT(setEnabled(bool)) ); - redoAct = new Action( editp, tr("&Redo"), me, SLOT(redo()), + connect( me, TQ_SIGNAL(undoAvailable(bool)), undoAct, TQ_SLOT(setEnabled(bool)) ); + redoAct = new Action( editp, tr("&Redo"), me, TQ_SLOT(redo()), "redo.png", TQAccel::stringToKey(tr("Ctrl+Y")) ); redoAct->setEnabled( FALSE ); - connect( me, SIGNAL(redoAvailable(bool)), redoAct, SLOT(setEnabled(bool)) ); + connect( me, TQ_SIGNAL(redoAvailable(bool)), redoAct, TQ_SLOT(setEnabled(bool)) ); editp->insertSeparator(); - cutAct = new Action( editp, tr("Cu&t"), me, SLOT(cut()), + cutAct = new Action( editp, tr("Cu&t"), me, TQ_SLOT(cut()), "editcut.png", TQAccel::stringToKey(tr("Ctrl+X")) ); cutAct->setEnabled( FALSE ); - connect( me, SIGNAL(cutAvailable(bool)), cutAct, SLOT(setEnabled(bool)) ); - copyAct = new Action( editp, tr("&Copy"), me, SLOT(copy()), + connect( me, TQ_SIGNAL(cutAvailable(bool)), cutAct, TQ_SLOT(setEnabled(bool)) ); + copyAct = new Action( editp, tr("&Copy"), me, TQ_SLOT(copy()), "editcopy.png", TQAccel::stringToKey(tr("Ctrl+C")) ); copyAct->setEnabled( FALSE ); - connect( me, SIGNAL(copyAvailable(bool)), copyAct, SLOT(setEnabled(bool)) ); - pasteAct = new Action( editp, tr("&Paste"), me, SLOT(paste()), + connect( me, TQ_SIGNAL(copyAvailable(bool)), copyAct, TQ_SLOT(setEnabled(bool)) ); + pasteAct = new Action( editp, tr("&Paste"), me, TQ_SLOT(paste()), "editpaste.png", TQAccel::stringToKey(tr("Ctrl+V")) ); pasteAct->setEnabled( FALSE ); - connect( me, SIGNAL(pasteAvailable(bool)), - pasteAct, SLOT(setEnabled(bool)) ); - selectAllAct = new Action( editp, tr("Select &All"), me, SLOT(selectAll()), + connect( me, TQ_SIGNAL(pasteAvailable(bool)), + pasteAct, TQ_SLOT(setEnabled(bool)) ); + selectAllAct = new Action( editp, tr("Select &All"), me, TQ_SLOT(selectAll()), TQString::null, TQAccel::stringToKey(tr("Ctrl+A")) ); selectAllAct->setEnabled( FALSE ); editp->insertSeparator(); - findAct = new Action( editp, tr("&Find..."), this, SLOT(find()), + findAct = new Action( editp, tr("&Find..."), this, TQ_SLOT(find()), "searchfind.png", TQAccel::stringToKey(tr("Ctrl+F")) ); findAct->setEnabled( FALSE ); findAgainAct = new Action( editp, tr("Find &Next"), - this, SLOT(findAgain()), TQString::null, Key_F3 ); + this, TQ_SLOT(findAgain()), TQString::null, Key_F3 ); findAgainAct->setEnabled( FALSE ); #ifdef notyet - replaceAct = new Action( editp, tr("&Replace..."), this, SLOT(replace()), + replaceAct = new Action( editp, tr("&Replace..."), this, TQ_SLOT(replace()), TQAccel::stringToKey(tr("Ctrl+H")) ); replaceAct->setEnabled( FALSE ); #endif @@ -1492,36 +1492,36 @@ void TrWindow::setupMenuBar() // Translation menu // when updating the accelerators, remember the status bar prevUnfinishedAct = new Action( translationp, tr("&Prev Unfinished"), - this, SLOT(prevUnfinished()), + this, TQ_SLOT(prevUnfinished()), "prevunfinished.png", TQAccel::stringToKey(tr("Ctrl+K")) ); nextUnfinishedAct = new Action( translationp, tr("&Next Unfinished"), - this, SLOT(nextUnfinished()), + this, TQ_SLOT(nextUnfinished()), "nextunfinished.png", TQAccel::stringToKey(tr("Ctrl+L")) ); prevAct = new Action( translationp, tr("P&rev"), - this, SLOT(prev()), "prev.png", + this, TQ_SLOT(prev()), "prev.png", TQAccel::stringToKey(tr("Ctrl+Shift+K")) ); nextAct = new Action( translationp, tr("Ne&xt"), - this, SLOT(next()), "next.png", + this, TQ_SLOT(next()), "next.png", TQAccel::stringToKey(tr("Ctrl+Shift+L")) ); doneAndNextAct = new Action( translationp, tr("Done and &Next"), - this, SLOT(doneAndNext()), "doneandnext.png", + this, TQ_SLOT(doneAndNext()), "doneandnext.png", TQAccel::stringToKey(tr("Ctrl+Enter")) ); doneAndNextAlt = new TQAction( this ); doneAndNextAlt->setAccel( TQAccel::stringToKey(tr("Ctrl+Return")) ); - connect( doneAndNextAlt, SIGNAL(activated()), this, SLOT(doneAndNext()) ); + connect( doneAndNextAlt, TQ_SIGNAL(activated()), this, TQ_SLOT(doneAndNext()) ); beginFromSourceAct = new Action( translationp, tr("&Begin from Source"), - me, SLOT(beginFromSource()), + me, TQ_SLOT(beginFromSource()), TQString::null, TQAccel::stringToKey(tr("Ctrl+B")) ); - connect( me, SIGNAL(updateActions(bool)), beginFromSourceAct, - SLOT(setEnabled(bool)) ); + connect( me, TQ_SIGNAL(updateActions(bool)), beginFromSourceAct, + TQ_SLOT(setEnabled(bool)) ); // Phrasebook menu newPhraseBookAct = new Action( phrasep, tr("&New Phrase Book..."), - this, SLOT(newPhraseBook()), + this, TQ_SLOT(newPhraseBook()), TQString::null, TQAccel::stringToKey(tr("Ctrl+N")) ); openPhraseBookAct = new Action( phrasep, tr("&Open Phrase Book..."), - this, SLOT(openPhraseBook()), + this, TQ_SLOT(openPhraseBook()), "book.png", TQAccel::stringToKey(tr("Ctrl+H")) ); closePhraseBookId = phrasep->insertItem( tr("&Close Phrase Book"), closePhraseBookp ); @@ -1530,41 +1530,41 @@ void TrWindow::setupMenuBar() editPhraseBookp ); printPhraseBookId = phrasep->insertItem( tr("&Print Phrase Book..."), printPhraseBookp ); - connect( phrasep, SIGNAL(aboutToShow()), this, SLOT(setupPhrase()) ); + connect( phrasep, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(setupPhrase()) ); // Validation menu acceleratorsAct = new Action( validationp, tr("&Accelerators"), - this, SLOT(revalidate()), "accelerator.png", 0, TRUE ); + this, TQ_SLOT(revalidate()), "accelerator.png", 0, TRUE ); acceleratorsAct->setOn( TRUE ); endingPunctuationAct = new Action( validationp, tr("&Ending Punctuation"), - this, SLOT(revalidate()), "punctuation.png", 0, TRUE ); + this, TQ_SLOT(revalidate()), "punctuation.png", 0, TRUE ); endingPunctuationAct->setOn( TRUE ); phraseMatchesAct = new Action( validationp, tr("&Phrase Matches"), - this, SLOT(revalidate()), "phrase.png", 0, TRUE ); + this, TQ_SLOT(revalidate()), "phrase.png", 0, TRUE ); phraseMatchesAct->setOn( TRUE ); // View menu revertSortingAct = new Action( viewp, tr("&Revert Sorting"), - this, SLOT(revertSorting()) ); + this, TQ_SLOT(revertSorting()) ); doGuessesAct = new Action( viewp, tr("&Display guesses"), - this, SLOT(toggleGuessing()) ); + this, TQ_SLOT(toggleGuessing()) ); doGuessesAct->setToggleAction( TRUE ); doGuessesAct->setOn( TRUE ); - toggleStats = new Action( viewp, tr("&Statistics"), this, SLOT(toggleStatistics()) ); + toggleStats = new Action( viewp, tr("&Statistics"), this, TQ_SLOT(toggleStatistics()) ); toggleStats->setToggleAction( TRUE ); viewp->insertSeparator(); viewp->insertItem( tr("Vie&ws"), createDockWindowMenu( NoToolBars ) ); viewp->insertItem( tr("&Toolbars"), createDockWindowMenu( OnlyToolBars ) ); // Help - manualAct = new Action( helpp, tr("&Manual"), this, SLOT(manual()), 0, + manualAct = new Action( helpp, tr("&Manual"), this, TQ_SLOT(manual()), 0, Key_F1 ); helpp->insertSeparator(); - aboutAct = new Action( helpp, tr("&About"), this, SLOT(about()) ); - aboutTQtAct = new Action( helpp, tr("About &TQt"), this, SLOT(aboutTQt()) ); + aboutAct = new Action( helpp, tr("&About"), this, TQ_SLOT(about()) ); + aboutTQtAct = new Action( helpp, tr("About &TQt"), this, TQ_SLOT(aboutTQt()) ); helpp->insertSeparator(); whatsThisAct = new Action( helpp, tr("&What's This?"), - this, SLOT(whatsThis()), "whatsthis.xpm", SHIFT + Key_F1 ); + this, TQ_SLOT(whatsThis()), "whatsthis.xpm", SHIFT + Key_F1 ); openAct->setWhatsThis( tr("Open a TQt translation source file (TS file) for" " editing.") ); @@ -2011,9 +2011,9 @@ void TrWindow::toggleStatistics() if ( toggleStats->isOn() ) { if ( !stats ) { stats = new Statistics( this, "linguist_stats" ); - connect( this, SIGNAL(statsChanged(int,int,int,int,int,int)), stats, - SLOT(updateStats(int,int,int,int,int,int)) ); - connect( stats, SIGNAL(closed()), toggleStats, SLOT(toggle()) ); + connect( this, TQ_SIGNAL(statsChanged(int,int,int,int,int,int)), stats, + TQ_SLOT(updateStats(int,int,int,int,int,int)) ); + connect( stats, TQ_SIGNAL(closed()), toggleStats, TQ_SLOT(toggle()) ); } updateStatistics(); stats->show(); diff --git a/tools/linguist/tutorial/tt2/mainwindow.cpp b/tools/linguist/tutorial/tt2/mainwindow.cpp index b2951f6e9..a2507331c 100644 --- a/tools/linguist/tutorial/tt2/mainwindow.cpp +++ b/tools/linguist/tutorial/tt2/mainwindow.cpp @@ -19,7 +19,7 @@ MainWindow::MainWindow( TQWidget *parent, const char *name ) setCentralWidget( ap ); TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( tr("E&xit"), tqApp, SLOT(quit()), + file->insertItem( tr("E&xit"), tqApp, TQ_SLOT(quit()), tr("Ctrl+Q", "Quit") ); menuBar()->insertItem( tr("&File"), file ); menuBar()->setSeparator( TQMenuBar::InWindowsStyle ); diff --git a/tools/linguist/tutorial/tt3/mainwindow.cpp b/tools/linguist/tutorial/tt3/mainwindow.cpp index efaaac932..8e4bee5cd 100644 --- a/tools/linguist/tutorial/tt3/mainwindow.cpp +++ b/tools/linguist/tutorial/tt3/mainwindow.cpp @@ -22,11 +22,11 @@ MainWindow::MainWindow( TQWidget *parent, const char *name ) setCentralWidget( pp ); TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( tr("E&xit"), tqApp, SLOT(quit()), + file->insertItem( tr("E&xit"), tqApp, TQ_SLOT(quit()), tr("Ctrl+Q", "Quit") ); TQPopupMenu *help = new TQPopupMenu( this ); - help->insertItem( tr("&About"), this, SLOT(about()), Key_F1 ); - help->insertItem( tr("About &TQt"), this, SLOT(aboutTQt()) ); + help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) ); menuBar()->insertItem( tr("&File"), file ); menuBar()->insertSeparator(); diff --git a/tools/maketqpf/main.cpp b/tools/maketqpf/main.cpp index 10519eb28..d105a1689 100644 --- a/tools/maketqpf/main.cpp +++ b/tools/maketqpf/main.cpp @@ -153,8 +153,8 @@ public: TQString fontdir = TQString(getenv("TQTDIR")) + "/lib/fonts"; readFontDir(fontdir); - connect(view,SIGNAL(selectionChanged(TQListViewItem*)), - this,SLOT(renderAndSave(TQListViewItem*))); + connect(view,TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this,TQ_SLOT(renderAndSave(TQListViewItem*))); } void readFontDir(const TQString& fntd) diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp index 57a9e5868..a34e2a667 100644 --- a/tools/qconfig/main.cpp +++ b/tools/qconfig/main.cpp @@ -279,42 +279,42 @@ Main::Main() info->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); info->setAlignment(AlignTop); - connect(info, SIGNAL(idClicked(const TQString&)), - this, SLOT(selectId(const TQString&))); + connect(info, TQ_SIGNAL(idClicked(const TQString&)), + this, TQ_SLOT(selectId(const TQString&))); #ifdef FIXED_LAYOUT horizontal->setStretchFactor(info,2); #endif - connect(lv, SIGNAL(pressed(TQListViewItem*)), - this, SLOT(updateAvailability(TQListViewItem*))); - connect(lv, SIGNAL(selectionChanged(TQListViewItem*)), - this, SLOT(showInfo(TQListViewItem*))); + connect(lv, TQ_SIGNAL(pressed(TQListViewItem*)), + this, TQ_SLOT(updateAvailability(TQListViewItem*))); + connect(lv, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(showInfo(TQListViewItem*))); setCentralWidget(horizontal); TQToolBar* tb = new TQToolBar( this, "browser controls" ); tb->setLabel( "Browser Controls" ); (void)new TQToolButton( TQPixmap(back_xpm), "Back", TQString::null, - info, SLOT(back()), tb, "back" ); + info, TQ_SLOT(back()), tb, "back" ); (void)new TQToolButton( TQPixmap(forward_xpm), "Forward", TQString::null, - info, SLOT(forward()), tb, "forward" ); + info, TQ_SLOT(forward()), tb, "forward" ); TQPopupMenu* file = new TQPopupMenu( menuBar() ); - file->insertItem( "&Open", this, SLOT(open()), CTRL+Key_O ); - file->insertItem( "&Save", this, SLOT(save()), CTRL+Key_S ); + file->insertItem( "&Open", this, TQ_SLOT(open()), CTRL+Key_O ); + file->insertItem( "&Save", this, TQ_SLOT(save()), CTRL+Key_S ); file->insertSeparator(); - file->insertItem( "&Test all", this, SLOT(testAll()), CTRL+Key_T ); + file->insertItem( "&Test all", this, TQ_SLOT(testAll()), CTRL+Key_T ); file->insertSeparator(); - file->insertItem( "E&xit", tqApp, SLOT(quit()), CTRL+Key_Q ); + file->insertItem( "E&xit", tqApp, TQ_SLOT(quit()), CTRL+Key_Q ); menuBar()->insertItem( "&File",file ); menuBar()->insertSeparator(); TQPopupMenu *help = new TQPopupMenu( menuBar() ); - help->insertItem( "&About", this, SLOT(about()) ); - help->insertItem( "About &TQt", this, SLOT(aboutTQt()) ); + help->insertItem( "&About", this, TQ_SLOT(about()) ); + help->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt()) ); menuBar()->insertItem( "&Help", help ); diff --git a/tools/qtconfig/colorbutton.cpp b/tools/qtconfig/colorbutton.cpp index 948043774..2d8668c21 100644 --- a/tools/qtconfig/colorbutton.cpp +++ b/tools/qtconfig/colorbutton.cpp @@ -45,7 +45,7 @@ ColorButton::ColorButton(TQWidget *parent, const char *name) { setAcceptDrops(TRUE); col = black; - connect(this, SIGNAL(clicked()), SLOT(changeColor())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(changeColor())); } @@ -54,7 +54,7 @@ ColorButton::ColorButton(const TQColor &c, TQWidget *parent, const char *name) { setAcceptDrops(TRUE); col = c; - connect(this, SIGNAL(clicked()), SLOT(changeColor())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(changeColor())); } diff --git a/tools/tqvfb/tqvfb.cpp b/tools/tqvfb/tqvfb.cpp index 334efadf6..1fb8ade04 100644 --- a/tools/tqvfb/tqvfb.cpp +++ b/tools/tqvfb/tqvfb.cpp @@ -130,32 +130,32 @@ void TQVFb::enableCursor( bool e ) void TQVFb::createMenu(TQMenuData *menu) { TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( "&Configure...", this, SLOT(configure()), ALT+CTRL+Key_C ); + file->insertItem( "&Configure...", this, TQ_SLOT(configure()), ALT+CTRL+Key_C ); file->insertSeparator(); - file->insertItem( "&Save image...", this, SLOT(saveImage()), ALT+CTRL+Key_S ); - file->insertItem( "&Animation...", this, SLOT(toggleAnimation()), ALT+CTRL+Key_A ); + file->insertItem( "&Save image...", this, TQ_SLOT(saveImage()), ALT+CTRL+Key_S ); + file->insertItem( "&Animation...", this, TQ_SLOT(toggleAnimation()), ALT+CTRL+Key_A ); file->insertSeparator(); - file->insertItem( "&Quit", tqApp, SLOT(quit()) ); + file->insertItem( "&Quit", tqApp, TQ_SLOT(quit()) ); menu->insertItem( "&File", file ); viewMenu = new TQPopupMenu( this ); viewMenu->setCheckable( TRUE ); - cursorId = viewMenu->insertItem( "Show &Cursor", this, SLOT(toggleCursor()) ); + cursorId = viewMenu->insertItem( "Show &Cursor", this, TQ_SLOT(toggleCursor()) ); enableCursor(TRUE); - viewMenu->insertItem( "&Refresh Rate...", this, SLOT(changeRate()) ); + viewMenu->insertItem( "&Refresh Rate...", this, TQ_SLOT(changeRate()) ); viewMenu->insertSeparator(); - viewMenu->insertItem( "Zoom scale &1", this, SLOT(setZoom1()) ); - viewMenu->insertItem( "Zoom scale &2", this, SLOT(setZoom2()) ); - viewMenu->insertItem( "Zoom scale &3", this, SLOT(setZoom3()) ); - viewMenu->insertItem( "Zoom scale &4", this, SLOT(setZoom4()) ); - viewMenu->insertItem( "Zoom scale &0.5", this, SLOT(setZoomHalf()) ); + viewMenu->insertItem( "Zoom scale &1", this, TQ_SLOT(setZoom1()) ); + viewMenu->insertItem( "Zoom scale &2", this, TQ_SLOT(setZoom2()) ); + viewMenu->insertItem( "Zoom scale &3", this, TQ_SLOT(setZoom3()) ); + viewMenu->insertItem( "Zoom scale &4", this, TQ_SLOT(setZoom4()) ); + viewMenu->insertItem( "Zoom scale &0.5", this, TQ_SLOT(setZoomHalf()) ); menu->insertItem( "&View", viewMenu ); TQPopupMenu *help = new TQPopupMenu( this ); - help->insertItem("&About", this, SLOT(about())); - help->insertItem("About &TQt", this, SLOT(aboutTQt())); + help->insertItem("&About", this, TQ_SLOT(about())); + help->insertItem("About &TQt", this, TQ_SLOT(aboutTQt())); menu->insertSeparator(); menu->insertItem( "&Help", help ); } @@ -221,7 +221,7 @@ void TQVFb::changeRate() { if ( !rateDlg ) { rateDlg = new TQVFbRateDialog( view->rate(), this ); - connect( rateDlg, SIGNAL(updateRate(int)), view, SLOT(setRate(int)) ); + connect( rateDlg, TQ_SIGNAL(updateRate(int)), view, TQ_SLOT(setRate(int)) ); } rateDlg->show(); @@ -297,10 +297,10 @@ void TQVFb::configure() config->gslider->setValue(int(view->gammaGreen()*400)); config->bslider->setValue(int(view->gammaBlue()*400)); } - connect(config->gammaslider, SIGNAL(valueChanged(int)), this, SLOT(setGamma400(int))); - connect(config->rslider, SIGNAL(valueChanged(int)), this, SLOT(setR400(int))); - connect(config->gslider, SIGNAL(valueChanged(int)), this, SLOT(setG400(int))); - connect(config->bslider, SIGNAL(valueChanged(int)), this, SLOT(setB400(int))); + connect(config->gammaslider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setGamma400(int))); + connect(config->rslider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setR400(int))); + connect(config->gslider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setG400(int))); + connect(config->bslider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setB400(int))); updateGammaLabels(); double ogr=view->gammaRed(), ogg=view->gammaGreen(), ogb=view->gammaBlue(); diff --git a/tools/tqvfb/tqvfbratedlg.cpp b/tools/tqvfb/tqvfbratedlg.cpp index 5c87e702e..082f2bb99 100644 --- a/tools/tqvfb/tqvfbratedlg.cpp +++ b/tools/tqvfb/tqvfbratedlg.cpp @@ -52,16 +52,16 @@ TQVFbRateDialog::TQVFbRateDialog( int rate, TQWidget *parent, const char *name, TQHBoxLayout *hl = new TQHBoxLayout( tl ); rateSlider = new TQSlider( 1, 100, 10, rate, TQSlider::Horizontal, this ); hl->addWidget( rateSlider ); - connect( rateSlider, SIGNAL(valueChanged(int)), this, SLOT(rateChanged(int)) ); + connect( rateSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rateChanged(int)) ); rateLabel = new TQLabel( TQString( "%1fps" ).arg(rate), this ); hl->addWidget( rateLabel ); hl = new TQHBoxLayout( tl ); TQPushButton *pb = new TQPushButton( "OK", this ); - connect( pb, SIGNAL(clicked()), this, SLOT(accept()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); hl->addWidget( pb ); pb = new TQPushButton( "Cancel", this ); - connect( pb, SIGNAL(clicked()), this, SLOT(cancel()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(cancel()) ); hl->addWidget( pb ); } diff --git a/tools/tqvfb/tqvfbview.cpp b/tools/tqvfb/tqvfbview.cpp index f96df8ca1..d3ce8460b 100644 --- a/tools/tqvfb/tqvfbview.cpp +++ b/tools/tqvfb/tqvfbview.cpp @@ -144,7 +144,7 @@ TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent, resizeContents( w, h ); timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), this, SLOT(timeout()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) ); gammatable=0; setGamma(1.0,1.0,1.0); diff --git a/tutorial/t10/lcdrange.cpp b/tutorial/t10/lcdrange.cpp index cbb60a993..2a56b9ad2 100644 --- a/tutorial/t10/lcdrange.cpp +++ b/tutorial/t10/lcdrange.cpp @@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name ) slider = new TQSlider( Horizontal, this, "slider" ); slider->setRange( 0, 99 ); slider->setValue( 0 ); - connect( slider, SIGNAL(valueChanged(int)), - lcd, SLOT(display(int)) ); - connect( slider, SIGNAL(valueChanged(int)), - SIGNAL(valueChanged(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + lcd, TQ_SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)) ); setFocusProxy( slider ); } diff --git a/tutorial/t10/main.cpp b/tutorial/t10/main.cpp index 7b14dc14b..4138a2f2f 100644 --- a/tutorial/t10/main.cpp +++ b/tutorial/t10/main.cpp @@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); LCDRange *angle = new LCDRange( this, "angle" ); angle->setRange( 5, 70 ); @@ -37,15 +37,15 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) CannonField *cannonField = new CannonField( this, "cannonField" ); - connect( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - connect( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + connect( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + connect( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - connect( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - connect( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + connect( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + connect( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); grid->addWidget( quit, 0, 0 ); diff --git a/tutorial/t11/cannon.cpp b/tutorial/t11/cannon.cpp index bfbc12a10..a61b2bb68 100644 --- a/tutorial/t11/cannon.cpp +++ b/tutorial/t11/cannon.cpp @@ -19,8 +19,8 @@ CannonField::CannonField( TQWidget *parent, const char *name ) f = 0; timerCount = 0; autoShootTimer = new TQTimer( this, "movement handler" ); - connect( autoShootTimer, SIGNAL(timeout()), - this, SLOT(moveShot()) ); + connect( autoShootTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(moveShot()) ); shoot_ang = 0; shoot_f = 0; setPalette( TQPalette( TQColor( 250, 250, 200) ) ); diff --git a/tutorial/t11/lcdrange.cpp b/tutorial/t11/lcdrange.cpp index cbb60a993..2a56b9ad2 100644 --- a/tutorial/t11/lcdrange.cpp +++ b/tutorial/t11/lcdrange.cpp @@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name ) slider = new TQSlider( Horizontal, this, "slider" ); slider->setRange( 0, 99 ); slider->setValue( 0 ); - connect( slider, SIGNAL(valueChanged(int)), - lcd, SLOT(display(int)) ); - connect( slider, SIGNAL(valueChanged(int)), - SIGNAL(valueChanged(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + lcd, TQ_SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)) ); setFocusProxy( slider ); } diff --git a/tutorial/t11/main.cpp b/tutorial/t11/main.cpp index 4ddd2938c..c909ad74c 100644 --- a/tutorial/t11/main.cpp +++ b/tutorial/t11/main.cpp @@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); LCDRange *angle = new LCDRange( this, "angle" ); angle->setRange( 5, 70 ); @@ -37,20 +37,20 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) CannonField *cannonField = new CannonField( this, "cannonField" ); - connect( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - connect( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + connect( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + connect( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - connect( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - connect( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + connect( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + connect( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); TQPushButton *shoot = new TQPushButton( "&Shoot", this, "shoot" ); shoot->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( shoot, SIGNAL(clicked()), cannonField, SLOT(shoot()) ); + connect( shoot, TQ_SIGNAL(clicked()), cannonField, TQ_SLOT(shoot()) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); grid->addWidget( quit, 0, 0 ); diff --git a/tutorial/t12/cannon.cpp b/tutorial/t12/cannon.cpp index 597c54645..f3d05ca12 100644 --- a/tutorial/t12/cannon.cpp +++ b/tutorial/t12/cannon.cpp @@ -21,8 +21,8 @@ CannonField::CannonField( TQWidget *parent, const char *name ) f = 0; timerCount = 0; autoShootTimer = new TQTimer( this, "movement handler" ); - connect( autoShootTimer, SIGNAL(timeout()), - this, SLOT(moveShot()) ); + connect( autoShootTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(moveShot()) ); shoot_ang = 0; shoot_f = 0; target = TQPoint( 0, 0 ); diff --git a/tutorial/t12/lcdrange.cpp b/tutorial/t12/lcdrange.cpp index 79614365c..dfa7f6e93 100644 --- a/tutorial/t12/lcdrange.cpp +++ b/tutorial/t12/lcdrange.cpp @@ -37,10 +37,10 @@ void LCDRange::init() label = new TQLabel( " ", this, "label" ); label->setAlignment( AlignCenter ); - connect( slider, SIGNAL(valueChanged(int)), - lcd, SLOT(display(int)) ); - connect( slider, SIGNAL(valueChanged(int)), - SIGNAL(valueChanged(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + lcd, TQ_SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)) ); setFocusProxy( slider ); } diff --git a/tutorial/t12/main.cpp b/tutorial/t12/main.cpp index 5401d9972..2026126f5 100644 --- a/tutorial/t12/main.cpp +++ b/tutorial/t12/main.cpp @@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); LCDRange *angle = new LCDRange( "ANGLE", this, "angle" ); angle->setRange( 5, 70 ); @@ -37,20 +37,20 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) CannonField *cannonField = new CannonField( this, "cannonField" ); - connect( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - connect( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + connect( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + connect( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - connect( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - connect( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + connect( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + connect( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); TQPushButton *shoot = new TQPushButton( "&Shoot", this, "shoot" ); shoot->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( shoot, SIGNAL(clicked()), cannonField, SLOT(shoot()) ); + connect( shoot, TQ_SIGNAL(clicked()), cannonField, TQ_SLOT(shoot()) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); grid->addWidget( quit, 0, 0 ); diff --git a/tutorial/t13/cannon.cpp b/tutorial/t13/cannon.cpp index 85a038f0c..9ca28f165 100644 --- a/tutorial/t13/cannon.cpp +++ b/tutorial/t13/cannon.cpp @@ -21,8 +21,8 @@ CannonField::CannonField( TQWidget *parent, const char *name ) f = 0; timerCount = 0; autoShootTimer = new TQTimer( this, "movement handler" ); - connect( autoShootTimer, SIGNAL(timeout()), - this, SLOT(moveShot()) ); + connect( autoShootTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(moveShot()) ); shoot_ang = 0; shoot_f = 0; target = TQPoint( 0, 0 ); diff --git a/tutorial/t13/gamebrd.cpp b/tutorial/t13/gamebrd.cpp index a8ee16c54..587dd2ea2 100644 --- a/tutorial/t13/gamebrd.cpp +++ b/tutorial/t13/gamebrd.cpp @@ -22,7 +22,7 @@ GameBoard::GameBoard( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); LCDRange *angle = new LCDRange( "ANGLE", this, "angle" ); angle->setRange( 5, 70 ); @@ -32,33 +32,33 @@ GameBoard::GameBoard( TQWidget *parent, const char *name ) cannonField = new CannonField( this, "cannonField" ); - connect( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - connect( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + connect( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + connect( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - connect( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - connect( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + connect( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + connect( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); - connect( cannonField, SIGNAL(hit()), - this, SLOT(hit()) ); - connect( cannonField, SIGNAL(missed()), - this, SLOT(missed()) ); + connect( cannonField, TQ_SIGNAL(hit()), + this, TQ_SLOT(hit()) ); + connect( cannonField, TQ_SIGNAL(missed()), + this, TQ_SLOT(missed()) ); TQPushButton *shoot = new TQPushButton( "&Shoot", this, "shoot" ); shoot->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( shoot, SIGNAL(clicked()), SLOT(fire()) ); - connect( cannonField, SIGNAL(canShoot(bool)), - shoot, SLOT(setEnabled(bool)) ); + connect( shoot, TQ_SIGNAL(clicked()), TQ_SLOT(fire()) ); + connect( cannonField, TQ_SIGNAL(canShoot(bool)), + shoot, TQ_SLOT(setEnabled(bool)) ); TQPushButton *restart = new TQPushButton( "&New Game", this, "newgame" ); restart->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( restart, SIGNAL(clicked()), this, SLOT(newGame()) ); + connect( restart, TQ_SIGNAL(clicked()), this, TQ_SLOT(newGame()) ); hits = new TQLCDNumber( 2, this, "hits" ); shotsLeft = new TQLCDNumber( 2, this, "shotsleft" ); diff --git a/tutorial/t13/lcdrange.cpp b/tutorial/t13/lcdrange.cpp index fb601592a..5ce3e37ed 100644 --- a/tutorial/t13/lcdrange.cpp +++ b/tutorial/t13/lcdrange.cpp @@ -37,10 +37,10 @@ void LCDRange::init() label = new TQLabel( " ", this, "label" ); label->setAlignment( AlignCenter ); - connect( slider, SIGNAL(valueChanged(int)), - lcd, SLOT(display(int)) ); - connect( slider, SIGNAL(valueChanged(int)), - SIGNAL(valueChanged(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + lcd, TQ_SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)) ); setFocusProxy( slider ); diff --git a/tutorial/t14/cannon.cpp b/tutorial/t14/cannon.cpp index 37bc274e6..1feacd9b4 100644 --- a/tutorial/t14/cannon.cpp +++ b/tutorial/t14/cannon.cpp @@ -21,8 +21,8 @@ CannonField::CannonField( TQWidget *parent, const char *name ) f = 0; timerCount = 0; autoShootTimer = new TQTimer( this, "movement handler" ); - connect( autoShootTimer, SIGNAL(timeout()), - this, SLOT(moveShot()) ); + connect( autoShootTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(moveShot()) ); shoot_ang = 0; shoot_f = 0; target = TQPoint( 0, 0 ); diff --git a/tutorial/t14/gamebrd.cpp b/tutorial/t14/gamebrd.cpp index 2aebec56e..05f661b47 100644 --- a/tutorial/t14/gamebrd.cpp +++ b/tutorial/t14/gamebrd.cpp @@ -24,7 +24,7 @@ GameBoard::GameBoard( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); LCDRange *angle = new LCDRange( "ANGLE", this, "angle" ); angle->setRange( 5, 70 ); @@ -37,34 +37,34 @@ GameBoard::GameBoard( TQWidget *parent, const char *name ) cannonField = new CannonField( box, "cannonField" ); - connect( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - connect( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + connect( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + connect( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); - connect( force, SIGNAL(valueChanged(int)), - cannonField, SLOT(setForce(int)) ); - connect( cannonField, SIGNAL(forceChanged(int)), - force, SLOT(setValue(int)) ); + connect( force, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setForce(int)) ); + connect( cannonField, TQ_SIGNAL(forceChanged(int)), + force, TQ_SLOT(setValue(int)) ); - connect( cannonField, SIGNAL(hit()), - this, SLOT(hit()) ); - connect( cannonField, SIGNAL(missed()), - this, SLOT(missed()) ); + connect( cannonField, TQ_SIGNAL(hit()), + this, TQ_SLOT(hit()) ); + connect( cannonField, TQ_SIGNAL(missed()), + this, TQ_SLOT(missed()) ); TQPushButton *shoot = new TQPushButton( "&Shoot", this, "shoot" ); shoot->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( shoot, SIGNAL(clicked()), SLOT(fire()) ); + connect( shoot, TQ_SIGNAL(clicked()), TQ_SLOT(fire()) ); - connect( cannonField, SIGNAL(canShoot(bool)), - shoot, SLOT(setEnabled(bool)) ); + connect( cannonField, TQ_SIGNAL(canShoot(bool)), + shoot, TQ_SLOT(setEnabled(bool)) ); TQPushButton *restart = new TQPushButton( "&New Game", this, "newgame" ); restart->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( restart, SIGNAL(clicked()), this, SLOT(newGame()) ); + connect( restart, TQ_SIGNAL(clicked()), this, TQ_SLOT(newGame()) ); hits = new TQLCDNumber( 2, this, "hits" ); shotsLeft = new TQLCDNumber( 2, this, "shotsleft" ); @@ -74,11 +74,11 @@ GameBoard::GameBoard( TQWidget *parent, const char *name ) TQAccel *accel = new TQAccel( this ); accel->connectItem( accel->insertItem( Key_Enter ), - this, SLOT(fire()) ); + this, TQ_SLOT(fire()) ); accel->connectItem( accel->insertItem( Key_Return ), - this, SLOT(fire()) ); + this, TQ_SLOT(fire()) ); accel->connectItem( accel->insertItem( CTRL+Key_Q ), - tqApp, SLOT(quit()) ); + tqApp, TQ_SLOT(quit()) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); grid->addWidget( quit, 0, 0 ); diff --git a/tutorial/t14/lcdrange.cpp b/tutorial/t14/lcdrange.cpp index fb601592a..5ce3e37ed 100644 --- a/tutorial/t14/lcdrange.cpp +++ b/tutorial/t14/lcdrange.cpp @@ -37,10 +37,10 @@ void LCDRange::init() label = new TQLabel( " ", this, "label" ); label->setAlignment( AlignCenter ); - connect( slider, SIGNAL(valueChanged(int)), - lcd, SLOT(display(int)) ); - connect( slider, SIGNAL(valueChanged(int)), - SIGNAL(valueChanged(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + lcd, TQ_SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)) ); setFocusProxy( slider ); diff --git a/tutorial/t15/main.cpp b/tutorial/t15/main.cpp index 9277ce17d..6fcbc1e72 100644 --- a/tutorial/t15/main.cpp +++ b/tutorial/t15/main.cpp @@ -23,7 +23,7 @@ void WorkerObject::run() if (!eventLoop) return; TQTimer *t = new TQTimer(this); - connect( t, SIGNAL(timeout()), SLOT(timerHandler()) ); + connect( t, TQ_SIGNAL(timeout()), TQ_SLOT(timerHandler()) ); t->start( 1000, FALSE ); for( int count = 0; count < 5; count++ ) { @@ -61,8 +61,8 @@ void MainObject::buttonClicked() WorkerObject x; \ x.threadFriendlyName = y; \ x.moveToThread(&z); \ - TQObject::connect(&x, SIGNAL(displayMessage(TQString,TQString)), &mainobject, SLOT(emitMessage(TQString,TQString))); \ - TQTimer::singleShot(0, &x, SLOT(run())); + TQObject::connect(&x, TQ_SIGNAL(displayMessage(TQString,TQString)), &mainobject, TQ_SLOT(emitMessage(TQString,TQString))); \ + TQTimer::singleShot(0, &x, TQ_SLOT(run())); int main( int argc, char **argv ) { @@ -142,7 +142,7 @@ int main( int argc, char **argv ) workerthread19.start(); a.setMainWidget( &hello ); - TQObject::connect(&hello, SIGNAL(clicked()), &mainobject, SLOT(buttonClicked())); + TQObject::connect(&hello, TQ_SIGNAL(clicked()), &mainobject, TQ_SLOT(buttonClicked())); hello.show(); a.exec(); hello.hide(); diff --git a/tutorial/t2/main.cpp b/tutorial/t2/main.cpp index e7f13ffec..ab32ea986 100644 --- a/tutorial/t2/main.cpp +++ b/tutorial/t2/main.cpp @@ -17,7 +17,7 @@ int main( int argc, char **argv ) quit.resize( 75, 30 ); quit.setFont( TQFont( "Times", 18, TQFont::Bold ) ); - TQObject::connect( &quit, SIGNAL(clicked()), &a, SLOT(quit()) ); + TQObject::connect( &quit, TQ_SIGNAL(clicked()), &a, TQ_SLOT(quit()) ); a.setMainWidget( &quit ); quit.show(); diff --git a/tutorial/t3/main.cpp b/tutorial/t3/main.cpp index a007cd28d..531f6262e 100644 --- a/tutorial/t3/main.cpp +++ b/tutorial/t3/main.cpp @@ -19,7 +19,7 @@ int main( int argc, char **argv ) TQPushButton quit( "Quit", &box ); quit.setFont( TQFont( "Times", 18, TQFont::Bold ) ); - TQObject::connect( &quit, SIGNAL(clicked()), &a, SLOT(quit()) ); + TQObject::connect( &quit, TQ_SIGNAL(clicked()), &a, TQ_SLOT(quit()) ); a.setMainWidget( &box ); box.show(); diff --git a/tutorial/t4/main.cpp b/tutorial/t4/main.cpp index e72550b9d..fb89b924d 100644 --- a/tutorial/t4/main.cpp +++ b/tutorial/t4/main.cpp @@ -26,7 +26,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) quit->setGeometry( 62, 40, 75, 30 ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); } diff --git a/tutorial/t5/main.cpp b/tutorial/t5/main.cpp index cbc5c00a7..2b9a710d7 100644 --- a/tutorial/t5/main.cpp +++ b/tutorial/t5/main.cpp @@ -25,7 +25,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); TQLCDNumber *lcd = new TQLCDNumber( 2, this, "lcd" ); @@ -33,7 +33,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) slider->setRange( 0, 99 ); slider->setValue( 0 ); - connect( slider, SIGNAL(valueChanged(int)), lcd, SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), lcd, TQ_SLOT(display(int)) ); } int main( int argc, char **argv ) diff --git a/tutorial/t6/main.cpp b/tutorial/t6/main.cpp index 75d1440e3..0b17bbea3 100644 --- a/tutorial/t6/main.cpp +++ b/tutorial/t6/main.cpp @@ -25,7 +25,7 @@ LCDRange::LCDRange( TQWidget *parent, const char *name ) TQSlider * slider = new TQSlider( Horizontal, this, "slider" ); slider->setRange( 0, 99 ); slider->setValue( 0 ); - connect( slider, SIGNAL(valueChanged(int)), lcd, SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), lcd, TQ_SLOT(display(int)) ); } class MyWidget : public TQVBox @@ -41,7 +41,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); TQGrid *grid = new TQGrid( 4, this ); diff --git a/tutorial/t7/lcdrange.cpp b/tutorial/t7/lcdrange.cpp index 4bb78ab0b..c8a29e0ee 100644 --- a/tutorial/t7/lcdrange.cpp +++ b/tutorial/t7/lcdrange.cpp @@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name ) slider = new TQSlider( Horizontal, this, "slider" ); slider->setRange( 0, 99 ); slider->setValue( 0 ); - connect( slider, SIGNAL(valueChanged(int)), - lcd, SLOT(display(int)) ); - connect( slider, SIGNAL(valueChanged(int)), - SIGNAL(valueChanged(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + lcd, TQ_SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)) ); } int LCDRange::value() const diff --git a/tutorial/t7/main.cpp b/tutorial/t7/main.cpp index 773e91114..0a3465609 100644 --- a/tutorial/t7/main.cpp +++ b/tutorial/t7/main.cpp @@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); TQGrid *grid = new TQGrid( 4, this ); @@ -36,8 +36,8 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) for( int c = 0 ; c < 4 ; c++ ) { LCDRange* lr = new LCDRange( grid ); if ( previous ) - connect( lr, SIGNAL(valueChanged(int)), - previous, SLOT(setValue(int)) ); + connect( lr, TQ_SIGNAL(valueChanged(int)), + previous, TQ_SLOT(setValue(int)) ); previous = lr; } } diff --git a/tutorial/t8/lcdrange.cpp b/tutorial/t8/lcdrange.cpp index cbb60a993..2a56b9ad2 100644 --- a/tutorial/t8/lcdrange.cpp +++ b/tutorial/t8/lcdrange.cpp @@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name ) slider = new TQSlider( Horizontal, this, "slider" ); slider->setRange( 0, 99 ); slider->setValue( 0 ); - connect( slider, SIGNAL(valueChanged(int)), - lcd, SLOT(display(int)) ); - connect( slider, SIGNAL(valueChanged(int)), - SIGNAL(valueChanged(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + lcd, TQ_SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)) ); setFocusProxy( slider ); } diff --git a/tutorial/t8/main.cpp b/tutorial/t8/main.cpp index 97947afe4..0af6d3347 100644 --- a/tutorial/t8/main.cpp +++ b/tutorial/t8/main.cpp @@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); LCDRange *angle = new LCDRange( this, "angle" ); angle->setRange( 5, 70 ); @@ -35,10 +35,10 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) CannonField *cannonField = new CannonField( this, "cannonField" ); - connect( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - connect( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + connect( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + connect( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); //2x2, 10 pixel border diff --git a/tutorial/t9/lcdrange.cpp b/tutorial/t9/lcdrange.cpp index cbb60a993..2a56b9ad2 100644 --- a/tutorial/t9/lcdrange.cpp +++ b/tutorial/t9/lcdrange.cpp @@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name ) slider = new TQSlider( Horizontal, this, "slider" ); slider->setRange( 0, 99 ); slider->setValue( 0 ); - connect( slider, SIGNAL(valueChanged(int)), - lcd, SLOT(display(int)) ); - connect( slider, SIGNAL(valueChanged(int)), - SIGNAL(valueChanged(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + lcd, TQ_SLOT(display(int)) ); + connect( slider, TQ_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)) ); setFocusProxy( slider ); } diff --git a/tutorial/t9/main.cpp b/tutorial/t9/main.cpp index ffd6739ba..7d81b6cfa 100644 --- a/tutorial/t9/main.cpp +++ b/tutorial/t9/main.cpp @@ -27,17 +27,17 @@ MyWidget::MyWidget( TQWidget *parent, const char *name ) TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" ); quit->setFont( TQFont( "Times", 18, TQFont::Bold ) ); - connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) ); + connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); LCDRange *angle = new LCDRange( this, "angle" ); angle->setRange( 5, 70 ); CannonField *cannonField = new CannonField( this, "cannonField" ); - connect( angle, SIGNAL(valueChanged(int)), - cannonField, SLOT(setAngle(int)) ); - connect( cannonField, SIGNAL(angleChanged(int)), - angle, SLOT(setValue(int)) ); + connect( angle, TQ_SIGNAL(valueChanged(int)), + cannonField, TQ_SLOT(setAngle(int)) ); + connect( cannonField, TQ_SIGNAL(angleChanged(int)), + angle, TQ_SLOT(setValue(int)) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); grid->addWidget( quit, 0, 0 ); |