diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp index 0f6b50b6bd79b88645f4399023365663be703983..2810ef23d97346dcc90d4b4904b243c94dad667b 100644 --- a/src/plugins/debugger/gdb/attachgdbadapter.cpp +++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp @@ -85,7 +85,7 @@ void AttachGdbAdapter::handleAttach(const GdbResponse &response) emit inferiorPrepared(); m_engine->updateAll(); } else { - QString msg = __(response.data.findChild("msg").data()); + QString msg = QString::fromLocal8Bit(response.data.findChild("msg").data()); emit inferiorStartFailed(msg); } } diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp index ee0304208be70654ea66aca1b4afe67075af3cbe..e64abf9af319f3b23cedea4ea53fd1e9bc3e15d7 100644 --- a/src/plugins/debugger/gdb/coregdbadapter.cpp +++ b/src/plugins/debugger/gdb/coregdbadapter.cpp @@ -108,7 +108,7 @@ void CoreGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response) showStatusMessage(tr("Symbols found.")); } else { QString msg = tr("Loading symbols from \"%1\" failed:\n").arg(m_executable) - + __(response.data.findChild("msg").data()); + + QString::fromLocal8Bit(response.data.findChild("msg").data()); showMessageBox(QMessageBox::Warning, tr("Error Loading Symbols"), msg); } loadCoreFile(); @@ -160,7 +160,7 @@ void CoreGdbAdapter::handleTargetCore(const GdbResponse &response) m_engine->updateAll(); } else { QString msg = tr("Attach to core \"%1\" failed:\n").arg(startParameters().coreFile) - + __(response.data.findChild("msg").data()); + + QString::fromLocal8Bit(response.data.findChild("msg").data()); emit inferiorStartFailed(msg); } } diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index bd5d6c5ee71b387a13695d1991c137c2bddb915e..9a1e9da89eac6b2a6d4a99d11fbfee6801dfdce0 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -1518,7 +1518,8 @@ void GdbEngine::handleInferiorShutdown(const GdbResponse &response) } else { debugMessage(_("INFERIOR SHUTDOWN FAILED")); setState(InferiorShutdownFailed); - QString msg = m_gdbAdapter->msgInferiorStopFailed(_(response.data.findChild("msg").data())); + QString msg = m_gdbAdapter->msgInferiorStopFailed( + QString::fromLocal8Bit(response.data.findChild("msg").data())); showMessageBox(QMessageBox::Critical, tr("Inferior shutdown failed"), msg); } shutdown(); // re-iterate... @@ -1531,7 +1532,8 @@ void GdbEngine::handleGdbExit(const GdbResponse &response) m_commandsDoneCallback = 0; // don't set state here, this will be handled in handleGdbFinished() } else { - QString msg = m_gdbAdapter->msgGdbStopFailed(_(response.data.findChild("msg").data())); + QString msg = m_gdbAdapter->msgGdbStopFailed( + QString::fromLocal8Bit(response.data.findChild("msg").data())); debugMessage(_("GDB WON'T EXIT (%1); KILLING IT").arg(msg)); m_gdbProc.kill(); } @@ -4229,7 +4231,7 @@ void GdbEngine::handleFetchDisassemblerByLine(const GdbResponse &response) if (msg == "mi_cmd_disassemble: Invalid line number") fetchDisassemblerByAddress(ac.agent, true); else - showStatusMessage(tr("Disassembler failed: %1").arg(_(msg)), 5000); + showStatusMessage(tr("Disassembler failed: %1").arg(QString::fromLocal8Bit(msg)), 5000); } } @@ -4254,7 +4256,7 @@ void GdbEngine::handleFetchDisassemblerByAddress1(const GdbResponse &response) } else { // 26^error,msg="Cannot access memory at address 0x801ca308" QByteArray msg = response.data.findChild("msg").data(); - showStatusMessage(tr("Disassembler failed: %1").arg(_(msg)), 5000); + showStatusMessage(tr("Disassembler failed: %1").arg(QString::fromLocal8Bit(msg)), 5000); } } @@ -4268,7 +4270,7 @@ void GdbEngine::handleFetchDisassemblerByAddress0(const GdbResponse &response) ac.agent->setContents(parseDisassembler(lines)); } else { QByteArray msg = response.data.findChild("msg").data(); - showStatusMessage(tr("Disassembler failed: %1").arg(_(msg)), 5000); + showStatusMessage(tr("Disassembler failed: %1").arg(QString::fromLocal8Bit(msg)), 5000); } } diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp index c0e0908666ddaadc52474d09ed667bcc0ecef2ab..a4c0d34d86b67c8570719f60b8b17572c169156d 100644 --- a/src/plugins/debugger/gdb/plaingdbadapter.cpp +++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp @@ -121,7 +121,7 @@ void PlainGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response) emit inferiorPrepared(); } else { QString msg = tr("Starting executable failed:\n") + - __(response.data.findChild("msg").data()); + QString::fromLocal8Bit(response.data.findChild("msg").data()); emit inferiorStartFailed(msg); } } @@ -163,7 +163,7 @@ void PlainGdbAdapter::handleExecRun(const GdbResponse &response) showStatusMessage(msgInferiorStarted()); } else { QTC_ASSERT(state() == InferiorRunningRequested, qDebug() << state()); - const QByteArray &msg = response.data.findChild("msg").data(); + const QString &msg = QString::fromLocal8Bit(response.data.findChild("msg").data()); //QTC_ASSERT(status() == InferiorRunning, /**/); //interruptInferior(); emit inferiorStartFailed(msg); diff --git a/src/plugins/debugger/gdb/remotegdbadapter.cpp b/src/plugins/debugger/gdb/remotegdbadapter.cpp index 4550359956a1023e721e135408499aa63e70e446..b144c146209c123fa69347eded1d2cb0087a6934 100644 --- a/src/plugins/debugger/gdb/remotegdbadapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbadapter.cpp @@ -203,7 +203,7 @@ void RemoteGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response) CB(handleTargetRemote)); } else { QString msg = tr("Starting remote executable failed:\n"); - msg += __(response.data.findChild("msg").data()); + msg += QString::fromLocal8Bit(response.data.findChild("msg").data()); emit inferiorStartFailed(msg); } } @@ -219,7 +219,8 @@ void RemoteGdbAdapter::handleTargetRemote(const GdbResponse &record) emit inferiorPrepared(); } else { // 16^error,msg="hd:5555: Connection timed out." - QString msg = msgConnectRemoteServerFailed(__(record.data.findChild("msg").data())); + QString msg = msgConnectRemoteServerFailed( + QString::fromLocal8Bit(record.data.findChild("msg").data())); emit inferiorStartFailed(msg); } } diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp index 613aaa79f30b0a5d6e72ea741e52329acea572cc..53378a4205337668bbf866c4fc7a6397e1831ae6 100644 --- a/src/plugins/debugger/gdb/termgdbadapter.cpp +++ b/src/plugins/debugger/gdb/termgdbadapter.cpp @@ -143,7 +143,7 @@ void TermGdbAdapter::handleStubAttached(const GdbResponse &response) m_engine->postCommand(_("-stack-list-frames 0 0"), CB(handleEntryPoint)); #endif } else if (response.resultClass == GdbResultError) { - QString msg = _(response.data.findChild("msg").data()); + QString msg = QString::fromLocal8Bit(response.data.findChild("msg").data()); emit inferiorStartFailed(msg); } } diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp index 3eab98ab2e785c94feb0491dab28ca542c8143be..5e95384f4e603aa0a19eb7a0e868bb19ef30476c 100644 --- a/src/plugins/debugger/gdb/trkgdbadapter.cpp +++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp @@ -1628,7 +1628,7 @@ void TrkGdbAdapter::handleTargetRemote(const GdbResponse &record) emit inferiorPrepared(); } else { QString msg = tr("Connecting to TRK server adapter failed:\n") - + _(record.data.findChild("msg").data()); + + QString::fromLocal8Bit(record.data.findChild("msg").data()); emit inferiorStartFailed(msg); } }