From fb401a891f1b426e9419c0cb16403df407138611 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 27 Dec 2023 19:25:43 +0900
Subject: Rename METHOD, SIGNAL, SLOT to TQ_METHOD, TQ_SIGNAL, TQ_SLOT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 doc/html/aclock-example.html                  |  4 +-
 doc/html/addressbook-example.html             | 32 +++++-----
 doc/html/archivesearch-example.html           | 16 ++---
 doc/html/buttongroups-example.html            |  6 +-
 doc/html/canvas-chart-example.html            | 44 +++++++-------
 doc/html/canvas-example.html                  | 58 +++++++++---------
 doc/html/chart-chartform-cpp.html             | 44 +++++++-------
 doc/html/chart-optionsform-cpp.html           |  6 +-
 doc/html/chart-setdataform-cpp.html           | 18 +++---
 doc/html/checklists-example.html              | 12 ++--
 doc/html/clientserver-example.html            | 50 +++++++--------
 doc/html/customlayout-example.html            |  2 +-
 doc/html/designer-manual-3.html               |  2 +-
 doc/html/designer-manual-4.html               |  4 +-
 doc/html/designer-manual-7.html               |  8 +--
 doc/html/dirview-example.html                 | 12 ++--
 doc/html/distributor-example.html             |  2 +-
 doc/html/drawdemo-example.html                |  4 +-
 doc/html/extension-dialog-example.html        |  2 +-
 doc/html/fileiconview-example.html            | 88 +++++++++++++--------------
 doc/html/forever-example.html                 |  4 +-
 doc/html/ftpclient-example.html               | 48 +++++++--------
 doc/html/grapher-nsplugin-example.html        | 12 ++--
 doc/html/hello-example.html                   |  4 +-
 doc/html/helpsystem-example.html              | 24 ++++----
 doc/html/helpviewer-example.html              | 64 +++++++++----------
 doc/html/httpd-example.html                   | 12 ++--
 doc/html/i18n-example.html                    |  8 +--
 doc/html/i18n.html                            |  2 +-
 doc/html/iconview-example.html                |  6 +-
 doc/html/iconview-simple_dd-main-cpp.html     |  4 +-
 doc/html/layout-example.html                  |  2 +-
 doc/html/lineedits-example.html               | 30 ++++-----
 doc/html/linguist-manual-4.html               | 10 +--
 doc/html/listbox-example.html                 | 22 +++----
 doc/html/listboxcombo-example.html            | 14 ++---
 doc/html/listviews-example.html               | 16 ++---
 doc/html/mail-example.html                    | 12 ++--
 doc/html/mdi-example.html                     | 42 ++++++-------
 doc/html/menu-example.html                    | 48 +++++++--------
 doc/html/motif-customwidget-example.html      |  2 +-
 doc/html/movies-example.html                  | 20 +++---
 doc/html/network.html                         | 12 ++--
 doc/html/networkprotocol-example.html         | 20 +++---
 doc/html/ntqaccel.html                        |  8 +--
 doc/html/ntqaction.html                       |  6 +-
 doc/html/ntqapplication.html                  |  6 +-
 doc/html/ntqkeysequence.html                  |  2 +-
 doc/html/ntqmainwindow.html                   |  8 +--
 doc/html/ntqmenubar.html                      | 10 +--
 doc/html/ntqmenudata.html                     |  6 +-
 doc/html/ntqobject.html                       | 16 ++---
 doc/html/ntqpopupmenu.html                    |  6 +-
 doc/html/ntqprocess.html                      |  6 +-
 doc/html/ntqprogressdialog.html               |  4 +-
 doc/html/ntqstatusbar.html                    |  4 +-
 doc/html/ntqtimer.html                        |  6 +-
 doc/html/popup-example.html                   | 10 +--
 doc/html/process-example.html                 | 12 ++--
 doc/html/progress-example.html                | 16 ++---
 doc/html/progressbar-example.html             | 20 +++---
 doc/html/qaction-application-example.html     | 32 +++++-----
 doc/html/qactiongroup.html                    |  2 +-
 doc/html/qaxbase.html                         |  8 +--
 doc/html/qaxcontainer-example-qutlook.html    |  6 +-
 doc/html/qaxcontainer-example-webbrowser.html |  4 +-
 doc/html/qaxserver-example-simple.html        |  4 +-
 doc/html/qdir-example.html                    | 16 ++---
 doc/html/qfd-example.html                     |  8 +--
 doc/html/qmag-example.html                    | 10 +--
 doc/html/qmake-manual-7.html                  |  2 +-
 doc/html/qtableitem.html                      |  2 +-
 doc/html/qtooltipgroup.html                   |  8 +--
 doc/html/qwerty-example.html                  | 28 ++++-----
 doc/html/rangecontrols-example.html           |  4 +-
 doc/html/regexptester-example.html            |  8 +--
 doc/html/richtext-example.html                |  6 +-
 doc/html/rot-example.html                     |  6 +-
 doc/html/scribble-example.html                |  8 +--
 doc/html/scrollview-example.html              | 30 ++++-----
 doc/html/showimg-example.html                 | 34 +++++------
 doc/html/signalsandslots.html                 |  2 +-
 doc/html/simple-application-example.html      | 28 ++++-----
 doc/html/simple-application.html              | 30 ++++-----
 doc/html/simple-font-demo-example.html        | 12 ++--
 doc/html/simple_dd-example.html               |  4 +-
 doc/html/sound-example.html                   | 14 ++---
 doc/html/sql-overview-custom1-main-cpp.html   |  6 +-
 doc/html/sql.html                             | 10 +--
 doc/html/statistics-example.html              |  6 +-
 doc/html/t10-lcdrange-cpp.html                |  8 +--
 doc/html/t10-main-cpp.html                    | 18 +++---
 doc/html/t11-cannon-cpp.html                  |  4 +-
 doc/html/t11-lcdrange-cpp.html                |  8 +--
 doc/html/t11-main-cpp.html                    | 20 +++---
 doc/html/t12-cannon-cpp.html                  |  4 +-
 doc/html/t12-lcdrange-cpp.html                |  8 +--
 doc/html/t12-main-cpp.html                    | 20 +++---
 doc/html/t13-cannon-cpp.html                  |  4 +-
 doc/html/t13-gamebrd-cpp.html                 | 34 +++++------
 doc/html/t13-lcdrange-cpp.html                |  8 +--
 doc/html/t14-cannon-cpp.html                  |  4 +-
 doc/html/t14-gamebrd-cpp.html                 | 40 ++++++------
 doc/html/t14-lcdrange-cpp.html                |  8 +--
 doc/html/t7-lcdrange-cpp.html                 |  8 +--
 doc/html/t7-main-cpp.html                     |  6 +-
 doc/html/t8-lcdrange-cpp.html                 |  8 +--
 doc/html/t8-main-cpp.html                     | 10 +--
 doc/html/t9-lcdrange-cpp.html                 |  8 +--
 doc/html/t9-main-cpp.html                     | 10 +--
 doc/html/tabdialog-example.html               |  2 +-
 doc/html/table-statistics-statistics-cpp.html |  6 +-
 doc/html/themes-example.html                  | 10 +--
 doc/html/tictac-example.html                  | 14 ++---
 doc/html/timers.html                          |  8 +--
 doc/html/toggleaction-example.html            |  4 +-
 doc/html/toplevel-example.html                |  2 +-
 doc/html/tutorial1-02.html                    |  4 +-
 doc/html/tutorial1-03.html                    |  2 +-
 doc/html/tutorial1-04.html                    |  4 +-
 doc/html/tutorial1-05.html                    |  6 +-
 doc/html/tutorial1-06.html                    |  8 +--
 doc/html/tutorial1-07.html                    | 12 ++--
 doc/html/tutorial1-08.html                    |  8 +--
 doc/html/tutorial1-10.html                    |  8 +--
 doc/html/tutorial1-11.html                    |  6 +-
 doc/html/tutorial1-12.html                    |  8 +--
 doc/html/tutorial1-13.html                    | 16 ++---
 doc/html/tutorial1-14.html                    |  6 +-
 doc/html/tutorial2-05.html                    |  8 +--
 doc/html/tutorial2-08.html                    | 18 +++---
 doc/html/tutorial2-09.html                    |  6 +-
 doc/html/wizard-example.html                  | 16 ++---
 doc/html/wizard-wizard-cpp.html               | 16 ++---
 doc/html/xform-example.html                   | 32 +++++-----
 135 files changed, 902 insertions(+), 902 deletions(-)

(limited to 'doc/html')

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-&gt;<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> &amp; 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>()-&gt;insertItem( "&amp;File", file );
 
-<a name="x569"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "New", this, SLOT( fileNew() ), CTRL + Key_N );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "fileopen.xpm" ), "Open", this, SLOT( fileOpen() ), CTRL + Key_O );
+<a name="x569"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "New", this, TQ_SLOT( fileNew() ), CTRL + Key_N );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "fileopen.xpm" ), "Open", this, TQ_SLOT( fileOpen() ), CTRL + Key_O );
 <a name="x570"></a>    file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "filesave.xpm" ), "Save", this, SLOT( fileSave() ), CTRL + Key_S );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save As...", this, SLOT( fileSaveAs() ) );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "filesave.xpm" ), "Save", this, TQ_SLOT( fileSave() ), CTRL + Key_S );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save As...", this, TQ_SLOT( fileSaveAs() ) );
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "fileprint.xpm" ), "Print...", this, SLOT( filePrint() ), CTRL + Key_P );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( TQPixmap( "fileprint.xpm" ), "Print...", this, TQ_SLOT( filePrint() ), CTRL + Key_P );
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Close", this, SLOT( closeWindow() ), CTRL + Key_W );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Quit", tqApp, SLOT( <a href="ntqapplication.html#quit">quit</a>() ), CTRL + Key_Q );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Close", this, TQ_SLOT( closeWindow() ), CTRL + Key_W );
+    file-&gt;<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&amp;dd", input );
 <a name="x599"></a><a name="x598"></a>    add-&gt;<a href="ntqwidget.html#resize">resize</a>( add-&gt;<a href="ntqwidget.html#sizeHint">sizeHint</a>() );
     grid1-&gt;<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-&gt;<a href="ntqwidget.html#resize">resize</a>( iFirstName-&gt;<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>( "&amp;Change", input );
     change-&gt;<a href="ntqwidget.html#resize">resize</a>( change-&gt;<a href="ntqwidget.html#sizeHint">sizeHint</a>() );
     grid1-&gt;<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-&gt;<a href="ntqtabwidget.html#addTab">addTab</a>( input, "&amp;Add/Change Entry" );
 
@@ -408,22 +408,22 @@ void <a name="f277"></a>ABCentralWidget::setupTabWidget()
     cFirstName = new <a href="ntqcheckbox.html">TQCheckBox</a>( "First &amp;Name", search );
 <a name="x575"></a>    cFirstName-&gt;<a href="ntqwidget.html#resize">resize</a>( cFirstName-&gt;<a href="ntqwidget.html#sizeHint">sizeHint</a>() );
     grid2-&gt;<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>( "&amp;Last Name", search );
     cLastName-&gt;<a href="ntqwidget.html#resize">resize</a>( cLastName-&gt;<a href="ntqwidget.html#sizeHint">sizeHint</a>() );
     grid2-&gt;<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&amp;ress", search );
     cAddress-&gt;<a href="ntqwidget.html#resize">resize</a>( cAddress-&gt;<a href="ntqwidget.html#sizeHint">sizeHint</a>() );
     grid2-&gt;<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>( "&amp;E-Mail", search );
     cEMail-&gt;<a href="ntqwidget.html#resize">resize</a>( cEMail-&gt;<a href="ntqwidget.html#sizeHint">sizeHint</a>() );
     grid2-&gt;<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-&gt;<a href="ntqwidget.html#resize">resize</a>( sFirstName-&gt;<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&amp;ind", search );
     find-&gt;<a href="ntqwidget.html#resize">resize</a>( find-&gt;<a href="ntqwidget.html#sizeHint">sizeHint</a>() );
     grid2-&gt;<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-&gt;<a href="ntqcheckbox.html#setChecked">setChecked</a>( TRUE );
 <a name="x605"></a>    sFirstName-&gt;<a href="ntqwidget.html#setEnabled">setEnabled</a>( TRUE );
@@ -467,7 +467,7 @@ void <a name="f278"></a>ABCentralWidget::setupListView()
 
 <a name="x592"></a>    listView-&gt;<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-&gt;<a href="qgridlayout.html#addWidget">addWidget</a>( listView, 1, 0 );
 <a name="x591"></a>    listView-&gt;<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-&gt;<a href="ntqwidget.html#show">show</a>();
 
-<a name="x609"></a><a name="x608"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, SIGNAL( <a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>() ), &amp;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>( &amp;a, TQ_SIGNAL( <a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>() ), &amp;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(&amp;articleSearcher, SIGNAL(done(bool)), this, SLOT(searchDone(bool)));
-    connect(&amp;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(&amp;articleSearcher, TQ_SIGNAL(done(bool)), this, TQ_SLOT(searchDone(bool)));
+    connect(&amp;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>( &amp;a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()),
-<a name="x488"></a>                      &amp;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>( &amp;a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()),
+<a name="x488"></a>                      &amp;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&amp;nable Radiobuttons", bgrp3 );
     state-&gt;<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 ),
             "&amp;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 ),
             "&amp;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 ),
             "&amp;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 &amp;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 &amp;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 ),
             "&amp;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 &amp;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 &amp;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 &amp;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", "&amp;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>()-&gt;insertItem( "&amp;Help", helpMenu );
-    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Help", this, SLOT(helpHelp()), Key_F1 );
-    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, SLOT(helpAbout()) );
-    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, SLOT(helpAboutTQt()) );
+    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Help", this, TQ_SLOT(helpHelp()), Key_F1 );
+    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, TQ_SLOT(helpAbout()) );
+    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;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 &lt; int(m_recentFiles.count()) )
             fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( TQString( "&amp;%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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Fill canvas", this, SLOT(init()), CTRL+Key_F);
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Erase canvas", this, SLOT(clear()), CTRL+Key_E);
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;New view", this, SLOT(newView()), CTRL+Key_N);
+<a name="x2936"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Fill canvas", this, TQ_SLOT(init()), CTRL+Key_F);
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Erase canvas", this, TQ_SLOT(clear()), CTRL+Key_E);
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;New view", this, TQ_SLOT(newView()), CTRL+Key_N);
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Print...", this, SLOT(print()), CTRL+Key_P);
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Print...", this, TQ_SLOT(print()), CTRL+Key_P);
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("E&amp;xit", tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q);
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("E&amp;xit", tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q);
     menu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;File", file);
 
     <a href="ntqpopupmenu.html">TQPopupMenu</a>* edit = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menu );
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Circle", this, SLOT(addCircle()), ALT+Key_C);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Hexagon", this, SLOT(addHexagon()), ALT+Key_H);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Polygon", this, SLOT(addPolygon()), ALT+Key_P);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add Spl&amp;ine", this, SLOT(addSpline()), ALT+Key_I);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Text", this, SLOT(addText()), ALT+Key_T);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Line", this, SLOT(addLine()), ALT+Key_L);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Rectangle", this, SLOT(addRectangle()), ALT+Key_R);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Sprite", this, SLOT(addSprite()), ALT+Key_S);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Create &amp;Mesh", this, SLOT(addMesh()), ALT+Key_M );
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Alpha-blended image", this, SLOT(addButterfly()), ALT+Key_A);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Circle", this, TQ_SLOT(addCircle()), ALT+Key_C);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Hexagon", this, TQ_SLOT(addHexagon()), ALT+Key_H);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Polygon", this, TQ_SLOT(addPolygon()), ALT+Key_P);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add Spl&amp;ine", this, TQ_SLOT(addSpline()), ALT+Key_I);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Text", this, TQ_SLOT(addText()), ALT+Key_T);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Line", this, TQ_SLOT(addLine()), ALT+Key_L);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Rectangle", this, TQ_SLOT(addRectangle()), ALT+Key_R);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Sprite", this, TQ_SLOT(addSprite()), ALT+Key_S);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Create &amp;Mesh", this, TQ_SLOT(addMesh()), ALT+Key_M );
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Add &amp;Alpha-blended image", this, TQ_SLOT(addButterfly()), ALT+Key_A);
     menu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Edit", edit);
 
     <a href="ntqpopupmenu.html">TQPopupMenu</a>* view = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menu );
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Enlarge", this, SLOT(enlarge()), SHIFT+CTRL+Key_Plus);
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Shr&amp;ink", this, SLOT(shrink()), SHIFT+CTRL+Key_Minus);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Enlarge", this, TQ_SLOT(enlarge()), SHIFT+CTRL+Key_Plus);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Shr&amp;ink", this, TQ_SLOT(shrink()), SHIFT+CTRL+Key_Minus);
     view-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Rotate clockwise", this, SLOT(rotateClockwise()), CTRL+Key_PageDown);
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Rotate &amp;counterclockwise", this, SLOT(rotateCounterClockwise()), CTRL+Key_PageUp);
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Zoom in", this, SLOT(zoomIn()), CTRL+Key_Plus);
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Zoom &amp;out", this, SLOT(zoomOut()), CTRL+Key_Minus);
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Translate left", this, SLOT(moveL()), CTRL+Key_Left);
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Translate right", this, SLOT(moveR()), CTRL+Key_Right);
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Translate up", this, SLOT(moveU()), CTRL+Key_Up);
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Translate down", this, SLOT(moveD()), CTRL+Key_Down);
-    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Mirror", this, SLOT(mirror()), CTRL+Key_Home);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Rotate clockwise", this, TQ_SLOT(rotateClockwise()), CTRL+Key_PageDown);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Rotate &amp;counterclockwise", this, TQ_SLOT(rotateCounterClockwise()), CTRL+Key_PageUp);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Zoom in", this, TQ_SLOT(zoomIn()), CTRL+Key_Plus);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Zoom &amp;out", this, TQ_SLOT(zoomOut()), CTRL+Key_Minus);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Translate left", this, TQ_SLOT(moveL()), CTRL+Key_Left);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Translate right", this, TQ_SLOT(moveR()), CTRL+Key_Right);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Translate up", this, TQ_SLOT(moveU()), CTRL+Key_Up);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Translate down", this, TQ_SLOT(moveD()), CTRL+Key_Down);
+    view-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Mirror", this, TQ_SLOT(mirror()), CTRL+Key_Home);
     menu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;View", view);
 
     options = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menu );
-    dbf_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Double buffer", this, SLOT(toggleDoubleBuffer()));
+    dbf_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Double buffer", this, TQ_SLOT(toggleDoubleBuffer()));
 <a name="x2939"></a>    options-&gt;<a href="ntqmenudata.html#setItemChecked">setItemChecked</a>(dbf_id, TRUE);
     menu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Options",options);
 
     menu-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
 
     <a href="ntqpopupmenu.html">TQPopupMenu</a>* help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menu );
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;About", this, SLOT(help()), Key_F1);
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;About", this, TQ_SLOT(help()), Key_F1);
     help-&gt;<a href="ntqmenudata.html#setItemChecked">setItemChecked</a>(dbf_id, TRUE);
     menu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;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 ),
             "&amp;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 ),
             "&amp;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 ),
             "&amp;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 &amp;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 &amp;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 ),
             "&amp;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 &amp;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 &amp;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 &amp;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", "&amp;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>()-&gt;insertItem( "&amp;Help", helpMenu );
-    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Help", this, SLOT(helpHelp()), Key_F1 );
-    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, SLOT(helpAbout()) );
-    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, SLOT(helpAboutTQt()) );
+    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Help", this, TQ_SLOT(helpHelp()), Key_F1 );
+    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, TQ_SLOT(helpAbout()) );
+    helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;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 &lt; int(m_recentFiles.count()) )
             fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( TQString( "&amp;%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-&gt;<a href="qboxlayout.html#addWidget">addWidget</a>( cancelPushButton );
     optionsFormLayout-&gt;<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-&gt;<a href="ntqlabel.html#setBuddy">setBuddy</a>( chartTypeComboBox );
     decimalPlacesTextLabel-&gt;<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-&gt;<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>&amp;) ),
-             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>&amp;) ),
+             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>( "  -&gt;  ", this );
     tmp-&gt;<a href="qboxlayout.html#addWidget">addWidget</a>( copy1 );
 <a name="x437"></a><a name="x433"></a>    copy1-&gt;<a href="ntqwidget.html#setMaximumWidth">setMaximumWidth</a>( copy1-&gt;<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>( "  -&gt;  ", this );
     lay-&gt;<a href="qboxlayout.html#addWidget">addWidget</a>( copy2 );
     copy2-&gt;<a href="ntqwidget.html#setMaximumWidth">setMaximumWidth</a>( copy2-&gt;<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-&gt;<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-&gt;<a href="ntqtextedit.html#append">append</a>( tr("New connection\n") );
-        connect( s, SIGNAL(logText(const <a href="ntqstring.html">TQString</a>&amp;)),
-                infoText, SLOT(<a href="ntqtextedit.html#append">append</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
-<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>&amp;)),
+                infoText, TQ_SLOT(<a href="ntqtextedit.html#append">append</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
+<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-&gt;<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-&gt;<a href="ntqsocket.html#close">close</a>();
 <a name="x804"></a>        if ( socket-&gt;<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-&gt;<a href="ntqlayout.html#add">add</a>( new <a href="ntqpushbutton.html">TQPushButton</a>( "More text", f ) );
     b1-&gt;<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-&gt;<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( &amp;a, SIGNAL( lastWindowClosed() ), &amp;a, SLOT( quit() ) );
+    a.connect( &amp;a, TQ_SIGNAL( lastWindowClosed() ), &amp;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>&amp;) ),
-                     this, SLOT( lookfor(const <a href="ntqstring.html">TQString</a>&amp;) ) );
+            <a href="ntqobject.html#connect">connect</a>( findForm, TQ_SIGNAL( lookfor(const <a href="ntqstring.html">TQString</a>&amp;) ),
+                     this, TQ_SLOT( lookfor(const <a href="ntqstring.html">TQString</a>&amp;) ) );
         }
         findForm-&gt;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-&gt;<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> &amp; ) ),
-                 this, SIGNAL( fileNameChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+<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> &amp; ) ),
+                 this, TQ_SIGNAL( fileNameChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
 
         button = new <a href="ntqpushbutton.html">TQPushButton</a>( "...", this, "filechooser_button" );
         button-&gt;<a href="ntqwidget.html#setFixedWidth">setFixedWidth</a>( button-&gt;<a href="ntqwidget.html#fontMetrics">fontMetrics</a>().width( " ... " ) );
         layout-&gt;<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>()-&gt;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()-&gt;setAutoDefault( FALSE );
     backButton()-&gt;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-&gt;<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-&gt;<a href="ntqwidget.html#resize">resize</a>( 80, 30 );
 <a name="x1093"></a><a name="x1080"></a>    print-&gt;<a href="ntqwidget.html#move">move</a>( maxwidth/2 - print-&gt;<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-&gt;<a href="ntqwidget.html#resize">resize</a>( maxwidth, print-&gt;<a href="ntqwidget.html#y">y</a>()+print-&gt;<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-&gt;show();
-<a name="x2868"></a><a name="x2867"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;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>( &amp;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>( &amp;timer, SIGNAL( timeout() ),
-                      <a href="qiconviewitem.html#iconView">iconView</a>(), SLOT( openFolder() ) );
+    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;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> &amp;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>&lt;TQIconDragItem&gt; &amp; ) ),
-             this, SLOT( slotDropped( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt; &amp; ) ) );
-    <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> &amp; ) ),
-             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>&lt;TQIconDragItem&gt; &amp; ) ),
+             this, TQ_SLOT( slotDropped( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt; &amp; ) ) );
+    <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> &amp; ) ),
+             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>( "&amp;Large view", this, SLOT( viewLarge() ) );
-        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Small view", this, SLOT( viewSmall() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Large view", this, TQ_SLOT( viewLarge() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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 &amp;bottom", this, SLOT( viewBottom() ) );
-        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Text at the &amp;right", this, SLOT( viewRight() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Text at the &amp;bottom", this, TQ_SLOT( viewBottom() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Text at the &amp;right", this, TQ_SLOT( viewRight() ) );
         menu.<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange l&amp;eft to right", this, SLOT( flowEast() ) );
-        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange t&amp;op to bottom", this, SLOT( flowSouth() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange l&amp;eft to right", this, TQ_SLOT( flowEast() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange t&amp;op to bottom", this, TQ_SLOT( flowSouth() ) );
         menu.<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Truncate item text", this, SLOT( itemTextTruncate() ) );
-        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Wordwrap item text", this, SLOT( itemTextWordWrap() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Truncate item text", this, TQ_SLOT( itemTextTruncate() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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 &amp;grid", this, SLOT( <a href="ntqiconview.html#arrangeItemsInGrid">arrangeItemsInGrid</a>() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Arrange items in &amp;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 &amp;ascending", this, SLOT( sortAscending() ) );
-        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Sort &amp;descending", this, SLOT( sortDescending() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Sort &amp;ascending", this, TQ_SLOT( sortAscending() ) );
+        menu.<a href="ntqmenudata.html#insertItem">insertItem</a>( "Sort &amp;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-&gt;<a href="ntqcombobox.html#setAutoCompletion">setAutoCompletion</a>( TRUE );
 <a name="x896"></a>    toolbar-&gt;<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> &amp; ) ),
-             this, SLOT ( changePath( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+<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> &amp; ) ),
+             this, TQ_SLOT ( changePath( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
 
 <a name="x895"></a>    toolbar-&gt;<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> &amp; ) ),
-             fileview, SLOT ( setDirectory( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
-    <a href="ntqobject.html#connect">connect</a>( fileview, SIGNAL( directoryChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ),
-             this, SLOT( directoryChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
-    <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> &amp; ) ),
+             fileview, TQ_SLOT ( setDirectory( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( fileview, TQ_SIGNAL( directoryChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ),
+             this, TQ_SLOT( directoryChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <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>()-&gt;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-&gt;<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()-&gt;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> &amp;)),
-            SLOT(ftp_listInfo(const <a href="ntqurlinfo.html">TQUrlInfo</a> &amp;)) );
-<a name="x761"></a>    connect( ftp, SIGNAL(<a href="ntqftp.html#rawCommandReply">rawCommandReply</a>(int, const <a href="ntqstring.html">TQString</a> &amp;)),
-            SLOT(ftp_rawCommandReply(int, const <a href="ntqstring.html">TQString</a> &amp;)) );
+<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> &amp;)),
+            TQ_SLOT(ftp_listInfo(const <a href="ntqurlinfo.html">TQUrlInfo</a> &amp;)) );
+<a name="x761"></a>    connect( ftp, TQ_SIGNAL(<a href="ntqftp.html#rawCommandReply">rawCommandReply</a>(int, const <a href="ntqstring.html">TQString</a> &amp;)),
+            TQ_SLOT(ftp_rawCommandReply(int, const <a href="ntqstring.html">TQString</a> &amp;)) );
 }
 
 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>            &amp;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>            &amp;progress, SLOT(<a href="ntqprogressdialog.html#reset">reset</a>()) );
-<a name="x768"></a>    connect( &amp;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>            &amp;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>            &amp;progress, TQ_SLOT(<a href="ntqprogressdialog.html#reset">reset</a>()) );
+<a name="x768"></a>    connect( &amp;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-&gt;<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)),
-            &amp;progress, SLOT(<a href="ntqprogressdialog.html#setProgress">setProgress</a>(int,int)) );
-    connect( ftp, SIGNAL(<a href="ntqftp.html#commandFinished">commandFinished</a>(int,bool)),
-            &amp;progress, SLOT(<a href="ntqprogressdialog.html#reset">reset</a>()) );
-    connect( &amp;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)),
+            &amp;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)),
+            &amp;progress, TQ_SLOT(<a href="ntqprogressdialog.html#reset">reset</a>()) );
+    connect( &amp;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-&gt;<a href="ntqftp.html#get">get</a>( item-&gt;<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-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Style", stylemenu);
     menubar-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
 
     <a href="ntqpopupmenu.html">TQPopupMenu</a>* help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>;
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About plugin...", this, SIGNAL(aboutPlugin()) );
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About data...", this, SIGNAL(aboutData()) );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About plugin...", this, TQ_SIGNAL(aboutPlugin()) );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About data...", this, TQ_SIGNAL(aboutData()) );
     menubar-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Help", help);
 <a name="x2745"></a>    menubar-&gt;<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-&gt;<a href="ntqwidget.html#font">font</a>().pointSize();
     if (fontfamily) graph-&gt;<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-&gt;<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>( &amp;h, SIGNAL(clicked()), &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;h, TQ_SIGNAL(clicked()), &amp;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>( &amp;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>()-&gt;insertItem( "&amp;File", fileMenu );
         <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertItem( "&amp;Help", helpMenu );
 
-        int fileId = fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "E&amp;xit", this, SLOT(<a href="ntqwidget.html#close">close</a>()) );
+        int fileId = fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "E&amp;xit", this, TQ_SLOT(<a href="ntqwidget.html#close">close</a>()) );
 
-        int helpId = helpMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Open Assistant", this, SLOT(assistantSlot()) );
+        int helpId = helpMenu-&gt;<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>&amp;)), statusBar(),
-            SLOT(message(const <a href="ntqstring.html">TQString</a>&amp;)) );
-    <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>&amp;)), statusBar(),
+            TQ_SLOT(message(const <a href="ntqstring.html">TQString</a>&amp;)) );
+    <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>&amp;)), assistant,
-            SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
-        <a href="ntqobject.html#connect">connect</a>( verticalWhatsThis, SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&amp;)), assistant,
-            SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
-        <a href="ntqobject.html#connect">connect</a>( cellWhatsThis, SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&amp;)), assistant,
-            SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
+        <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>&amp;)), assistant,
+            TQ_SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
+        <a href="ntqobject.html#connect">connect</a>( verticalWhatsThis, TQ_SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&amp;)), assistant,
+            TQ_SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
+        <a href="ntqobject.html#connect">connect</a>( cellWhatsThis, TQ_SIGNAL(linkClicked(const <a href="ntqstring.html">TQString</a>&amp;)), assistant,
+            TQ_SLOT(<a href="ntqassistantclient.html#showPage">showPage</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
     }
 </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-&gt;<a href="ntqtextedit.html#mimeSourceFactory">mimeSourceFactory</a>()-&gt;setFilePath( _path );
     browser-&gt;<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>&amp; ) ),
-             this, SLOT( sourceChanged( const <a href="ntqstring.html">TQString</a>&amp;) ) );
+<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>&amp; ) ),
+             this, TQ_SLOT( sourceChanged( const <a href="ntqstring.html">TQString</a>&amp;) ) );
 
     <a href="ntqmainwindow.html#setCentralWidget">setCentralWidget</a>( browser );
 
     if ( !home_.<a href="ntqstring.html#isEmpty">isEmpty</a>() )
 <a name="x1025"></a>        browser-&gt;<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>&amp;) ),
-             <a href="ntqmainwindow.html#statusBar">statusBar</a>(), SLOT( message( const <a href="ntqstring.html">TQString</a>&amp;)) );
+<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>&amp;) ),
+             <a href="ntqmainwindow.html#statusBar">statusBar</a>(), TQ_SLOT( message( const <a href="ntqstring.html">TQString</a>&amp;)) );
 
     <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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;New Window"), this, SLOT( newWindow() ), CTRL+Key_N );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;Open File"), this, SLOT( openFile() ), CTRL+Key_O );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;Print"), this, SLOT( print() ), CTRL+Key_P );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;New Window"), this, TQ_SLOT( newWindow() ), CTRL+Key_N );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;Open File"), this, TQ_SLOT( openFile() ), CTRL+Key_O );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;Print"), this, TQ_SLOT( print() ), CTRL+Key_P );
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;Close"), this, SLOT( <a href="ntqwidget.html#close">close</a>() ), CTRL+Key_Q );
-<a name="x980"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;xit"), tqApp, SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_X );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;Close"), this, TQ_SLOT( <a href="ntqwidget.html#close">close</a>() ), CTRL+Key_Q );
+<a name="x980"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( icon_back,
-<a name="x1019"></a>                                 <a href="ntqobject.html#tr">tr</a>("&amp;Backward"), browser, SLOT( <a href="ntqtextbrowser.html#backward">backward</a>() ),
+<a name="x1019"></a>                                 <a href="ntqobject.html#tr">tr</a>("&amp;Backward"), browser, TQ_SLOT( <a href="ntqtextbrowser.html#backward">backward</a>() ),
                                  CTRL+Key_Left );
     forwardId = go-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( icon_forward,
-<a name="x1021"></a>                                <a href="ntqobject.html#tr">tr</a>("&amp;Forward"), browser, SLOT( <a href="ntqtextbrowser.html#forward">forward</a>() ),
+<a name="x1021"></a>                                <a href="ntqobject.html#tr">tr</a>("&amp;Forward"), browser, TQ_SLOT( <a href="ntqtextbrowser.html#forward">forward</a>() ),
                                 CTRL+Key_Right );
-<a name="x1024"></a>    go-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( icon_home, tr("&amp;Home"), browser, SLOT( <a href="ntqtextbrowser.html#home">home</a>() ) );
+<a name="x1024"></a>    go-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( icon_home, tr("&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;About"), this, SLOT( about() ) );
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("About &amp;TQt"), this, SLOT( aboutTQt() ) );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;About"), this, TQ_SLOT( about() ) );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("About &amp;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-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>( "Add Bookmark" ), this, SLOT( addBookmark() ) );
+    bookm-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) );
     bookm-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
 
     TQStringList::Iterator it2 = bookmarks.begin();
     for ( ; it2 != bookmarks.end(); ++it2 )
         mBookmarks[ bookm-&gt;<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>()-&gt;insertItem( <a href="ntqobject.html#tr">tr</a>("&amp;File"), file );
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertItem( <a href="ntqobject.html#tr">tr</a>("&amp;Go"), go );
@@ -220,29 +220,29 @@ private:
 
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;setItemEnabled( forwardId, FALSE);
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;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-&gt;<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-&gt;<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-&gt;<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> &amp; ) ),
-             this, SLOT( pathSelected( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+<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> &amp; ) ),
+             this, TQ_SLOT( pathSelected( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
 <a name="x1034"></a>    toolbar-&gt;<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-&gt;<a href="ntqwidget.html#showMaximized">showMaximized</a>();
 
-<a name="x1039"></a>    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()),
-                      &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+<a name="x1039"></a>    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()),
+                      &amp;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-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;xit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()),
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;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>()-&gt;insertItem( <a href="ntqobject.html#tr">tr</a>("&amp;File"), file );
 
@@ -195,7 +195,7 @@ public:
 <a name="x1938"></a>        vb-&gt;<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>&amp; cancel=TQString::null,
                     const <a href="ntqstring.html">TQString</a>&amp; 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-&gt;<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-&gt;<a href="ntqwidget.html#setGeometry">setGeometry</a>(x,y,197,356);
                     w-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( tr("&amp;Quit"), this, SLOT(quit()),
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( tr("&amp;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( &amp;qiconview );
-<a name="x1460"></a><a name="x1455"></a>    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;qiconview, SIGNAL( <a href="ntqiconview.html#dropped">dropped</a>( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt; &amp; ) ),
-                      &amp;listen_dnd, SLOT( dropped( <a href="qdropevent.html">TQDropEvent</a> * ) ) );
-<a name="x1456"></a>    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;qiconview, SIGNAL( <a href="ntqiconview.html#moved">moved</a>() ), &amp;listen_dnd, SLOT( moved() ) );
+<a name="x1460"></a><a name="x1455"></a>    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;qiconview, TQ_SIGNAL( <a href="ntqiconview.html#dropped">dropped</a>( <a href="qdropevent.html">TQDropEvent</a> *, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt; &amp; ) ),
+                      &amp;listen_dnd, TQ_SLOT( dropped( <a href="qdropevent.html">TQDropEvent</a> * ) ) );
+<a name="x1456"></a>    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;qiconview, TQ_SIGNAL( <a href="ntqiconview.html#moved">moved</a>() ), &amp;listen_dnd, TQ_SLOT( moved() ) );
 
     a.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>( &amp;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>&lt;TQIconDragItem&gt;&amp;)),
-        iv, SLOT(slotNewItem(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt;&amp;)));
+<a name="x2821"></a>        iv, TQ_SIGNAL(<a href="ntqiconview.html#dropped">dropped</a>(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt;&amp;)),
+        iv, TQ_SLOT(slotNewItem(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt;&amp;)));
 
     // 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-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Quit", tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+    popup-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Quit", tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
     menubar-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<a href="ntqcombobox.html#insertItem">insertItem</a>( "Normal" );
     combo1-&gt;<a href="ntqcombobox.html#insertItem">insertItem</a>( "Password" );
     combo1-&gt;<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-&gt;<a href="ntqcombobox.html#insertItem">insertItem</a>( "No Validator" );
     combo2-&gt;<a href="ntqcombobox.html#insertItem">insertItem</a>( "Integer Validator" );
     combo2-&gt;<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-&gt;<a href="ntqcombobox.html#insertItem">insertItem</a>( "Left" );
     combo3-&gt;<a href="ntqcombobox.html#insertItem">insertItem</a>( "Centered" );
     combo3-&gt;<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-&gt;<a href="ntqcombobox.html#insertItem">insertItem</a>( "License key" );
 
     // ...this time we use the activated( const <a href="ntqstring.html">TQString</a> &amp; ) 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-&gt;<a href="ntqcombobox.html#insertItem">insertItem</a>( "False" );
     combo5-&gt;<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> &amp;mask )
+ * TQ_SLOT slotInputMaskChanged( const <a href="ntqstring.html">TQString</a> &amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;xit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()),
+<pre>        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;xit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()),
+<!-- index Ctrl Key --><!-- index Alt Key --><pre>        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;xit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()),
+<pre>        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("E&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;About"), this, SLOT(about()), Key_F1 );
-        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("About &amp;TQt"), this, SLOT(aboutTQt()) );
+        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;About"), this, TQ_SLOT(about()), Key_F1 );
+        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("About &amp;TQt"), this, TQ_SLOT(aboutTQt()) );
 
         <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertItem( <a href="ntqobject.html#tr">tr</a>("&amp;File"), file );
         <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;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-&gt;<a href="ntqbuttongroup.html#insert">insert</a>( b );
 <a name="x1425"></a>    v-&gt;<a href="qboxlayout.html#addWidget">addWidget</a>( b );
 <a name="x1440"></a>    b-&gt;<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-&gt;<a href="qboxlayout.html#addLayout">addLayout</a>( h );
 <a name="x1423"></a>    h-&gt;<a href="qboxlayout.html#addSpacing">addSpacing</a>( 30 );
@@ -151,7 +151,7 @@ private:
                           this );
     bg-&gt;<a href="ntqbuttongroup.html#insert">insert</a>( b );
     v-&gt;<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-&gt;<a href="qboxlayout.html#addSpacing">addSpacing</a>( 12 );
 
@@ -160,7 +160,7 @@ private:
                           this );
     bg-&gt;<a href="ntqbuttongroup.html#insert">insert</a>( b );
     v-&gt;<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-&gt;<a href="qboxlayout.html#addLayout">addLayout</a>( h );
     h-&gt;<a href="qboxlayout.html#addSpacing">addSpacing</a>( 30 );
@@ -177,30 +177,30 @@ private:
                           this );
     bg-&gt;<a href="ntqbuttongroup.html#insert">insert</a>( b );
     v-&gt;<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-&gt;<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-&gt;<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-&gt;<a href="qboxlayout.html#addWidget">addWidget</a>( cb );
     v-&gt;<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-&gt;<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-&gt;<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-&gt;<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-&gt;<a href="qboxlayout.html#addWidget">addWidget</a>( pb );
 
 <a name="x1424"></a>    v-&gt;<a href="qboxlayout.html#addStretch">addStretch</a>( 100 );
@@ -214,8 +214,8 @@ private:
     rows-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( 1, 256 );
     rows-&gt;<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>( " -&gt; ", 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> &amp; ) ), this, SLOT( slotCombo1Activated( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
-    <a href="ntqobject.html#connect">connect</a>( cb2, SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ), this, SLOT( slotCombo2Activated( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+<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> &amp; ) ), this, TQ_SLOT( slotCombo1Activated( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( cb2, TQ_SIGNAL( <a href="ntqcombobox.html#activated">activated</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ), this, TQ_SLOT( slotCombo2Activated( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
 }
 
 /*
- * 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> &amp;s )
+ * TQ_SLOT slotCombo1Activated( const <a href="ntqstring.html">TQString</a> &amp;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> &amp;s )
+ * TQ_SLOT slotCombo2Activated( const <a href="ntqstring.html">TQString</a> &amp;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 &lt;= 10; i++ )
         menu-&gt;<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>&amp; , int ) ),
-            this, SLOT( slotRMB( <a href="qlistviewitem.html">TQListViewItem</a> *, const <a href="ntqpoint.html">TQPoint</a> &amp;, 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>&amp; , int ) ),
+            this, TQ_SLOT( slotRMB( <a href="qlistviewitem.html">TQListViewItem</a> *, const <a href="ntqpoint.html">TQPoint</a> &amp;, int ) ) );
 <a name="x161"></a>    vsplitter-&gt;<a href="ntqsplitter.html#setResizeMode">setResizeMode</a>( messages, TQSplitter::KeepSize );
 
     message = new <a href="ntqlabel.html">TQLabel</a>( vsplitter );
     message-&gt;<a href="ntqlabel.html#setAlignment">setAlignment</a>( TQt::AlignTop );
 <a name="x163"></a>    message-&gt;<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-&gt;<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> &amp;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>()-&gt;insertItem( "&amp;File", file );
 
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New", this, SLOT(newDoc()), CTRL+Key_N );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New", this, TQ_SLOT(newDoc()), CTRL+Key_N );
 
     id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( openIcon, "&amp;Open...",
-                           this, SLOT(load()), CTRL+Key_O );
+                           this, TQ_SLOT(load()), CTRL+Key_O );
 <a name="x2035"></a>    file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileOpenText );
 
     id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( saveIcon, "&amp;Save",
-                           this, SLOT(save()), CTRL+Key_S );
+                           this, TQ_SLOT(save()), CTRL+Key_S );
     file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText );
-    id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &amp;As...", this, SLOT(saveAs()) );
+    id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &amp;As...", this, TQ_SLOT(saveAs()) );
     file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText );
 #ifndef TQT_NO_PRINTER
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
     id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( printIcon, "&amp;Print...",
-                           this, SLOT(print()), CTRL+Key_P );
+                           this, TQ_SLOT(print()), CTRL+Key_P );
     file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, filePrintText );
 #endif
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, SLOT(closeWindow()), CTRL+Key_W );
-<a name="x2020"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Quit", tqApp, SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, TQ_SLOT(closeWindow()), CTRL+Key_W );
+<a name="x2020"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<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>()-&gt;insertItem( "&amp;Windows", windowsMenu );
 
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertSeparator();
     <a href="ntqpopupmenu.html">TQPopupMenu</a> * help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this );
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertItem( "&amp;Help", help );
 
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, SLOT(about()), Key_F1);
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, SLOT(aboutTQt()));
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, TQ_SLOT(about()), Key_F1);
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, TQ_SLOT(aboutTQt()));
     help-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;This", this, SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1);
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;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-&gt;<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>&amp;, int) ), statusBar(), SLOT( message(const <a href="ntqstring.html">TQString</a>&amp;, int )) );
+    <a href="ntqobject.html#connect">connect</a>( w, TQ_SIGNAL( message(const <a href="ntqstring.html">TQString</a>&amp;, int) ), statusBar(), TQ_SLOT( message(const <a href="ntqstring.html">TQString</a>&amp;, int )) );
     w-&gt;<a href="ntqwidget.html#setCaption">setCaption</a>("unnamed document");
 <a name="x2085"></a>    w-&gt;<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-&gt;<a href="ntqmenudata.html#clear">clear</a>();
-<a name="x2091"></a>    int cascadeId = windowsMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Cascade", ws, SLOT(<a href="ntqworkspace.html#cascade">cascade</a>() ) );
-<a name="x2093"></a>    int tileId = windowsMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Tile", ws, SLOT(<a href="ntqworkspace.html#tile">tile</a>() ) );
-    int horTileId = windowsMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Tile &amp;Horizontally", this, SLOT(tileHorizontal() ) );
+<a name="x2091"></a>    int cascadeId = windowsMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Cascade", ws, TQ_SLOT(<a href="ntqworkspace.html#cascade">cascade</a>() ) );
+<a name="x2093"></a>    int tileId = windowsMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Tile", ws, TQ_SLOT(<a href="ntqworkspace.html#tile">tile</a>() ) );
+    int horTileId = windowsMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Tile &amp;Horizontally", this, TQ_SLOT(tileHorizontal() ) );
     if ( ws-&gt;<a href="ntqworkspace.html#windowList">windowList</a>().isEmpty() ) {
 <a name="x2033"></a>        windowsMenu-&gt;<a href="ntqmenudata.html#setItemEnabled">setItemEnabled</a>( cascadeId, FALSE );
         windowsMenu-&gt;<a href="ntqmenudata.html#setItemEnabled">setItemEnabled</a>( tileId, FALSE );
@@ -356,7 +356,7 @@ void <a name="f544"></a>ApplicationWindow::windowsMenuAboutToShow()
     TQWidgetList windows = ws-&gt;<a href="ntqworkspace.html#windowList">windowList</a>();
 <a name="x2054"></a>    for ( int i = 0; i &lt; int(windows.count()); ++i ) {
 <a name="x2053"></a>        int id = windowsMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>(windows.at(i)-&gt;caption(),
-                                         this, SLOT( windowsMenuActivated( int ) ) );
+                                         this, TQ_SLOT( windowsMenuActivated( int ) ) );
 <a name="x2034"></a>        windowsMenu-&gt;<a href="ntqmenudata.html#setItemParameter">setItemParameter</a>( id, i );
 <a name="x2032"></a>        windowsMenu-&gt;<a href="ntqmenudata.html#setItemChecked">setItemChecked</a>( id, ws-&gt;<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-&gt;<a href="ntqwidget.html#setCaption">setCaption</a>( "TQt Example - Multiple Documents Interface (MDI)" );
     mw-&gt;<a href="ntqwidget.html#show">show</a>();
-<a name="x2097"></a><a name="x2096"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;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>( &amp;a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;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-&gt;<a href="ntqpopupmenu.html#insertTearOffHandle">insertTearOffHandle</a>();
-<a name="x1869"></a>    print-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Print to printer", this, SLOT(printer()) );
-    print-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to &amp;file", this, SLOT(file()) );
-    print-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to fa&amp;x", this, SLOT(fax()) );
+<a name="x1869"></a>    print-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Print to printer", this, TQ_SLOT(printer()) );
+    print-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to &amp;file", this, TQ_SLOT(file()) );
+    print-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to fa&amp;x", this, TQ_SLOT(fax()) );
 <a name="x1870"></a>    print-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    print-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Printer &amp;Setup", this, SLOT(printerSetup()) );
+    print-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Printer &amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p1, "&amp;Open",  this, SLOT(open()), CTRL+Key_O );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p2, "&amp;New", this, SLOT(news()), CTRL+Key_N );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p3, "&amp;Save", this, SLOT(save()), CTRL+Key_S );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, SLOT(closeDoc()), CTRL+Key_W );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p1, "&amp;Open",  this, TQ_SLOT(open()), CTRL+Key_O );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p2, "&amp;New", this, TQ_SLOT(news()), CTRL+Key_N );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p3, "&amp;Save", this, TQ_SLOT(save()), CTRL+Key_S );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, TQ_SLOT(closeDoc()), CTRL+Key_W );
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
     file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Print", print, CTRL+Key_P );
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "E&amp;xit",  tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "E&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Undo", this, SLOT(undo()) );
-    int redoID = edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Redo", this, SLOT(redo()) );
+    int undoID = edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Undo", this, TQ_SLOT(undo()) );
+    int redoID = edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Redo", this, TQ_SLOT(redo()) );
 <a name="x1873"></a>    edit-&gt;<a href="ntqmenudata.html#setItemEnabled">setItemEnabled</a>( undoID, FALSE );
     edit-&gt;<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-&gt;<a href="ntqpopupmenu.html#insertTearOffHandle">insertTearOffHandle</a>();
     options-&gt;<a href="ntqwidget.html#setCaption">setCaption</a>("Options");
-    options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Normal Font", this, SLOT(normal()) );
+    options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Normal Font", this, TQ_SLOT(normal()) );
     options-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
 
 <a name="x1883"></a>    options-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( new MyMenuItem( "Bold", f ) );
 <a name="x1871"></a>    options-&gt;<a href="ntqmenudata.html#setAccel">setAccel</a>( CTRL+Key_B, boldID );
-<a name="x1868"></a>    options-&gt;<a href="ntqmenudata.html#connectItem">connectItem</a>( boldID, this, SLOT(bold()) );
+<a name="x1868"></a>    options-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( new MyMenuItem( "Underline", f ) );
     options-&gt;<a href="ntqmenudata.html#setAccel">setAccel</a>( CTRL+Key_U, underlineID );
-    options-&gt;<a href="ntqmenudata.html#connectItem">connectItem</a>( underlineID, this, SLOT(underline()) );
+    options-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, SLOT(about()), CTRL+Key_H );
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, SLOT(aboutTQt()) );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, TQ_SLOT(about()), CTRL+Key_H );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;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-&gt;<a href="ntqframe.html#setLineWidth">setLineWidth</a>( 1 );
     label-&gt;<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>&amp;)),
-             label, SLOT(<a href="ntqlabel.html#setText">setText</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
+    <a href="ntqobject.html#connect">connect</a>( this,  TQ_SIGNAL(explain(const <a href="ntqstring.html">TQString</a>&amp;)),
+             label, TQ_SLOT(<a href="ntqlabel.html#setText">setText</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
 
     <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&lt;/b&gt;&lt;/u&gt;&lt;/font&gt;", this );
     caption-&gt;<a href="ntqlabel.html#setAlignment">setAlignment</a>( TQt::AlignCenter );
     contextMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( caption );
-    contextMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New",  this, SLOT(news()), CTRL+Key_N );
-    contextMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Open...", this, SLOT(open()), CTRL+Key_O );
-    contextMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Save", this, SLOT(save()), CTRL+Key_S );
+    contextMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New",  this, TQ_SLOT(news()), CTRL+Key_N );
+    contextMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Open...", this, TQ_SLOT(open()), CTRL+Key_O );
+    contextMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Print to printer", this, SLOT(printer()) );
-    submenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to &amp;file", this, SLOT(file()) );
-    submenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to fa&amp;x", this, SLOT(fax()) );
+    submenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Print to printer", this, TQ_SLOT(printer()) );
+    submenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to &amp;file", this, TQ_SLOT(file()) );
+    submenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Print to fa&amp;x", this, TQ_SLOT(fax()) );
     contextMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Print", submenu );
 <a name="x1878"></a><a name="x1859"></a>    contextMenu-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;Quit"), tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+    filemenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>("&amp;Quit"), tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
 
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertItem( <a href="ntqobject.html#tr">tr</a>("&amp;File"), filemenu );
     <a href="ntqmainwindow.html#statusBar">statusBar</a>()-&gt;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>&amp;)));
-<a name="x498"></a>        movie.<a href="ntqmovie.html#connectResize">connectResize</a>(this, SLOT(movieResized(const <a href="ntqsize.html">TQSize</a>&amp;)));
-<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>&amp;)));
+<a name="x498"></a>        movie.<a href="ntqmovie.html#connectResize">connectResize</a>(this, TQ_SLOT(movieResized(const <a href="ntqsize.html">TQSize</a>&amp;)));
+<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>("&lt;&lt;", 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>("&gt;|", 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>("&gt;&gt;|", 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>&amp;)),
-            this, SLOT(startMovie(const <a href="ntqstring.html">TQString</a>&amp;)));
+    <a href="ntqobject.html#connect">connect</a>(this, TQ_SIGNAL(<a href="ntqfiledialog.html#fileSelected">fileSelected</a>(const <a href="ntqstring.html">TQString</a>&amp;)),
+            this, TQ_SLOT(startMovie(const <a href="ntqstring.html">TQString</a>&amp;)));
 }
 
 
@@ -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( &amp;op, SIGNAL( newChildren( const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQUrlInfo&gt; &amp;, TQNetworkOperation * ) ),
-             this, SLOT( slotInsertEntries( const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQUrlInfo&gt; &amp;, TQNetworkOperation * ) ) );
-    connect( &amp;op, SIGNAL( start( <a href="qnetworkoperation.html">TQNetworkOperation</a> * ) ),
-             this, SLOT( slotStart( <a href="qnetworkoperation.html">TQNetworkOperation</a> *) ) );
-    connect( &amp;op, SIGNAL( finished( <a href="qnetworkoperation.html">TQNetworkOperation</a> * ) ),
-             this, SLOT( slotFinished( <a href="qnetworkoperation.html">TQNetworkOperation</a> *) ) );
+    connect( &amp;op, TQ_SIGNAL( newChildren( const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQUrlInfo&gt; &amp;, TQNetworkOperation * ) ),
+             this, TQ_SLOT( slotInsertEntries( const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQUrlInfo&gt; &amp;, TQNetworkOperation * ) ) );
+    connect( &amp;op, TQ_SIGNAL( start( <a href="qnetworkoperation.html">TQNetworkOperation</a> * ) ),
+             this, TQ_SLOT( slotStart( <a href="qnetworkoperation.html">TQNetworkOperation</a> *) ) );
+    connect( &amp;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>&lt;TQUrlInfo&gt; &amp;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( "&amp;Exit", parent ); // automatic shortcut ALT+Key_E
         <a href="ntqpopupmenu.html">TQPopupMenu</a> *fileMenu = new fileMenu( parent );
-        fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Undo", parent, SLOT(undo()), CTRL+Key_Z );
+        fileMenu-&gt;<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-&gt;<a href="#connectItem">connectItem</a>( a-&gt;<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-&gt;connectItem( 201, mainView, SLOT(quit()) );
+        a-&gt;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p1, tr("&amp;Open..."), this, SLOT(open()),
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p1, tr("&amp;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 ), "&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Quit", tqApp, SLOT(<a href="#closeAllWindows">closeAllWindows</a>()), CTRL+Key_Q );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( tr("&amp;Open..."), this, SLOT(open()),
+        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( tr("&amp;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>()-&gt;insertItem( "&amp;Help", help );
 
-        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, SLOT(about()), Key_F1 );
+        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<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 ), "&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;This", this , SLOT(<a href="#whatsThis">whatsThis</a>()), SHIFT+Key_F1);
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p1, "&amp;Open",  this, SLOT(open()), CTRL+Key_O );
-        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p2, "&amp;New", this, SLOT(news()), CTRL+Key_N );
+</pre><pre>        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p1, "&amp;Open",  this, TQ_SLOT(open()), CTRL+Key_O );
+        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( p2, "&amp;New", this, TQ_SLOT(news()), CTRL+Key_N );
 </pre><pre>        menu = new TQMenuBar( this );
 </pre><pre>        menu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "New",  myView, SLOT(newFile()), CTRL+Key_N );
-        fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Open", myView, SLOT(open()),    CTRL+Key_O );
+        fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "New",  myView, TQ_SLOT(newFile()), CTRL+Key_N );
+        fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Open", myView, TQ_SLOT(open()),    CTRL+Key_O );
         mainMenu-&gt;<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-&gt;insertItem( <a href="ntqobject.html#tr">tr</a>("Open"), myView, SLOT(open()),
+        fileMenu-&gt;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-&gt;<a href="#insertItem">insertItem</a>( "New",  myView, SLOT(newFile()), CTRL+Key_N );
-        fileMenu-&gt;<a href="#insertItem">insertItem</a>( "Open", myView, SLOT(open()),    CTRL+Key_O );
+        fileMenu-&gt;<a href="#insertItem">insertItem</a>( "New",  myView, TQ_SLOT(newFile()), CTRL+Key_N );
+        fileMenu-&gt;<a href="#insertItem">insertItem</a>( "Open", myView, TQ_SLOT(open()),    CTRL+Key_O );
         mainMenu-&gt;<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-&gt;insertItem( tr("Open"), myView, SLOT(open()),
+        fileMenu-&gt;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-&gt;disconnect( SIGNAL(mySignal()) );
+       myObject-&gt;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "New",  myView, SLOT(newFile()), CTRL+Key_N );
-        fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Open", myView, SLOT(open()),    CTRL+Key_O );
+        fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "New",  myView, TQ_SLOT(newFile()), CTRL+Key_N );
+        fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Open", myView, TQ_SLOT(open()),    CTRL+Key_O );
         mainMenu-&gt;<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-&gt;insertItem( <a href="ntqobject.html#tr">tr</a>("Open"), myView, SLOT(open()),
+        fileMenu-&gt;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-&gt;<a href="#addArgument">addArgument</a>( "i18n" );
         proc-&gt;<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-&gt;<a href="#start">start</a>() ) {
             // error handling
 </pre><pre>        }
@@ -347,7 +347,7 @@ tryTerminate().
 is to do something like this:
 <pre>
         process-&gt;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-&gt;<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>&amp;)),
-                 statusBar(), SLOT(<a href="#message">message</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
+        <a href="ntqobject.html#connect">connect</a>( loader, TQ_SIGNAL(progressMessage(const <a href="ntqstring.html">TQString</a>&amp;)),
+                 statusBar(), TQ_SLOT(<a href="#message">message</a>(const <a href="ntqstring.html">TQString</a>&amp;)) );
 
         statusBar()-&gt;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-&gt;<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-&gt;<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, &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+            TQTimer::<a href="#singleShot">singleShot</a>( 10*60*1000, &amp;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-&gt;<a href="ntqwidget.html#setMaximumSize">setMaximumSize</a>(button1-&gt;<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-&gt;<a href="ntqframe.html#setFrameStyle">setFrameStyle</a>( WinPanel|Raised );
     popup1-&gt;<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-&gt;<a href="ntqwidget.html#setGeometry">setGeometry</a>(10,10, 130, 30);
 <a name="x1625"></a>    tmpE-&gt;<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-&gt;<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-&gt;<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-&gt;<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-&gt;<a href="ntqprocess.html#addArgument">addArgument</a>( "i18n" );
     proc-&gt;<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-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;File", file );
         for (int i=first_draw_item; i&lt;=last_draw_item; i++)
             file-&gt;<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-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Quit", tqApp,  SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+        file-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Options", options );
-        td_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Timer driven", this, SLOT(timerDriven()) );
-        ld_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Loop driven", this, SLOT(loopDriven()) );
+        td_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Timer driven", this, TQ_SLOT(timerDriven()) );
+        ld_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Loop driven", this, TQ_SLOT(loopDriven()) );
         options-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-        dl_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Default label", this, SLOT(defaultLabel()) );
-        cl_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Custom label", this, SLOT(customLabel()) );
+        dl_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Default label", this, TQ_SLOT(defaultLabel()) );
+        cl_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Custom label", this, TQ_SLOT(customLabel()) );
         options-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-        md_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "No minimum duration", this, SLOT(toggleMinimumDuration()) );
+        md_id = options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "No minimum duration", this, TQ_SLOT(toggleMinimumDuration()) );
 <a name="x81"></a>        options-&gt;<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-&gt;<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-&gt;<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>( &amp;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>( &amp;timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) );
 
     // Let's start with normal speed...
 <a name="x972"></a>    normal-&gt;<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>( "&amp;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 ), "&amp;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 = "&lt;p&gt;&lt;img source=\"fileopen\"&gt; "
                      "Click this button to open a &lt;em&gt;new file&lt;/em&gt;. &lt;br&gt;"
@@ -158,7 +158,7 @@ private:
 
     fileSaveAction = new <a href="ntqaction.html">TQAction</a>( TQPixmap( filesave ),
                                   "&amp;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 = "&lt;p&gt;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 &amp;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-&gt;<a href="ntqaction.html#setWhatsThis">setWhatsThis</a>( fileSaveText );
 
     filePrintAction = new <a href="ntqaction.html">TQAction</a>( "Print File", TQPixmap( fileprint ),
                                    "&amp;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", "&amp;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", "&amp;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>()-&gt;insertItem( "&amp;Help", help );
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, SLOT(about()), Key_F1 );
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, SLOT(aboutTQt()) );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, TQ_SLOT(about()), Key_F1 );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, TQ_SLOT(aboutTQt()) );
     help-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;This", this, SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()),
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;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-&gt;<a href="ntqwidget.html#setCaption">setCaption</a>( "Document 1" );
 <a name="x1178"></a>    mw-&gt;<a href="ntqwidget.html#show">show</a>();
-<a name="x1179"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+<a name="x1179"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;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>&amp;)),
-             this, SLOT(setCaption(const <a href="ntqstring.html">TQString</a>&amp;)) );
+    connect( webBrowser, TQ_SIGNAL(TitleChanged(const <a href="ntqstring.html">TQString</a>&amp;)),
+             this, TQ_SLOT(setCaption(const <a href="ntqstring.html">TQString</a>&amp;)) );
     </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)), &amp;object, SLOT(showColumn(int)) );
+    connect( this, TQ_SIGNAL(clicked(int)), &amp;object, TQ_SLOT(showColumn(int)) );
     bool ok = object.<a href="#dynamicCall">dynamicCall</a>( "addColumn(const <a href="ntqstring.html">TQString</a>&amp;)", "Column 1" ).toBool();
 
     <a href="ntqvaluelist.html">TQValueList</a>&lt;TQVariant&gt; 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-&gt;<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-&gt;<a href="ntqwidget.html#hide">hide</a>();
         statusBar()-&gt;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>&amp;)), statusBar(), SLOT(message(const <a href="ntqstring.html">TQString</a>&amp;)) );
+        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>&amp;)), statusBar(), TQ_SLOT(message(const <a href="ntqstring.html">TQString</a>&amp;)) );
 
         WebBrowser-&gt;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>&amp;)), this, SLOT(setText(const <a href="ntqstring.html">TQString</a>&amp;)) );
+    <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>&amp;)), this, TQ_SLOT(setText(const <a href="ntqstring.html">TQString</a>&amp;)) );
 
             vbox-&gt;<a href="qboxlayout.html#addWidget">addWidget</a>( slider );
             vbox-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( <a href="ntqobject.html#tr">tr</a>( "Add bookmark" ) );
     bookmarkMenu-&gt;<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> &amp; ) ),
-             this, SLOT( setDir2( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
-    <a href="ntqobject.html#connect">connect</a>( this, SIGNAL( <a href="ntqfiledialog.html#dirEntered">dirEntered</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
-             dirView, SLOT( <a href="ntqfiledialog.html#setDir">setDir</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( dirView, TQ_SIGNAL( folderSelected( const <a href="ntqstring.html">TQString</a> &amp; ) ),
+             this, TQ_SLOT( setDir2( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL( <a href="ntqfiledialog.html#dirEntered">dirEntered</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
+             dirView, TQ_SLOT( <a href="ntqfiledialog.html#setDir">setDir</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
 
     <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-&gt;<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-&gt;<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>&amp;)),
-            <a href="ntqmainwindow.html#statusBar">statusBar</a>(),SLOT(message(const <a href="ntqstring.html">TQString</a>&amp;)));
+<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>&amp;)),
+            <a href="ntqmainwindow.html#statusBar">statusBar</a>(),TQ_SLOT(message(const <a href="ntqstring.html">TQString</a>&amp;)));
     table-&gt;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-&gt;<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-&gt;<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&lt;9; n++) {
 <a name="x1797"></a>        int w2 = zoom-&gt;<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-&gt;<a href="ntqbutton.html#setText">setText</a>( "Save" );
 <a name="x1788"></a>    saveButton-&gt;<a href="ntqwidget.html#setGeometry">setGeometry</a>( x+w+30+2, 2,
                              10+saveButton-&gt;<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-&gt;<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-&gt;<a href="ntqbutton.html#setText">setText</a>( "MultiSave" );
 <a name="x1798"></a>    multiSaveButton-&gt;<a href="ntqwidget.html#setGeometry">setGeometry</a>( saveButton-&gt;<a href="ntqwidget.html#geometry">geometry</a>().right() + 2, 2,
                              10+multiSaveButton-&gt;<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-&gt;<a href="ntqbutton.html#setText">setText</a>( "Quit" );
     quitButton-&gt;<a href="ntqwidget.html#setGeometry">setGeometry</a>( multiSaveButton-&gt;<a href="ntqwidget.html#geometry">geometry</a>().right() + 2, 2,
                              10+quitButton-&gt;<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>( &amp;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 )-&gt;cb = new <a href="ntqcombobox.html">TQComboBox</a>( <a href="#table">table</a>()-&gt;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-&gt;insertItem( "Yes" );
         cb-&gt;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>&amp;)),
-                 myLabel, SLOT(setText(const <a href="ntqstring.html">TQString</a>&amp;)) );
-        <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>&amp;)),
+                 myLabel, TQ_SLOT(setText(const <a href="ntqstring.html">TQString</a>&amp;)) );
+        <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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;File", file );
 
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New",   this, SLOT(newDoc()),   ALT+Key_N );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Open...",  this, SLOT(load()),     ALT+Key_O );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Save...",  this, SLOT(save()),     ALT+Key_S );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New",   this, TQ_SLOT(newDoc()),   ALT+Key_N );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Open...",  this, TQ_SLOT(load()),     ALT+Key_O );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Save...",  this, TQ_SLOT(save()),     ALT+Key_S );
 <a name="x372"></a>    file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
     open_as = new <a href="ntqpopupmenu.html">TQPopupMenu</a>();
     file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Open &amp;As",  open_as );
     save_as = new <a href="ntqpopupmenu.html">TQPopupMenu</a>();
     file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Sa&amp;ve As",  save_as );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Add &amp;Encoding", this, SLOT(addEncoding()) );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Add &amp;Encoding", this, TQ_SLOT(addEncoding()) );
 #ifndef TQT_NO_PRINTER
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Print...", this, SLOT(print()),    ALT+Key_P );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Print...", this, TQ_SLOT(print()),    ALT+Key_P );
 #endif
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, SLOT(<a href="ntqwidget.html#close">close</a>()),ALT+Key_W );
-<a name="x358"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Quit",  tqApp, SLOT(<a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>()),     ALT+Key_Q );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, TQ_SLOT(<a href="ntqwidget.html#close">close</a>()),ALT+Key_W );
+<a name="x358"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Edit", edit );
 
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "To &amp;Uppercase",   this, SLOT(toUpper()),   ALT+Key_U );
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "To &amp;Lowercase",   this, SLOT(toLower()),   ALT+Key_L );
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "To &amp;Uppercase",   this, TQ_SLOT(toUpper()),   ALT+Key_U );
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "To &amp;Lowercase",   this, TQ_SLOT(toLower()),   ALT+Key_L );
 #ifndef TQT_NO_FONTDIALOG
     edit-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Select Font" ,   this, SLOT(<a href="ntqwidget.html#font">font</a>()),     ALT+Key_T );
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<a href="ntqwidget.html#show">show</a>();
         }
     }
-<a name="x416"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+<a name="x416"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;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-&gt;<a href="ntqlcdnumber.html#display">display</a>( 33 );
 <a name="x1385"></a>    lcd2-&gt;<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-&gt;<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-&gt;<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>(&amp;app, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;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>(&amp;app, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;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-&gt;<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>( "&amp;Quit", this );
 <a name="x1379"></a>    quit-&gt;<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-&gt;<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-&gt;<a href="ntqbutton.html#setText">setText</a>( "Save as..." );
 
 <a name="x943"></a>    tools-&gt;<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-&gt;<a href="ntqbutton.html#setText">setText</a>( "Choose Pen Color..." );
 
     tools-&gt;<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-&gt;<a href="ntqspinbox.html#setValue">setValue</a>( 3 );
 
     tools-&gt;<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-&gt;<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&lt;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 &gt; 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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;File", file );
-        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Quit", tqApp,  SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+        file-&gt;<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-&gt;<a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE );
         menubar-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Vertical Auto" );
         vaoff_id = vp_options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Vertical AlwaysOff" );
@@ -271,8 +271,8 @@ public:
 <a name="x655"></a>            BigShrinker *bs = new BigShrinker(0);//(vp-&gt;<a href="ntqscrollview.html#viewport">viewport</a>());
 <a name="x645"></a>            vp-&gt;<a href="ntqscrollview.html#addChild">addChild</a>(bs);
 <a name="x659"></a>            bs-&gt;<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-&gt;<a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE );
         menubar-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "F&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "No Frame", style_id );
         f_options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Box", style_id|TQFrame::Box );
@@ -313,8 +313,8 @@ public:
             lw_options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( str, lw_id | lw );
         }
         f_options-&gt;<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-&gt;<a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE );
@@ -324,8 +324,8 @@ public:
             mlw_options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( str, mlw_id | mlw );
         }
         f_options-&gt;<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-&gt;<a href="ntqpopupmenu.html#setCheckable">setCheckable</a>( TRUE );
@@ -335,8 +335,8 @@ public:
             mw_options-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( str, mw_id | mw );
         }
         f_options-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( f );
         savepixmap-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;File", file );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New window", this,  SLOT(newWindow()), CTRL+Key_N );
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Open...", this,  SLOT(openFile()), CTRL+Key_O );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New window", this,  TQ_SLOT(newWindow()), CTRL+Key_N );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Open...", this,  TQ_SLOT(openFile()), CTRL+Key_O );
     si = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save image", saveimage );
     sp = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save pixmap", savepixmap );
 <a name="x1328"></a>    file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "E&amp;xit", tqApp,  SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "E&amp;xit", tqApp,  TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()), CTRL+Key_Q );
 
     edit =  new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar );
     menubar-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Edit", edit );
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Copy", this, SLOT(copy()), CTRL+Key_C);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Paste", this, SLOT(paste()), CTRL+Key_V);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Copy", this, TQ_SLOT(copy()), CTRL+Key_C);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Paste", this, TQ_SLOT(paste()), CTRL+Key_V);
     edit-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Horizontal flip", this, SLOT(hFlip()), ALT+Key_H);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Vertical flip", this, SLOT(vFlip()), ALT+Key_V);
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Rotate 180", this, SLOT(rot180()), ALT+Key_R);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Horizontal flip", this, TQ_SLOT(hFlip()), ALT+Key_H);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Vertical flip", this, TQ_SLOT(vFlip()), ALT+Key_V);
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Rotate 180", this, TQ_SLOT(rot180()), ALT+Key_R);
     edit-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Text...", this, SLOT(editText()));
+    edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Text...", this, TQ_SLOT(editText()));
     edit-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    t1 = edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &amp;1 bit", this, SLOT(to1Bit()) );
-    t8 = edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &amp;8 bit", this, SLOT(to8Bit()) );
-    t32 = edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &amp;32 bit", this, SLOT(to32Bit()) );
+    t1 = edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &amp;1 bit", this, TQ_SLOT(to1Bit()) );
+    t8 = edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &amp;8 bit", this, TQ_SLOT(to8Bit()) );
+    t32 = edit-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Convert to &amp;32 bit", this, TQ_SLOT(to32Bit()) );
 
     options =  new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar );
     menubar-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Options", options );
@@ -240,9 +240,9 @@ private slots:
 
     <a href="ntqpopupmenu.html">TQPopupMenu</a>* help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( menubar );
     menubar-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Help", help );
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Help!", this, SLOT(giveHelp()), CTRL+Key_H );
+    help-&gt;<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-&gt;<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(&amp;a, SIGNAL(valueChanged(int)), &amp;b, SLOT(setValue(int)));
+    connect(&amp;a, TQ_SIGNAL(valueChanged(int)), &amp;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>()-&gt;insertItem( "&amp;File", file );
 
 
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New", this, SLOT(newDoc()), CTRL+Key_N );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New", this, TQ_SLOT(newDoc()), CTRL+Key_N );
 
     int id;
     id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( openIcon, "&amp;Open...",
-                           this, SLOT(choose()), CTRL+Key_O );
+                           this, TQ_SLOT(choose()), CTRL+Key_O );
 <a name="x1554"></a>    file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileOpenText );
 
     id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( saveIcon, "&amp;Save",
-                           this, SLOT(save()), CTRL+Key_S );
+                           this, TQ_SLOT(save()), CTRL+Key_S );
     file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText );
 
-    id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &amp;As...", this, SLOT(saveAs()) );
+    id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &amp;As...", this, TQ_SLOT(saveAs()) );
     file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText );
 
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
 
     id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( printIcon, "&amp;Print...",
-                           this, SLOT(print()), CTRL+Key_P );
+                           this, TQ_SLOT(print()), CTRL+Key_P );
     file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, filePrintText );
 
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
 
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, SLOT(<a href="ntqwidget.html#close">close</a>()), CTRL+Key_W );
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, TQ_SLOT(<a href="ntqwidget.html#close">close</a>()), CTRL+Key_W );
 
-<a name="x1544"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Quit", tqApp, SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q );
+<a name="x1544"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Quit", tqApp, TQ_SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q );
 
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertSeparator();
 
     <a href="ntqpopupmenu.html">TQPopupMenu</a> * help = new <a href="ntqpopupmenu.html">TQPopupMenu</a>( this );
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertItem( "&amp;Help", help );
 
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, SLOT(about()), Key_F1 );
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, SLOT(aboutTQt()) );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, TQ_SLOT(about()), Key_F1 );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, TQ_SLOT(aboutTQt()) );
     help-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;This", this, SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1 );
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;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-&gt;<a href="ntqwidget.html#setFocus">setFocus</a>();
@@ -408,7 +408,7 @@ int main( int argc, char ** argv ) {
     ApplicationWindow *mw = new ApplicationWindow();
     mw-&gt;<a href="ntqwidget.html#setCaption">setCaption</a>( "TQt Example - Application" );
 <a name="x1598"></a>    mw-&gt;<a href="ntqwidget.html#show">show</a>();
-<a name="x1599"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+<a name="x1599"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;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-&gt;<a href="ntqwidget.html#setCaption">setCaption</a>( "TQt Example - Application" );
 <a name="x1598"></a>    mw-&gt;<a href="ntqwidget.html#show">show</a>();
-<a name="x1599"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+<a name="x1599"></a>    a.<a href="ntqobject.html#connect">connect</a>( &amp;a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;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>( &amp;a, SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+<pre>        a.<a href="ntqobject.html#connect">connect</a>( &amp;a, TQ_SIGNAL(<a href="ntqapplication.html#lastWindowClosed">lastWindowClosed</a>()), &amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;New", this, SLOT(newDoc()), CTRL+Key_N );
+<p> <pre>        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( openIcon, "&amp;Open...",
-                               this, SLOT(choose()), CTRL+Key_O );
+                               this, TQ_SLOT(choose()), CTRL+Key_O );
         file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileOpenText );
 
         id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( saveIcon, "&amp;Save",
-                               this, SLOT(save()), CTRL+Key_S );
+                               this, TQ_SLOT(save()), CTRL+Key_S );
         file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, fileSaveText );
 
-        id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &amp;As...", this, SLOT(saveAs()) );
+        id = file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "Save &amp;As...", this, TQ_SLOT(saveAs()) );
         file-&gt;<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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( printIcon, "&amp;Print...",
-                               this, SLOT(print()), CTRL+Key_P );
+                               this, TQ_SLOT(print()), CTRL+Key_P );
         file-&gt;<a href="ntqmenudata.html#setWhatsThis">setWhatsThis</a>( id, filePrintText );
 
         file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
 
-        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, SLOT(<a href="ntqwidget.html#close">close</a>()), CTRL+Key_W );
-        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Quit", tqApp, SLOT( <a href="ntqapplication.html#closeAllWindows">closeAllWindows</a>() ), CTRL+Key_Q );
+        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;Close", this, TQ_SLOT(<a href="ntqwidget.html#close">close</a>()), CTRL+Key_W );
+        file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;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>()-&gt;insertItem( "&amp;Help", help );
 
-        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, SLOT(about()), Key_F1 );
-        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, SLOT(aboutTQt()) );
+        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, TQ_SLOT(about()), Key_F1 );
+        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, TQ_SLOT(aboutTQt()) );
         help-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;This", this, SLOT(<a href="ntqmainwindow.html#whatsThis">whatsThis</a>()), SHIFT+Key_F1 );
+        help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "What's &amp;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-&gt;<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-&gt;<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-&gt;<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>&lt;TQIconDragItem&gt;&amp;)),
-        iv, SLOT(slotNewItem(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt;&amp;)));
+<a name="x2821"></a>        iv, TQ_SIGNAL(<a href="ntqiconview.html#dropped">dropped</a>(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt;&amp;)),
+        iv, TQ_SLOT(slotNewItem(TQDropEvent*, const <a href="ntqvaluelist.html">TQValueList</a>&lt;TQIconDragItem&gt;&amp;)));
 
     // 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-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play &amp;1",  this, SLOT(doPlay1()), CTRL+Key_1);
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play &amp;2",  this, SLOT(doPlay2()), CTRL+Key_2);
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play from bucket &amp;3",  this, SLOT(doPlay3()), CTRL+Key_3);
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play from bucket &amp;4",  this, SLOT(doPlay4()), CTRL+Key_4);
+<a name="x2810"></a>    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play &amp;1",  this, TQ_SLOT(doPlay1()), CTRL+Key_1);
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play &amp;2",  this, TQ_SLOT(doPlay2()), CTRL+Key_2);
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play from bucket &amp;3",  this, TQ_SLOT(doPlay3()), CTRL+Key_3);
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play from bucket &amp;4",  this, TQ_SLOT(doPlay4()), CTRL+Key_4);
 <a name="x2811"></a>    file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play 3 and 4 together",  this, SLOT(doPlay34()));
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play all together",  this, SLOT(doPlay1234()));
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play 3 and 4 together",  this, TQ_SLOT(doPlay34()));
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("Play all together",  this, TQ_SLOT(doPlay1234()));
     file-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("E&amp;xit",  tqApp, SLOT(<a href="ntqapplication.html#quit">quit</a>()));
+    file-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("E&amp;xit",  tqApp, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()));
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertItem("&amp;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> &amp;)),
-             this, SLOT(changed(const <a href="ntqstring.html">TQString</a> &amp;)) );
+    <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a> &amp;)),
+             this, TQ_SLOT(changed(const <a href="ntqstring.html">TQString</a> &amp;)) );
 }
 
 
@@ -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-&gt;<a href="ntqlineedit.html#setAlignment">setAlignment</a>( TQt::AlignRight );
     <a href="ntqpushbutton.html">TQPushButton</a> *saveButton     = new <a href="ntqpushbutton.html">TQPushButton</a>( "&amp;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-&gt;<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>( "&amp;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> &amp;)),
-                 this, SLOT(changed(const <a href="ntqstring.html">TQString</a> &amp;)) );
+        <a href="ntqobject.html#connect">connect</a>( this, TQ_SIGNAL(<a href="ntqlineedit.html#textChanged">textChanged</a>(const <a href="ntqstring.html">TQString</a> &amp;)),
+                 this, TQ_SLOT(changed(const <a href="ntqstring.html">TQString</a> &amp;)) );
     }
 </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 )-&gt;cb = new <a href="ntqcombobox.html">TQComboBox</a>( <a href="qtableitem.html#table">table</a>()-&gt;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-&gt;insertItem( "Yes" );
     cb-&gt;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-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 );
     slider-&gt;<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>( "&amp;Quit", this, "quit" );
     quit-&gt;<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-&gt;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-&gt;<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-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 );
     slider-&gt;<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>( "&amp;Quit", this, "quit" );
     quit-&gt;<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-&gt;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>( "&amp;Shoot", this, "shoot" );
     shoot-&gt;<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-&gt;<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-&gt;<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>( "&amp;Quit", this, "quit" );
     quit-&gt;<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-&gt;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>( "&amp;Shoot", this, "shoot" );
     shoot-&gt;<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-&gt;<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>( "&amp;Quit", this, "quit" );
     quit-&gt;<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-&gt;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>( "&amp;Shoot", this, "shoot" );
     shoot-&gt;<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>( "&amp;New Game", this, "newgame" );
     restart-&gt;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-&gt;<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>( "&amp;Quit", this, "quit" );
     quit-&gt;<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-&gt;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>( "&amp;Shoot", this, "shoot" );
     shoot-&gt;<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>( "&amp;New Game", this, "newgame" );
     restart-&gt;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-&gt;<a href="ntqaccel.html#connectItem">connectItem</a>( accel-&gt;<a href="ntqaccel.html#insertItem">insertItem</a>( Key_Enter ),
-                        this, SLOT(fire()) );
+                        this, TQ_SLOT(fire()) );
     accel-&gt;<a href="ntqaccel.html#connectItem">connectItem</a>( accel-&gt;<a href="ntqaccel.html#insertItem">insertItem</a>( Key_Return ),
-                        this, SLOT(fire()) );
+                        this, TQ_SLOT(fire()) );
     accel-&gt;<a href="ntqaccel.html#connectItem">connectItem</a>( accel-&gt;<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-&gt;<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-&gt;<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-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 );
     slider-&gt;<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-&gt;<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 &lt; 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-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 );
     slider-&gt;<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-&gt;<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-&gt;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-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 );
     slider-&gt;<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>( "&amp;Quit", this, "quit" );
     quit-&gt;<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-&gt;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-&gt;<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 )-&gt;cb = new <a href="ntqcombobox.html">TQComboBox</a>( <a href="qtableitem.html#table">table</a>()-&gt;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-&gt;insertItem( "Yes" );
     cb-&gt;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-&gt;<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>&amp; ) ), this, SLOT( makeStyle( const <a href="ntqstring.html">TQString</a>&amp; ) ) );
+<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>&amp; ) ), this, TQ_SLOT( makeStyle( const <a href="ntqstring.html">TQString</a>&amp; ) ) );
 <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 = "&amp;"+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-&gt;<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-&gt;<a href="ntqsignalmapper.html#setMapping">setMapping</a>( a, a-&gt;<a href="ntqaction.html#text">text</a>() );
     }
 <a name="x318"></a>    ag-&gt;<a href="qactiongroup.html#addTo">addTo</a>(style);
     style-&gt;<a href="ntqmenudata.html#insertSeparator">insertSeparator</a>();
-    style-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;Quit", tqApp, SLOT( <a href="ntqapplication.html#quit">quit</a>() ), CTRL | Key_Q );
+    style-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>("&amp;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>()-&gt;insertSeparator();
     <a href="ntqmainwindow.html#menuBar">menuBar</a>()-&gt;insertItem( "&amp;Help", help );
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, SLOT(about()), Key_F1);
-    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, SLOT(aboutTQt()));
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "&amp;About", this, TQ_SLOT(about()), Key_F1);
+    help-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( "About &amp;TQt", this, TQ_SLOT(aboutTQt()));
 
 #ifndef TQT_NO_STYLE_WINDOWS
 <a name="x325"></a>    tqApp-&gt;<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-&gt;<a href="ntqwidget.html#setPalette">setPalette</a>( p );
         ttb-&gt;<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-&gt;<a href="qgridlayout.html#addWidget">addWidget</a>( ttb, i%nBoard, i/nBoard );
         buttons-&gt;insert( i, ttb );
         btArray-&gt;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-&gt;<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-&gt;<a href="qboxlayout.html#addLayout">addLayout</a>( b );
     b-&gt;<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-&gt;<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>( &amp;timer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()), SLOT(calculate()) );
+        <a href="ntqobject.html#connect">connect</a>( &amp;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-&gt;<a href="ntqaction.html#setAccel">setAccel</a>( TQt::ALT+TQt::Key_L );
 <a name="x2973"></a>    labelonoffaction-&gt;<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-&gt;<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-&gt;<a href="ntqlabel.html#setTextFormat">setTextFormat</a>(RichText);
     <a name="x2531"></a>        label-&gt;<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-&gt;<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>( &amp;quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &amp;a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
 
     a.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>( &amp;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>( &amp;quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &amp;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>( &amp;quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &amp;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", &amp;box );
     quit.<a href="ntqwidget.html#setFont">setFont</a>( TQFont( "Times", 18, TQFont::Bold ) );
 
-    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;quit, SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &amp;a, SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
+    TQObject::<a href="ntqobject.html#connect">connect</a>( &amp;quit, TQ_SIGNAL(<a href="ntqbutton.html#clicked">clicked</a>()), &amp;a, TQ_SLOT(<a href="ntqapplication.html#quit">quit</a>()) );
 
     a.<a href="ntqapplication.html#setMainWidget">setMainWidget</a>( &amp;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-&gt;<a href="ntqwidget.html#setGeometry">setGeometry</a>( 62, 40, 75, 30 );
     quit-&gt;<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-&gt;<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-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 );
     slider-&gt;<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-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 );
     slider-&gt;<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-&gt;<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-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( 0, 99 );
     <a name="x2326"></a>    slider-&gt;<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-&gt;<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 &lt; 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-&gt;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-&gt;<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>( "&amp;New Game", this, "newgame" );
         restart-&gt;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-&gt;<a href="ntqaccel.html#connectItem">connectItem</a>( accel-&gt;<a href="ntqaccel.html#insertItem">insertItem</a>( Key_Enter ),
-                            this, SLOT(fire()) );
+                            this, TQ_SLOT(fire()) );
         accel-&gt;<a href="ntqaccel.html#connectItem">connectItem</a>( accel-&gt;<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-&gt;<a href="ntqaccel.html#connectItem">connectItem</a>( accel-&gt;<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 ),
                 "&amp;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 &lt; int(m_recentFiles.count()) )
                 fileMenu-&gt;<a href="ntqmenudata.html#insertItem">insertItem</a>( TQString( "&amp;%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>&amp;) ),
-                 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>&amp;) ),
+                 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-&gt;<a href="ntqlineedit.html#setMaxLength">setMaxLength</a>( 4 );
 <a name="x7"></a>    key-&gt;<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> &amp; ) ),
-             this, SLOT( keyChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+<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> &amp; ) ),
+             this, TQ_SLOT( keyChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
 
     <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> &amp; ) ),
-             this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
-    <a href="ntqobject.html#connect">connect</a>( lastName, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
-             this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
-    <a href="ntqobject.html#connect">connect</a>( email, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
-             this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( firstName, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
+             this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( lastName, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
+             this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( email, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
+             this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
 
     <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-&gt;<a href="ntqlineedit.html#setMaxLength">setMaxLength</a>( 4 );
 <a name="x7"></a>    key-&gt;<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> &amp; ) ),
-             this, SLOT( keyChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+<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> &amp; ) ),
+             this, TQ_SLOT( keyChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
 
     <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> &amp; ) ),
-             this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
-    <a href="ntqobject.html#connect">connect</a>( lastName, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
-             this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
-    <a href="ntqobject.html#connect">connect</a>( email, SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
-             this, SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( firstName, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
+             this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( lastName, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
+             this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
+    <a href="ntqobject.html#connect">connect</a>( email, TQ_SIGNAL( <a href="ntqlineedit.html#textChanged">textChanged</a>( const <a href="ntqstring.html">TQString</a> &amp; ) ),
+             this, TQ_SLOT( dataChanged( const <a href="ntqstring.html">TQString</a> &amp; ) ) );
 
     <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-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( -180, 180 );
 <a name="x1261"></a>    rotS-&gt;<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-&gt;<a href="ntqlcdnumber.html#display">display</a>( "0.00" );
 
     shearS-&gt;<a href="ntqrangecontrol.html#setRange">setRange</a>( -25, 25 );
     shearS-&gt;<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-&gt;<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-&gt;<a href="ntqwidget.html#hide">hide</a>();
@@ -204,23 +204,23 @@ private:
     rb_img-&gt;<a href="ntqbutton.html#setText">setText</a>( <a href="ntqobject.html#tr">tr</a>("Image") );
 <a name="x1249"></a>    rb_img-&gt;<a href="ntqradiobutton.html#setChecked">setChecked</a>(TRUE);
     rb_pic-&gt;<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-&gt;<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-&gt;<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>&amp;)),
-                     SLOT(newTxt(const <a href="ntqstring.html">TQString</a>&amp;)) );
+<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>&amp;)),
+                     TQ_SLOT(newTxt(const <a href="ntqstring.html">TQString</a>&amp;)) );
 
     magLCD = new <a href="ntqlcdnumber.html">TQLCDNumber</a>( 4,optionals_other, "magLCD" );
     magLCD-&gt;<a href="ntqlcdnumber.html#display">display</a>( "100" );
     magS = new <a href="ntqslider.html">TQSlider</a>( TQSlider::Horizontal, optionals_other,
                            "magnifySlider" );
     magS-&gt;<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-&gt;<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-&gt;<a href="ntqwidget.html#adjustSize">adjustSize</a>();
     optionals_other-&gt;<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-&gt;<a href="ntqframe.html#setFrameStyle">setFrameStyle</a>( TQFrame::Panel | TQFrame::Raised );
 <a name="x1227"></a>    xc-&gt;<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>&amp;)), sx,
-                 SLOT(setText(const <a href="ntqstring.html">TQString</a>&amp;)) );
-    <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>&amp;)), sx,
-                 SLOT(<a href="ntqwidget.html#setFont">setFont</a>(const <a href="ntqfont.html">TQFont</a>&amp;)) );
-    <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>&amp;)), sx,
+                 TQ_SLOT(setText(const <a href="ntqstring.html">TQString</a>&amp;)) );
+    <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>&amp;)), sx,
+                 TQ_SLOT(<a href="ntqwidget.html#setFont">setFont</a>(const <a href="ntqfont.html">TQFont</a>&amp;)) );
+    <a href="ntqobject.html#connect">connect</a>( xc, TQ_SIGNAL(newMode(int)), TQ_SLOT(newMode(int)) );
     sx-&gt;setText( "Troll" );
     newMode( Image );
     sx-&gt;setMatrix(xc-&gt;matrix());
-- 
cgit v1.2.1