summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2012-01-16 23:41:56 +0100
committerTim Jenssen <tim.jenssen@nokia.com>2012-01-17 12:05:22 +0100
commite5c477906fd506cf06ac95311a5b3512a6d85e47 (patch)
tree5988dc146b4b48cb6fdd95e7ec22009f14e13d56 /installerbuilder
parent91ef6ea2ae0fa00b56c248a608c48b540e6dd51b (diff)
Small QString improvements.
Use QString::fromLatin1 instead of creating QLatin1String inside the the QString constructor first. Remove some superfluous QStrings at all. Change-Id: Icea93494c669ffa382fd5fbfacc6596383b4de21 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/binarycreator/binarycreator.cpp2
-rw-r--r--installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp4
-rw-r--r--installerbuilder/libinstaller/getrepositorymetainfojob.cpp4
-rw-r--r--installerbuilder/libinstaller/messageboxhandler.cpp4
-rw-r--r--installerbuilder/libinstaller/progresscoordinator.cpp8
-rw-r--r--installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp8
-rw-r--r--installerbuilder/libinstaller/qtpatch.cpp6
-rw-r--r--installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp4
-rw-r--r--installerbuilder/libinstaller/setpathonqtcoreoperation.cpp4
-rw-r--r--installerbuilder/libinstaller/setpluginpathonqtcoreoperation.cpp4
10 files changed, 23 insertions, 25 deletions
diff --git a/installerbuilder/binarycreator/binarycreator.cpp b/installerbuilder/binarycreator/binarycreator.cpp
index e4e7aba77..786abef09 100644
--- a/installerbuilder/binarycreator/binarycreator.cpp
+++ b/installerbuilder/binarycreator/binarycreator.cpp
@@ -555,7 +555,7 @@ int main(int argc, char **argv)
templateBinary += QLatin1String(".exe");
#endif
if (!QFileInfo(templateBinary).exists())
- templateBinary = QString(QLatin1String("%1/%2")).arg(qApp->applicationDirPath(), templateBinary);
+ templateBinary = QString::fromLatin1("%1/%2").arg(qApp->applicationDirPath(), templateBinary);
QString target;
QString configDir;
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp
index 4ae146b97..fda944544 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterufuncompressor.cpp
@@ -126,7 +126,7 @@ bool UFUncompressor::uncompress()
d->setError(tr("Could not create folder: %1/%2").arg(d->destination, fileName));
return false;
}
- fileEngine.setFileName(QString(QLatin1String("%1/%2")).arg(d->destination, fileName));
+ fileEngine.setFileName(QString::fromLatin1("%1/%2").arg(d->destination, fileName));
fileEngine.setPermissions(header.permList[i] | QAbstractFileEngine::ExeOwnerPerm);
} else {
++numExpectedFiles;
@@ -144,7 +144,7 @@ bool UFUncompressor::uncompress()
}
ufEntry.addToHash(hash);
- const QString completeFileName = QString(QLatin1String( "%1/%2" )).arg(d->destination, ufEntry.fileName);
+ const QString completeFileName = QString::fromLatin1("%1/%2").arg(d->destination, ufEntry.fileName);
const QByteArray ba = qUncompress(ufEntry.fileData);
// check the size
diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
index fc6cce5b5..f6bc0144b 100644
--- a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
+++ b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
@@ -211,8 +211,8 @@ void GetRepositoryMetaInfoJob::startUpdatesXmlDownload()
}
//append a random string to avoid proxy caches
- m_downloader->setUrl(QUrl(url.toString() + QString(QLatin1String("/Updates.xml?")).append(
- QString::number(qrand() * qrand()))));
+ m_downloader->setUrl(QUrl(url.toString() + QString::fromLatin1("/Updates.xml?")
+ .append(QString::number(qrand() * qrand()))));
QAuthenticator auth;
auth.setUser(m_repository.username());
diff --git a/installerbuilder/libinstaller/messageboxhandler.cpp b/installerbuilder/libinstaller/messageboxhandler.cpp
index cd598dc0f..7edcd2fc6 100644
--- a/installerbuilder/libinstaller/messageboxhandler.cpp
+++ b/installerbuilder/libinstaller/messageboxhandler.cpp
@@ -281,8 +281,8 @@ QMessageBox::StandardButton MessageBoxHandler::showMessageBox(MessageType messag
messageTypeHash.insert(warningType, QLatin1String("warning"));
};
- qDebug() << QString(QLatin1String("created %1 message box %2: '%3', %4")).arg(
- messageTypeHash.value(messageType),identifier, title, text);
+ qDebug() << QString::fromLatin1("created %1 message box %2: '%3', %4").arg(messageTypeHash
+ .value(messageType),identifier, title, text);
if (QApplication::type() == QApplication::Tty)
return defaultButton;
diff --git a/installerbuilder/libinstaller/progresscoordinator.cpp b/installerbuilder/libinstaller/progresscoordinator.cpp
index 9206ae5cf..041689224 100644
--- a/installerbuilder/libinstaller/progresscoordinator.cpp
+++ b/installerbuilder/libinstaller/progresscoordinator.cpp
@@ -97,20 +97,18 @@ void ProgressCoordinator::registerPartProgress(QObject *sender, const char *sign
void ProgressCoordinator::partProgressChanged(double fraction)
{
if (fraction < 0 || fraction > 1) {
- qWarning() << QString(QLatin1String("The fraction is outside from possible value:"))
- << QString::number(fraction);
+ qWarning() << "The fraction is outside from possible value:" << QString::number(fraction);
return;
}
double partProgressSize = m_senderPartProgressSizeHash.value(sender(), 0);
if (partProgressSize == 0) {
- qWarning() << QString(QLatin1String("It seems that this sender was not registered in the right way:"))
- << sender();
+ qWarning() << "It seems that this sender was not registered in the right way:" << sender();
return;
}
if (m_undoMode) {
- //qDebug() << "fraction: " << fraction;
+ //qDebug() << "fraction:" << fraction;
double maxSize = m_reachedPercentageBeforeUndo * partProgressSize;
double pendingCalculatedPartPercentage = maxSize * fraction;
diff --git a/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp b/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp
index 9bdacde9f..fe40ccb22 100644
--- a/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp
+++ b/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp
@@ -109,14 +109,14 @@ bool QtCreatorPersistentSettings::addToolChain(const QtCreatorToolChain &toolCha
QVariantMap newToolChainVariantMap;
newToolChainVariantMap.insert(QLatin1String(ID_KEY),
- QString(QLatin1String("%1:%2.%3")).arg(toolChain.type, QFileInfo(toolChain.compilerPath
+ QString::fromLatin1("%1:%2.%3").arg(toolChain.type, QFileInfo(toolChain.compilerPath
).absoluteFilePath(), toolChain.abiString));
newToolChainVariantMap.insert(QLatin1String(DISPLAY_NAME_KEY), toolChain.displayName);
- newToolChainVariantMap.insert(QString(QLatin1String("ProjectExplorer.%1.Path")).arg(toolChain.key),
+ newToolChainVariantMap.insert(QString::fromLatin1("ProjectExplorer.%1.Path").arg(toolChain.key),
QFileInfo(toolChain.compilerPath).absoluteFilePath());
- newToolChainVariantMap.insert(QString(QLatin1String("ProjectExplorer.%1.TargetAbi")).arg(toolChain.key),
+ newToolChainVariantMap.insert(QString::fromLatin1("ProjectExplorer.%1.TargetAbi").arg(toolChain.key),
toolChain.abiString);
- newToolChainVariantMap.insert(QString(QLatin1String("ProjectExplorer.%1.Debugger")).arg(toolChain.key),
+ newToolChainVariantMap.insert(QString::fromLatin1("ProjectExplorer.%1.Debugger").arg(toolChain.key),
QFileInfo(toolChain.debuggerPath).absoluteFilePath());
m_toolChains.insert(QFileInfo(toolChain.compilerPath).absoluteFilePath(), newToolChainVariantMap);
diff --git a/installerbuilder/libinstaller/qtpatch.cpp b/installerbuilder/libinstaller/qtpatch.cpp
index c687adb55..6fabe22a8 100644
--- a/installerbuilder/libinstaller/qtpatch.cpp
+++ b/installerbuilder/libinstaller/qtpatch.cpp
@@ -86,11 +86,11 @@ QHash<QString, QByteArray> QtPatch::qmakeValues(const QString &qmakePath, QByteA
QFileInfo qmake(qmakePath);
if (!qmake.exists()) {
- qmakeOutput->append(QString(QLatin1String("%1 is not existing")).arg(qmakePath));
+ qmakeOutput->append(QString::fromLatin1("%1 is not existing").arg(qmakePath));
return qmakeValueHash;
}
if (!qmake.isExecutable()) {
- qmakeOutput->append(QString(QLatin1String("%1 is not executable")).arg(qmakePath));
+ qmakeOutput->append(QString::fromLatin1("%1 is not executable").arg(qmakePath));
return qmakeValueHash;
}
@@ -101,7 +101,7 @@ QHash<QString, QByteArray> QtPatch::qmakeValues(const QString &qmakePath, QByteA
process.start(qmake.absoluteFilePath(), args, QIODevice::ReadOnly);
if (process.waitForFinished(2000)) {
if (process.exitStatus() == QProcess::CrashExit) {
- QInstaller::verbose() << qPrintable(QString(QLatin1String("%1 was crashed")).arg(qmakePath) ) << std::endl;
+ QInstaller::verbose() << qmakePath << " was crashed" << std::endl;
return qmakeValueHash;
}
QByteArray output = process.readAllStandardOutput();
diff --git a/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp b/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp
index ad2c2cd20..284b6f65d 100644
--- a/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp
+++ b/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp
@@ -112,8 +112,8 @@ bool SetImportsPathOnQtCoreOperation::performOperation()
}
QStringList libraryFiles;
#ifdef Q_OS_WIN
- libraryFiles << QString(QLatin1String("%1/QtCore4.dll")).arg(qtCoreLibraryDir);
- libraryFiles << QString(QLatin1String("%1/QtCore4d.dll")).arg(qtCoreLibraryDir);
+ libraryFiles << QString::fromLatin1("%1/QtCore4.dll").arg(qtCoreLibraryDir);
+ libraryFiles << QString::fromLatin1("%1/QtCore4d.dll").arg(qtCoreLibraryDir);
#else
libraryFiles << qtCoreLibraryDir + QLatin1String("/libQtCore.so");
#endif
diff --git a/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp b/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp
index b32b2eecc..c0a88d032 100644
--- a/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp
+++ b/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp
@@ -136,8 +136,8 @@ bool SetPathOnQtCoreOperation::performOperation()
}
QStringList libraryFiles;
#ifdef Q_OS_WIN
- libraryFiles << QString(QLatin1String("%1/QtCore4.dll")).arg(qtCoreLibraryDir);
- libraryFiles << QString(QLatin1String("%1/QtCore4d.dll")).arg(qtCoreLibraryDir);
+ libraryFiles << QString::fromLatin1("%1/QtCore4.dll").arg(qtCoreLibraryDir);
+ libraryFiles << QString::fromLatin1("%1/QtCore4d.dll").arg(qtCoreLibraryDir);
#else
libraryFiles << qtCoreLibraryDir + QLatin1String("/libQtCore.so");
#endif
diff --git a/installerbuilder/libinstaller/setpluginpathonqtcoreoperation.cpp b/installerbuilder/libinstaller/setpluginpathonqtcoreoperation.cpp
index 6fb601a0c..88c4376fe 100644
--- a/installerbuilder/libinstaller/setpluginpathonqtcoreoperation.cpp
+++ b/installerbuilder/libinstaller/setpluginpathonqtcoreoperation.cpp
@@ -111,8 +111,8 @@ bool SetPluginPathOnQtCoreOperation::performOperation()
}
QStringList libraryFiles;
#ifdef Q_OS_WIN
- libraryFiles << QString(QLatin1String("%1/QtCore4.dll")).arg(qtCoreLibraryDir);
- libraryFiles << QString(QLatin1String("%1/QtCore4d.dll")).arg(qtCoreLibraryDir);
+ libraryFiles << QString::fromLatin1("%1/QtCore4.dll").arg(qtCoreLibraryDir);
+ libraryFiles << QString::fromLatin1("%1/QtCore4d.dll").arg(qtCoreLibraryDir);
#else
libraryFiles << qtCoreLibraryDir + QLatin1String("/libQtCore.so");
#endif