feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TRK: Changed strings.

Browse Source 
Using "TRK" when referring to the protocol, "App TRK" when referring to the program on the device.

Reviewed-by: Oswald Buddenhagen
This commit is contained in:
Robert Loehning
2009-10-29 14:18:49 +01:00
parent 6e154b3055
commit 64e2519915
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -1113,7 +1113,7 @@ void TrkGdbAdapter::handleCpuType(const TrkResult &result)
void TrkGdbAdapter::handleDeleteProcess(const TrkResult &result)
{
Q_UNUSED(result);
logMessage("TRK Process killed");
logMessage("Inferior process killed");
//sendTrkMessage(0x01, TrkCB(handleDeleteProcess2)); // Ping
sendTrkMessage(0x02, TrkCB(handleDeleteProcess2)); // Disconnect
}
@@ -1121,7 +1121,7 @@ void TrkGdbAdapter::handleDeleteProcess(const TrkResult &result)
void TrkGdbAdapter::handleDeleteProcess2(const TrkResult &result)
{
Q_UNUSED(result);
logMessage("process killed");
logMessage("App TRK disconnected");
sendGdbServerAck();
sendGdbServerMessage("", "process killed");
}
@@ -1456,9 +1456,9 @@ void TrkGdbAdapter::handleTrkVersionsStartGdb(const TrkResult &result)
QTextStream str(&logMsg);
str << "Versions: ";
if (result.data.size() >= 5) {
str << "Trk version " << int(result.data.at(1)) << '.'
str << "App TRK version " << int(result.data.at(1)) << '.'
<< int(result.data.at(2))
<< ", Protocol version " << int(result.data.at(3))
<< ", TRK protocol version " << int(result.data.at(3))
<< '.' << int(result.data.at(4));
}
logMessage(logMsg);
@@ -1473,7 +1473,7 @@ void TrkGdbAdapter::handleTrkVersionsStartGdb(const TrkResult &result)
void TrkGdbAdapter::handleDisconnect(const TrkResult & /*result*/)
{
logMessage(QLatin1String("Trk disconnected"));
logMessage(QLatin1String("App TRK disconnected"));
}
void TrkGdbAdapter::readMemory(uint addr, uint len, bool buffered)
@@ -1618,7 +1618,7 @@ void TrkGdbAdapter::handleTargetRemote(const GdbResponse &record)
if (record.resultClass == GdbResultDone) {
emit inferiorPrepared();
} else {
QString msg = tr("Connecting to trk server adapter failed:\n")
QString msg = tr("Connecting to TRK server adapter failed:\n")
+ _(record.data.findChild("msg").data());
emit inferiorStartFailed(msg);
}