Rename METHOD, SIGNAL, SLOT to TQ_METHOD, TQ_SIGNAL, TQ_SLOT

Signed-off-by: Michele Calgaro <[email protected]>

7 files changed, 121 insertions, 121 deletions

diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index 30692ad5e..b0e558d81 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -179,48 +179,48 @@ HelpDialog::HelpDialog( TQWidget *parent, MainWindow *h )
 
 void HelpDialog::initialize()
 {
-    connect( tabWidget, SIGNAL( selected(const TQString&) ),
-	     this, SLOT( currentTabChanged(const TQString&) ) );
-    connect( listContents, SIGNAL( mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int ) ),
-	     this, SLOT( showTopic(int,TQListViewItem*, const TQPoint &) ) );
-    connect( listContents, SIGNAL( currentChanged(TQListViewItem*) ),
-	     this, SLOT( currentContentsChanged(TQListViewItem*) ) );
-    connect( listContents, SIGNAL( selectionChanged(TQListViewItem*) ),
-	     this, SLOT( currentContentsChanged(TQListViewItem*) ) );
-    connect( listContents, SIGNAL( doubleClicked(TQListViewItem*) ),
-	     this, SLOT( showTopic(TQListViewItem*) ) );
-    connect( listContents, SIGNAL( returnPressed(TQListViewItem*) ),
-	     this, SLOT( showTopic(TQListViewItem*) ) );
-    connect( listContents, SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
-	     this, SLOT( showItemMenu( TQListViewItem*, const TQPoint& ) ) );
-    connect( editIndex, SIGNAL( returnPressed() ),
-	     this, SLOT( showTopic() ) );
-    connect( editIndex, SIGNAL( textChanged(const TQString&) ),
-	     this, SLOT( searchInIndex(const TQString&) ) );
-
-    connect( listIndex, SIGNAL( selectionChanged(TQListBoxItem*) ),
-	     this, SLOT( currentIndexChanged(TQListBoxItem*) ) );
-    connect( listIndex, SIGNAL( returnPressed(TQListBoxItem*) ),
-	     this, SLOT( showTopic() ) );
-    connect( listIndex, SIGNAL( mouseButtonClicked(int, TQListBoxItem*, const TQPoint &) ),
-	     this, SLOT( showTopic( int, TQListBoxItem *, const TQPoint & ) ) );
-    connect( listIndex, SIGNAL( currentChanged(TQListBoxItem*) ),
-	     this, SLOT( currentIndexChanged(TQListBoxItem*) ) );
-    connect( listIndex, SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ),
-	     this, SLOT( showItemMenu( TQListBoxItem*, const TQPoint& ) ) );
-
-    connect( listBookmarks, SIGNAL( mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int ) ),
-	     this, SLOT( showTopic(int, TQListViewItem*, const TQPoint &) ) );
-    connect( listBookmarks, SIGNAL( returnPressed(TQListViewItem*) ),
-	     this, SLOT( showTopic(TQListViewItem*) ) );
-    connect( listBookmarks, SIGNAL( selectionChanged(TQListViewItem*) ),
-	     this, SLOT( currentBookmarkChanged(TQListViewItem*) ) );
-    connect( listBookmarks, SIGNAL( currentChanged(TQListViewItem*) ),
-	     this, SLOT( currentBookmarkChanged(TQListViewItem*) ) );
-    connect( listBookmarks, SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
-	     this, SLOT( showItemMenu( TQListViewItem*, const TQPoint& ) ) );
-    connect( resultBox, SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ),
-	     this, SLOT( showItemMenu( TQListBoxItem*, const TQPoint& ) ) );
+    connect( tabWidget, TQ_SIGNAL( selected(const TQString&) ),
+	     this, TQ_SLOT( currentTabChanged(const TQString&) ) );
+    connect( listContents, TQ_SIGNAL( mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int ) ),
+	     this, TQ_SLOT( showTopic(int,TQListViewItem*, const TQPoint &) ) );
+    connect( listContents, TQ_SIGNAL( currentChanged(TQListViewItem*) ),
+	     this, TQ_SLOT( currentContentsChanged(TQListViewItem*) ) );
+    connect( listContents, TQ_SIGNAL( selectionChanged(TQListViewItem*) ),
+	     this, TQ_SLOT( currentContentsChanged(TQListViewItem*) ) );
+    connect( listContents, TQ_SIGNAL( doubleClicked(TQListViewItem*) ),
+	     this, TQ_SLOT( showTopic(TQListViewItem*) ) );
+    connect( listContents, TQ_SIGNAL( returnPressed(TQListViewItem*) ),
+	     this, TQ_SLOT( showTopic(TQListViewItem*) ) );
+    connect( listContents, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
+	     this, TQ_SLOT( showItemMenu( TQListViewItem*, const TQPoint& ) ) );
+    connect( editIndex, TQ_SIGNAL( returnPressed() ),
+	     this, TQ_SLOT( showTopic() ) );
+    connect( editIndex, TQ_SIGNAL( textChanged(const TQString&) ),
+	     this, TQ_SLOT( searchInIndex(const TQString&) ) );
+
+    connect( listIndex, TQ_SIGNAL( selectionChanged(TQListBoxItem*) ),
+	     this, TQ_SLOT( currentIndexChanged(TQListBoxItem*) ) );
+    connect( listIndex, TQ_SIGNAL( returnPressed(TQListBoxItem*) ),
+	     this, TQ_SLOT( showTopic() ) );
+    connect( listIndex, TQ_SIGNAL( mouseButtonClicked(int, TQListBoxItem*, const TQPoint &) ),
+	     this, TQ_SLOT( showTopic( int, TQListBoxItem *, const TQPoint & ) ) );
+    connect( listIndex, TQ_SIGNAL( currentChanged(TQListBoxItem*) ),
+	     this, TQ_SLOT( currentIndexChanged(TQListBoxItem*) ) );
+    connect( listIndex, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ),
+	     this, TQ_SLOT( showItemMenu( TQListBoxItem*, const TQPoint& ) ) );
+
+    connect( listBookmarks, TQ_SIGNAL( mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int ) ),
+	     this, TQ_SLOT( showTopic(int, TQListViewItem*, const TQPoint &) ) );
+    connect( listBookmarks, TQ_SIGNAL( returnPressed(TQListViewItem*) ),
+	     this, TQ_SLOT( showTopic(TQListViewItem*) ) );
+    connect( listBookmarks, TQ_SIGNAL( selectionChanged(TQListViewItem*) ),
+	     this, TQ_SLOT( currentBookmarkChanged(TQListViewItem*) ) );
+    connect( listBookmarks, TQ_SIGNAL( currentChanged(TQListViewItem*) ),
+	     this, TQ_SLOT( currentBookmarkChanged(TQListViewItem*) ) );
+    connect( listBookmarks, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ),
+	     this, TQ_SLOT( showItemMenu( TQListViewItem*, const TQPoint& ) ) );
+    connect( resultBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ),
+	     this, TQ_SLOT( showItemMenu( TQListBoxItem*, const TQPoint& ) ) );
 
     cacheFilesPath = TQDir::homeDirPath() + "/.assistant/"; //### Find a better location for the dbs
 
@@ -230,7 +230,7 @@ void HelpDialog::initialize()
     listContents->header()->hide();
     listContents->header()->setStretchEnabled( TRUE );
     framePrepare->hide();
-    connect( tqApp, SIGNAL(lastWindowClosed()), SLOT(lastWinClosed()) );
+    connect( tqApp, TQ_SIGNAL(lastWindowClosed()), TQ_SLOT(lastWinClosed()) );
 
     termsEdit->setValidator( new SearchValidator( termsEdit ) );
 
@@ -570,13 +570,13 @@ void HelpDialog::buildContentDict()
 void HelpDialog::currentTabChanged( const TQString &s )
 {
     if ( stripAmpersand( s ).contains( tr( "Index" ) ) )
-	TQTimer::singleShot( 0, this, SLOT( loadIndexFile() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( loadIndexFile() ) );
     else if ( stripAmpersand( s ).contains( tr( "Bookmarks" ) ) )
 	insertBookmarks();
     else if ( stripAmpersand( s ).contains( tr( "Contents" ) ) )
-	TQTimer::singleShot( 0, this, SLOT( insertContents() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( insertContents() ) );
     else if ( stripAmpersand( s ).contains( tr( "Search" ) ) )
-	TQTimer::singleShot( 0, this, SLOT( setupFullTextIndex() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( setupFullTextIndex() ) );
 }
 
 void HelpDialog::showInitDoneMessage()
@@ -936,8 +936,8 @@ void HelpDialog::setupFullTextIndex()
     fullTextIndex->setDocListFile( cacheFilesPath + "indexdb.doc." + pname );
     processEvents();
 
-    connect( fullTextIndex, SIGNAL( indexingProgress( int ) ),
-        this, SLOT( setIndexingProgress( int ) ) );
+    connect( fullTextIndex, TQ_SIGNAL( indexingProgress( int ) ),
+        this, TQ_SLOT( setIndexingProgress( int ) ) );
     TQFile f( cacheFilesPath + "indexdb.dict." + pname );
     if ( !f.exists() ) {
         TQMap<TQString, TQString>::ConstIterator it = titleMap.begin();
diff --git a/tools/assistant/helpwindow.cpp b/tools/assistant/helpwindow.cpp
index 266fa972c..175bc577b 100644
--- a/tools/assistant/helpwindow.cpp
+++ b/tools/assistant/helpwindow.cpp
@@ -59,8 +59,8 @@ HelpWindow::HelpWindow( MainWindow *w, TQWidget *parent, const char *name )
     : TQTextBrowser( parent, name ), mw( w ), blockScroll( FALSE ),
       shiftPressed( FALSE ), newWindow( FALSE )
 {
-    connect(this, SIGNAL(forwardAvailable(bool)), this, SLOT(updateForward(bool)));
-    connect(this, SIGNAL(backwardAvailable(bool)), this, SLOT(updateBackward(bool)));
+    connect(this, TQ_SIGNAL(forwardAvailable(bool)), this, TQ_SLOT(updateForward(bool)));
+    connect(this, TQ_SIGNAL(backwardAvailable(bool)), this, TQ_SLOT(updateBackward(bool)));
 }
 
 void HelpWindow::setSource( const TQString &name )
@@ -116,7 +116,7 @@ void HelpWindow::setSource( const TQString &name )
 	TQProcess *proc = new TQProcess(this);
 
 	proc->addArgument( webbrowser );
-        TQObject::connect(proc, SIGNAL(processExited()), proc, SLOT(deleteLater()));
+        TQObject::connect(proc, TQ_SIGNAL(processExited()), proc, TQ_SLOT(deleteLater()));
 	proc->addArgument( name );
 	proc->start();
 	return;
@@ -146,7 +146,7 @@ void HelpWindow::setSource( const TQString &name )
 	    return;
 	}
 	TQProcess *proc = new TQProcess(this);
-        TQObject::connect(proc, SIGNAL(processExited()), proc, SLOT(deleteLater()));
+        TQObject::connect(proc, TQ_SIGNAL(processExited()), proc, TQ_SLOT(deleteLater()));
 	proc->addArgument( pdfbrowser );
 	proc->addArgument( name );
 	proc->start();
@@ -206,9 +206,9 @@ TQPopupMenu *HelpWindow::createPopupMenu( const TQPoint& pos )
 	    lastAnchor = ( hsh>=0 ? src.left( hsh ) : src ) + lastAnchor;
 	}
 	m->insertItem( tr("Open Link in New Window\tShift+LMB"),
-		       this, SLOT( openLinkInNewWindow() ) );
+		       this, TQ_SLOT( openLinkInNewWindow() ) );
 	m->insertItem( tr("Open Link in New Tab"),
-		       this, SLOT( openLinkInNewPage() ) );
+		       this, TQ_SLOT( openLinkInNewPage() ) );
     }
     mw->actionNewWindow->addTo( m );
     mw->actionOpenPage->addTo( m );
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index 7a3428920..c5d142208 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -69,8 +69,8 @@ Index::Index( const TQString &dp, const TQString &hp )
 {
     alreadyHaveDocList = FALSE;
     lastWindowClosed = FALSE;
-    connect( tqApp, SIGNAL( lastWindowClosed() ),
-	     this, SLOT( setLastWinClosed() ) );
+    connect( tqApp, TQ_SIGNAL( lastWindowClosed() ),
+	     this, TQ_SLOT( setLastWinClosed() ) );
 }
 
 Index::Index( const TQStringList &dl, const TQString &hp )
@@ -79,8 +79,8 @@ Index::Index( const TQStringList &dl, const TQString &hp )
     docList = dl;
     alreadyHaveDocList = TRUE;
     lastWindowClosed = FALSE;
-    connect( tqApp, SIGNAL( lastWindowClosed() ),
-	     this, SLOT( setLastWinClosed() ) );
+    connect( tqApp, TQ_SIGNAL( lastWindowClosed() ),
+	     this, TQ_SLOT( setLastWinClosed() ) );
 }
 
 void Index::setLastWinClosed()
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index d61043eb6..0e0ba4b09 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -151,18 +151,18 @@ TQAssistantClient::TQAssistantClient( const TQString &path, TQObject *parent, co
         assistantCommand += ".exe";
 #endif
     socket = new TQSocket( this );
-    connect( socket, SIGNAL( connected() ),
-	    SLOT( socketConnected() ) );
-    connect( socket, SIGNAL( connectionClosed() ),
-	    SLOT( socketConnectionClosed() ) );
-    connect( socket, SIGNAL( error( int ) ),
-	    SLOT( socketError( int ) ) );
+    connect( socket, TQ_SIGNAL( connected() ),
+	    TQ_SLOT( socketConnected() ) );
+    connect( socket, TQ_SIGNAL( connectionClosed() ),
+	    TQ_SLOT( socketConnectionClosed() ) );
+    connect( socket, TQ_SIGNAL( error( int ) ),
+	    TQ_SLOT( socketError( int ) ) );
     opened = FALSE;
     proc = new TQProcess( this );
     port = 0;
     pageBuffer = "";
-    connect( proc, SIGNAL( readyReadStderr() ),
-	     this, SLOT( readStdError() ) );
+    connect( proc, TQ_SIGNAL( readyReadStderr() ),
+	     this, TQ_SLOT( readStdError() ) );
 }
 
 /*!
@@ -223,8 +223,8 @@ void TQAssistantClient::openAssistant()
 		    .arg( proc->arguments().join( " " ) ) );
 	return;
     }
-    connect( proc, SIGNAL( readyReadStdout() ),
-	     this, SLOT( readPort() ) );
+    connect( proc, TQ_SIGNAL( readyReadStdout() ),
+	     this, TQ_SLOT( readPort() ) );
 }
 
 void TQAssistantClient::readPort()
@@ -236,8 +236,8 @@ void TQAssistantClient::readPort()
 	return;
     }
     socket->connectToHost( host, port );
-    disconnect( proc, SIGNAL( readyReadStdout() ),
-		this, SLOT( readPort() ) );
+    disconnect( proc, TQ_SIGNAL( readyReadStdout() ),
+		this, TQ_SLOT( readPort() ) );
 }
 
 /*!
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index ce8ffd2db..b2e2a62df 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -92,10 +92,10 @@ private:
 AssistantSocket::AssistantSocket( int sock, TQObject *parent )
     : TQSocket( parent, 0 )
 {
-    connect( this, SIGNAL( readyRead() ),
-	     SLOT( readClient() ) );
-    connect( this, SIGNAL( connectionClosed() ),
-	     SLOT( connectionClosed() ) );
+    connect( this, TQ_SIGNAL( readyRead() ),
+	     TQ_SLOT( readClient() ) );
+    connect( this, TQ_SIGNAL( connectionClosed() ),
+	     TQ_SLOT( connectionClosed() ) );
     setSocket( sock );
 }
 
@@ -135,8 +135,8 @@ TQ_UINT16 AssistantServer::getPort() const
 void AssistantServer::newConnection( int socket )
 {
     AssistantSocket *as = new AssistantSocket( socket, this );
-    connect( as, SIGNAL( showLinkRequest( const TQString& ) ),
-	     this, SIGNAL( showLinkRequest( const TQString& ) ) );
+    connect( as, TQ_SIGNAL( showLinkRequest( const TQString& ) ),
+	     this, TQ_SIGNAL( showLinkRequest( const TQString& ) ) );
     emit newConnect();
 }
 
@@ -318,8 +318,8 @@ int main( int argc, char ** argv )
 	as = new AssistantServer();
 	printf("%d\n", as->port() );
 	fflush( stdout );
-	as->connect( as, SIGNAL( showLinkRequest( const TQString& ) ),
-		     mw, SLOT( showLinkFromClient( const TQString& ) ) );
+	as->connect( as, TQ_SIGNAL( showLinkRequest( const TQString& ) ),
+		     mw, TQ_SLOT( showLinkFromClient( const TQString& ) ) );
     }
 
     if ( max )
@@ -332,7 +332,7 @@ int main( int argc, char ** argv )
     else if ( file.isEmpty() )
 	mw->showLinks( links );
 
-    a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
+    a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) );
 
     int appExec = a.exec();
     delete (MainWindow*)mw;
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index 789b085eb..0afab0aac 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -103,7 +103,7 @@ void MainWindow::init()
 	dw->hide();
 
     tabs->setup();
-    TQTimer::singleShot( 0, this, SLOT( setup() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( setup() ) );
 #if defined(Q_OS_MACX)
     // Use the same forward and backward browser shortcuts as Safari and Internet Explorer do
     // on the Mac. This means that if you have access to one of those cool Intellimice, the thing
@@ -122,44 +122,44 @@ void MainWindow::setup()
     statusBar()->message( tr( "Initializing TQt Assistant..." ) );
     setupCompleted = TRUE;
     helpDock->initialize();
-    connect( actionGoPrevious, SIGNAL( activated() ), tabs, SLOT( backward() ) );
-    connect( actionGoNext, SIGNAL( activated() ), tabs, SLOT( forward() ) );
-    connect( actionEditCopy, SIGNAL( activated() ), tabs, SLOT( copy() ) );
-    connect( actionFileExit, SIGNAL( activated() ), tqApp, SLOT( closeAllWindows() ) );
-    connect( actionAddBookmark, SIGNAL( activated() ),
-	     helpDock, SLOT( addBookmark() ) );
-    connect( helpDock, SIGNAL( showLink( const TQString& ) ),
-	     this, SLOT( showLink( const TQString& ) ) );
-    connect( helpDock, SIGNAL( showSearchLink( const TQString&, const TQStringList& ) ),
-	     this, SLOT( showSearchLink( const TQString&, const TQStringList&) ) );
+    connect( actionGoPrevious, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( backward() ) );
+    connect( actionGoNext, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( forward() ) );
+    connect( actionEditCopy, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( copy() ) );
+    connect( actionFileExit, TQ_SIGNAL( activated() ), tqApp, TQ_SLOT( closeAllWindows() ) );
+    connect( actionAddBookmark, TQ_SIGNAL( activated() ),
+	     helpDock, TQ_SLOT( addBookmark() ) );
+    connect( helpDock, TQ_SIGNAL( showLink( const TQString& ) ),
+	     this, TQ_SLOT( showLink( const TQString& ) ) );
+    connect( helpDock, TQ_SIGNAL( showSearchLink( const TQString&, const TQStringList& ) ),
+	     this, TQ_SLOT( showSearchLink( const TQString&, const TQStringList&) ) );
 
-    connect( bookmarkMenu, SIGNAL( activated( int ) ),
-	     this, SLOT( showBookmark( int ) ) );
-    connect( actionZoomIn, SIGNAL( activated() ), tabs, SLOT( zoomIn() ) );
-    connect( actionZoomOut, SIGNAL( activated() ), tabs, SLOT( zoomOut() ) );
+    connect( bookmarkMenu, TQ_SIGNAL( activated( int ) ),
+	     this, TQ_SLOT( showBookmark( int ) ) );
+    connect( actionZoomIn, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( zoomIn() ) );
+    connect( actionZoomOut, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( zoomOut() ) );
 
-    connect( actionOpenPage, SIGNAL( activated() ), tabs, SLOT( newTab() ) );
-    connect( actionClosePage, SIGNAL( activated() ), tabs, SLOT( closeTab() ) );
-    connect( actionNextPage, SIGNAL( activated() ), tabs, SLOT( nextTab() ) );
-    connect( actionPrevPage, SIGNAL( activated() ), tabs, SLOT( previousTab() ) );
+    connect( actionOpenPage, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( newTab() ) );
+    connect( actionClosePage, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( closeTab() ) );
+    connect( actionNextPage, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( nextTab() ) );
+    connect( actionPrevPage, TQ_SIGNAL( activated() ), tabs, TQ_SLOT( previousTab() ) );
 
 
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
     TQAccel *acc = new TQAccel( this );
-//     acc->connectItem( acc->insertItem( Key_F5 ), browser, SLOT( reload() ) );
-    acc->connectItem( acc->insertItem( TQKeySequence("SHIFT+CTRL+=") ), actionZoomIn, SIGNAL(activated()) );
+//     acc->connectItem( acc->insertItem( Key_F5 ), browser, TQ_SLOT( reload() ) );
+    acc->connectItem( acc->insertItem( TQKeySequence("SHIFT+CTRL+=") ), actionZoomIn, TQ_SIGNAL(activated()) );
 #endif
 
     TQAccel *a = new TQAccel( this, dw );
     a->connectItem( a->insertItem( TQAccel::stringToKey( tr("Ctrl+T") ) ),
-		    helpDock, SLOT( toggleContents() ) );
+		    helpDock, TQ_SLOT( toggleContents() ) );
     a->connectItem( a->insertItem( TQAccel::stringToKey( tr("Ctrl+I") ) ),
-		    helpDock, SLOT( toggleIndex() ) );
+		    helpDock, TQ_SLOT( toggleIndex() ) );
     a->connectItem( a->insertItem( TQAccel::stringToKey( tr("Ctrl+B") ) ),
-		    helpDock, SLOT( toggleBookmarks() ) );
+		    helpDock, TQ_SLOT( toggleBookmarks() ) );
     a->connectItem( a->insertItem( TQAccel::stringToKey( tr("Ctrl+S") ) ),
-		    helpDock, SLOT( toggleSearch() ) );
+		    helpDock, TQ_SLOT( toggleSearch() ) );
 
     Config *config = Config::configuration();
 
@@ -205,8 +205,8 @@ void MainWindow::setupGoActions()
 	    action->addTo( goActionToolbar );
 	    goActions->append( action );
 	    goActionDocFiles->insert( action, config->indexPage( title ) );
-	    connect( action, SIGNAL( activated() ),
-		     this, SLOT( showGoActionLink() ) );
+	    connect( action, TQ_SIGNAL( activated() ),
+		     this, TQ_SLOT( showGoActionLink() ) );
 	    ++addCount;
 	}
     }
diff --git a/tools/assistant/tabbedbrowser.ui.h b/tools/assistant/tabbedbrowser.ui.h
index 35ed6a952..2d0a04393 100644
--- a/tools/assistant/tabbedbrowser.ui.h
+++ b/tools/assistant/tabbedbrowser.ui.h
@@ -81,14 +81,14 @@ HelpWindow *TabbedBrowser::createHelpWindow(const TQString &title)
     win->setStyleSheet( tabStyleSheet );
     win->setMimeSourceFactory( mimeSourceFactory );
     tab->addTab(win, reduceLabelLength(title));
-    connect( win, SIGNAL( highlighted( const TQString & ) ),
-	     (const TQObject*) (mainWin->statusBar()), SLOT( message( const TQString & ) ) );
-    connect( win, SIGNAL( chooseWebBrowser() ), mainWin, SLOT( showWebBrowserSettings() ) );
-    connect( win, SIGNAL( backwardAvailable(bool) ),
-	     mainWin, SLOT( backwardAvailable(bool) ) );
-    connect( win, SIGNAL( forwardAvailable(bool) ),
-	     mainWin, SLOT( forwardAvailable(bool) ) );
-    connect( win, SIGNAL( sourceChanged(const TQString &) ), this, SLOT( sourceChanged() ));
+    connect( win, TQ_SIGNAL( highlighted( const TQString & ) ),
+	     (const TQObject*) (mainWin->statusBar()), TQ_SLOT( message( const TQString & ) ) );
+    connect( win, TQ_SIGNAL( chooseWebBrowser() ), mainWin, TQ_SLOT( showWebBrowserSettings() ) );
+    connect( win, TQ_SIGNAL( backwardAvailable(bool) ),
+	     mainWin, TQ_SLOT( backwardAvailable(bool) ) );
+    connect( win, TQ_SIGNAL( forwardAvailable(bool) ),
+	     mainWin, TQ_SLOT( forwardAvailable(bool) ) );
+    connect( win, TQ_SIGNAL( sourceChanged(const TQString &) ), this, TQ_SLOT( sourceChanged() ));
 
     tab->cornerWidget( TQt::TopRight )->setEnabled( tab->count() > 1 );
     return win;
@@ -141,10 +141,10 @@ void TabbedBrowser::init()
     mimeSourceFactory->setExtensionType("jpeg", "image/jpeg" );
     setMimePath( Config::configuration()->mimePaths() );
 
-    connect( tab, SIGNAL( currentChanged( TQWidget* ) ),
-	     this, SLOT( transferFocus() ) );
-    connect( tab, SIGNAL( currentChanged( TQWidget* ) ),
-        mainWindow(), SLOT( browserTabChanged() ) );
+    connect( tab, TQ_SIGNAL( currentChanged( TQWidget* ) ),
+	     this, TQ_SLOT( transferFocus() ) );
+    connect( tab, TQ_SIGNAL( currentChanged( TQWidget* ) ),
+        mainWindow(), TQ_SLOT( browserTabChanged() ) );
 
     TQTabBar *tabBar = (TQTabBar*)tab->child( 0, "TQTabBar", FALSE );
     int m = ( tabBar ? style().pixelMetric( TQStyle::PM_TabBarTabVSpace, (TQWidget*)tabBar )
@@ -164,7 +164,7 @@ void TabbedBrowser::init()
     newTabButton->setAutoRaise( TRUE );
     newTabButton->setPixmap( TQPixmap::fromMimeSource( "addtab.png" ) );
     newTabButton->setFixedSize( s, s );
-    TQObject::connect( newTabButton, SIGNAL( clicked() ), this, SLOT( newTab() ) );
+    TQObject::connect( newTabButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newTab() ) );
     TQToolTip::add( newTabButton, tr( "Add page" ) );
 
     TQToolButton *closeTabButton = new TQToolButton( this );
@@ -177,7 +177,7 @@ void TabbedBrowser::init()
     is.setPixmap( disabledPix, TQIconSet::Small, TQIconSet::Disabled );
     closeTabButton->setIconSet( is );
     closeTabButton->setFixedSize( s, s );
-    TQObject::connect( closeTabButton, SIGNAL( clicked() ), this, SLOT( closeTab() ) );
+    TQObject::connect( closeTabButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeTab() ) );
     TQToolTip::add( closeTabButton, tr( "Close page" ) );
     closeTabButton->setEnabled( FALSE );
 }
@@ -304,7 +304,7 @@ void TabbedBrowser::closeTab()
 	return;
     HelpWindow *win = currentBrowser();
     tab->removePage( win );
-    TQTimer::singleShot(0, win, SLOT(deleteLater()));
+    TQTimer::singleShot(0, win, TQ_SLOT(deleteLater()));
     tab->cornerWidget( TQt::TopRight )->setEnabled( tab->count() > 1 );
 }