Commit b3c8dec9 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Fix single-character strings in QNX-plugin.



Change-Id: I5a4780fe4fcd285df9f8cbae712e12bff2d2bdda
Reviewed-by: default avatarRafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
parent 6c636ef2
......@@ -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)
......
......@@ -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);
......
......@@ -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;
}
......
......@@ -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());
......
......@@ -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());
......
......@@ -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);
}
......
......@@ -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");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment