From b3c8dec943ca47e018e325b5580345b9ba3df79c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 14 May 2013 17:31:08 +0200
Subject: [PATCH] Fix single-character strings in QNX-plugin.
Change-Id: I5a4780fe4fcd285df9f8cbae712e12bff2d2bdda
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
src/plugins/qnx/blackberrycertificate.cpp | 2 +-
.../qnx/blackberrydebugtokenrequestdialog.cpp | 2 +-
src/plugins/qnx/blackberrydeployinformation.cpp | 2 +-
.../blackberrydeviceconfigurationwizardpages.cpp | 2 +-
src/plugins/qnx/blackberrysetupwizard.cpp | 2 +-
src/plugins/qnx/blackberrysetupwizardpages.cpp | 14 +++++++-------
src/plugins/qnx/qnxrunconfiguration.cpp | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/plugins/qnx/blackberrycertificate.cpp b/src/plugins/qnx/blackberrycertificate.cpp
index d442ad36792..5f4c84caea5 100644
--- a/src/plugins/qnx/blackberrycertificate.cpp
+++ b/src/plugins/qnx/blackberrycertificate.cpp
@@ -117,7 +117,7 @@ QString BlackBerryCertificate::author() const
QString BlackBerryCertificate::id() const
{
QString tmpId = fileName();
- return tmpId.replace(QLatin1String("/"), QLatin1String("-"));
+ return tmpId.replace(QLatin1Char('/'), QLatin1Char('-'));
}
void BlackBerryCertificate::storeFinished(int status)
diff --git a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
index cbe3e59ac64..8728f11c071 100644
--- a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
+++ b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
@@ -185,7 +185,7 @@ void BlackBerryDebugTokenRequestDialog::expandPath()
{
const QString path = m_ui->debugTokenPath->path();
- if (path.isEmpty() || path.startsWith(QLatin1String("/")))
+ if (path.isEmpty() || path.startsWith(QLatin1Char('/')))
return;
const QFileInfo fileInfo(path);
diff --git a/src/plugins/qnx/blackberrydeployinformation.cpp b/src/plugins/qnx/blackberrydeployinformation.cpp
index 251cdc23724..5698bd8893e 100644
--- a/src/plugins/qnx/blackberrydeployinformation.cpp
+++ b/src/plugins/qnx/blackberrydeployinformation.cpp
@@ -65,7 +65,7 @@ QString BarPackageDeployInformation::appDescriptorPath() const
QString BarPackageDeployInformation::packagePath() const
{
if (userPackagePath.isEmpty())
- return buildDir + QLatin1String("/") + targetName + QLatin1String(".bar");
+ return buildDir + QLatin1Char('/') + targetName + QLatin1String(".bar");
return userPackagePath;
}
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
index 36299ac13aa..f923cc5cd07 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
@@ -254,7 +254,7 @@ bool BlackBerryDeviceConfigurationWizardSshKeyPage::saveKeys(const QString &priv
Utils::FileSaver pubSaver(publicKeyFile);
// 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();
pubKeyContent.append(atHost.toLocal8Bit());
diff --git a/src/plugins/qnx/blackberrysetupwizard.cpp b/src/plugins/qnx/blackberrysetupwizard.cpp
index 6d29689e03f..2a5df8bb326 100644
--- a/src/plugins/qnx/blackberrysetupwizard.cpp
+++ b/src/plugins/qnx/blackberrysetupwizard.cpp
@@ -409,7 +409,7 @@ void BlackBerrySetupWizard::generateSshKeys()
Utils::FileSaver publicKeySaver(publicKeyPath());
// 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();
publicKeyContent.append(atHost.toLocal8Bit());
diff --git a/src/plugins/qnx/blackberrysetupwizardpages.cpp b/src/plugins/qnx/blackberrysetupwizardpages.cpp
index cb7ab612717..bc823b206af 100644
--- a/src/plugins/qnx/blackberrysetupwizardpages.cpp
+++ b/src/plugins/qnx/blackberrysetupwizardpages.cpp
@@ -189,15 +189,15 @@ void BlackBerrySetupWizardKeysPage::initUi()
connect(m_ui->linkLabel, SIGNAL(linkActivated(QString)),
this, SLOT(showKeysMessage(QString)));
- registerField(QLatin1String(PbdtPathField) + QLatin1String("*"),
+ registerField(QLatin1String(PbdtPathField) + QLatin1Char('*'),
m_ui->pbdtPath, "path", SIGNAL(changed(QString)));
- registerField(QLatin1String(RdkPathField) + QLatin1String("*"),
+ registerField(QLatin1String(RdkPathField) + QLatin1Char('*'),
m_ui->rdkPath, "path", SIGNAL(changed(QString)));
- registerField(QLatin1String(CsjPinField) + QLatin1String("*"),
+ registerField(QLatin1String(CsjPinField) + QLatin1Char('*'),
m_ui->csjPin);
- registerField(QLatin1String(PasswordField) + QLatin1String("*"),
+ registerField(QLatin1String(PasswordField) + QLatin1Char('*'),
m_ui->password);
- registerField(QLatin1String(Password2Field) + QLatin1String("*"),
+ registerField(QLatin1String(Password2Field) + QLatin1Char('*'),
m_ui->password2);
}
@@ -263,8 +263,8 @@ BlackBerrySetupWizardDevicePage::BlackBerrySetupWizardDevicePage(QWidget *parent
connect(m_ui->password, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged()));
connect(m_ui->physicalDevice, SIGNAL(toggled(bool)), this, SIGNAL(completeChanged()));
- registerField(QLatin1String(NameField) + QLatin1String("*"), m_ui->deviceName);
- registerField(QLatin1String(IpAddressField) + QLatin1String("*"), m_ui->ipAddress);
+ registerField(QLatin1String(NameField) + QLatin1Char('*'), m_ui->deviceName);
+ registerField(QLatin1String(IpAddressField) + QLatin1Char('*'), m_ui->ipAddress);
registerField(QLatin1String(PasswordField), m_ui->password);
registerField(QLatin1String(PhysicalDeviceField), m_ui->physicalDevice);
}
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index 2e6495ee03f..277bcfe6e1f 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -68,7 +68,7 @@ QString QnxRunConfiguration::environmentPreparationCommand() const
foreach (const QString &filePath, filesToSource)
command += QString::fromLatin1("test -f %1 && . %1;").arg(filePath);
if (!workingDirectory().isEmpty())
- command += QLatin1String("cd ") + workingDirectory() + QLatin1String(";");
+ command += QLatin1String("cd ") + workingDirectory() + QLatin1Char(';');
if (!m_qtLibPath.isEmpty())
command += QLatin1String("LD_LIBRARY_PATH=") + m_qtLibPath + QLatin1String(":$LD_LIBRARY_PATH");
--
GitLab