Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

11 files changed, 80 insertions, 80 deletions

diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp
index 637f76a4..1e02305f 100644
--- a/quanta/components/debugger/backtracelistview.cpp
+++ b/quanta/components/debugger/backtracelistview.cpp
@@ -64,7 +64,7 @@ BacktraceListview::BacktraceListview(TQWidget *parent, const char *name)
   setAllColumnsShowFocus(true);
 
   // Jump to bt
-  connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBacktraceDoubleClick( TQListViewItem *, const TQPoint &, int)));
+  connect(this, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(slotBacktraceDoubleClick( TQListViewItem *, const TQPoint &, int)));
 }
 
 
diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp
index 055512da..630fbf8b 100644
--- a/quanta/components/debugger/conditionalbreakpointdialog.cpp
+++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp
@@ -40,11 +40,11 @@ ConditionalBreakpointDialog::ConditionalBreakpointDialog(const TQString& express
   buttonClearClass->setPixmap(SmallIcon("clear_left"));
   buttonClearFunction->setPixmap(SmallIcon("clear_left"));
   
-  connect(comboExpression, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotExpressionChanged()));
+  connect(comboExpression, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotExpressionChanged()));
 
-  connect(buttonClearFile, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearFile()));
-  connect(buttonClearClass, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearClass()));
-  connect(buttonClearFunction, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearFunction()));
+  connect(buttonClearFile, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearFile()));
+  connect(buttonClearClass, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearClass()));
+  connect(buttonClearFunction, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearFunction()));
 
   slotExpressionChanged();
 }
diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
index 7730960d..03fb82aa 100644
--- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp
+++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
@@ -48,11 +48,11 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt
     if(m_socket)
     {
 //       m_socket->setBufferSize(-1);
-      connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int)));
-      connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KNetwork::KResolverEntry &)));
-      connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed()));
-      connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
-      connect(m_socket, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSocketDestroyed()));
+      connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int)));
+      connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KNetwork::KResolverEntry &)));
+      connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed()));
+      connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead()));
+      connect(m_socket, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotSocketDestroyed()));
       m_socket->connect();
       emit active(false);
       kdDebug(24002) << k_funcinfo << ", proxy:" << server << ", " << service << endl;
@@ -65,8 +65,8 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt
       m_server = new KNetwork::TDEServerSocket(service);
 
       m_server->setAddressReuseable(true);
-      connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
-      connect(m_server, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int)));
+      connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
+      connect(m_server, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int)));
 
       if(m_server->listen())
       {
@@ -91,7 +91,7 @@ void DBGpNetwork::sessionEnd()
   if(m_socket)
   {
     m_socket->flush();
-    disconnect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed()));
+    disconnect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed()));
     if (m_socket)
       m_socket->close();
     delete m_socket;
@@ -146,7 +146,7 @@ void DBGpNetwork::slotReadyAccept()
   kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl;
   if(!m_socket)
   {
-    disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
+    disconnect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
 
     m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!)
     if(m_socket)
@@ -156,10 +156,10 @@ void DBGpNetwork::slotReadyAccept()
       m_socket->setAddressReuseable(true);
 //       m_socket->setSocketFlags(KExtendedSocket::inetSocket |  KExtendedSocket::inputBufferedSocket);
 //       m_socket->setBufferSize(-1);
-      connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int)));
-      connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &)));
-      connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed()));
-      connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
+      connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int)));
+      connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &)));
+      connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed()));
+      connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead()));
       connected();
     }
     else
@@ -215,7 +215,7 @@ void DBGpNetwork::slotConnectionClosed()
   }
 
   if(m_server)
-    connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
+    connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
 
   // Disable all session related actions and enable connection action
   emit connected(false);
diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp
index e9bbc249..13b1f46c 100644
--- a/quanta/components/debugger/dbgp/dbgpsettings.cpp
+++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp
@@ -24,7 +24,7 @@ DBGpSettings::DBGpSettings(const TQString &protocolversion)
     : DBGpSettingsS(0, "DBGpSettings", false, 0)
 {
   textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion));
-  connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool)));
+  connect(checkLocalProject, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotLocalProjectToggle(bool)));
 }
 
 DBGpSettings::~DBGpSettings()
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index 6e2ec6ce..f4204ec2 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -59,10 +59,10 @@ QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQS
   setExecutionState(m_defaultExecutionState);
   emit updateStatus(DebuggerUI::NoSession);
   
-  connect(&m_network, TQT_SIGNAL(command(const TQString&)), this, TQT_SLOT(processCommand(const TQString&)));
-  connect(&m_network, TQT_SIGNAL(active(bool)), this, TQT_SLOT(slotNetworkActive(bool)));
-  connect(&m_network, TQT_SIGNAL(connected(bool)), this, TQT_SLOT(slotNetworkConnected(bool)));
-  connect(&m_network, TQT_SIGNAL(networkError(const TQString &, bool)), this, TQT_SLOT(slotNetworkError(const TQString &, bool)));
+  connect(&m_network, TQ_SIGNAL(command(const TQString&)), this, TQ_SLOT(processCommand(const TQString&)));
+  connect(&m_network, TQ_SIGNAL(active(bool)), this, TQ_SLOT(slotNetworkActive(bool)));
+  connect(&m_network, TQ_SIGNAL(connected(bool)), this, TQ_SLOT(slotNetworkConnected(bool)));
+  connect(&m_network, TQ_SIGNAL(networkError(const TQString &, bool)), this, TQ_SLOT(slotNetworkError(const TQString &, bool)));
 
 }
 
diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp
index 7cb4c097..140ee4b7 100644
--- a/quanta/components/debugger/debuggerbreakpointview.cpp
+++ b/quanta/components/debugger/debuggerbreakpointview.cpp
@@ -67,12 +67,12 @@ DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *nam
   setAllColumnsShowFocus(true);
 
   m_breakpointPopup = new TDEPopupMenu(this);
-  m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()));
+  m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQ_SLOT(slotRemoveSelected()));
 
-  connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
+  connect(this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
 
   // Jump to bp
-  connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int)));
+  connect(this, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int)));
 }
 
 
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index ff41b764..b672617c 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
   if(m_client)
   {
     
-    disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
+    disconnect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
 
     delete m_client;
     m_client = NULL;
@@ -143,7 +143,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
 
     // recreate UI
     m_debuggerui = new DebuggerUI(this, "debuggerui");
-    connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
+    connect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
     
     // Load saved breakpoints
     if(Project::ref()->debuggerPersistentBreakpoints())
@@ -212,65 +212,65 @@ void DebuggerManager::initActions()
     return;
 
   //Debugger, breakpoint
-  newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle");
+  newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQ_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle");
   newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location"));
   
-  newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear");
+  newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQ_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear");
   newaction->setToolTip(i18n("Clears all breakpoints"));
   
-  newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break");
+  newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQ_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break");
   newaction->setToolTip(i18n("Adds a new conditional breakpoint"));
   
-  newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog");
+  newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQ_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog");
   newaction->setToolTip(i18n("Adds a new conditional breakpoint"));
 
   // Execution
-  newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request");
+  newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQ_SLOT(slotDebugRequest()), ac, "debug_request");
   newaction->setToolTip(i18n("Initiate HTTP Request to the server with debugging activated"));
   
-  newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace");
+  newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQ_SLOT(slotDebugTrace()), ac, "debug_trace");
   newaction->setToolTip(i18n("Traces through the script. If a script is currently not being debugged, it will start in trace mode when started"));
   
-  newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run");
+  newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQ_SLOT(slotDebugRun()), ac, "debug_run");
   newaction->setToolTip(i18n("Runs the script. If a script is currently not being debugged, it will start in run mode when started"));
   
-  newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover");
+  newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQ_SLOT(slotDebugStepOver()), ac, "debug_stepover");
   newaction->setToolTip(i18n("Executes the next line of execution, but does not step into functions or includes"));
   
-  newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto");
+  newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQ_SLOT(slotDebugStepInto()), ac, "debug_stepinto");
   newaction->setToolTip(i18n("Executes the next line of execution and steps into it if it is a function call or inclusion of a file"));
   
-  newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip");
+  newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQ_SLOT(slotDebugSkip()), ac, "debug_skip");
   newaction->setToolTip(i18n("Skips the next command of execution and makes the next command the current one"));
   
-  newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout");
+  newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQ_SLOT(slotDebugStepOut()), ac, "debug_stepout");
   newaction->setToolTip(i18n("Executes the rest of the commands in the current function/file and pauses when it is done (when it reaches a higher level in the backtrace)"));
   
-  newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause");
+  newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQ_SLOT(slotDebugPause()), ac, "debug_pause");
   newaction->setToolTip(i18n("Pauses the scripts if it is running or tracing. If a script is currently not being debugged, it will start in paused mode when started"));
-  newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill");
+  newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQ_SLOT(slotDebugKill()), ac, "debug_kill");
   newaction->setToolTip(i18n("Kills the currently running script"));
   
-  newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect");
+  newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQ_SLOT(slotDebugStartSession()), ac, "debug_connect");
   newaction->setToolTip(i18n("Starts the debugger internally (Makes debugging possible)"));
   
-  newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect");
+  newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQ_SLOT(slotDebugEndSession()), ac, "debug_disconnect");
   newaction->setToolTip(i18n("Stops the debugger internally (debugging not longer possible)"));
 
   // Variables
-  newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch");
+  newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQ_SLOT(slotAddWatch()), ac, "debug_addwatch");
   newaction->setToolTip(i18n("Adds a variable to the watch list"));
   
-  newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog");
+  newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQ_SLOT(slotAddWatch()), ac, "debug_addwatchdialog");
   newaction->setToolTip(i18n("Adds a variable to the watch list"));
   
-  newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set");
+  newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQ_SLOT(slotVariableSet()), ac, "debug_variable_set");
   newaction->setToolTip(i18n("Changes the value of a variable"));
   
-  newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog");
+  newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQ_SLOT(slotVariableSet()), ac, "debug_variable_setdialog");
   newaction->setToolTip(i18n("Changes the value of a variable"));
 
-  newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open");
+  newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQ_SLOT(slotProfilerOpen()), ac, "debug_profiler_open");
   newaction->setToolTip(i18n("Opens the profiler output file"));
 
   enableAction("*", false);
@@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager()
   if(m_client)
   {
         
-    disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
+    disconnect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
 
     delete m_client;
     m_client = 0L;
@@ -642,20 +642,20 @@ void DebuggerManager::setMark(const TQString& filename, long line, bool set, int
 
 void DebuggerManager::connectBreakpointSignals(Document* qdoc)
 {
-  connect(qdoc, TQT_SIGNAL(breakpointMarked(Document*, int)),
-    this, TQT_SLOT(slotBreakpointMarked(Document*, int)));
+  connect(qdoc, TQ_SIGNAL(breakpointMarked(Document*, int)),
+    this, TQ_SLOT(slotBreakpointMarked(Document*, int)));
 
-  connect(qdoc, TQT_SIGNAL(breakpointUnmarked(Document*, int)),
-    this, TQT_SLOT(slotBreakpointUnmarked(Document*, int)));
+  connect(qdoc, TQ_SIGNAL(breakpointUnmarked(Document*, int)),
+    this, TQ_SLOT(slotBreakpointUnmarked(Document*, int)));
 }
 
 void DebuggerManager::disconnectBreakpointSignals(Document* qdoc)
 {
-  disconnect(qdoc, TQT_SIGNAL(breakpointMarked(Document*, int)),
-    this, TQT_SLOT(slotBreakpointMarked(Document*, int)));
+  disconnect(qdoc, TQ_SIGNAL(breakpointMarked(Document*, int)),
+    this, TQ_SLOT(slotBreakpointMarked(Document*, int)));
 
-  disconnect(qdoc, TQT_SIGNAL(breakpointUnmarked(Document*, int)),
-    this, TQT_SLOT(slotBreakpointUnmarked(Document*, int)));
+  disconnect(qdoc, TQ_SIGNAL(breakpointUnmarked(Document*, int)),
+    this, TQ_SLOT(slotBreakpointUnmarked(Document*, int)));
 }
 
 // Show a status message and optionally put it on the log
diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp
index 9f512460..1fcdc7da 100644
--- a/quanta/components/debugger/debuggerui.cpp
+++ b/quanta/components/debugger/debuggerui.cpp
@@ -64,14 +64,14 @@ DebuggerUI::DebuggerUI(TQObject *parent, const char *name)
   m_preview->view()->setIcon(UserIcon("debug_run"));
   m_preview->view()->setCaption(i18n("Debug Output"));
   m_previewTVA = quantaApp->addToolWindow(m_preview->view(), quantaApp->prevDockPosition(m_preview->view(), KDockWidget::DockBottom), quantaApp->getMainDockWidget());
-  connect(m_preview, TQT_SIGNAL(openFile(const KURL&, const TQString&, bool)), quantaApp, TQT_SLOT(slotFileOpen(const KURL&, const TQString&, bool)));
+  connect(m_preview, TQ_SIGNAL(openFile(const KURL&, const TQString&, bool)), quantaApp, TQ_SLOT(slotFileOpen(const KURL&, const TQString&, bool)));
   
   // Show debugger toolbar
   quantaApp->toolBar("debugger_toolbar")->show();
 
-  connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* )));
+  connect(m_variablesListView, TQ_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQ_SLOT(slotRemoveVariable(DebuggerVariable* )));
 
-  connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* )));
+  connect(m_debuggerBreakpointView, TQ_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQ_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* )));
   showMenu();
 }
 
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index 14d46941..086ff878 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -98,10 +98,10 @@ void QuantaDebuggerGubed::startSession()
     {
       m_socket = new KNetwork::KStreamSocket(m_serverHost, m_serverPort);
 
-      connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int)));
-      connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &)));
-      connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed()));
-      connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
+      connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int)));
+      connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &)));
+      connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed()));
+      connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead()));
 
       m_socket->connect();
       debuggerInterface()->enableAction("debug_connect", true);
@@ -119,7 +119,7 @@ void QuantaDebuggerGubed::startSession()
       m_server = new KNetwork::TDEServerSocket(m_listenPort);
 
       m_server->setAddressReuseable(true);
-      connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
+      connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
 
       if(m_server->listen())
       {
@@ -280,7 +280,7 @@ void QuantaDebuggerGubed::slotReadyAccept()
   {
 
     // Perhaps this shouldnt be disconnected - instead check if connections are available at disconnect?
-    disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
+    disconnect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
 
     m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!)
     if(m_socket)
@@ -288,10 +288,10 @@ void QuantaDebuggerGubed::slotReadyAccept()
       kdDebug(24002) << k_funcinfo << ", ready" << endl;
       m_socket->enableRead(true);
 
-      connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int)));
-      connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &)));
-      connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed()));
-      connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
+      connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int)));
+      connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &)));
+      connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed()));
+      connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead()));
       connected();
 
       emit updateStatus(DebuggerUI::Connected);
@@ -339,7 +339,7 @@ void QuantaDebuggerGubed::slotConnectionClosed()
   }
 
   if(m_server)
-    connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
+    connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
 
   // Disable all session related actions and enable connection action
   debuggerInterface()->enableAction("*", false);
diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp
index 7f6f4027..343b55f3 100644
--- a/quanta/components/debugger/pathmapperdialog.cpp
+++ b/quanta/components/debugger/pathmapperdialog.cpp
@@ -32,9 +32,9 @@ PathMapperDialog::PathMapperDialog(const TQString& path, const PathMapperDialog:
   if(m_direction == LocalToServer)
     ledTranslationExists->hide();
   
-  connect(listHistory, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
-  connect(lineLocalPath, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPathsChanged()));
-  connect(lineServerPath, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPathsChanged()));
+  connect(listHistory, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+  connect(lineLocalPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPathsChanged()));
+  connect(lineServerPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPathsChanged()));
 }
 
 PathMapperDialog::~PathMapperDialog()
diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp
index 9624416f..8fc97aaf 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -60,16 +60,16 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name)
   setSorting(-1); // No sorting
   
   m_variablePopup = new TDEPopupMenu(this);
-  m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch);
+  m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQ_SLOT(slotRemoveSelected()), 0, removeWatch);
 
   if(quantaApp->debugger()->client()->supports(DebuggerClientCapabilities::VariableSetValue))
-    m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQT_SLOT(slotVariableSetValue()), 0, setValue);
+    m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQ_SLOT(slotVariableSetValue()), 0, setValue);
 
-  m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQT_SLOT(slotVariableDump()), 0, dumpValue);
+  m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQ_SLOT(slotVariableDump()), 0, dumpValue);
   
-  m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue);
+  m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQ_SLOT(slotVariableCopyToClipboard()), 0, copyValue);
 
-  connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
+  connect(this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
 }