diff options
author | Pawel Polanski <pawel.3.polanski@nokia.com> | 2010-08-20 14:14:15 +0200 |
---|---|---|
committer | Pawel Polanski <pawel.3.polanski@nokia.com> | 2010-08-20 14:39:46 +0200 |
commit | b230898b662d43bda9776f38a777ea8e4e6b758d (patch) | |
tree | 6e3b1b203af73c8bea87558d8fa389a8c18f2f0a | |
parent | 6840c1d19812372076c7fadf35ca0d3eae4dcb72 (diff) | |
download | qt-creator-b230898b662d43bda9776f38a777ea8e4e6b758d.tar.gz |
Small change concerning casting
-rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp | 7 | ||||
-rw-r--r-- | src/shared/symbianutils/launcher.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp index b4ab7c920a..0ace818e77 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp @@ -163,10 +163,9 @@ void S60DeployConfigurationWidget::updateInstallationDrives() { m_installationDriveCombo->clear(); for (int i = STARTING_DRIVE_LETTER; i <= LAST_DRIVE_LETTER; ++i) { - m_installationDriveCombo->addItem(QString("%1:").arg((char)i), qVariantFromValue(i)); + m_installationDriveCombo->addItem(QString("%1:").arg(static_cast<char>(i)), qVariantFromValue(i)); } - ushort installationDrive = m_deployConfiguration->installationDrive(); - int index = QChar::toUpper(installationDrive) - STARTING_DRIVE_LETTER; + int index = QChar::toUpper(static_cast<ushort>(m_deployConfiguration->installationDrive())) - STARTING_DRIVE_LETTER; Q_ASSERT(index >= 0 && index <= LAST_DRIVE_LETTER-STARTING_DRIVE_LETTER); @@ -228,7 +227,7 @@ void S60DeployConfigurationWidget::updateTargetInformation() void S60DeployConfigurationWidget::setInstallationDrive(int index) { - m_deployConfiguration->setInstallationDrive((char)(STARTING_DRIVE_LETTER + index)); + m_deployConfiguration->setInstallationDrive(static_cast<char>(STARTING_DRIVE_LETTER + index)); } void S60DeployConfigurationWidget::setSerialPort(int index) diff --git a/src/shared/symbianutils/launcher.cpp b/src/shared/symbianutils/launcher.cpp index 7218deec06..ad34e671eb 100644 --- a/src/shared/symbianutils/launcher.cpp +++ b/src/shared/symbianutils/launcher.cpp @@ -893,7 +893,7 @@ void Launcher::installRemotePackageSilently() emit installingStarted(); d->m_currentInstallationStep = InstallationModeSilent; QByteArray ba; - ba.append((char)QChar::toUpper((ushort)d->m_installationDrive)); + ba.append(static_cast<char>(QChar::toUpper((ushort)d->m_installationDrive))); appendString(&ba, d->m_installFileNames.at(d->m_currentInstallFileName).toLocal8Bit(), TargetByteOrder, false); d->m_device->sendTrkMessage(TrkInstallFile, TrkCallback(this, &Launcher::handleInstallPackageFinished), ba); } |