TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 60 insertions, 60 deletions

diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index 481c8d61..ba1c7c44 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -49,15 +49,15 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggerdbgp,
 
 const char QuantaDebuggerDBGp::protocolversion[] = "1.0";
 
-QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQStringList&)
-    : DebuggerClient (parent, "DBGp")
+QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *tqparent, const char*, const TQStringList&)
+    : DebuggerClient (tqparent, "DBGp")
 {
   // Create a socket object and set up its signals
-  m_errormask = 1794;
+  m_errortqmask = 1794;
   m_supportsasync = false;
   m_defaultExecutionState = Starting;
   setExecutionState(m_defaultExecutionState);
-  emit updateStatus(DebuggerUI::NoSession);
+  emit updatetqStatus(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)));
@@ -88,9 +88,9 @@ void QuantaDebuggerDBGp::slotNetworkActive(bool active)
   setExecutionState(m_defaultExecutionState);
   
   if(active)
-    emit updateStatus(DebuggerUI::AwaitingConnection);
+    emit updatetqStatus(DebuggerUI::AwaitingConnection);
   else
-    emit updateStatus(DebuggerUI::NoSession);
+    emit updatetqStatus(DebuggerUI::NoSession);
 
 }
 
@@ -113,11 +113,11 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
 
   debuggerInterface()->setActiveLine("", 0);
   if(connected)
-    emit updateStatus(DebuggerUI::Connected);
+    emit updatetqStatus(DebuggerUI::Connected);
   else
   {
     setExecutionState(m_defaultExecutionState);
-    emit updateStatus(DebuggerUI::AwaitingConnection);
+    emit updatetqStatus(DebuggerUI::AwaitingConnection);
 
     profilerOpen(false);
   }
@@ -126,7 +126,7 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
 
 void QuantaDebuggerDBGp::slotNetworkError(const TQString &errormsg, bool log)
 {
-  debuggerInterface()->showStatus(errormsg, log);
+  debuggerInterface()->showtqStatus(errormsg, log);
 }
 
 
@@ -194,29 +194,29 @@ void QuantaDebuggerDBGp::setExecutionState(const TQString &state)
   if(state == "starting")
   {
     setExecutionState(Starting);
-    emit updateStatus(DebuggerUI::Paused);
+    emit updatetqStatus(DebuggerUI::Paused);
   }
   else if(state == "stopping")
   {
     setExecutionState(Stopping);
-    emit updateStatus(DebuggerUI::Paused);
+    emit updatetqStatus(DebuggerUI::Paused);
     m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
   }
   else if(state == "stopped")
   {
     setExecutionState(Stopped);
-    emit updateStatus(DebuggerUI::Paused);
+    emit updatetqStatus(DebuggerUI::Paused);
     m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
   }
   else if(state == "running")
   {
     setExecutionState(Running);
-    emit updateStatus(DebuggerUI::Running);
+    emit updatetqStatus(DebuggerUI::Running);
   }
   else if(state == "break")
   {
     setExecutionState(Break);
-    emit updateStatus(DebuggerUI::Paused);
+    emit updatetqStatus(DebuggerUI::Paused);
   }
 
 }
@@ -263,7 +263,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
     TQDomNode response = data.elementsByTagName("response").item(0);
     TQString command = attribute(response, "command");
 
-    // Status command
+    // tqStatus command
     if(command == "status")
       setExecutionState(attribute(response, "status"));
       
@@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
   }
   else
   {
-    debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").arg(datas.left(50)).arg(datas.length() > 50 ? "..." : ""), true);
+    debuggerInterface()->showtqStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true);
 
     kdDebug(24002) << datas << endl;
   }
@@ -338,10 +338,10 @@ void QuantaDebuggerDBGp::initiateSession(const TQDomNode& initpacket)
 {
   if(attribute(initpacket, "protocol_version") != protocolversion)
   {
-    debuggerInterface()->showStatus(
+    debuggerInterface()->showtqStatus(
       i18n("The debugger for %1 uses an unsupported protocol version (%2)")
-            .arg(attribute(initpacket, "language"))
-            .arg(attribute(initpacket, "protocol_version"))
+            .tqarg(attribute(initpacket, "language"))
+            .tqarg(attribute(initpacket, "protocol_version"))
           , true);
 
     endSession();
@@ -384,7 +384,7 @@ void QuantaDebuggerDBGp::stackShow(const TQDomNode&node)
     // Type isnt currently correct with xdebug
 //     type = (attribute(child, "type") == "file" ? File : Eval);
     typestr = attribute(child, "filename");
-    if(typestr.find(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0)
+    if(typestr.tqfind(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0)
       type = Eval;
     else
       type = File;
@@ -540,7 +540,7 @@ void QuantaDebuggerDBGp::addBreakpoint (DebuggerBreakpoint* breakpoint)
                         " -n " + TQString::number(breakpoint->line() + 1)
                         , breakpoint->condition());
 
-  breakpoint->setKey(TQString("id %1").arg(id));
+  breakpoint->setKey(TQString("id %1").tqarg(id));
 }
 
 void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response )
@@ -550,7 +550,7 @@ void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response )
   id = attribute(response, "transaction_id").toLong();
   if(id > 0)
   {
-    TQString oldkey = TQString("id %1").arg(id);
+    TQString oldkey = TQString("id %1").tqarg(id);
     DebuggerBreakpoint *bp = debuggerInterface()->findDebuggerBreakpoint(oldkey);
     if(bp)
       debuggerInterface()->updateBreakpointKey(*bp, attribute(response, "id"));
@@ -573,15 +573,15 @@ void QuantaDebuggerDBGp::fileOpened(const TQString&)
 // Watch a variable
 void QuantaDebuggerDBGp::addWatch(const TQString & variable)
 {
-  if(m_watchlist.find(variable) == m_watchlist.end())
+  if(m_watchlist.tqfind(variable) == m_watchlist.end())
     m_watchlist.append(variable);
   m_network.sendCommand("property_get", "-n " + variable);
 }
 // Remove watch
 void QuantaDebuggerDBGp::removeWatch(DebuggerVariable *variable)
 {
-  if(m_watchlist.find(variable->name()) != m_watchlist.end())
-    m_watchlist.remove(m_watchlist.find(variable->name()));
+  if(m_watchlist.tqfind(variable->name()) != m_watchlist.end())
+    m_watchlist.remove(m_watchlist.tqfind(variable->name()));
 }
 
 // Show conditional breakpoint state
@@ -649,9 +649,9 @@ void QuantaDebuggerDBGp::readConfig(TQDomNode node)
   valuenode = node.namedItem("useproxy");
   m_useproxy = valuenode.firstChild().nodeValue() == "1";
 
-  valuenode = node.namedItem("errormask");
-  m_errormask = valuenode.firstChild().nodeValue().toLong();
-  kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl;
+  valuenode = node.namedItem("errortqmask");
+  m_errortqmask = valuenode.firstChild().nodeValue().toLong();
+  kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl;
   
   // Profiler
   valuenode = node.namedItem("profilerfilename");
@@ -687,11 +687,11 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
   else
     set.comboDefaultExecutionState->setCurrentItem(1);
 
-  set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errormask);
-  set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errormask);
-  set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errormask);
-  set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errormask);
-  set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errormask);
+  set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errortqmask);
+  set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errortqmask);
+  set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errortqmask);
+  set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errortqmask);
+  set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errortqmask);
 
   set.lineProfilerFilename->setText(m_profilerFilename);
   if(m_profilerAutoOpen)
@@ -705,7 +705,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("localproject").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("localproject");
     node.appendChild( el );
     if(set.checkLocalProject->isChecked())
@@ -725,7 +725,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("localbasedir").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("localbasedir");
     node.appendChild( el );
     el.appendChild( node.ownerDocument().createTextNode(m_localBasedir) );
@@ -734,7 +734,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("serverbasedir").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("serverbasedir");
     node.appendChild( el );
     if(debuggerInterface())
@@ -743,7 +743,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("listenport").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("listenport");
     node.appendChild( el );
     m_listenPort = set.lineServerListenPort->text();
@@ -751,7 +751,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("startsession").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("startsession");
     node.appendChild( el );
     m_startsession = set.lineStartSession->text();
@@ -759,7 +759,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("defaultexecutionstate").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("defaultexecutionstate");
     node.appendChild( el );
     if(set.comboDefaultExecutionState->currentItem() == 0)
@@ -774,23 +774,23 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     }
 
-    el = node.namedItem("errormask").toElement();
+    el = node.namedItem("errortqmask").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
-    el = node.ownerDocument().createElement("errormask");
+      el.tqparentNode().removeChild(el);
+    el = node.ownerDocument().createElement("errortqmask");
     node.appendChild( el );
-    m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0)
+    m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0)
                   + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerDBGp::Warning : 0)
                   + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerDBGp::User_Notice : 0)
                   + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerDBGp::User_Warning : 0)
                   + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerDBGp::User_Error : 0);
-    kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl;
-    el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask)));
+    kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl;
+    el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask)));
 
     // Profiler
     el = node.namedItem("profilerfilename").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("profilerfilename");
     node.appendChild( el );
     m_profilerFilename = set.lineProfilerFilename->text();
@@ -798,7 +798,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("profilerfilename_map").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("profilerfilename_map");
     node.appendChild( el );
     m_profilerMapFilename = (set.checkProfilerMapFilename->isChecked() ? true : false);
@@ -806,7 +806,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("profiler_autoopen").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("profiler_autoopen");
     node.appendChild( el );
     m_profilerAutoOpen = (set.checkProfilerAutoOpen->isChecked() ? true : false);
@@ -850,8 +850,8 @@ void QuantaDebuggerDBGp::profilerOpen()
 void QuantaDebuggerDBGp::profilerOpen(bool forceopen)
 {
   TQString profileroutput = m_profilerFilename;
-  profileroutput.replace("%a", m_appid);
-  profileroutput.replace("%c", m_initialscript);
+  profileroutput.tqreplace("%a", m_appid);
+  profileroutput.tqreplace("%c", m_initialscript);
 
   if(m_profilerMapFilename)
     profileroutput = mapServerPathToLocal( profileroutput);
@@ -867,9 +867,9 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen)
     else
     {
       if(forceopen)
-        KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").arg(profileroutput), i18n("Profiler File Error"));
+        KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error"));
       else
-        debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").arg(profileroutput), false);
+        debuggerInterface()->showtqStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false);
     }
   }
   else
@@ -923,7 +923,7 @@ void QuantaDebuggerDBGp::propertySetResponse( const TQDomNode & setnode)
 {
   if(attribute(setnode, "success") == "0")
   {
-    debuggerInterface()->showStatus(i18n("Unable to set value of variable."), true);
+    debuggerInterface()->showtqStatus(i18n("Unable to set value of variable."), true);
   }
 }
 
@@ -932,11 +932,11 @@ DebuggerVariable* QuantaDebuggerDBGp::buildVariable( const TQDomNode & variablen
 {
   /*
     Sample:
-    <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" children="1" numchildren="4">
+    <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" tqchildren="1" numtqchildren="4">
       <property name="birthyear" fullname="$arrayVar['birthyear']" address="135522364" type="int">
         <![CDATA[1949]]>
       </property>
-      <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" children="1" numchildren="3">
+      <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" tqchildren="1" numtqchildren="3">
         <property name="0" fullname="$arrayVar['songs'][0]" address="135522332" type="string" encoding="base64">
           <![CDATA[SW5ub2NlbnQgV2hlbiBZb3UgRHJlYW0=]]>
         </property>
@@ -1015,22 +1015,22 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode )
         {
           // Managable error
           long error = attribute(errornode, "code").toLong();
-          if(!(error & m_errormask))
+          if(!(error & m_errortqmask))
           {
             setExecutionState(Running);
           }
           else
           {
-            emit updateStatus(DebuggerUI::HaltedOnError);
-            debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
+            emit updatetqStatus(DebuggerUI::HaltedOnError);
+            debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
           }
           break; 
         }
         else
         {
           // Fatal error
-          emit updateStatus(DebuggerUI::HaltedOnError);
-          debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
+          emit updatetqStatus(DebuggerUI::HaltedOnError);
+          debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
         }
       }
       errornode = errornode.nextSibling();