CODA: Rename TCF, TCF TRK to CODA

Change-Id: I92d9bc873f62d04c149e7347145701d8a11c232c
Reviewed-on: http://codereview.qt.nokia.com/119
Reviewed-by: Paweł Polański <jaggernod@gmail.com>

4 files changed, 17 insertions, 17 deletions

diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
index 4da2635526..c99316c3ca 100644
--- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
@@ -135,7 +135,7 @@ bool CodaRunControl::setupLauncher()
                 this, SLOT(deviceRemoved(SymbianUtils::SymbianDevice)));
         connect(m_codaDevice.data(), SIGNAL(error(QString)), this, SLOT(slotError(QString)));
         connect(m_codaDevice.data(), SIGNAL(logMessage(QString)), this, SLOT(slotTrkLogMessage(QString)));
-        connect(m_codaDevice.data(), SIGNAL(tcfEvent(Coda::CodaEvent)), this, SLOT(slotCodaEvent(Coda::CodaEvent)));
+        connect(m_codaDevice.data(), SIGNAL(codaEvent(Coda::CodaEvent)), this, SLOT(slotCodaEvent(Coda::CodaEvent)));
         connect(m_codaDevice.data(), SIGNAL(serialPong(QString)), this, SLOT(slotSerialPong(QString)));
         m_state = StateConnecting;
         m_codaDevice->sendSerialPing(false);
@@ -144,7 +144,7 @@ bool CodaRunControl::setupLauncher()
         m_codaDevice = QSharedPointer<Coda::CodaDevice>(new Coda::CodaDevice, &QObject::deleteLater); // finishRunControl, which deletes m_codaDevice, can get called from within a coda callback, so need to use deleteLater
         connect(m_codaDevice.data(), SIGNAL(error(QString)), this, SLOT(slotError(QString)));
         connect(m_codaDevice.data(), SIGNAL(logMessage(QString)), this, SLOT(slotTrkLogMessage(QString)));
-        connect(m_codaDevice.data(), SIGNAL(tcfEvent(Coda::CodaEvent)), this, SLOT(slotCodaEvent(Coda::CodaEvent)));
+        connect(m_codaDevice.data(), SIGNAL(codaEvent(Coda::CodaEvent)), this, SLOT(slotCodaEvent(Coda::CodaEvent)));
 
         const QSharedPointer<QTcpSocket> codaSocket(new QTcpSocket);
         m_codaDevice->setDevice(codaSocket);
@@ -257,9 +257,9 @@ void CodaRunControl::handleContextRemoved(const CodaEvent &event)
 
 void CodaRunControl::handleContextAdded(const CodaEvent &event)
 {
-    typedef CodaRunControlContextAddedEvent TcfAddedEvent;
+    typedef CodaRunControlContextAddedEvent CodaAddedEvent;
 
-    const TcfAddedEvent &me = static_cast<const TcfAddedEvent &>(event);
+    const CodaAddedEvent &me = static_cast<const CodaAddedEvent &>(event);
     foreach (const RunControlContext &context, me.contexts()) {
         if (context.parentId == "root") //is the created context a process
             m_runningProcessId = QLatin1String(context.id);
@@ -268,16 +268,16 @@ void CodaRunControl::handleContextAdded(const CodaEvent &event)
 
 void CodaRunControl::handleContextSuspended(const CodaEvent &event)
 {
-    typedef CodaRunControlContextSuspendedEvent TcfSuspendEvent;
+    typedef CodaRunControlContextSuspendedEvent CodaSuspendEvent;
 
-    const TcfSuspendEvent &me = static_cast<const TcfSuspendEvent &>(event);
+    const CodaSuspendEvent &me = static_cast<const CodaSuspendEvent &>(event);
 
     switch (me.reason()) {
-    case TcfSuspendEvent::Other:
-    case TcfSuspendEvent::Crash:
+    case CodaSuspendEvent::Other:
+    case CodaSuspendEvent::Crash:
         appendMessage(tr("Thread has crashed: %1\n").arg(QString::fromLatin1(me.message())), Utils::ErrorMessageFormat);
 
-        if (me.reason() == TcfSuspendEvent::Crash)
+        if (me.reason() == CodaSuspendEvent::Crash)
             stop();
         else
             m_codaDevice->sendRunControlResumeCommand(CodaCallback(), me.id()); //TODO: Should I resume automatically
@@ -292,9 +292,9 @@ void CodaRunControl::handleContextSuspended(const CodaEvent &event)
 void CodaRunControl::handleModuleLoadSuspended(const CodaEvent &event)
 {
     // Debug mode start: Continue:
-    typedef CodaRunControlModuleLoadContextSuspendedEvent TcfModuleLoadSuspendedEvent;
+    typedef CodaRunControlModuleLoadContextSuspendedEvent CodaModuleLoadSuspendedEvent;
 
-    const TcfModuleLoadSuspendedEvent &me = static_cast<const TcfModuleLoadSuspendedEvent &>(event);
+    const CodaModuleLoadSuspendedEvent &me = static_cast<const CodaModuleLoadSuspendedEvent &>(event);
     if (me.info().requireResume)
         m_codaDevice->sendRunControlResumeCommand(CodaCallback(), me.id());
 }
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
index aa27522766..f984e15552 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
@@ -66,7 +66,7 @@ const char * const DEVICE_ADDRESS_KEY("Qt4ProjectManager.S60DeployConfiguration.
 const char * const DEVICE_PORT_KEY("Qt4ProjectManager.S60DeployConfiguration.DevicePort");
 const char * const COMMUNICATION_CHANNEL_KEY("Qt4ProjectManager.S60DeployConfiguration.CommunicationChannel");
 
-const char * const DEFAULT_TCF_TRK_TCP_PORT("65029");
+const char * const DEFAULT_CODA_TCP_PORT("65029");
 
 QString pathFromId(const QString &id)
 {
@@ -93,7 +93,7 @@ S60DeployConfiguration::S60DeployConfiguration(Target *parent) :
 #endif
     m_installationDrive('C'),
     m_silentInstall(true),
-    m_devicePort(QLatin1String(DEFAULT_TCF_TRK_TCP_PORT)),
+    m_devicePort(QLatin1String(DEFAULT_CODA_TCP_PORT)),
     m_communicationChannel(CommunicationTrkSerialConnection)
 {
     ctor();
@@ -332,7 +332,7 @@ bool S60DeployConfiguration::fromMap(const QVariantMap &map)
                           .toChar().toAscii();
     m_silentInstall = map.value(QLatin1String(SILENT_INSTALL_KEY), QVariant(true)).toBool();
     m_deviceAddress = map.value(QLatin1String(DEVICE_ADDRESS_KEY)).toString();
-    m_devicePort = map.value(QLatin1String(DEVICE_PORT_KEY), QString(QLatin1String(DEFAULT_TCF_TRK_TCP_PORT))).toString();
+    m_devicePort = map.value(QLatin1String(DEVICE_PORT_KEY), QString(QLatin1String(DEFAULT_CODA_TCP_PORT))).toString();
     m_communicationChannel = static_cast<CommunicationChannel>(map.value(QLatin1String(COMMUNICATION_CHANNEL_KEY),
                                                                          QVariant(CommunicationTrkSerialConnection)).toInt());
 
@@ -404,7 +404,7 @@ void S60DeployConfiguration::setDevicePort(const QString &port)
 {
     if (m_devicePort != port) {
         if (port.isEmpty()) //setup the default CODA's port
-            m_devicePort = QLatin1String(DEFAULT_TCF_TRK_TCP_PORT);
+            m_devicePort = QLatin1String(DEFAULT_CODA_TCP_PORT);
         else
             m_devicePort = port;
         emit devicePortChanged();
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
index d16093a7c1..a7f8d813e4 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
@@ -596,7 +596,7 @@ void S60DeployConfigurationWidget::updateDeviceInfo()
     } else if(m_deployConfiguration->communicationChannel() == S60DeployConfiguration::CommunicationCodaTcpConnection) {
         // collectingInfoFinished, which deletes m_codaDevice, can get called from within a coda callback, so need to use deleteLater
         m_codaInfoDevice =  QSharedPointer<Coda::CodaDevice>(new Coda::CodaDevice, &QObject::deleteLater);
-        connect(m_codaInfoDevice.data(), SIGNAL(tcfEvent(Coda::CodaEvent)), this, SLOT(codaEvent(Coda::CodaEvent)));
+        connect(m_codaInfoDevice.data(), SIGNAL(codaEvent(Coda::CodaEvent)), this, SLOT(codaEvent(Coda::CodaEvent)));
 
         const QSharedPointer<QTcpSocket> codaSocket(new QTcpSocket);
         m_codaInfoDevice->setDevice(codaSocket);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
index ab13784354..dd2b58e4d3 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -355,7 +355,7 @@ void S60DeployStep::setupConnections()
     } else {
         connect(m_codaDevice.data(), SIGNAL(error(QString)), this, SLOT(slotError(QString)));
         connect(m_codaDevice.data(), SIGNAL(logMessage(QString)), this, SLOT(slotTrkLogMessage(QString)));
-        connect(m_codaDevice.data(), SIGNAL(tcfEvent(Coda::CodaEvent)), this, SLOT(slotCodaEvent(Coda::CodaEvent)), Qt::DirectConnection);
+        connect(m_codaDevice.data(), SIGNAL(codaEvent(Coda::CodaEvent)), this, SLOT(slotCodaEvent(Coda::CodaEvent)), Qt::DirectConnection);
         connect(m_codaDevice.data(), SIGNAL(serialPong(QString)), this, SLOT(slotSerialPong(QString)));
         connect(this, SIGNAL(manualInstallation()), this, SLOT(showManualInstallationInfo()));
     }