From 1fffbdafa12271a1a635caf46777fb8acfb6f31b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:36 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076. --- quanta/components/debugger/dbgp/dbgpnetwork.cpp | 6 +-- quanta/components/debugger/dbgp/dbgpsettingss.ui | 10 ++-- quanta/components/debugger/dbgp/qbytearrayfifo.cpp | 2 +- .../debugger/dbgp/quantadebuggerdbgp.cpp | 54 +++++++++++----------- .../components/debugger/dbgp/quantadebuggerdbgp.h | 2 +- 5 files changed, 37 insertions(+), 37 deletions(-) (limited to 'quanta/components/debugger/dbgp') diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index a087ae03..584e71f0 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -71,14 +71,14 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt if(m_server->listen()) { emit active(true); - emit networkError(i18n("Listening on port %1").arg(service), true); + emit networkError(i18n("Listening on port %1").tqarg(service), true); } else { delete m_server; m_server = NULL; emit active(false); - emit networkError(i18n("Unable to listen on port %1").arg(service), true); + emit networkError(i18n("Unable to listen on port %1").tqarg(service), true); } } } @@ -293,7 +293,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen return false; m_transaction_id++; - TQString commandline = command + TQString(" -i %1").arg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; + TQString commandline = command + TQString(" -i %1").tqarg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; kdDebug(24002) << k_funcinfo << ", sending: " << commandline << endl; diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui index 10888885..b8ab40bd 100644 --- a/quanta/components/debugger/dbgp/dbgpsettingss.ui +++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui @@ -46,7 +46,7 @@ Expanding - + 20 20 @@ -207,7 +207,7 @@ Expanding - + 21 40 @@ -496,7 +496,7 @@ Break on: - + AlignTop @@ -605,7 +605,7 @@ Default mode: - + AlignVCenter @@ -621,7 +621,7 @@ Expanding - + 21 40 diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp index 7c76066b..578fedb9 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp @@ -47,7 +47,7 @@ TQString TQByteArrayFifo::retrieve( ) bool TQByteArrayFifo::append(const char * chars, size_t size ) { // Resize the array, fail if not possible - if(!m_array.resize(m_size + size )) + if(!m_array.tqresize(m_size + size )) return false; // Copy the elements diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 3fe2f972..4ee2bceb 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -57,7 +57,7 @@ QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQS 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(); @@ -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")); @@ -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: - + - + @@ -1021,16 +1021,16 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode ) } 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(); diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h index 668fbe30..8e5b667f 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h @@ -161,7 +161,7 @@ class QuantaDebuggerDBGp : public DebuggerClient void processCommand(const TQString&); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; #endif -- cgit v1.2.1