From 64e2519915938734a6ee0c99f56d8250d9104a05 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Thu, 29 Oct 2009 14:18:49 +0100
Subject: [PATCH] TRK: Changed strings. Using "TRK" when referring to the
protocol, "App TRK" when referring to the program on the device.
Reviewed-by: Oswald Buddenhagen
---
src/plugins/debugger/gdb/trkgdbadapter.cpp | 12 ++++++------
src/plugins/debugger/gdb/trkoptionspage.cpp | 2 +-
.../qt-s60/s60devicerunconfiguration.cpp | 6 +++---
src/shared/trk/bluetoothlistener_gui.cpp | 4 ++--
src/shared/trk/communicationstarter.h | 4 ++--
src/shared/trk/trkutils.cpp | 4 ++--
tests/manual/trklauncher/main.cpp | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index a75650cad45..82ce54376bd 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -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);
}
diff --git a/src/plugins/debugger/gdb/trkoptionspage.cpp b/src/plugins/debugger/gdb/trkoptionspage.cpp
index 98b103b8d78..1a7c8a91c96 100644
--- a/src/plugins/debugger/gdb/trkoptionspage.cpp
+++ b/src/plugins/debugger/gdb/trkoptionspage.cpp
@@ -40,7 +40,7 @@
namespace Debugger {
namespace Internal {
-const char * const TRK_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::TrkOptionsPage", "Symbian Trk");
+const char * const TRK_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::TrkOptionsPage", "Symbian TRK");
TrkOptionsPage::TrkOptionsPage(const TrkOptionsPtr &options) :
m_options(options)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 181fe4d1926..2cb8caf38f4 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -626,7 +626,7 @@ void S60DeviceRunControlBase::signsisProcessFinished()
if (!m_launcher->startServer(&errorMessage)) {
error(this, tr("Could not connect to phone on port '%1': %2\n"
- "Check if the phone is connected and the TRK application is running.").arg(m_serialPortName, errorMessage));
+ "Check if the phone is connected and App TRK is running.").arg(m_serialPortName, errorMessage));
stop();
emit finished();
}
@@ -683,9 +683,9 @@ void S60DeviceRunControlBase::launcherFinished()
QMessageBox *S60DeviceRunControlBase::createTrkWaitingMessageBox(const QString &port, QWidget *parent)
{
const QString title = QCoreApplication::translate("Qt4ProjectManager::Internal::S60DeviceRunControlBase",
- "Waiting for TRK");
+ "Waiting for App TRK");
const QString text = QCoreApplication::translate("Qt4ProjectManager::Internal::S60DeviceRunControlBase",
- "Please start TRK on %1.").arg(port);
+ "Please start App TRK on %1.").arg(port);
QMessageBox *rc = new QMessageBox(QMessageBox::Information, title, text,
QMessageBox::Cancel, parent);
return rc;
diff --git a/src/shared/trk/bluetoothlistener_gui.cpp b/src/shared/trk/bluetoothlistener_gui.cpp
index edcb40a9a52..9b6dbd3bc6e 100644
--- a/src/shared/trk/bluetoothlistener_gui.cpp
+++ b/src/shared/trk/bluetoothlistener_gui.cpp
@@ -81,8 +81,8 @@ PromptStartCommunicationResult
QWidget *msgBoxParent,
QString *errorMessage)
{
- const QString title = QCoreApplication::translate("trk::promptStartCommunication", "Waiting for TRK");
- const QString message = QCoreApplication::translate("trk::promptStartCommunication", "Waiting for TRK to start on %1...").arg(starter.device());
+ const QString title = QCoreApplication::translate("trk::promptStartCommunication", "Waiting for App TRK");
+ const QString message = QCoreApplication::translate("trk::promptStartCommunication", "Waiting for App TRK to start on %1...").arg(starter.device());
return promptStartCommunication(starter, title, message, msgBoxParent, errorMessage);
}
diff --git a/src/shared/trk/communicationstarter.h b/src/shared/trk/communicationstarter.h
index 7b89e2472ed..6f9f6d1e434 100644
--- a/src/shared/trk/communicationstarter.h
+++ b/src/shared/trk/communicationstarter.h
@@ -45,8 +45,8 @@ struct BaseCommunicationStarterPrivate;
* connection attempt in start() fails, the
* virtual initializeStartupResources() is called to initialize resources
* required to pull up the communication (namely Bluetooth listeners).
- * The base class can be used as is to prompt the user to launch TRK for a serial
- * communication as this requires no further resource setup. */
+ * The base class can be used as is to prompt the user to launch App TRK for a
+ * serial communication as this requires no further resource setup. */
class BaseCommunicationStarter : public QObject {
Q_OBJECT
diff --git a/src/shared/trk/trkutils.cpp b/src/shared/trk/trkutils.cpp
index 93df3937994..4b63cad0343 100644
--- a/src/shared/trk/trkutils.cpp
+++ b/src/shared/trk/trkutils.cpp
@@ -98,8 +98,8 @@ QString Session::deviceDescription(unsigned verbose) const
if (fpTypeSize)
str << ", float size: " << fpTypeSize;
}
- str << ", Trk: v" << trkAppVersion.trkMajor << '.' << trkAppVersion.trkMinor
- << " Protocol: v" << trkAppVersion.protocolMajor << '.' << trkAppVersion.protocolMinor;
+ str << ", App TRK: v" << trkAppVersion.trkMajor << '.' << trkAppVersion.trkMinor
+ << " TRK protocol: v" << trkAppVersion.protocolMajor << '.' << trkAppVersion.protocolMinor;
}
return msg;
}
diff --git a/tests/manual/trklauncher/main.cpp b/tests/manual/trklauncher/main.cpp
index 35336632173..9938f847931 100644
--- a/tests/manual/trklauncher/main.cpp
+++ b/tests/manual/trklauncher/main.cpp
@@ -126,7 +126,7 @@ static TrkLauncherPtr parseArguments(const QStringList &arguments, bool *bluetoo
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
- QCoreApplication::setApplicationName(QLatin1String("trklauncher"));
+ QCoreApplication::setApplicationName(QLatin1String("TRKlauncher"));
QCoreApplication::setOrganizationName(QLatin1String("Nokia"));
bool bluetooth;
--
GitLab