From 7af884d886e2428d5b28e9cf7d81c97d7e378123 Mon Sep 17 00:00:00 2001 From: samelian Date: Sun, 16 Jan 2011 14:35:51 +0000 Subject: [kdewebdev/quanta] fix deprecation warnings; make compatible with QT_NO_ASCII_CAST flag git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1214823 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp | 2 +- quanta/components/debugger/debuggermanager.cpp | 4 ++-- quanta/components/debugger/gubed/quantadebuggergubed.cpp | 8 ++++---- quanta/components/debugger/gubed/quantadebuggergubed.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'quanta/components/debugger') diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index d16319a9..481c8d61 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -956,7 +956,7 @@ DebuggerVariable* QuantaDebuggerDBGp::buildVariable( const TQDomNode & variablen } else if (type == "string") { - TQCString value = TQCString(variablenode.firstChild().nodeValue()); + TQCString value = TQCString(variablenode.firstChild().nodeValue().ascii()); value = KCodecs::base64Decode(value); return debuggerInterface()->newDebuggerVariable( name, value, DebuggerVariableTypes::String); } diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index 4c5aaa58..b62b3e3b 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -341,8 +341,8 @@ void DebuggerManager::enableAction(const TQString& action, bool enable) { // The action may or may not exist, depending on capabilities of the debugger plugin KActionCollection *ac = quantaApp->actionCollection(); - if(ac && ac->action(action)) - ac->action(action)->setEnabled(enable); + if(ac && ac->action(action.ascii())) + ac->action(action.ascii())->setEnabled(enable); } } diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index f909832a..8c2ab1b5 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -443,7 +443,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else if(m_command == "status") { long argcnt = args["args"].toLong(); - TQString msg = i18n(args["message"]); // How will we get these messages throught to the translators? + TQString msg = i18n(args["message"].ascii()); // How will we get these messages throught to the translators? for(int cnt = 1; cnt <= argcnt; cnt++) msg.replace("%" + TQString("%1").arg(cnt) + "%", args[TQString("arg%1").arg(cnt)]); @@ -604,15 +604,15 @@ bool QuantaDebuggerGubed::sendCommand(const TQString& command, StringMap args) TQString buffer = phpSerialize(args); buffer = TQString(command + ":%1;" + buffer).arg(buffer.length()); - m_socket->writeBlock(buffer, buffer.length()); + m_socket->writeBlock(buffer.ascii(), buffer.length()); return true; } // Send a command to gubed -bool QuantaDebuggerGubed::sendCommand(const TQString& command, char * firstarg, ...) +bool QuantaDebuggerGubed::sendCommand(const TQString& command, const char * firstarg, ...) { StringMap ca; - char *next; + const char *next; va_list l_Arg; va_start(l_Arg, firstarg); diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index 0f41b804..624a8ae8 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -116,7 +116,7 @@ class QuantaDebuggerGubed : public DebuggerClient // bool sendCommand(const TQString&, const TQString&); bool sendCommand(const TQString& command, StringMap args); - bool sendCommand(const TQString& command, char * firstarg, ...); + bool sendCommand(const TQString& command, const char * firstarg, ...); void processCommand(const TQString&); void sendWatches(); -- cgit v1.2.1