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

Fix single-character strings in QNX-plugin.

Browse Source 
Change-Id: I5a4780fe4fcd285df9f8cbae712e12bff2d2bdda
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Friedemann Kleint
2013-05-14 17:31:08 +02:00
parent 6c636ef2f7
commit b3c8dec943
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/blackberrycertificate.cpp
View File

@@ -117,7 +117,7 @@ QString BlackBerryCertificate::author() const
QString BlackBerryCertificate::id() const QString BlackBerryCertificate::id() const
{ {
QString tmpId = fileName(); QString tmpId = fileName();
return tmpId.replace(QLatin1String("/"), QLatin1String("-")); return tmpId.replace(QLatin1Char('/'), QLatin1Char('-'));
} }
void BlackBerryCertificate::storeFinished(int status) void BlackBerryCertificate::storeFinished(int status)

2
src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
View File

@@ -185,7 +185,7 @@ void BlackBerryDebugTokenRequestDialog::expandPath()
{ {
const QString path = m_ui->debugTokenPath->path(); const QString path = m_ui->debugTokenPath->path();
if (path.isEmpty() || path.startsWith(QLatin1String("/"))) if (path.isEmpty() || path.startsWith(QLatin1Char('/')))
return; return;
const QFileInfo fileInfo(path); const QFileInfo fileInfo(path);

2
src/plugins/qnx/blackberrydeployinformation.cpp
View File

@@ -65,7 +65,7 @@ QString BarPackageDeployInformation::appDescriptorPath() const
QString BarPackageDeployInformation::packagePath() const QString BarPackageDeployInformation::packagePath() const
{ {
if (userPackagePath.isEmpty()) if (userPackagePath.isEmpty())
return buildDir + QLatin1String("/") + targetName + QLatin1String(".bar"); return buildDir + QLatin1Char('/') + targetName + QLatin1String(".bar");
return userPackagePath; return userPackagePath;
} }

2
src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
View File

@@ -254,7 +254,7 @@ bool BlackBerryDeviceConfigurationWizardSshKeyPage::saveKeys(const QString &priv
Utils::FileSaver pubSaver(publicKeyFile); Utils::FileSaver pubSaver(publicKeyFile);
// blackberry-connect requires an @ character to be included in the RSA comment // blackberry-connect requires an @ character to be included in the RSA comment
const QString atHost = QLatin1String("@") + QHostInfo::localHostName(); const QString atHost = QLatin1Char('@') + QHostInfo::localHostName();
QByteArray pubKeyContent = m_sshKeysGenerator->keyGenerator()->publicKey(); QByteArray pubKeyContent = m_sshKeysGenerator->keyGenerator()->publicKey();
pubKeyContent.append(atHost.toLocal8Bit()); pubKeyContent.append(atHost.toLocal8Bit());

2
src/plugins/qnx/blackberrysetupwizard.cpp
View File

@@ -409,7 +409,7 @@ void BlackBerrySetupWizard::generateSshKeys()
Utils::FileSaver publicKeySaver(publicKeyPath()); Utils::FileSaver publicKeySaver(publicKeyPath());
// blackberry-connect requires an @ character to be included in the RSA comment // blackberry-connect requires an @ character to be included in the RSA comment
const QString atHost = QLatin1String("@") + QHostInfo::localHostName(); const QString atHost = QLatin1Char('@') + QHostInfo::localHostName();
QByteArray publicKeyContent = m_keyGenerator->publicKey(); QByteArray publicKeyContent = m_keyGenerator->publicKey();
publicKeyContent.append(atHost.toLocal8Bit()); publicKeyContent.append(atHost.toLocal8Bit());

14
src/plugins/qnx/blackberrysetupwizardpages.cpp
View File

@@ -189,15 +189,15 @@ void BlackBerrySetupWizardKeysPage::initUi()
connect(m_ui->linkLabel, SIGNAL(linkActivated(QString)), connect(m_ui->linkLabel, SIGNAL(linkActivated(QString)),
this, SLOT(showKeysMessage(QString))); this, SLOT(showKeysMessage(QString)));
registerField(QLatin1String(PbdtPathField) + QLatin1String("*"), registerField(QLatin1String(PbdtPathField) + QLatin1Char('*'),
m_ui->pbdtPath, "path", SIGNAL(changed(QString))); m_ui->pbdtPath, "path", SIGNAL(changed(QString)));
registerField(QLatin1String(RdkPathField) + QLatin1String("*"), registerField(QLatin1String(RdkPathField) + QLatin1Char('*'),
m_ui->rdkPath, "path", SIGNAL(changed(QString))); m_ui->rdkPath, "path", SIGNAL(changed(QString)));
registerField(QLatin1String(CsjPinField) + QLatin1String("*"), registerField(QLatin1String(CsjPinField) + QLatin1Char('*'),
m_ui->csjPin); m_ui->csjPin);
registerField(QLatin1String(PasswordField) + QLatin1String("*"), registerField(QLatin1String(PasswordField) + QLatin1Char('*'),
m_ui->password); m_ui->password);
registerField(QLatin1String(Password2Field) + QLatin1String("*"), registerField(QLatin1String(Password2Field) + QLatin1Char('*'),
m_ui->password2); m_ui->password2);
} }
@@ -263,8 +263,8 @@ BlackBerrySetupWizardDevicePage::BlackBerrySetupWizardDevicePage(QWidget *parent
connect(m_ui->password, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged())); connect(m_ui->password, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged()));
connect(m_ui->physicalDevice, SIGNAL(toggled(bool)), this, SIGNAL(completeChanged())); connect(m_ui->physicalDevice, SIGNAL(toggled(bool)), this, SIGNAL(completeChanged()));
registerField(QLatin1String(NameField) + QLatin1String("*"), m_ui->deviceName); registerField(QLatin1String(NameField) + QLatin1Char('*'), m_ui->deviceName);
registerField(QLatin1String(IpAddressField) + QLatin1String("*"), m_ui->ipAddress); registerField(QLatin1String(IpAddressField) + QLatin1Char('*'), m_ui->ipAddress);
registerField(QLatin1String(PasswordField), m_ui->password); registerField(QLatin1String(PasswordField), m_ui->password);
registerField(QLatin1String(PhysicalDeviceField), m_ui->physicalDevice); registerField(QLatin1String(PhysicalDeviceField), m_ui->physicalDevice);
} }

2
src/plugins/qnx/qnxrunconfiguration.cpp
View File

@@ -68,7 +68,7 @@ QString QnxRunConfiguration::environmentPreparationCommand() const
foreach (const QString &filePath, filesToSource) foreach (const QString &filePath, filesToSource)
command += QString::fromLatin1("test -f %1 && . %1;").arg(filePath); command += QString::fromLatin1("test -f %1 && . %1;").arg(filePath);
if (!workingDirectory().isEmpty()) if (!workingDirectory().isEmpty())
command += QLatin1String("cd ") + workingDirectory() + QLatin1String(";"); command += QLatin1String("cd ") + workingDirectory() + QLatin1Char(';');
if (!m_qtLibPath.isEmpty()) if (!m_qtLibPath.isEmpty())
command += QLatin1String("LD_LIBRARY_PATH=") + m_qtLibPath + QLatin1String(":$LD_LIBRARY_PATH"); command += QLatin1String("LD_LIBRARY_PATH=") + m_qtLibPath + QLatin1String(":$LD_LIBRARY_PATH");