summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-05-16 19:16:09 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-05-16 19:16:09 +0200
commit1eb34a308dd956517a48487008653343c72e3a93 (patch)
tree733edd5987bf83764383a75b39e0dae8354f5e46 /installerbuilder/libinstaller
parent6391f4a773c66b768f70133e628544db0af67a58 (diff)
some flow control spaces
Diffstat (limited to 'installerbuilder/libinstaller')
-rw-r--r--installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp4
-rw-r--r--installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp12
2 files changed, 8 insertions, 8 deletions
diff --git a/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp b/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp
index 6a980c44b..6d53ab644 100644
--- a/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp
+++ b/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp
@@ -54,7 +54,7 @@ QHash<QString, QVariantMap> QtCreatorPersistentSettings::readValidToolChains()
//gets the path variable, hope ".Path" will stay in QtCreator
QStringList pathContainingKeyList = QStringList(toolChainMap.keys()).filter(QLatin1String(
".Path"));
- foreach(const QString& pathKey, pathContainingKeyList) {
+ foreach (const QString& pathKey, pathContainingKeyList) {
QString path = toolChainMap.value(pathKey).toString();
if (!path.isEmpty() && QFile::exists(path)) {
toolChainHash.insert(path, toolChainMap);
@@ -149,7 +149,7 @@ bool QtCreatorPersistentSettings::save()
QHashIterator<QString, QString> it(m_abiToDebuggerHash);
int debuggerCounter = 0;
- while(it.hasNext()) {
+ while (it.hasNext()) {
it.next();
const QString abiKey = QString::fromLatin1(DEFAULT_DEBUGGER_ABI_KEY) + QString::number(
debuggerCounter);
diff --git a/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp b/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp
index 9ce3b7c71..e503ababe 100644
--- a/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp
+++ b/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp
@@ -75,10 +75,10 @@ void removeInstallerRegisteredQtVersions(QSettings &settings, const QStringList
//get the installer added Qt Version settings ids
QList<int> toRemoveIds;
QHashIterator<QString, QVariant> it(oldSettingsAsHash);
- while(it.hasNext()) {
+ while (it.hasNext()) {
it.next();
- if(it.key().endsWith(QLatin1String("QMakePath")) && !it.value().toString().isEmpty()) {
- foreach(const QString &toRemoveQmakePath, qmakePathes) {
+ if (it.key().endsWith(QLatin1String("QMakePath")) && !it.value().toString().isEmpty()) {
+ foreach (const QString &toRemoveQmakePath, qmakePathes) {
if (QFileInfo(it.value().toString()) == QFileInfo(toRemoveQmakePath)) {
int firstNoDigitCharIndex = it.key().indexOf(QRegExp(QLatin1String("[^0-9]")));
QString numberAtTheBeginning = it.key().left(firstNoDigitCharIndex);
@@ -92,7 +92,7 @@ void removeInstallerRegisteredQtVersions(QSettings &settings, const QStringList
it.toFront();
QHash<int, int> qtVersionIdMapper; //old, new
int newVersionId = 1;
- while(it.hasNext()) {
+ while (it.hasNext()) {
it.next();
settings.remove(it.key());
int firstNoDigitCharIndex = it.key().indexOf(QRegExp(QLatin1String("[^0-9]")));
@@ -209,7 +209,7 @@ void convertDefaultGDBInstallerSettings(QSettings &settings)
QString gdbTypesAsCommaSeperatedString = oldValue.mid(oldValue.indexOf(QLatin1String(",")));
QStringList gdbTypeList = gdbTypesAsCommaSeperatedString.split(QLatin1String(","));
- foreach(const QString &gdbType, gdbTypeList) {
+ foreach (const QString &gdbType, gdbTypeList) {
if (gdbType == QLatin1String("0")) {
abiToDefaultDebuggerHash.insert(QLatin1String("x86-linux-generic-elf-64bit"), gdbBinaryPath);
abiToDefaultDebuggerHash.insert(QLatin1String("x86-linux-generic-elf-32bit"), gdbBinaryPath);
@@ -230,7 +230,7 @@ void convertDefaultGDBInstallerSettings(QSettings &settings)
QInstaller::RegisterDefaultDebuggerOperation operation;
QHashIterator<QString, QString> it(abiToDefaultDebuggerHash);
- while(it.hasNext()) {
+ while (it.hasNext()) {
it.next();
operation.setArguments(QStringList() << it.key() << it.value());
bool result = operation.performOperation();