Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

34 files changed, 360 insertions, 360 deletions

diff --git a/src/bookmarksdlg.cpp b/src/bookmarksdlg.cpp
index f42deb6..12ddd5e 100644
--- a/src/bookmarksdlg.cpp
+++ b/src/bookmarksdlg.cpp
@@ -35,8 +35,8 @@ BookmarksDlg::BookmarksDlg(TQWidget* pParent, const char* szName) :
 	m_pView->setColumnWidth(0, 0);
 	
 	// Handle requests for source locations
-	connect(m_pView, SIGNAL(lineRequested(const TQString&, uint)), this,
-		SLOT(slotLineRequested(const TQString&, uint)));
+	connect(m_pView, TQ_SIGNAL(lineRequested(const TQString&, uint)), this,
+		TQ_SLOT(slotLineRequested(const TQString&, uint)));
 }
 
 BookmarksDlg::~BookmarksDlg()
diff --git a/src/calltreedlg.cpp b/src/calltreedlg.cpp
index b0619f4..517fbba 100644
--- a/src/calltreedlg.cpp
+++ b/src/calltreedlg.cpp
@@ -70,12 +70,12 @@ CallTreeDlg::CallTreeDlg(TQWidget* pParent, const char* szName) :
 	m_pPrefButton->setPixmap(GET_PIXMAP(ButtonPref));
 	
 	// Open the location of a call
-	connect(m_pGraphWidget, SIGNAL(lineRequested(const TQString&, uint)),
-		this, SIGNAL(lineRequested(const TQString&, uint)));
-	connect(m_pCalledWidget, SIGNAL(lineRequested(const TQString&, uint)),
-		this, SIGNAL(lineRequested(const TQString&, uint)));
-	connect(m_pCallingWidget, SIGNAL(lineRequested(const TQString&, uint)),
-		this, SIGNAL(lineRequested(const TQString&, uint)));
+	connect(m_pGraphWidget, TQ_SIGNAL(lineRequested(const TQString&, uint)),
+		this, TQ_SIGNAL(lineRequested(const TQString&, uint)));
+	connect(m_pCalledWidget, TQ_SIGNAL(lineRequested(const TQString&, uint)),
+		this, TQ_SIGNAL(lineRequested(const TQString&, uint)));
+	connect(m_pCallingWidget, TQ_SIGNAL(lineRequested(const TQString&, uint)),
+		this, TQ_SIGNAL(lineRequested(const TQString&, uint)));
 	
 	m_pCallingWidget->setMode(TreeWidget::Calling);
 	
diff --git a/src/calltreemanager.cpp b/src/calltreemanager.cpp
index ac03cac..5ae0257 100644
--- a/src/calltreemanager.cpp
+++ b/src/calltreemanager.cpp
@@ -104,12 +104,12 @@ CallTreeDlg* CallTreeManager::addDialog()
 	m_lstDialogs.append(pDlg); 
 	
 	// Open an editor whenever a function name is double-clicked
-	connect(pDlg, SIGNAL(lineRequested(const TQString&, uint)),
-		this, SIGNAL(lineRequested(const TQString&, uint)));
+	connect(pDlg, TQ_SIGNAL(lineRequested(const TQString&, uint)),
+		this, TQ_SIGNAL(lineRequested(const TQString&, uint)));
 
 	// Track the closing of the call tree dialog
-	connect(pDlg, SIGNAL(closed(const CallTreeDlg*)), this,
-		SLOT(slotRemoveDialog(const CallTreeDlg*)));
+	connect(pDlg, TQ_SIGNAL(closed(const CallTreeDlg*)), this,
+		TQ_SLOT(slotRemoveDialog(const CallTreeDlg*)));
 	
 	return pDlg;
 }
diff --git a/src/cscopefrontend.cpp b/src/cscopefrontend.cpp
index e272b14..1123609 100644
--- a/src/cscopefrontend.cpp
+++ b/src/cscopefrontend.cpp
@@ -426,7 +426,7 @@ void CscopeProgress::setProgress(int nProgress, int nTotal)
 			m_pLabel->setPaletteForegroundColor(
 				TDEGlobalSettings::highlightedTextColor());
 				
-			TQTimer::singleShot(1000, this, SLOT(slotShowLabel()));
+			TQTimer::singleShot(1000, this, TQ_SLOT(slotShowLabel()));
 		}
 		
 		return;
@@ -438,7 +438,7 @@ void CscopeProgress::setProgress(int nProgress, int nTotal)
 	// on very short queries.
 	if (m_pProgressBar == NULL) {
 		m_pProgressBar = new TQProgressBar(m_pMainWidget);
-		TQTimer::singleShot(1000, this, SLOT(slotShowProgressBar()));
+		TQTimer::singleShot(1000, this, TQ_SLOT(slotShowProgressBar()));
 	}
 	
 	// Set the current progress value
@@ -490,9 +490,9 @@ void CscopeVerifier::verify()
 	ConfigFrontend* pConf;
 	 
 	pConf = new ConfigFrontend(true);
-	connect(pConf, SIGNAL(result(uint, const TQString&)), this,
-		SLOT(slotConfigResult(uint, const TQString&)));
-	connect(pConf, SIGNAL(finished(uint)), this, SLOT(slotFinished()));
+	connect(pConf, TQ_SIGNAL(result(uint, const TQString&)), this,
+		TQ_SLOT(slotConfigResult(uint, const TQString&)));
+	connect(pConf, TQ_SIGNAL(finished(uint)), this, TQ_SLOT(slotFinished()));
 	
 	pConf->run(Config().getCscopePath(), "", "", true);
 }
diff --git a/src/cscopemsgdlg.cpp b/src/cscopemsgdlg.cpp
index fe6bd87..469202f 100644
--- a/src/cscopemsgdlg.cpp
+++ b/src/cscopemsgdlg.cpp
@@ -38,10 +38,10 @@ CscopeMsgDlg::CscopeMsgDlg(TQWidget* pParent, const char* szName)
 	: CscopeMsgLayout(pParent, szName, false, 0)
 {
 	// Hide the dialog when the "Hide" button is clicked
-	connect(m_pHideButton, SIGNAL(clicked()), this, SLOT(hide()));
+	connect(m_pHideButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(hide()));
 	
 	// Clear all messages when the "Clear" button is clicked
-	connect(m_pClearButton, SIGNAL(clicked()), m_pMsgText, SLOT(clear()));
+	connect(m_pClearButton, TQ_SIGNAL(clicked()), m_pMsgText, TQ_SLOT(clear()));
 }
 
 /**
diff --git a/src/ctagslist.cpp b/src/ctagslist.cpp
index 8c5dca1..46bd5f7 100644
--- a/src/ctagslist.cpp
+++ b/src/ctagslist.cpp
@@ -113,8 +113,8 @@ CtagsList::CtagsList(TQWidget* pParent, const char* szName) :
 	m_nPendLine(0)
 {
 	m_pList->setShowSortIndicator(true);
-	connect(m_pList->header(), SIGNAL(clicked(int)), this,
-		SLOT(slotSortChanged(int)));
+	connect(m_pList->header(), TQ_SIGNAL(clicked(int)), this,
+		TQ_SLOT(slotSortChanged(int)));
 	
 	// Determine the default sorting order
 	switch (Config().getCtagSortOrder()) {
diff --git a/src/editorpage.cpp b/src/editorpage.cpp
index 945159b..d024a50 100644
--- a/src/editorpage.cpp
+++ b/src/editorpage.cpp
@@ -72,27 +72,27 @@ EditorPage::EditorPage(KTextEditor::Document* pDoc, TQPopupMenu* pMenu,
 	m_pSplit->setResizeMode(m_pCtagsList, TQSplitter::KeepSize);
 	
 	// Perform tasks only when the document has been loaded completely
-	connect(m_pDoc, SIGNAL(completed()), this, SLOT(slotFileOpened()));
+	connect(m_pDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotFileOpened()));
 	
 	// Be notified when the text in the editor changes
-	connect(m_pDoc, SIGNAL(textChanged()), this, SLOT(slotSetModified()));
-	connect(m_pDoc, SIGNAL(undoChanged()), this, SLOT(slotUndoChanged()));
+	connect(m_pDoc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotSetModified()));
+	connect(m_pDoc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotUndoChanged()));
 	
 	// Store the sizes of the child windows when the tag list is resized
 	// (since it may imply a move of the splitter divider)
-	connect(m_pCtagsList, SIGNAL(resized()), this, SLOT(slotChildResized()));
+	connect(m_pCtagsList, TQ_SIGNAL(resized()), this, TQ_SLOT(slotChildResized()));
 
 	// Go to a symbol's line if it is selected in the tag list
-	connect(m_pCtagsList, SIGNAL(lineRequested(uint)), this,
-		SLOT(slotGotoLine(uint)));
+	connect(m_pCtagsList, TQ_SIGNAL(lineRequested(uint)), this,
+		TQ_SLOT(slotGotoLine(uint)));
 
 	// Add Ctag records to the tag list
-	connect(&m_ctags, SIGNAL(dataReady(FrontendToken*)), m_pCtagsList,
-		SLOT(slotDataReady(FrontendToken*)));
+	connect(&m_ctags, TQ_SIGNAL(dataReady(FrontendToken*)), m_pCtagsList,
+		TQ_SLOT(slotDataReady(FrontendToken*)));
 		
 	// Monitor Ctags' operation
-	connect(&m_ctags, SIGNAL(finished(uint)), m_pCtagsList, 
-		SLOT(slotCtagsFinished(uint)));
+	connect(&m_ctags, TQ_SIGNAL(finished(uint)), m_pCtagsList, 
+		TQ_SLOT(slotCtagsFinished(uint)));
 		
 	// Set the context menu
 	pMenuIf = dynamic_cast<KTextEditor::PopupMenuInterface*>(m_pView);
@@ -102,8 +102,8 @@ EditorPage::EditorPage(KTextEditor::Document* pDoc, TQPopupMenu* pMenu,
 	// Emit a signal whenever the cursor's position changes
 	pCursorIf = dynamic_cast<KTextEditor::ViewCursorInterface*>(m_pView);
 	if (pCursorIf) {
-		connect(m_pView, SIGNAL(cursorPositionChanged()), this,
-			SLOT(slotCursorPosChange()));
+		connect(m_pView, TQ_SIGNAL(cursorPositionChanged()), this,
+			TQ_SLOT(slotCursorPosChange()));
 	}
 }
 
diff --git a/src/editortabs.cpp b/src/editortabs.cpp
index 24aa6d4..e728f7e 100644
--- a/src/editortabs.cpp
+++ b/src/editortabs.cpp
@@ -53,16 +53,16 @@ EditorTabs::EditorTabs(TQWidget* pParent, const char* szName) :
 	setAcceptDrops(true);
 	
 	// Close an editor page when its close button is clicked
-	connect(this, SIGNAL(closeRequest(TQWidget*)), this,
-		SLOT(slotRemovePage(TQWidget*)));
+	connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this,
+		TQ_SLOT(slotRemovePage(TQWidget*)));
 	
 	// Set an editor page as the active part, when its tab is selected	
-	connect(this, SIGNAL(currentChanged(TQWidget*)), this,
-		SLOT(slotCurrentChanged(TQWidget*)));
+	connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this,
+		TQ_SLOT(slotCurrentChanged(TQWidget*)));
 
 	// Start dragging a file from a tab
-	connect(this, SIGNAL(initiateDrag(TQWidget*)), this,
-		SLOT(slotInitiateDrag(TQWidget*)));
+	connect(this, TQ_SIGNAL(initiateDrag(TQWidget*)), this,
+		TQ_SLOT(slotInitiateDrag(TQWidget*)));
 }
 
 /**
@@ -79,10 +79,10 @@ EditorTabs::~EditorTabs()
 void EditorTabs::setWindowMenu(TQPopupMenu* pWindowMenu)
 {
 	m_pWindowMenu = pWindowMenu;
-	connect(pWindowMenu, SIGNAL(aboutToShow()), this,
-		SLOT(slotFillWindowMenu()));
-	connect(pWindowMenu, SIGNAL(activated(int)), this,
-		SLOT(slotSetCurrentPage(int)));
+	connect(pWindowMenu, TQ_SIGNAL(aboutToShow()), this,
+		TQ_SLOT(slotFillWindowMenu()));
+	connect(pWindowMenu, TQ_SIGNAL(activated(int)), this,
+		TQ_SLOT(slotSetCurrentPage(int)));
 }
 
 /**
@@ -97,16 +97,16 @@ void EditorTabs::addEditorPage(EditorPage* pNewPage)
 
 	// Add the file edited by this page to the map, and display its name,
 	// once the file is opened
-	connect(pNewPage, SIGNAL(fileOpened(EditorPage*, const TQString&)), this,
-		SLOT(slotAttachFile(EditorPage*, const TQString&)));
+	connect(pNewPage, TQ_SIGNAL(fileOpened(EditorPage*, const TQString&)), this,
+		TQ_SLOT(slotAttachFile(EditorPage*, const TQString&)));
 
 	// Handle new unnamed files
-	connect(pNewPage, SIGNAL(newFile(EditorPage*)), this,
-		SLOT(slotNewFile(EditorPage*)));
+	connect(pNewPage, TQ_SIGNAL(newFile(EditorPage*)), this,
+		TQ_SLOT(slotNewFile(EditorPage*)));
 	
 	// Change tab icon when a file is modified
-	connect(pNewPage, SIGNAL(modified(EditorPage*, bool)), this,
-		SLOT(slotFileModified(EditorPage*, bool)));
+	connect(pNewPage, TQ_SIGNAL(modified(EditorPage*, bool)), this,
+		TQ_SLOT(slotFileModified(EditorPage*, bool)));
 	
 	// If this is the first page, the current page will not be set by the 
 	// signal handler, so we need to do it manually
diff --git a/src/fileview.cpp b/src/fileview.cpp
index f7ac9aa..a9c7b84 100644
--- a/src/fileview.cpp
+++ b/src/fileview.cpp
@@ -57,12 +57,12 @@ FileView::FileView(TQWidget* pParent, const char* szName, WFlags fl) :
 	
 	// Send the fileRequested() signal whenever a file is selected in either
 	// the list or the tree
-	connect(m_pFileList, SIGNAL(fileRequested(const TQString&, uint)), this,
-		SIGNAL(fileRequested(const TQString&, uint)));
-	connect(m_pFileTree, SIGNAL(doubleClicked(TQListViewItem*)), 
-		this, SLOT(slotTreeItemSelected(TQListViewItem*)));
-	connect(m_pFileTree, SIGNAL(returnPressed(TQListViewItem*)), this, 
-		SLOT(slotTreeItemSelected(TQListViewItem*)));
+	connect(m_pFileList, TQ_SIGNAL(fileRequested(const TQString&, uint)), this,
+		TQ_SIGNAL(fileRequested(const TQString&, uint)));
+	connect(m_pFileTree, TQ_SIGNAL(doubleClicked(TQListViewItem*)), 
+		this, TQ_SLOT(slotTreeItemSelected(TQListViewItem*)));
+	connect(m_pFileTree, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, 
+		TQ_SLOT(slotTreeItemSelected(TQListViewItem*)));
 }
 
 /**
diff --git a/src/frontend.cpp b/src/frontend.cpp
index ab12459..52c97c2 100644
--- a/src/frontend.cpp
+++ b/src/frontend.cpp
@@ -46,16 +46,16 @@ Frontend::Frontend(uint nRecordSize, bool bAutoDelete) : TDEProcess(),
 	m_nRecordSize(nRecordSize)
 {
 	// Parse data on the standard output
-	connect(this, SIGNAL(receivedStdout(TDEProcess*, char*, int)), this,
-		SLOT(slotReadStdout(TDEProcess*, char*, int)));
+	connect(this, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this,
+		TQ_SLOT(slotReadStdout(TDEProcess*, char*, int)));
 
 	// Parse data on the standard error
-	connect(this, SIGNAL(receivedStderr(TDEProcess*, char*, int)), this,
-		SLOT(slotReadStderr(TDEProcess*, char*, int)));
+	connect(this, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this,
+		TQ_SLOT(slotReadStderr(TDEProcess*, char*, int)));
 		
 	// Delete the process object when the process exits
-	connect(this, SIGNAL(processExited(TDEProcess*)), this,
-		SLOT(slotProcessExit(TDEProcess*)));
+	connect(this, TQ_SIGNAL(processExited(TDEProcess*)), this,
+		TQ_SLOT(slotProcessExit(TDEProcess*)));
 }
 
 /**
diff --git a/src/graphwidget.cpp b/src/graphwidget.cpp
index b2911c0..d0f38fe 100644
--- a/src/graphwidget.cpp
+++ b/src/graphwidget.cpp
@@ -137,23 +137,23 @@ GraphWidget::GraphWidget(TQWidget* pParent, const char* szName) :
 	m_pCscope = new CscopeFrontend();
 	
 	// Add records output by the Cscope process
-	connect(m_pCscope, SIGNAL(dataReady(FrontendToken*)), this,
-		SLOT(slotDataReady(FrontendToken*)));
+	connect(m_pCscope, TQ_SIGNAL(dataReady(FrontendToken*)), this,
+		TQ_SLOT(slotDataReady(FrontendToken*)));
 	
 	// Display query progress information
-	connect(m_pCscope, SIGNAL(progress(int, int)), this,
-		SLOT(slotProgress(int, int)));	
+	connect(m_pCscope, TQ_SIGNAL(progress(int, int)), this,
+		TQ_SLOT(slotProgress(int, int)));	
 		
 	// Draw the graph when the process has finished
-	connect(m_pCscope, SIGNAL(finished(uint)), this,
-		SLOT(slotFinished(uint)));
+	connect(m_pCscope, TQ_SIGNAL(finished(uint)), this,
+		TQ_SLOT(slotFinished(uint)));
 	
 	// Show a multi-call node when a query results in too many records
-	connect(m_pCscope, SIGNAL(aborted()), this,
-		SLOT(slotAborted()));
+	connect(m_pCscope, TQ_SIGNAL(aborted()), this,
+		TQ_SLOT(slotAborted()));
 	
 	// Redraw the graph when Dot exits
-	connect(&m_dot, SIGNAL(finished(uint)), this, SLOT(slotDotFinished()));	
+	connect(&m_dot, TQ_SIGNAL(finished(uint)), this, TQ_SLOT(slotDotFinished()));	
 	
 	// Create the node popup menu
 	m_pNodePopup = new TQPopupMenu(this);
@@ -161,38 +161,38 @@ GraphWidget::GraphWidget(TQWidget* pParent, const char* szName) :
 	m_pNodePopup->insertItem(new MenuLabel(i18n("<b>Called Functions</b>"),
 		m_pNodePopup));
 	m_pNodePopup->insertItem(i18n("Show"), this,
-		SLOT(slotShowCalled()));
+		TQ_SLOT(slotShowCalled()));
 	m_pNodePopup->insertItem(i18n("List/Filter..."), this,
-		SLOT(slotListCalled()));
+		TQ_SLOT(slotListCalled()));
 	m_pNodePopup->insertItem(i18n("Hide"), this,
-		SLOT(slotHideCalled()));
+		TQ_SLOT(slotHideCalled()));
 	
 	m_pNodePopup->insertItem(new MenuLabel(i18n("<b>Calling Functions</b>"),
 		m_pNodePopup));
 	m_pNodePopup->insertItem(i18n("Show"), this,
-		SLOT(slotShowCalling()));
+		TQ_SLOT(slotShowCalling()));
 	m_pNodePopup->insertItem(i18n("List/Filter..."), this,
-		SLOT(slotListCalling()));
+		TQ_SLOT(slotListCalling()));
 	m_pNodePopup->insertItem(i18n("Hide"), this,
-		SLOT(slotHideCalling()));
+		TQ_SLOT(slotHideCalling()));
 	
 	m_pNodePopup->insertItem(new MenuLabel(i18n("<b>This Function</b>"),
 		m_pNodePopup));
 	m_pNodePopup->insertItem(i18n("Find Definition"), this,
-		SLOT(slotFindDef()));
-	m_pNodePopup->insertItem(i18n("Remove"), this, SLOT(slotRemoveNode()));
+		TQ_SLOT(slotFindDef()));
+	m_pNodePopup->insertItem(i18n("Remove"), this, TQ_SLOT(slotRemoveNode()));
 		
 	// Create the multi-call node popup menu
 	m_pMultiCallPopup = new TQPopupMenu(this);
 	m_pMultiCallPopup->insertItem(i18n("List..."), this,
-		SLOT(slotMultiCallDetails()));
+		TQ_SLOT(slotMultiCallDetails()));
 	m_pMultiCallPopup->insertSeparator();
 	m_pMultiCallPopup->insertItem(i18n("Remove"), this,
-		SLOT(slotRemoveNode()));
+		TQ_SLOT(slotRemoveNode()));
 	
 	// Create the edge menu
 	m_pEdgePopup = new TQPopupMenu(this);
-	m_pEdgePopup->insertItem(i18n("Open Call"), this, SLOT(slotOpenCall()));
+	m_pEdgePopup->insertItem(i18n("Open Call"), this, TQ_SLOT(slotOpenCall()));
 		
 	(void)new GraphTip(this);
 }
@@ -1085,8 +1085,8 @@ void GraphWidget::slotFindDef()
 	pDlg = new QueryViewDlg(QueryViewDlg::DestroyOnSelect, this);
 	
 	// Display a line when it is selected in the dialogue
-	connect(pDlg, SIGNAL(lineRequested(const TQString&, uint)), this,
-		SIGNAL(lineRequested(const TQString&, uint)));
+	connect(pDlg, TQ_SIGNAL(lineRequested(const TQString&, uint)), this,
+		TQ_SIGNAL(lineRequested(const TQString&, uint)));
 		
 	// Start the query
 	pDlg->query(CscopeFrontend::Definition, pNode->getFunc());
diff --git a/src/historypage.cpp b/src/historypage.cpp
index 81a3e87..8d5bc4a 100644
--- a/src/historypage.cpp
+++ b/src/historypage.cpp
@@ -42,8 +42,8 @@ HistoryPage::HistoryPage(TQWidget* pParent, const char* szName) :
 {
 	m_pView = new HistoryView(this);
 	
-	connect(m_pView, SIGNAL(lineRequested(const TQString&, uint)), this,
-		SIGNAL(lineRequested(const TQString&, uint)));
+	connect(m_pView, TQ_SIGNAL(lineRequested(const TQString&, uint)), this,
+		TQ_SIGNAL(lineRequested(const TQString&, uint)));
 	
 	// Set colours and font
 	applyPrefs();
diff --git a/src/kscope.cpp b/src/kscope.cpp
index 8d7d1d5..6483199 100644
--- a/src/kscope.cpp
+++ b/src/kscope.cpp
@@ -121,35 +121,35 @@ KScope::KScope(TQWidget* pParent, const char* szName) :
 	
 	// Open a file for editing when selected in the project's file list or the
 	// file tree
-	connect(m_pFileView, SIGNAL(fileRequested(const TQString&, uint)), this,
-		SLOT(slotShowEditor(const TQString&, uint)));
+	connect(m_pFileView, TQ_SIGNAL(fileRequested(const TQString&, uint)), this,
+		TQ_SLOT(slotShowEditor(const TQString&, uint)));
 
 	// Delete an editor page object after it is removed
-	connect(m_pEditTabs, SIGNAL(editorRemoved(EditorPage*)),
-		this, SLOT(slotDeleteEditor(EditorPage*)));
+	connect(m_pEditTabs, TQ_SIGNAL(editorRemoved(EditorPage*)),
+		this, TQ_SLOT(slotDeleteEditor(EditorPage*)));
 	
-	connect(m_pEditTabs, SIGNAL(filesDropped(TQDropEvent*)), this,
-		SLOT(slotDropEvent(TQDropEvent*)));
+	connect(m_pEditTabs, TQ_SIGNAL(filesDropped(TQDropEvent*)), this,
+		TQ_SLOT(slotDropEvent(TQDropEvent*)));
 	
 	// Set an editor as the active part whenever its owner tab is selected
-	connect(m_pEditTabs, SIGNAL(editorChanged(EditorPage*, EditorPage*)),
-		this, SLOT(slotChangeEditor(EditorPage*, EditorPage*)));
+	connect(m_pEditTabs, TQ_SIGNAL(editorChanged(EditorPage*, EditorPage*)),
+		this, TQ_SLOT(slotChangeEditor(EditorPage*, EditorPage*)));
 
 	// Display a file at a specific line when selected in a query list
-	connect(m_pQueryWidget, SIGNAL(lineRequested(const TQString&, uint)),
-		this, SLOT(slotQueryShowEditor(const TQString&, uint)));
+	connect(m_pQueryWidget, TQ_SIGNAL(lineRequested(const TQString&, uint)),
+		this, TQ_SLOT(slotQueryShowEditor(const TQString&, uint)));
 	
 	// Display the symbol dialogue when the user opens a new query page
-	connect(m_pQueryWidget, SIGNAL(newQuery()), 
-		this, SLOT(slotQueryReference()));
+	connect(m_pQueryWidget, TQ_SIGNAL(newQuery()), 
+		this, TQ_SLOT(slotQueryReference()));
 
 	// Rebuild the project database after a certain time period has elapsed
 	// since the last save
-	connect(&m_timerRebuild, SIGNAL(timeout()), this, SLOT(slotRebuildDB()));
+	connect(&m_timerRebuild, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRebuildDB()));
 
 	// Display a file at a specific line when selected in a call tree dialogue
-	connect(m_pCallTreeMgr, SIGNAL(lineRequested(const TQString&, uint)),
-		this, SLOT(slotQueryShowEditor(const TQString&, uint)));
+	connect(m_pCallTreeMgr, TQ_SIGNAL(lineRequested(const TQString&, uint)),
+		this, TQ_SLOT(slotQueryShowEditor(const TQString&, uint)));
 		
 	// Store main window settings when closed
 	setAutoSaveSettings();
@@ -223,8 +223,8 @@ void KScope::initMainWindow()
 
 	// Update the relevant shell action when the dock is hidden through its
 	// close button
-	connect(m_pQueryDock, SIGNAL(headerCloseButtonClicked()), m_pActions,
-		SLOT(slotQueryDockClosed()));
+	connect(m_pQueryDock, TQ_SIGNAL(headerCloseButtonClicked()), m_pActions,
+		TQ_SLOT(slotQueryDockClosed()));
 		
 	// Create the file view dock
 	m_pFileViewDock->setWidget(m_pFileView);
@@ -232,8 +232,8 @@ void KScope::initMainWindow()
 	
 	// Update the relevant shell action when the dock is hidden through its
 	// close button
-	connect(m_pFileViewDock, SIGNAL(headerCloseButtonClicked()), m_pActions,
-		SLOT(slotFileViewDockClosed()));
+	connect(m_pFileViewDock, TQ_SIGNAL(headerCloseButtonClicked()), m_pActions,
+		TQ_SLOT(slotFileViewDockClosed()));
 	
 	// Associate the "Window" menu with the editor tabs widdget
 	pPopup = (TQPopupMenu*)factory()->container("window", this);
@@ -534,8 +534,8 @@ void KScope::slotQueryQuickDef()
 	pDlg = new QueryViewDlg(QueryViewDlg::DestroyOnSelect, this);
 	
 	// Display a line when it is selected in the dialogue
-	connect(pDlg, SIGNAL(lineRequested(const TQString&, uint)), this,
-		SLOT(slotShowEditor(const TQString&, uint)));
+	connect(pDlg, TQ_SIGNAL(lineRequested(const TQString&, uint)), this,
+		TQ_SLOT(slotShowEditor(const TQString&, uint)));
 		
 	// Start the query
 	pDlg->query(nType, sSymbol);
@@ -593,7 +593,7 @@ void KScope::slotConfigure()
 
 	// Apply the preferences if either the "Apply" or the "OK" buttons are
 	// clicked
-	connect(&dlg, SIGNAL(applyPref()), this, SLOT(slotApplyPref()));
+	connect(&dlg, TQ_SIGNAL(applyPref()), this, TQ_SLOT(slotApplyPref()));
 
 	// Show the dialog
 	if (dlg.exec() == TQDialog::Accepted) {
@@ -945,8 +945,8 @@ void KScope::verifyCscope()
 	statusBar()->message(i18n("Verifying Cscope installation..."));
 	
 	pVer = new CscopeVerifier();
-	connect(pVer, SIGNAL(done(bool, uint)), this,
-		SLOT(slotCscopeVerified(bool, uint)));
+	connect(pVer, TQ_SIGNAL(done(bool, uint)), this,
+		TQ_SLOT(slotCscopeVerified(bool, uint)));
 	
 	pVer->verify();
 }
@@ -971,18 +971,18 @@ void KScope::initCscope()
 	m_pCscopeBuild = new CscopeFrontend();
 
 	// Show build progress information in the main status bar
-	connect(m_pCscopeBuild, SIGNAL(progress(int, int)), this,
-		SLOT(slotBuildProgress(int, int)));
-	connect(m_pCscopeBuild, SIGNAL(buildInvIndex()), this,
-		SLOT(slotBuildInvIndex()));
-	connect(m_pCscopeBuild, SIGNAL(finished(uint)), this,
-		SLOT(slotBuildFinished(uint)));
-	connect(m_pCscopeBuild, SIGNAL(aborted()), this,
-		SLOT(slotBuildAborted()));
+	connect(m_pCscopeBuild, TQ_SIGNAL(progress(int, int)), this,
+		TQ_SLOT(slotBuildProgress(int, int)));
+	connect(m_pCscopeBuild, TQ_SIGNAL(buildInvIndex()), this,
+		TQ_SLOT(slotBuildInvIndex()));
+	connect(m_pCscopeBuild, TQ_SIGNAL(finished(uint)), this,
+		TQ_SLOT(slotBuildFinished(uint)));
+	connect(m_pCscopeBuild, TQ_SIGNAL(aborted()), this,
+		TQ_SLOT(slotBuildAborted()));
 
 	// Show errors in a modeless dialogue
-	connect(m_pCscopeBuild, SIGNAL(error(const TQString&)), this,
-		SLOT(slotCscopeError(const TQString&)));
+	connect(m_pCscopeBuild, TQ_SIGNAL(error(const TQString&)), this,
+		TQ_SLOT(slotCscopeError(const TQString&)));
 }
 
 /**
@@ -1174,8 +1174,8 @@ void KScope::slotProjectMake()
 		m_pMakeDlg->setDir(sDir);
 		
 		// Show the relevant source location when an error link is clicked
-		connect(m_pMakeDlg, SIGNAL(fileRequested(const TQString&, uint)), this,
-			SLOT(slotShowEditor(const TQString&, uint)));
+		connect(m_pMakeDlg, TQ_SIGNAL(fileRequested(const TQString&, uint)), this,
+			TQ_SLOT(slotShowEditor(const TQString&, uint)));
 		
 		// Show the dialogue
 		m_pMakeDlg->show();
@@ -1327,20 +1327,20 @@ EditorPage* KScope::createEditorPage()
 	m_pEditTabs->addEditorPage(pPage);
 
 	// Show the file's path in the main title
-	connect(pPage, SIGNAL(fileOpened(EditorPage*, const TQString&)), this,
-		SLOT(slotFileOpened(EditorPage*, const TQString&)));
+	connect(pPage, TQ_SIGNAL(fileOpened(EditorPage*, const TQString&)), this,
+		TQ_SLOT(slotFileOpened(EditorPage*, const TQString&)));
 
 	// Show cursor position in the status bar
-	connect(pPage, SIGNAL(cursorPosChanged(uint, uint)), this,
-		SLOT(slotShowCursorPos(uint, uint)));
+	connect(pPage, TQ_SIGNAL(cursorPosChanged(uint, uint)), this,
+		TQ_SLOT(slotShowCursorPos(uint, uint)));
 	
 	// Rebuild the database after a file has changed
-	connect(pPage, SIGNAL(fileSaved(const TQString&, bool)), this,
-		SLOT(slotFileSaved(const TQString&, bool)));
+	connect(pPage, TQ_SIGNAL(fileSaved(const TQString&, bool)), this,
+		TQ_SLOT(slotFileSaved(const TQString&, bool)));
 	
 	// Handle file drops
-	connect(pPage->getView(), SIGNAL(dropEventPass(TQDropEvent*)), this,
-		SLOT(slotDropEvent(TQDropEvent*)));
+	connect(pPage->getView(), TQ_SIGNAL(dropEventPass(TQDropEvent*)), this,
+		TQ_SLOT(slotDropEvent(TQDropEvent*)));
 
 	// Apply per-project configuration
 	pProj = m_pProjMgr->curProject();
diff --git a/src/kscopeactions.cpp b/src/kscopeactions.cpp
index d6233d1..66e7e5d 100644
--- a/src/kscopeactions.cpp
+++ b/src/kscopeactions.cpp
@@ -50,24 +50,24 @@ KScopeActions::~KScopeActions()
 void KScopeActions::init()
 {
 	// File menu
-	KStdAction::openNew(m_pWindow, SLOT(slotNewFile()), m_pCollection);
-	KStdAction::open(m_pWindow, SLOT(slotOpenFile()), m_pCollection);
-	KStdAction::close(m_pWindow, SLOT(slotCloseEditor()), m_pCollection);
-	KStdAction::quit(m_pWindow, SLOT(slotClose()), m_pCollection);
+	KStdAction::openNew(m_pWindow, TQ_SLOT(slotNewFile()), m_pCollection);
+	KStdAction::open(m_pWindow, TQ_SLOT(slotOpenFile()), m_pCollection);
+	KStdAction::close(m_pWindow, TQ_SLOT(slotCloseEditor()), m_pCollection);
+	KStdAction::quit(m_pWindow, TQ_SLOT(slotClose()), m_pCollection);
 
 	addAction(i18n("Go to File List"),
 		NULL,
 		"Ctrl+Shift+O",
 		m_pWindow->m_pFileList,
-		SLOT(slotSetFocus()),
+		TQ_SLOT(slotSetFocus()),
 		"file_open_file_from_list",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 	
 	addAction(i18n("Save Al&l"),
 		"save_all",
 		"Ctrl+L",
 		m_pWindow->m_pEditTabs,
-		SLOT(slotSaveAll()),
+		TQ_SLOT(slotSaveAll()),
 		"file_save_all",
 		NULL);
 	
@@ -76,32 +76,32 @@ void KScopeActions::init()
 		NULL,
 		"Ctrl+E",
 		m_pWindow,
-		SLOT(slotExtEdit()),
+		TQ_SLOT(slotExtEdit()),
 		"edit_external_editor",
-		SIGNAL(toggleFile(bool)));
+		TQ_SIGNAL(toggleFile(bool)));
 		
 	addAction(i18n("Go To Tag"),
 		NULL,
 		"Ctrl+Shift+T",
 		m_pWindow,
-		SLOT(slotGotoTag()),
+		TQ_SLOT(slotGotoTag()),
 		"edit_goto_tag",
-		SIGNAL(toggleFile(bool)));
+		TQ_SIGNAL(toggleFile(bool)));
 	
 	addAction(i18n("Complete Symbol"),
 		NULL,
 		"Ctrl+Space",
 		m_pWindow,
-		SLOT(slotCompleteSymbol()),
+		TQ_SLOT(slotCompleteSymbol()),
 		"edit_comp_symbol",
-		SIGNAL(toggleFile(bool)));
+		TQ_SIGNAL(toggleFile(bool)));
 		
 	// Project menu
 	addAction(i18n("&New Project..."),
 		NULL,
 		NULL,
 		m_pWindow,
-		SLOT(slotCreateProject()),
+		TQ_SLOT(slotCreateProject()),
 		"project_new",
 		NULL);
 		
@@ -109,7 +109,7 @@ void KScopeActions::init()
 		"project_open",
 		NULL,
 		m_pWindow,
-		SLOT(slotOpenProject()),
+		TQ_SLOT(slotOpenProject()),
 		"project_open",
 		NULL);
 		
@@ -117,7 +117,7 @@ void KScopeActions::init()
 		NULL,
 		NULL,
 		m_pWindow,
-		SLOT(slotProjectCscopeOut()),
+		TQ_SLOT(slotProjectCscopeOut()),
 		"project_cscope_out",
 		NULL);
 		
@@ -125,153 +125,153 @@ void KScopeActions::init()
 		NULL,
 		NULL,
 		m_pWindow,
-		SLOT(slotProjectFiles()),
+		TQ_SLOT(slotProjectFiles()),
 		"project_add_rem_files",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("&Properties..."),
 		NULL,
 		NULL,
 		m_pWindow,
-		SLOT(slotProjectProps()),
+		TQ_SLOT(slotProjectProps()),
 		"project_properties",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("&Make Project"),
 		"make_tdevelop",
 		"Ctrl+M",
 		m_pWindow,
-		SLOT(slotProjectMake()),
+		TQ_SLOT(slotProjectMake()),
 		"project_make",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("&Remake Project"),
 		"rebuild",
 		"Ctrl+Shift+M",
 		m_pWindow,
-		SLOT(slotProjectRemake()),
+		TQ_SLOT(slotProjectRemake()),
 		"project_remake",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 	
 	addAction(i18n("&Close Project"),
 		"window-close",
 		NULL,
 		m_pWindow,
-		SLOT(slotCloseProject()),
+		TQ_SLOT(slotCloseProject()),
 		"project_close",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 
 	// Cscope menu
 	addAction(i18n("&References..."),
 		NULL,
 		"Ctrl+0",
 		m_pWindow,
-		SLOT(slotQueryReference()),
+		TQ_SLOT(slotQueryReference()),
 		"cscope_references",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("&Definition..."),
 		NULL,
 		"Ctrl+1",
 		m_pWindow,
-		SLOT(slotQueryDefinition()),
+		TQ_SLOT(slotQueryDefinition()),
 		"cscope_definition",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 	
 	addAction(i18n("&Called Functions..."),
 		NULL,
 		"Ctrl+2",
 		m_pWindow,
-		SLOT(slotQueryCalled()),
+		TQ_SLOT(slotQueryCalled()),
 		"cscope_called",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("C&alling Functions..."),
 		NULL,
 		"Ctrl+3",
 		m_pWindow,
-		SLOT(slotQueryCalling()),
+		TQ_SLOT(slotQueryCalling()),
 		"cscope_calling",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("Find &Text..."),
 		NULL,
 		"Ctrl+4",
 		m_pWindow,
-		SLOT(slotQueryText()),
+		TQ_SLOT(slotQueryText()),
 		"cscope_text",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("Find &EGrep Pattern..."),
 		NULL,
 		"Ctrl+5",
 		m_pWindow,
-		SLOT(slotQueryPattern()),
+		TQ_SLOT(slotQueryPattern()),
 		"cscope_pattern",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("Find &File..."),
 		NULL,
 		"Ctrl+7",
 		m_pWindow,
-		SLOT(slotQueryFile()),
+		TQ_SLOT(slotQueryFile()),
 		"cscope_file",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("&Including Files..."),
 		NULL,
 		"Ctrl+8",
 		m_pWindow,
-		SLOT(slotQueryIncluding()),
+		TQ_SLOT(slotQueryIncluding()),
 		"cscope_including",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("&Quick Definition"),
 		NULL,
 		"Ctrl+]",
 		m_pWindow,
-		SLOT(slotQueryQuickDef()),
+		TQ_SLOT(slotQueryQuickDef()),
 		"cscope_quick_def",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("Call &Graph..."),
 		NULL,
 		"Ctrl+\\",
 		m_pWindow,
-		SLOT(slotCallTree()),
+		TQ_SLOT(slotCallTree()),
 		"cscope_call_tree",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("Re&build database"),
 		"vcs_update",
 		NULL,
 		m_pWindow,
-		SLOT(slotRebuildDB()),
+		TQ_SLOT(slotRebuildDB()),
 		"cscope_rebuild",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 
 	// Go menu
 	addAction(i18n("P&revious Result"),
 		"go-up",
 		"Alt+Up", 
 		m_pWindow->m_pQueryWidget,
-		SLOT(slotPrevResult()),
+		TQ_SLOT(slotPrevResult()),
 		"go_prev_result",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 	
 	addAction(i18n("N&ext Result"),
 		"go-down",
 		"Alt+Down",
 		m_pWindow->m_pQueryWidget,
-		SLOT(slotNextResult()),
+		TQ_SLOT(slotNextResult()),
 		"go_next_result",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 	
 	addAction(i18n("&Previous Position"),
 		"back", 
 		"Alt+Left",
 		m_pWindow->m_pQueryWidget,
-		SLOT(slotHistoryPrev()),
+		TQ_SLOT(slotHistoryPrev()),
 		"go_prev_pos",
 		NULL);
 	
@@ -279,7 +279,7 @@ void KScopeActions::init()
 		"forward", 
 		"Alt+Right",
 		m_pWindow->m_pQueryWidget,
-		SLOT(slotHistoryNext()),
+		TQ_SLOT(slotHistoryNext()),
 		"go_next_pos",
 		NULL);
 		
@@ -287,7 +287,7 @@ void KScopeActions::init()
 		"history",
 		"Ctrl+h",
 		m_pWindow,
-		SLOT(slotHistoryShow()),
+		TQ_SLOT(slotHistoryShow()),
 		"go_history",
 		NULL);
 		
@@ -295,7 +295,7 @@ void KScopeActions::init()
 		"bookmark", 
 		"Ctrl+Shift+G",
 		m_pWindow,
-		SLOT(slotShowBookmarks()),
+		TQ_SLOT(slotShowBookmarks()),
 		"go_bookmarks",
 		NULL);
 
@@ -304,7 +304,7 @@ void KScopeActions::init()
 		"view_sidetree",
 		"Ctrl+/",
 		m_pWindow->m_pFileViewDock,
-		SLOT(changeHideShowState()),
+		TQ_SLOT(changeHideShowState()),
 		"view_toggle_filelist_dock",
 		NULL);
 	
@@ -312,7 +312,7 @@ void KScopeActions::init()
 		"view_top_bottom",
 		"Ctrl+.",
 		m_pWindow->m_pQueryDock,
-		SLOT(changeHideShowState()),
+		TQ_SLOT(changeHideShowState()),
 		"view_toggle_query_dock",
 		NULL);
 	
@@ -320,7 +320,7 @@ void KScopeActions::init()
 		"view_detailed",
 		"Ctrl+'",
 		m_pWindow->m_pEditTabs,
-		SLOT(slotToggleTagList()),
+		TQ_SLOT(slotToggleTagList()),
 		"view_toggle_tag_list",
 		NULL);
 			
@@ -329,7 +329,7 @@ void KScopeActions::init()
 		"window-close",
 		NULL,
 		m_pWindow,
-		SLOT(slotCloseAllWindows()),
+		TQ_SLOT(slotCloseAllWindows()),
 		"window_close_all",
 		NULL);
 		
@@ -337,7 +337,7 @@ void KScopeActions::init()
 		"back", 
 		"Alt+Shift+Left",
 		m_pWindow->m_pEditTabs,
-		SLOT(slotGoLeft()),
+		TQ_SLOT(slotGoLeft()),
 		"window_go_left",
 		NULL);
 		
@@ -345,20 +345,20 @@ void KScopeActions::init()
 		"forward",
 		"Alt+Shift+Right",
 		m_pWindow->m_pEditTabs,
-		SLOT(slotGoRight()),
+		TQ_SLOT(slotGoRight()),
 		"window_go_right",
 		NULL);
 		
 	// Settings menu
-	KStdAction::preferences(m_pWindow, SLOT(slotConfigure()), m_pCollection);
-	KStdAction::keyBindings(m_pWindow, SLOT(slotShortcuts()), m_pCollection);
+	KStdAction::preferences(m_pWindow, TQ_SLOT(slotConfigure()), m_pCollection);
+	KStdAction::keyBindings(m_pWindow, TQ_SLOT(slotShortcuts()), m_pCollection);
 	
 	// Help menu
 	addAction(i18n("Show &Welcome Message..."),
 		NULL,
 		NULL,
 		m_pWindow,
-		SLOT(slotShowWelcome()),
+		TQ_SLOT(slotShowWelcome()),
 		"help_welcome",
 		NULL);
 	
@@ -367,33 +367,33 @@ void KScopeActions::init()
 		"document-new",
 		NULL,
 		m_pWindow->m_pQueryWidget,
-		SLOT(slotNewQueryPage()),
+		TQ_SLOT(slotNewQueryPage()),
 		"query_new",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 	
 	addAction(i18n("&Refresh"),
 		"reload",
 		NULL,
 		m_pWindow->m_pQueryWidget,
-		SLOT(slotRefreshCurrent()),
+		TQ_SLOT(slotRefreshCurrent()),
 		"query_refresh",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	m_pLockAction = addToggle(i18n("&Lock/Unlock"),
 		"encrypted",
 		NULL,
 		m_pWindow->m_pQueryWidget,
-		SLOT(slotLockCurrent()),
+		TQ_SLOT(slotLockCurrent()),
 		"query_toggle_locked",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 		
 	addAction(i18n("&Close"),
 		"window-close",
 		NULL,
 		m_pWindow->m_pQueryWidget,
-		SLOT(slotCloseCurrent()),
+		TQ_SLOT(slotCloseCurrent()),
 		"query_close",
-		SIGNAL(toggleProject(bool)));
+		TQ_SIGNAL(toggleProject(bool)));
 	
 	m_pExtEditAction->setEnabled(Config().useExtEditor());
 }
@@ -491,7 +491,7 @@ TDEAction* KScopeActions::addAction(const TQString& sCaption, const char* szIcon
 			
 	// Add to the given action list, if any
 	if (szSignal)
-		connect(this, szSignal, pAction, SLOT(setEnabled(bool)));
+		connect(this, szSignal, pAction, TQ_SLOT(setEnabled(bool)));
 		
 	return pAction;
 }
@@ -525,7 +525,7 @@ TDEToggleAction* KScopeActions::addToggle(const TQString& sCaption,
 			
 	// Add to the given action list, if any
 	if (szSignal)
-		connect(this, szSignal, pAction, SLOT(setEnabled(bool)));
+		connect(this, szSignal, pAction, TQ_SLOT(setEnabled(bool)));
 		
 	return pAction;
 }
diff --git a/src/makedlg.cpp b/src/makedlg.cpp
index 287e5c6..cfd96f0 100644
--- a/src/makedlg.cpp
+++ b/src/makedlg.cpp
@@ -55,25 +55,25 @@ MakeDlg::MakeDlg(TQWidget* pParent, const char* szName) :
 	
 	// Create a new make front-end
 	m_pMake = new MakeFrontend();
-	connect(m_pMake, SIGNAL(dataReady(FrontendToken*)), this,
-		SLOT(slotShowOutput(FrontendToken*)));
-	connect(m_pMake, SIGNAL(finished(uint)), this, SLOT(slotFinished(uint)));
+	connect(m_pMake, TQ_SIGNAL(dataReady(FrontendToken*)), this,
+		TQ_SLOT(slotShowOutput(FrontendToken*)));
+	connect(m_pMake, TQ_SIGNAL(finished(uint)), this, TQ_SLOT(slotFinished(uint)));
 	connect(m_pMake,
-		SIGNAL(error(const TQString&, const TQString&, const TQString&)),
+		TQ_SIGNAL(error(const TQString&, const TQString&, const TQString&)),
 		this,
-		SLOT(slotAddError(const TQString&, const TQString&, const TQString&)));
+		TQ_SLOT(slotAddError(const TQString&, const TQString&, const TQString&)));
 	
 	// The Root URL control should browse directories
 	m_pRootURL->setMode(KFile::Directory);
 	
 	// Handle URL links in the browser
 	m_pOutputBrowser->setNotifyClick(true);
-	connect(m_pOutputBrowser, SIGNAL(urlClick(const TQString&)), this,
-		SLOT(slotBrowserClicked(const TQString&)));
+	connect(m_pOutputBrowser, TQ_SIGNAL(urlClick(const TQString&)), this,
+		TQ_SLOT(slotBrowserClicked(const TQString&)));
 		
 	// Handle selections in the error view
-	connect(m_pErrorView, SIGNAL(lineRequested(const TQString& , uint)), this,
-		SIGNAL(fileRequested(const TQString&, uint)));
+	connect(m_pErrorView, TQ_SIGNAL(lineRequested(const TQString& , uint)), this,
+		TQ_SIGNAL(fileRequested(const TQString&, uint)));
 		
 	// Do not allow duplicates in the command history
 	m_pCommandHistory->setDuplicatesEnabled(false);
diff --git a/src/newprojectdlg.cpp b/src/newprojectdlg.cpp
index da9cb38..ac2aa18 100644
--- a/src/newprojectdlg.cpp
+++ b/src/newprojectdlg.cpp
@@ -60,11 +60,11 @@ NewProjectDlg::NewProjectDlg(bool bNewProj, TQWidget* pParent,
 			KFile::LocalOnly);
 	
 	// Set up the Create/Cancel buttons	
-	connect(m_pCreateButton, SIGNAL(clicked()), this, SLOT(accept()));
-	connect(m_pCancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+	connect(m_pCreateButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+	connect(m_pCancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
 
 	// Show the auto-completion properties dialogue
-	connect(m_pACButton, SIGNAL(clicked()), m_pAutoCompDlg, SLOT(exec()));	
+	connect(m_pACButton, TQ_SIGNAL(clicked()), m_pAutoCompDlg, TQ_SLOT(exec()));	
 		
 	// Perform actions specific to the type of dialog (new project or
 	// project properties)
@@ -306,8 +306,8 @@ AutoCompletionDlg::AutoCompletionDlg(TQWidget* pParent,
 	const char* szName ) :
 	AutoCompletionLayout(pParent, szName)
 {
-	connect(m_pOKButton, SIGNAL(clicked()), this, SLOT(accept()));
-	connect(m_pCancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+	connect(m_pOKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+	connect(m_pCancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
 }
 
 /**
diff --git a/src/preferencesdlg.cpp b/src/preferencesdlg.cpp
index 983c3c2..a0810f4 100644
--- a/src/preferencesdlg.cpp
+++ b/src/preferencesdlg.cpp
@@ -93,11 +93,11 @@ PreferencesDlg::PreferencesDlg(uint nPage, TQWidget* pParent,
 	enableButtonApply(false);
 		
 	// Enable the "Apply" button when a parameter changes its value
-	connect(m_pPrefFrontend, SIGNAL(modified()), this, 
-		SLOT(slotModified()));
-	connect(m_pPrefColor, SIGNAL(modified()), this, SLOT(slotModified()));
-	connect(m_pPrefFont, SIGNAL(modified()), this, SLOT(slotModified()));
-	connect(m_pPrefOpt, SIGNAL(modified()), this, SLOT(slotModified()));
+	connect(m_pPrefFrontend, TQ_SIGNAL(modified()), this, 
+		TQ_SLOT(slotModified()));
+	connect(m_pPrefColor, TQ_SIGNAL(modified()), this, TQ_SLOT(slotModified()));
+	connect(m_pPrefFont, TQ_SIGNAL(modified()), this, TQ_SLOT(slotModified()));
+	connect(m_pPrefOpt, TQ_SIGNAL(modified()), this, TQ_SLOT(slotModified()));
 	
 	// Set the active page
 	showPage(nPage);
diff --git a/src/preffrontend.cpp b/src/preffrontend.cpp
index effeb69..2db9fdb 100644
--- a/src/preffrontend.cpp
+++ b/src/preffrontend.cpp
@@ -47,16 +47,16 @@ PrefFrontend::PrefFrontend(TQWidget* pParent, const char* szName) :
 	load();
 
 	// Attempt to guess paths based on the user's PATH environment variable
-	connect(m_pGuessButton, SIGNAL(clicked()), this,
-		SLOT(slotGuessPaths()));	
+	connect(m_pGuessButton, TQ_SIGNAL(clicked()), this,
+		TQ_SLOT(slotGuessPaths()));	
 		
 	// Emit the modified() signal when a new path is set
-	connect(m_pCscopeURL, SIGNAL(textChanged(const TQString&)), this,
-		SIGNAL(modified()));
-	connect(m_pCtagsURL, SIGNAL(textChanged(const TQString&)), this,
-		SIGNAL(modified()));
-	connect(m_pDotURL, SIGNAL(textChanged(const TQString&)), this,
-		SIGNAL(modified()));
+	connect(m_pCscopeURL, TQ_SIGNAL(textChanged(const TQString&)), this,
+		TQ_SIGNAL(modified()));
+	connect(m_pCtagsURL, TQ_SIGNAL(textChanged(const TQString&)), this,
+		TQ_SIGNAL(modified()));
+	connect(m_pDotURL, TQ_SIGNAL(textChanged(const TQString&)), this,
+		TQ_SIGNAL(modified()));
 }
 
 /**
@@ -115,10 +115,10 @@ void PrefFrontend::slotGuessPaths()
 	pConf = new ConfigFrontend(true);
 	
 	// Show tests and results in the text widget
-	connect(pConf, SIGNAL(test(uint)), this,
-		SLOT(slotAutoConfigTest(uint)));
-	connect(pConf, SIGNAL(result(uint, const TQString&)), this,
-		SLOT(slotAutoConfigResult(uint, const TQString&)));
+	connect(pConf, TQ_SIGNAL(test(uint)), this,
+		TQ_SLOT(slotAutoConfigTest(uint)));
+	connect(pConf, TQ_SIGNAL(result(uint, const TQString&)), this,
+		TQ_SLOT(slotAutoConfigResult(uint, const TQString&)));
 	
 	// Run the script
 	pConf->run(m_pCscopeURL->url(), m_pCtagsURL->url(),
diff --git a/src/prefopt.cpp b/src/prefopt.cpp
index 2610eff..c195d36 100644
--- a/src/prefopt.cpp
+++ b/src/prefopt.cpp
@@ -46,24 +46,24 @@ PrefOpt::PrefOpt(TQWidget* pParent, const char* szName)
 	// Emit the "modified" signal whenever any of the widgets changes its
 	// its. This will notify the parent dialogue to enable its "Apply"
 	// button
-	connect(m_pReadOnlyCheck, SIGNAL(toggled(bool)), this, 
-		SIGNAL(modified()));
-	connect(m_pLastProjCheck, SIGNAL(toggled(bool)), this, 
-		SIGNAL(modified()));
-	connect(m_pTagHlCheck, SIGNAL(toggled(bool)), this, 
-		SIGNAL(modified()));
-	connect(m_pBriefQueryCaptCheck, SIGNAL(toggled(bool)), this, 
-		SIGNAL(modified()));
-	connect(m_pWarnModifiedOnDiskCheck, SIGNAL(toggled(bool)), this, 
-		SIGNAL(modified()));
-	connect(m_pAutoSortCheck, SIGNAL(toggled(bool)), this, 
-		SIGNAL(modified()));
-	connect(m_pExtEditorEdit, SIGNAL(textChanged(const TQString&)), this,
-		SIGNAL(modified()));
-	connect(m_pSysProfileCB, SIGNAL(activated(int)), this,
-		SIGNAL(modified()));
-	connect(m_pEditorPopupCB, SIGNAL(activated(int)), this,
-		SIGNAL(modified()));
+	connect(m_pReadOnlyCheck, TQ_SIGNAL(toggled(bool)), this, 
+		TQ_SIGNAL(modified()));
+	connect(m_pLastProjCheck, TQ_SIGNAL(toggled(bool)), this, 
+		TQ_SIGNAL(modified()));
+	connect(m_pTagHlCheck, TQ_SIGNAL(toggled(bool)), this, 
+		TQ_SIGNAL(modified()));
+	connect(m_pBriefQueryCaptCheck, TQ_SIGNAL(toggled(bool)), this, 
+		TQ_SIGNAL(modified()));
+	connect(m_pWarnModifiedOnDiskCheck, TQ_SIGNAL(toggled(bool)), this, 
+		TQ_SIGNAL(modified()));
+	connect(m_pAutoSortCheck, TQ_SIGNAL(toggled(bool)), this, 
+		TQ_SIGNAL(modified()));
+	connect(m_pExtEditorEdit, TQ_SIGNAL(textChanged(const TQString&)), this,
+		TQ_SIGNAL(modified()));
+	connect(m_pSysProfileCB, TQ_SIGNAL(activated(int)), this,
+		TQ_SIGNAL(modified()));
+	connect(m_pEditorPopupCB, TQ_SIGNAL(activated(int)), this,
+		TQ_SIGNAL(modified()));
 }
 
 /**
diff --git a/src/progressdlg.cpp b/src/progressdlg.cpp
index 37e0487..d50b9e2 100644
--- a/src/progressdlg.cpp
+++ b/src/progressdlg.cpp
@@ -46,7 +46,7 @@ ProgressDlg::ProgressDlg(const TQString& sCaption, const TQString& sText,
 	m_pIdleTimer = new TQTimer(this);
 
 	// Display a busy indicator by increasing the value of the idle counter
-	connect (m_pIdleTimer, SIGNAL(timeout()), this, SLOT(slotShowBusy()));
+	connect (m_pIdleTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotShowBusy()));
 }
 
 /**
diff --git a/src/projectfilesdlg.cpp b/src/projectfilesdlg.cpp
index a353e5a..568261b 100644
--- a/src/projectfilesdlg.cpp
+++ b/src/projectfilesdlg.cpp
@@ -65,24 +65,24 @@ ProjectFilesDlg::ProjectFilesDlg(Project* pProj, TQWidget* pParent,
 		m_pFileList->setSortColumn(m_pFileList->columns() + 1);
 
 	// Add file/directory/tree when the appropriate button is clicked
-	connect(m_pAddFilesButton, SIGNAL(clicked()), this,
-		SLOT(slotAddFiles()));
-	connect(m_pAddDirButton, SIGNAL(clicked()), this, SLOT(slotAddDir()));
-	connect(m_pAddTreeButton, SIGNAL(clicked()), this, SLOT(slotAddTree()));
+	connect(m_pAddFilesButton, TQ_SIGNAL(clicked()), this,
+		TQ_SLOT(slotAddFiles()));
+	connect(m_pAddDirButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddDir()));
+	connect(m_pAddTreeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddTree()));
 
 	// Remove selected files/directory/tree when the appropriate button is
 	// clicked
-	connect(m_pRemSelButton, SIGNAL(clicked()), this, SLOT(slotRemSel()));
-	connect(m_pRemDirButton, SIGNAL(clicked()), this, SLOT(slotRemDir()));
-	connect(m_pRemTreeButton, SIGNAL(clicked()), this, SLOT(slotRemTree()));
+	connect(m_pRemSelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemSel()));
+	connect(m_pRemDirButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemDir()));
+	connect(m_pRemTreeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemTree()));
 
 	// Hide/show files according to filter
-	connect(m_pFilterButton, SIGNAL(clicked()), this, SLOT(slotFilter()));
-	connect(m_pShowAllButton, SIGNAL(clicked()), this, SLOT(slotShowAll()));
+	connect(m_pFilterButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFilter()));
+	connect(m_pShowAllButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotShowAll()));
 	
 	// Close the dialog when OK/Cancel are clicked
-	connect(m_pOKButton, SIGNAL(clicked()), this, SLOT(accept()));
-	connect(m_pCancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+	connect(m_pOKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+	connect(m_pCancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
 
 	// Fill the list with the project's files
 	m_pFileList->setUpdatesEnabled(false);
@@ -172,8 +172,8 @@ void ProjectFilesDlg::customEvent(TQCustomEvent* pEvent)
 		// Create the scan progress dialog, if required
 		if (m_pScanDlg == NULL) {
 			m_pScanDlg = new ScanProgressDlg(this);
-			connect(m_pScanDlg, SIGNAL(cancelled()), this,
-				SLOT(slotCancelDirScan()));
+			connect(m_pScanDlg, TQ_SIGNAL(cancelled()), this,
+				TQ_SLOT(slotCancelDirScan()));
 		}
 
 		// Set progress indication
diff --git a/src/querypage.cpp b/src/querypage.cpp
index 06a77b5..f5d90c0 100644
--- a/src/querypage.cpp
+++ b/src/querypage.cpp
@@ -56,8 +56,8 @@ QueryPage::QueryPage(TQWidget* pParent, const char * szName) :
 	m_pView = new QueryView(this);
 	m_pDriver = new QueryViewDriver(m_pView, this);
 	
-	connect(m_pView, SIGNAL(lineRequested(const TQString&, uint)), this,
-		SIGNAL(lineRequested(const TQString&, uint)));
+	connect(m_pView, TQ_SIGNAL(lineRequested(const TQString&, uint)), this,
+		TQ_SIGNAL(lineRequested(const TQString&, uint)));
 	
 	// Set colours and font
 	applyPrefs();
diff --git a/src/queryresultsmenu.cpp b/src/queryresultsmenu.cpp
index 2446d12..4865d15 100644
--- a/src/queryresultsmenu.cpp
+++ b/src/queryresultsmenu.cpp
@@ -38,17 +38,17 @@ QueryResultsMenu::QueryResultsMenu(TQWidget* pParent, const char* szName) :
 	m_pItem(NULL)
 {
 	// Create the menu
-	insertItem(i18n("&View Source"), this, SLOT(slotViewSource()), 0,
+	insertItem(i18n("&View Source"), this, TQ_SLOT(slotViewSource()), 0,
 		ViewSource);
-	insertItem(i18n("Find &Definition"), this, SLOT(slotFindDef()), 0, 
+	insertItem(i18n("Find &Definition"), this, TQ_SLOT(slotFindDef()), 0, 
 		FindDef);
 	insertSeparator();
-	insertItem(i18n("&Copy"), this, SLOT(slotCopy()), 0, Copy);
+	insertItem(i18n("&Copy"), this, TQ_SLOT(slotCopy()), 0, Copy);
 	insertSeparator();
-	insertItem(i18n("&Filter..."), this, SLOT(slotFilter()), 0, Filter);
-	insertItem(i18n("&Show All"), this, SIGNAL(showAll()), 0, ShowAll);
+	insertItem(i18n("&Filter..."), this, TQ_SLOT(slotFilter()), 0, Filter);
+	insertItem(i18n("&Show All"), this, TQ_SIGNAL(showAll()), 0, ShowAll);
 	insertSeparator();
-	insertItem(i18n("&Remove Item"), this, SLOT(slotRemove()), 0, Remove);
+	insertItem(i18n("&Remove Item"), this, TQ_SLOT(slotRemove()), 0, Remove);
 }
 
 /**
diff --git a/src/queryview.cpp b/src/queryview.cpp
index 172e484..68db81a 100644
--- a/src/queryview.cpp
+++ b/src/queryview.cpp
@@ -58,28 +58,28 @@ QueryView::QueryView(TQWidget* pParent, const char* szName) :
 	
 	// A record is selected if it is either double-clicked, or the ENTER
 	// key is pressed while the record is highlighted
-	connect(this, SIGNAL(doubleClicked(TQListViewItem*)), this, 
-		SLOT(slotRecordSelected(TQListViewItem*)));
-	connect(this, SIGNAL(returnPressed(TQListViewItem*)), this, 
-		SLOT(slotRecordSelected(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, 
+		TQ_SLOT(slotRecordSelected(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, 
+		TQ_SLOT(slotRecordSelected(TQListViewItem*)));
 		
 	// Show the popup-menu when requested
 	connect(this, 
-		SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
-		m_pQueryMenu, SLOT(slotShow(TQListViewItem*, const TQPoint&, int)));
+		TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
+		m_pQueryMenu, TQ_SLOT(slotShow(TQListViewItem*, const TQPoint&, int)));
 		
 	// Handle popup-menu commands
-	connect(m_pQueryMenu, SIGNAL(viewSource(TQListViewItem*)), this,
-		SLOT(slotRecordSelected(TQListViewItem*)));
-	connect(m_pQueryMenu, SIGNAL(findDef(const TQString&)), this,
-		SLOT(slotFindDef(const TQString&)));
-	connect(m_pQueryMenu, SIGNAL(copy(TQListViewItem*, int)), this,
-		SLOT(slotCopy(TQListViewItem*, int)));
-	connect(m_pQueryMenu, SIGNAL(filter(int)), this, SLOT(slotFilter(int)));
-	connect(m_pQueryMenu, SIGNAL(showAll()), this, 
-		SLOT(slotShowAll()));
-	connect(m_pQueryMenu, SIGNAL(remove(TQListViewItem*)), this,
-		SLOT(slotRemoveItem(TQListViewItem*)));
+	connect(m_pQueryMenu, TQ_SIGNAL(viewSource(TQListViewItem*)), this,
+		TQ_SLOT(slotRecordSelected(TQListViewItem*)));
+	connect(m_pQueryMenu, TQ_SIGNAL(findDef(const TQString&)), this,
+		TQ_SLOT(slotFindDef(const TQString&)));
+	connect(m_pQueryMenu, TQ_SIGNAL(copy(TQListViewItem*, int)), this,
+		TQ_SLOT(slotCopy(TQListViewItem*, int)));
+	connect(m_pQueryMenu, TQ_SIGNAL(filter(int)), this, TQ_SLOT(slotFilter(int)));
+	connect(m_pQueryMenu, TQ_SIGNAL(showAll()), this, 
+		TQ_SLOT(slotShowAll()));
+	connect(m_pQueryMenu, TQ_SIGNAL(remove(TQListViewItem*)), this,
+		TQ_SLOT(slotRemoveItem(TQListViewItem*)));
 }
 
 /**
@@ -290,8 +290,8 @@ void QueryView::slotFindDef(const TQString& sFunc)
 	pDlg = new QueryViewDlg(QueryViewDlg::DestroyOnSelect, this);
 	
 	// Display a line when it is selected in the dialogue
-	connect(pDlg, SIGNAL(lineRequested(const TQString&, uint)), this,
-		SIGNAL(lineRequested(const TQString&, uint)));
+	connect(pDlg, TQ_SIGNAL(lineRequested(const TQString&, uint)), this,
+		TQ_SIGNAL(lineRequested(const TQString&, uint)));
 		
 	// Start the query
 	pDlg->query(CscopeFrontend::Definition, sFunc);
diff --git a/src/queryviewdlg.cpp b/src/queryviewdlg.cpp
index f9ddb84..bb157e3 100644
--- a/src/queryviewdlg.cpp
+++ b/src/queryviewdlg.cpp
@@ -47,11 +47,11 @@ QueryViewDlg::QueryViewDlg(uint nFlags, TQWidget* pParent,
 	m_pDriver = new QueryViewDriver(m_pView, this);
 		
 	// Show the dialogue when instructed by the driver
-	connect(m_pView, SIGNAL(needToShow()), this, SLOT(slotShow()));	
+	connect(m_pView, TQ_SIGNAL(needToShow()), this, TQ_SLOT(slotShow()));	
 	
 	// Propagate the lineRequested() signal from the QueryView object
-	connect(m_pView, SIGNAL(lineRequested(const TQString&, uint)), this,
-		SLOT(slotLineRequested(const TQString&, uint)));
+	connect(m_pView, TQ_SIGNAL(lineRequested(const TQString&, uint)), this,
+		TQ_SLOT(slotLineRequested(const TQString&, uint)));
 		
 	// Make the dialogue modal
 	setModal(true);
diff --git a/src/queryviewdriver.cpp b/src/queryviewdriver.cpp
index eef943c..59ad92a 100644
--- a/src/queryviewdriver.cpp
+++ b/src/queryviewdriver.cpp
@@ -46,18 +46,18 @@ QueryViewDriver::QueryViewDriver(QueryView* pView, TQObject* pParent,
 	m_pCscope = new CscopeFrontend();	
 		
 	// Add records to the page when Cscope outputs them
-	connect(m_pCscope, SIGNAL(dataReady(FrontendToken*)), this,
-		SLOT(slotDataReady(FrontendToken*)));
+	connect(m_pCscope, TQ_SIGNAL(dataReady(FrontendToken*)), this,
+		TQ_SLOT(slotDataReady(FrontendToken*)));
 		
 	// Report progress information
-	connect(m_pCscope, SIGNAL(progress(int, int)), this,
-		SLOT(slotProgress(int, int)));
+	connect(m_pCscope, TQ_SIGNAL(progress(int, int)), this,
+		TQ_SLOT(slotProgress(int, int)));
 
 	// Perform tasks when the query process terminates
-	connect(m_pCscope, SIGNAL(finished(uint)), this,
-		SLOT(slotFinished(uint)));
+	connect(m_pCscope, TQ_SIGNAL(finished(uint)), this,
+		TQ_SLOT(slotFinished(uint)));
 	
-	connect(m_pView, SIGNAL(destroyed()), this, SLOT(slotViewClosed()));
+	connect(m_pView, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotViewClosed()));
 }
 
 /**
diff --git a/src/querywidget.cpp b/src/querywidget.cpp
index c28e051..b0f0755 100644
--- a/src/querywidget.cpp
+++ b/src/querywidget.cpp
@@ -50,18 +50,18 @@ QueryWidget::QueryWidget(TQWidget* pParent, const char* szName) :
 	m_pQueryTabs->setHoverCloseButton(true);
 	
 	// Change the lock action state according to the current page
-	connect(m_pQueryTabs, SIGNAL(currentChanged(TQWidget*)), this,
-		SLOT(slotCurrentChanged(TQWidget*)));
+	connect(m_pQueryTabs, TQ_SIGNAL(currentChanged(TQWidget*)), this,
+		TQ_SLOT(slotCurrentChanged(TQWidget*)));
 	
 	// Close a query when its tab button is clicked
-	connect(m_pQueryTabs, SIGNAL(closeRequest(TQWidget*)), this,
-		SLOT(slotClosePage(TQWidget*)));
+	connect(m_pQueryTabs, TQ_SIGNAL(closeRequest(TQWidget*)), this,
+		TQ_SLOT(slotClosePage(TQWidget*)));
 
 	// Show the menu when requested
-	connect(m_pQueryTabs, SIGNAL(contextMenu(const TQPoint&)), this,
-		SLOT(slotContextMenu(const TQPoint&)));
-	connect(m_pQueryTabs, SIGNAL(contextMenu(TQWidget*, const TQPoint&)), this,
-		SLOT(slotContextMenu(TQWidget*, const TQPoint&)));
+	connect(m_pQueryTabs, TQ_SIGNAL(contextMenu(const TQPoint&)), this,
+		TQ_SLOT(slotContextMenu(const TQPoint&)));
+	connect(m_pQueryTabs, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint&)), this,
+		TQ_SLOT(slotContextMenu(TQWidget*, const TQPoint&)));
 }
 
 /**
@@ -228,8 +228,8 @@ void QueryWidget::addQueryPage()
 	
 	// Emit the lineRequested() signal when a query record is selected on 
 	// this page
-	connect(pPage, SIGNAL(lineRequested(const TQString&, uint)), this, 
-		SLOT(slotRequestLine(const TQString&, uint)));
+	connect(pPage, TQ_SIGNAL(lineRequested(const TQString&, uint)), this, 
+		TQ_SLOT(slotRequestLine(const TQString&, uint)));
 }
 
 /**
@@ -594,8 +594,8 @@ void QueryWidget::findHistoryPage()
 
 	// Emit the lineRequested() signal when a query record is selected on 
 	// this page
-	connect(m_pHistPage, SIGNAL(lineRequested(const TQString&, uint)), this, 
-		SLOT(slotRequestLine(const TQString&, uint)));
+	connect(m_pHistPage, TQ_SIGNAL(lineRequested(const TQString&, uint)), this, 
+		TQ_SLOT(slotRequestLine(const TQString&, uint)));
 }
 
 #include "querywidget.moc"
diff --git a/src/scanprogressdlg.cpp b/src/scanprogressdlg.cpp
index 28708fa..d1cef0c 100644
--- a/src/scanprogressdlg.cpp
+++ b/src/scanprogressdlg.cpp
@@ -43,7 +43,7 @@ ScanProgressDlg::ScanProgressDlg(TQWidget* pParent, const char* szName) :
 	show();
 
 	// Emit the cancelled() signal when the "Cancel" button is clicked
-	connect(m_pCancelButton, SIGNAL(clicked()), this, SIGNAL(cancelled()));
+	connect(m_pCancelButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(cancelled()));
 }
 
 /**
diff --git a/src/searchlist.cpp b/src/searchlist.cpp
index b784ee5..38443f2 100644
--- a/src/searchlist.cpp
+++ b/src/searchlist.cpp
@@ -114,16 +114,16 @@ SearchList::SearchList(int nSearchCol, TQWidget* pParent, const char* szName) :
 	TQToolTip::remove(m_pList);
 	m_pToolTip = new ListToolTip(this);
 	
-	connect(m_pEdit, SIGNAL(textChanged(const TQString&)), this,
-		SLOT(slotFindItem(const TQString&)));
-	connect(m_pList, SIGNAL(doubleClicked(TQListViewItem*)), this,
-		SLOT(slotItemSelected(TQListViewItem*)));
-	connect(m_pList, SIGNAL(returnPressed(TQListViewItem*)), this,
-		SLOT(slotItemSelected(TQListViewItem*)));
-	connect(m_pEdit, SIGNAL(returnPressed()), this,
-		SLOT(slotItemSelected()));
-	connect(m_pEdit, SIGNAL(keyPressed(TQKeyEvent*)), this,
-		SLOT(slotKeyPressed(TQKeyEvent*)));
+	connect(m_pEdit, TQ_SIGNAL(textChanged(const TQString&)), this,
+		TQ_SLOT(slotFindItem(const TQString&)));
+	connect(m_pList, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this,
+		TQ_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(m_pList, TQ_SIGNAL(returnPressed(TQListViewItem*)), this,
+		TQ_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(m_pEdit, TQ_SIGNAL(returnPressed()), this,
+		TQ_SLOT(slotItemSelected()));
+	connect(m_pEdit, TQ_SIGNAL(keyPressed(TQKeyEvent*)), this,
+		TQ_SLOT(slotKeyPressed(TQKeyEvent*)));
 }
 
 /**
diff --git a/src/searchresultsdlg.cpp b/src/searchresultsdlg.cpp
index c6183d6..d6e6196 100644
--- a/src/searchresultsdlg.cpp
+++ b/src/searchresultsdlg.cpp
@@ -64,8 +64,8 @@ SearchResultsDlg::SearchResultsDlg(TQWidget* pParent, const char* szName) :
 		
 	// Terminate the dialogue when either the "OK" or "Cancel" buttons are
 	// clicked
-	connect(m_pOKButton, SIGNAL(clicked()), this, SLOT(accept()));
-	connect(m_pCancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+	connect(m_pOKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+	connect(m_pCancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
 }
 
 /**
diff --git a/src/symbolcompletion.cpp b/src/symbolcompletion.cpp
index ee603b4..6e1dd30 100644
--- a/src/symbolcompletion.cpp
+++ b/src/symbolcompletion.cpp
@@ -51,16 +51,16 @@ SymbolCompletion::SymbolCompletion(SymbolCompletion::Interface* pEditor,
 	m_pAutoCompTimer = new TQTimer(this);
 	
 	// Add entries to the completion list when they are available
-	connect(m_pCscope, SIGNAL(dataReady(FrontendToken*)), this, 
-		SLOT(slotAddEntry(FrontendToken*)));
+	connect(m_pCscope, TQ_SIGNAL(dataReady(FrontendToken*)), this, 
+		TQ_SLOT(slotAddEntry(FrontendToken*)));
 	
 	// Show the completion list when the query finishes
-	connect(m_pCscope, SIGNAL(finished(uint)), this, 
-		SLOT(slotQueryFinished(uint)));
+	connect(m_pCscope, TQ_SIGNAL(finished(uint)), this, 
+		TQ_SLOT(slotQueryFinished(uint)));
 			
 	// Initiate automatic symbol completion when timer expires
-	connect(m_pAutoCompTimer, SIGNAL(timeout()), this,
-		SLOT(slotAutoCompleteTimeout()));
+	connect(m_pAutoCompTimer, TQ_SIGNAL(timeout()), this,
+		TQ_SLOT(slotAutoCompleteTimeout()));
 }
 
 /**
@@ -262,9 +262,9 @@ void SymbolCompletion::slotQueryFinished(uint /* nRecords */)
 	// Insert the correct part of the completed symbol, when chosen by the
 	// user
 	connect(m_pCCObject, 
-		SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)),
+		TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)),
 		this, 
-		SLOT(slotFilterInsert(KTextEditor::CompletionEntry*, TQString*)));
+		TQ_SLOT(slotFilterInsert(KTextEditor::CompletionEntry*, TQString*)));
 
 	// Check the number of entries in the list	
 	if (nEntryCount == 0) {
diff --git a/src/symboldlg.cpp b/src/symboldlg.cpp
index 24b654b..f1b4047 100644
--- a/src/symboldlg.cpp
+++ b/src/symboldlg.cpp
@@ -59,41 +59,41 @@ SymbolDlg::SymbolDlg(TQWidget* pParent, const char* szName) :
 	adjustSize();
 	
 	// Close the dialogue when either the "OK" or "Cancel" button are clicked
-	connect(m_pOKButton, SIGNAL(clicked()), this, SLOT(accept()));
-	connect(m_pCancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+	connect(m_pOKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+	connect(m_pCancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
 	
 	// Run a symbol completion query when the "Hint" button is clicked
-	connect(m_pHintButton, SIGNAL(clicked()), this, SLOT(slotHintClicked()));
+	connect(m_pHintButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHintClicked()));
 	
 	// Add results to the hint list
-	connect(m_pCscope, SIGNAL(dataReady(FrontendToken*)), this,
-		SLOT(slotHintDataReady(FrontendToken*)));
+	connect(m_pCscope, TQ_SIGNAL(dataReady(FrontendToken*)), this,
+		TQ_SLOT(slotHintDataReady(FrontendToken*)));
 
 	// Set hint button availability based on the type of query
-	connect(m_pTypeCombo, SIGNAL(activated(int)), this, 
-		SLOT(slotTypeChanged(int)));
+	connect(m_pTypeCombo, TQ_SIGNAL(activated(int)), this, 
+		TQ_SLOT(slotTypeChanged(int)));
 		
 	// Selecting an item in the hint list sets it as the current text	
-	connect(m_pHintList, SIGNAL(selectionChanged(TQListViewItem*)), this,
-		SLOT(slotHintItemSelected(TQListViewItem*)));
+	connect(m_pHintList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this,
+		TQ_SLOT(slotHintItemSelected(TQListViewItem*)));
 	
 	// Double-clicking an item in the hint list accepts that item as the
 	// result of the query (i.e., the item is selcted and the dialogue is
 	// closed)
-	connect(m_pHintList, SIGNAL(doubleClicked(TQListViewItem*)), this,
-		SLOT(accept()));
+	connect(m_pHintList, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this,
+		TQ_SLOT(accept()));
 		
 	// Refresh the hint list when the hint options change
-	connect(m_pBeginWithRadio, SIGNAL(toggled(bool)), this,
-		SLOT(slotHintOptionChanged(bool)));
-	connect(m_pContainRadio, SIGNAL(toggled(bool)), this,
-		SLOT(slotHintOptionChanged(bool)));
+	connect(m_pBeginWithRadio, TQ_SIGNAL(toggled(bool)), this,
+		TQ_SLOT(slotHintOptionChanged(bool)));
+	connect(m_pContainRadio, TQ_SIGNAL(toggled(bool)), this,
+		TQ_SLOT(slotHintOptionChanged(bool)));
 		
 	// Show hint query progress information
-	connect(m_pCscope, SIGNAL(progress(int, int)), this,
-		SLOT(slotHintProgress(int, int)));
-	connect(m_pCscope, SIGNAL(finished(uint)), this,
-		SLOT(slotHintFinished(uint)));
+	connect(m_pCscope, TQ_SIGNAL(progress(int, int)), this,
+		TQ_SLOT(slotHintProgress(int, int)));
+	connect(m_pCscope, TQ_SIGNAL(finished(uint)), this,
+		TQ_SLOT(slotHintFinished(uint)));
 }
 
 /**
diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp
index 405c368..d9064e4 100644
--- a/src/tabwidget.cpp
+++ b/src/tabwidget.cpp
@@ -42,7 +42,7 @@ TabWidget::TabWidget(TQWidget* pParent, const char* szName) :
 	m_pMenu = new TQPopupMenu(this);
 	
 	// Set the current tab based on the menu selection
-	connect(m_pMenu, SIGNAL(activated(int)), this, SLOT(setCurrentPage(int)));
+	connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setCurrentPage(int)));
 	
 	// Create a button at the top-right corner of the tab widget
 	m_pButton = new TQToolButton(this);
@@ -52,7 +52,7 @@ TabWidget::TabWidget(TQWidget* pParent, const char* szName) :
 	setCornerWidget(m_pButton, TopRight);
 	
 	// Show the popup-menu when the button is clicked
-	connect(m_pButton, SIGNAL(clicked()), this, SLOT(slotShowTabList()));
+	connect(m_pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotShowTabList()));
 }
 
 /**
diff --git a/src/treewidget.cpp b/src/treewidget.cpp
index db0a26b..cae5edb 100644
--- a/src/treewidget.cpp
+++ b/src/treewidget.cpp
@@ -43,8 +43,8 @@ TreeWidget::TreeWidget(TQWidget* pParent, const char* szName) :
 	m_pDriver = new QueryViewDriver(this, this);
 	
 	// Query a tree item when it is expanded for the first time
-	connect(this, SIGNAL(expanded(TQListViewItem*)), this,
-		SLOT(slotQueryItem(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), this,
+		TQ_SLOT(slotQueryItem(TQListViewItem*)));
 }
 
 /**