summaryrefslogtreecommitdiffstats
path: root/quanta/components/debugger
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/components/debugger')
-rw-r--r--quanta/components/debugger/conditionalbreakpointdialogs.ui8
-rw-r--r--quanta/components/debugger/dbgp/dbgpsettingss.ui6
-rw-r--r--quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp40
-rw-r--r--quanta/components/debugger/dbgp/quantadebuggerdbgp.h2
-rw-r--r--quanta/components/debugger/debuggermanager.cpp10
-rw-r--r--quanta/components/debugger/debuggermanager.h2
-rw-r--r--quanta/components/debugger/debuggerui.cpp6
-rw-r--r--quanta/components/debugger/debuggerui.h6
-rw-r--r--quanta/components/debugger/debuggervariablesets.ui4
-rw-r--r--quanta/components/debugger/gubed/gubedsettingss.ui8
-rw-r--r--quanta/components/debugger/gubed/quantadebuggergubed.cpp50
-rw-r--r--quanta/components/debugger/gubed/quantadebuggergubed.h2
-rw-r--r--quanta/components/debugger/interfaces/debuggerclient.h2
-rw-r--r--quanta/components/debugger/interfaces/debuggerinterface.h2
-rw-r--r--quanta/components/debugger/pathmapper.cpp2
-rw-r--r--quanta/components/debugger/pathmapperdialog.cpp2
-rw-r--r--quanta/components/debugger/pathmapperdialogs.ui6
-rw-r--r--quanta/components/debugger/quantadebuggerinterface.cpp4
-rw-r--r--quanta/components/debugger/quantadebuggerinterface.h2
-rw-r--r--quanta/components/debugger/variableslistview.cpp6
20 files changed, 85 insertions, 85 deletions
diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui
index dd94f4ae..4b43fefb 100644
--- a/quanta/components/debugger/conditionalbreakpointdialogs.ui
+++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -163,13 +163,13 @@
<property name="name">
<cstring>ledWarning</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui
index b8ab40bd..93b5199a 100644
--- a/quanta/components/debugger/dbgp/dbgpsettingss.ui
+++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -207,7 +207,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
@@ -621,7 +621,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index 4ee2bceb..6e47fdb4 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 updatetqStatus(DebuggerUI::NoSession);
+ 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)));
@@ -88,9 +88,9 @@ void QuantaDebuggerDBGp::slotNetworkActive(bool active)
setExecutionState(m_defaultExecutionState);
if(active)
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
else
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
}
@@ -113,11 +113,11 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
debuggerInterface()->setActiveLine("", 0);
if(connected)
- emit updatetqStatus(DebuggerUI::Connected);
+ emit updateStatus(DebuggerUI::Connected);
else
{
setExecutionState(m_defaultExecutionState);
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
profilerOpen(false);
}
@@ -126,7 +126,7 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
void QuantaDebuggerDBGp::slotNetworkError(const TQString &errormsg, bool log)
{
- debuggerInterface()->showtqStatus(errormsg, log);
+ debuggerInterface()->showStatus(errormsg, log);
}
@@ -194,29 +194,29 @@ void QuantaDebuggerDBGp::setExecutionState(const TQString &state)
if(state == "starting")
{
setExecutionState(Starting);
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
}
else if(state == "stopping")
{
setExecutionState(Stopping);
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
}
else if(state == "stopped")
{
setExecutionState(Stopped);
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
}
else if(state == "running")
{
setExecutionState(Running);
- emit updatetqStatus(DebuggerUI::Running);
+ emit updateStatus(DebuggerUI::Running);
}
else if(state == "break")
{
setExecutionState(Break);
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
}
}
@@ -263,7 +263,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
TQDomNode response = data.elementsByTagName("response").item(0);
TQString command = attribute(response, "command");
- // tqStatus command
+ // Status command
if(command == "status")
setExecutionState(attribute(response, "status"));
@@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
}
else
{
- debuggerInterface()->showtqStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true);
+ debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true);
kdDebug(24002) << datas << endl;
}
@@ -338,7 +338,7 @@ void QuantaDebuggerDBGp::initiateSession(const TQDomNode& initpacket)
{
if(attribute(initpacket, "protocol_version") != protocolversion)
{
- debuggerInterface()->showtqStatus(
+ debuggerInterface()->showStatus(
i18n("The debugger for %1 uses an unsupported protocol version (%2)")
.tqarg(attribute(initpacket, "language"))
.tqarg(attribute(initpacket, "protocol_version"))
@@ -869,7 +869,7 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen)
if(forceopen)
KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error"));
else
- debuggerInterface()->showtqStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false);
+ debuggerInterface()->showStatus(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()->showtqStatus(i18n("Unable to set value of variable."), true);
+ debuggerInterface()->showStatus(i18n("Unable to set value of variable."), true);
}
}
@@ -1021,16 +1021,16 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode )
}
else
{
- emit updatetqStatus(DebuggerUI::HaltedOnError);
- debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
+ emit updateStatus(DebuggerUI::HaltedOnError);
+ debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
}
break;
}
else
{
// Fatal error
- emit updatetqStatus(DebuggerUI::HaltedOnError);
- debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
+ emit updateStatus(DebuggerUI::HaltedOnError);
+ debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
}
}
errornode = errornode.nextSibling();
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
index 8e5b667f..668fbe30 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 updatetqStatus(DebuggerUI::DebuggertqStatus);
+ void updateStatus(DebuggerUI::DebuggerStatus);
};
#endif
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index 0e65ee5c..9c24ba29 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(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
+ disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_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(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
+ connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
// Load saved breakpoints
if(Project::ref()->debuggerPersistentBreakpoints())
@@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager()
if(m_client)
{
- disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
+ disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
delete m_client;
m_client = 0L;
@@ -605,7 +605,7 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line )
quantaApp->gotoFileAndLine(filename, line, 0);
else
{
- showtqStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true);
+ showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true);
}
// Add new active line mark
@@ -659,7 +659,7 @@ void DebuggerManager::disconnectBreakpointSignals(Document* qdoc)
}
// Show a status message and optionally put it on the log
-bool DebuggerManager::showtqStatus(const TQString& a_message, bool log)
+bool DebuggerManager::showStatus(const TQString& a_message, bool log)
{
TQString message = a_message;
quantaApp->slotStatusMsg(m_client->getName() + ": " + message);
diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h
index 8fae5864..de032937 100644
--- a/quanta/components/debugger/debuggermanager.h
+++ b/quanta/components/debugger/debuggermanager.h
@@ -71,7 +71,7 @@ class DebuggerManager : public TQObject
void updateBreakpointKey(const DebuggerBreakpoint &bp, const TQString& newkey);
// Public help functions
- bool showtqStatus(const TQString& message, bool log);
+ bool showStatus(const TQString& message, bool log);
bool setActiveLine (const TQString& file, int line);
void setMark(const TQString& filename, long line, bool set, int mark);
diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp
index d2f710b6..fdf32a5c 100644
--- a/quanta/components/debugger/debuggerui.cpp
+++ b/quanta/components/debugger/debuggerui.cpp
@@ -109,7 +109,7 @@ void DebuggerUI::showMenu()
else
m_debuggerMenuID = 0;
- // tqStatus indicator
+ // Status indicator
quantaApp->statusBar()->insertFixedItem(i18n("Debugger Inactive"), IDS_STATUS_DEBUGGER);
}
@@ -124,7 +124,7 @@ void DebuggerUI::hideMenu()
}
m_debuggerMenuID = 0;
- // tqStatus indicator
+ // Status indicator
quantaApp->statusBar()->removeItem(IDS_STATUS_DEBUGGER);
}
@@ -148,7 +148,7 @@ void DebuggerUI::sendRequest(const KURL &url)
m_preview->openURL(url);
}
-void DebuggerUI::slottqStatus( DebuggertqStatus status )
+void DebuggerUI::slotStatus( DebuggerStatus status )
{
switch(status)
{
diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h
index de939315..c7e7d145 100644
--- a/quanta/components/debugger/debuggerui.h
+++ b/quanta/components/debugger/debuggerui.h
@@ -38,7 +38,7 @@ class DebuggerUI : public TQObject
TQ_OBJECT
public:
- enum DebuggertqStatus
+ enum DebuggerStatus
{
NoSession = 0,
AwaitingConnection,
@@ -83,8 +83,8 @@ class DebuggerUI : public TQObject
WHTMLPart *m_preview;
public slots:
- // tqStatus indication
- void slottqStatus(DebuggerUI::DebuggertqStatus status);
+ // Status indication
+ void slotStatus(DebuggerUI::DebuggerStatus status);
};
diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui
index 09a3873c..00ca41e8 100644
--- a/quanta/components/debugger/debuggervariablesets.ui
+++ b/quanta/components/debugger/debuggervariablesets.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -139,7 +139,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui
index ccca567c..82501178 100644
--- a/quanta/components/debugger/gubed/gubedsettingss.ui
+++ b/quanta/components/debugger/gubed/gubedsettingss.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
@@ -487,7 +487,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>50</height>
@@ -530,7 +530,7 @@
<property name="name">
<cstring>sliderDisplayDelay</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>27</height>
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index d083739a..61e1c8eb 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -57,7 +57,7 @@ QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *parent, const char* name, co
m_defaultExecutionState = Pause;
setExecutionState(m_defaultExecutionState);
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
m_datalen = -1;
}
@@ -80,7 +80,7 @@ QuantaDebuggerGubed::~QuantaDebuggerGubed ()
delete m_server;
m_server = NULL;
}
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
}
// Try to make a connection to the gubed server
@@ -109,7 +109,7 @@ void QuantaDebuggerGubed::startSession()
debuggerInterface()->enableAction("debug_request", false);
kdDebug(24002) << k_funcinfo << ", proxy:" << m_serverHost << ", " << m_serverPort.toUInt() << endl;
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
}
}
else
@@ -123,14 +123,14 @@ void QuantaDebuggerGubed::startSession()
if(m_server->listen())
{
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
debuggerInterface()->enableAction("debug_connect", false);
debuggerInterface()->enableAction("debug_disconnect", true);
debuggerInterface()->enableAction("debug_request", true);
}
else
{
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
delete m_server;
m_server = NULL;
debuggerInterface()->enableAction("debug_connect", true);
@@ -174,7 +174,7 @@ void QuantaDebuggerGubed::endSession()
debuggerInterface()->enableAction("debug_leap", false);
debuggerInterface()->enableAction("debug_pause", false);
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
}
// Change executionstate of the script
@@ -185,7 +185,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
sendCommand("pause", (char*)0L);
sendCommand("sendactiveline", (char*)0L);
if(isActive())
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
}
else if(newstate == Run)
{
@@ -194,7 +194,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
sendCommand("run", (char*)0L);
if(isActive())
- emit updatetqStatus(DebuggerUI::Running);
+ emit updateStatus(DebuggerUI::Running);
}
else if(newstate == Trace)
{
@@ -203,7 +203,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
sendCommand("trace", (char*)0L);
if(isActive())
- emit updatetqStatus(DebuggerUI::Tracing);
+ emit updateStatus(DebuggerUI::Tracing);
}
m_executionState = newstate;
@@ -259,14 +259,14 @@ void QuantaDebuggerGubed::slotError(int)
if(m_socket->error())
{
kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl;
- debuggerInterface()->showtqStatus(m_socket->KSocketBase::errorString(), false);
+ debuggerInterface()->showStatus(m_socket->KSocketBase::errorString(), false);
}
}
if(m_server && m_server->error())
{
kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl;
- debuggerInterface()->showtqStatus(m_server->errorString(), false);
+ debuggerInterface()->showStatus(m_server->errorString(), false);
}
}
@@ -294,7 +294,7 @@ void QuantaDebuggerGubed::slotReadyAccept()
connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
connected();
- emit updatetqStatus(DebuggerUI::Connected);
+ emit updateStatus(DebuggerUI::Connected);
}
else
{
@@ -307,7 +307,7 @@ void QuantaDebuggerGubed::slotReadyAccept()
// Connection established
void QuantaDebuggerGubed::slotConnected(const KNetwork::KResolverEntry &)
{
- emit updatetqStatus(DebuggerUI::Connected);
+ emit updateStatus(DebuggerUI::Connected);
connected();
}
@@ -353,7 +353,7 @@ void QuantaDebuggerGubed::slotConnectionClosed()
debuggerInterface()->setActiveLine("", 0);
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
m_active = false;
}
@@ -447,7 +447,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
for(int cnt = 1; cnt <= argcnt; cnt++)
msg.replace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]);
- debuggerInterface()->showtqStatus(msg, false);
+ debuggerInterface()->showStatus(msg, false);
}
// New current line
else if(m_command == "setactiveline")
@@ -462,7 +462,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
// Parsing failed
else if(m_command == "parsefailed")
{
- debuggerInterface()->showtqStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true);
+ debuggerInterface()->showStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true);
return;
}
// A debugging session is running
@@ -479,7 +479,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
else if(m_command == "error")
{
// Put the line number first so double clicking will jump to the corrrect line
- debuggerInterface()->showtqStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true);
+ debuggerInterface()->showStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true);
// Filter to get error code only and match it with out mask
long error = args["errnum"].toLong();
@@ -492,21 +492,21 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
else
setExecutionState(Pause);
- emit updatetqStatus(DebuggerUI::HaltedOnError);
+ emit updateStatus(DebuggerUI::HaltedOnError);
}
// We came across a hard coded breakpoint
else if(m_command == "forcebreak")
{
setExecutionState(Pause);
- emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint);
- debuggerInterface()->showtqStatus(i18n("Breakpoint reached"), true);
+ emit updateStatus(DebuggerUI::HaltedOnBreakpoint);
+ debuggerInterface()->showStatus(i18n("Breakpoint reached"), true);
}
// A conditional breakpoint was fulfilled
else if(m_command == "conditionalbreak")
{
setExecutionState(Pause);
- emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint);
- debuggerInterface()->showtqStatus(i18n("Conditional breakpoint fulfilled"), true);
+ emit updateStatus(DebuggerUI::HaltedOnBreakpoint);
+ debuggerInterface()->showStatus(i18n("Conditional breakpoint fulfilled"), true);
}
// There is a breakpoint set in this file/line
else if(m_command == "removebreakpoint")
@@ -516,7 +516,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
// We're about to debug a file..
else if(m_command == "initialize")
{
- debuggerInterface()->showtqStatus(i18n("Established connection to %1").tqarg(args["filename"]), false);
+ debuggerInterface()->showStatus(i18n("Established connection to %1").tqarg(args["filename"]), false);
sendCommand("sendprotocolversion", (char*)0L);
debuggerInterface()->setActiveLine(mapServerPathToLocal(args["filename"]), 0);
@@ -549,7 +549,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
// Reached en of an include
else if(m_command == "end")
{
- //debuggerInterface()->showtqStatus(i18n("At end of include %1").tqarg(data), true);
+ //debuggerInterface()->showStatus(i18n("At end of include %1").tqarg(data), true);
return;
}
// Check protocol version
@@ -557,7 +557,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
{
if(args["version"] != protocolversion)
{
- debuggerInterface()->showtqStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true);
+ debuggerInterface()->showStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true);
sendCommand("die", (char*)0L);
}
return;
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h
index 4663d9fa..d041e90d 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.h
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.h
@@ -148,7 +148,7 @@ class QuantaDebuggerGubed : public DebuggerClient
void slotReadyAccept();
signals:
- void updatetqStatus(DebuggerUI::DebuggertqStatus);
+ void updateStatus(DebuggerUI::DebuggerStatus);
};
#endif
diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h
index 317ff3e3..69ba5650 100644
--- a/quanta/components/debugger/interfaces/debuggerclient.h
+++ b/quanta/components/debugger/interfaces/debuggerclient.h
@@ -109,7 +109,7 @@ class DebuggerClient : public TQObject
DebuggerInterface *debuggerInterface();
signals:
- void updatetqStatus(DebuggerUI::DebuggertqStatus);
+ void updateStatus(DebuggerUI::DebuggerStatus);
};
diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h
index dabd685d..cf634884 100644
--- a/quanta/components/debugger/interfaces/debuggerinterface.h
+++ b/quanta/components/debugger/interfaces/debuggerinterface.h
@@ -44,7 +44,7 @@ class DebuggerInterface : public TQObject
virtual void havenoBreakpoint (const TQString& file, int line) = 0;
// Public help functions
- virtual bool showtqStatus(const TQString& message, bool log) = 0;
+ virtual bool showStatus(const TQString& message, bool log) = 0;
virtual bool setActiveLine (const TQString& file, int line) = 0;
virtual void enableAction(const TQString& action, bool enable) = 0;
diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp
index 96e4f628..c38e2fec 100644
--- a/quanta/components/debugger/pathmapper.cpp
+++ b/quanta/components/debugger/pathmapper.cpp
@@ -43,7 +43,7 @@ TQString PathMapper::translate(const TQString & path, const TQString & from, con
TQString translated = path;
// Check if this dir is matched by the maps
- if(path.tqstartsWith(from, false))
+ if(path.startsWith(from, false))
{
translated.remove(0, from.length());
translated = to + translated;
diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp
index 671bb871..7f6f4027 100644
--- a/quanta/components/debugger/pathmapperdialog.cpp
+++ b/quanta/components/debugger/pathmapperdialog.cpp
@@ -69,7 +69,7 @@ void PathMapperDialog::slotPathsChanged()
translated = m_path;
// Check if this dir is matched by the maps
- if(m_path.tqstartsWith(from, false))
+ if(m_path.startsWith(from, false))
{
translated.remove(0, from.length());
translated = to + translated;
diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui
index c0f27c04..58a79167 100644
--- a/quanta/components/debugger/pathmapperdialogs.ui
+++ b/quanta/components/debugger/pathmapperdialogs.ui
@@ -109,7 +109,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -251,13 +251,13 @@ The quanta will know that files starting with "/home/user/project/" on the local
<property name="name">
<cstring>ledTranslationExists</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp
index 385849a5..af70da0a 100644
--- a/quanta/components/debugger/quantadebuggerinterface.cpp
+++ b/quanta/components/debugger/quantadebuggerinterface.cpp
@@ -52,9 +52,9 @@ void QuantaDebuggerInterface::havenoBreakpoint (const TQString& file, int line)
}
// Public help functions
-bool QuantaDebuggerInterface::showtqStatus(const TQString& message, bool log)
+bool QuantaDebuggerInterface::showStatus(const TQString& message, bool log)
{
- return m_manager->showtqStatus(message, log);
+ return m_manager->showStatus(message, log);
}
bool QuantaDebuggerInterface::setActiveLine(const TQString& file, int line)
diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h
index 9c2ba724..5b9b5480 100644
--- a/quanta/components/debugger/quantadebuggerinterface.h
+++ b/quanta/components/debugger/quantadebuggerinterface.h
@@ -43,7 +43,7 @@ class QuantaDebuggerInterface : public DebuggerInterface
void refreshBreakpoints();
// Public help functions
- bool showtqStatus(const TQString& message, bool log);
+ bool showStatus(const TQString& message, bool log);
bool setActiveLine (const TQString& file, int line) ;
void enableAction(const TQString& action, bool enable);
diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp
index 72e4afa3..ec63c23f 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -39,7 +39,7 @@ namespace VariablesListViewColumns
enum Columns
{
Name = 0,
- tqStatus,
+ Status,
Value,
Type,
Size
@@ -206,9 +206,9 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
item = oldvar->item();
if(oldvar->value() != newvar->value())
- item->setPixmap(VariablesListViewColumns::tqStatus, SmallIcon("ok"));
+ item->setPixmap(VariablesListViewColumns::Status, SmallIcon("ok"));
else
- item->setPixmap(VariablesListViewColumns::tqStatus, KPixmap());
+ item->setPixmap(VariablesListViewColumns::Status, KPixmap());
oldvar->copy(newvar, false);