diff options
| author | Pawel Polanski <pawel.3.polanski@nokia.com> | 2011-05-25 16:08:13 +0200 |
|---|---|---|
| committer | Paweł Polański <jaggernod@gmail.com> | 2011-05-26 12:17:45 +0200 |
| commit | 536664b0c18483e2d99c20ef1957ebe30aafcdd3 (patch) | |
| tree | 12bb59502fc2c82c96a482e910e4fd7182683a4b /src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp | |
| parent | be48bfb2fe13dd081764cf59e17c02b8fb280cb1 (diff) | |
| download | qt-creator-536664b0c18483e2d99c20ef1957ebe30aafcdd3.tar.gz | |
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>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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(); |