From 9ca938ebdffaa8d94394851c4ea8067152c1e4d0 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 25 Nov 2013 18:41:02 +0200 Subject: Braces cleanup Change-Id: I6ed221814912d80c6fdf41276d521b4da2345df2 Reviewed-by: Christian Kandeler --- src/app/config/configcommandlineparser.cpp | 11 +++++------ src/app/detect-toolchains/probe.cpp | 5 ++--- src/app/qbs/parser/commandlineparser.cpp | 3 +-- src/lib/buildgraph/automoc.cpp | 5 ++--- src/lib/buildgraph/command.cpp | 5 ++--- src/lib/jsextensions/textfile.cpp | 7 +++---- src/lib/language/language.cpp | 3 +-- src/lib/tools/scripttools.cpp | 5 ++--- tests/manual/minimumSystemVersion/main.cpp | 3 +-- 9 files changed, 19 insertions(+), 28 deletions(-) diff --git a/src/app/config/configcommandlineparser.cpp b/src/app/config/configcommandlineparser.cpp index b21561e6a..f240915a0 100644 --- a/src/app/config/configcommandlineparser.cpp +++ b/src/app/config/configcommandlineparser.cpp @@ -52,17 +52,16 @@ void ConfigCommandLineParser::parse(const QStringList &commandLine) while (!args.isEmpty() && args.first().startsWith("--")) { const QString arg = args.takeFirst().mid(2); - if (arg == "list") { + if (arg == "list") setCommand(ConfigCommand::CfgList); - } else if (arg == "unset") { + else if (arg == "unset") setCommand(ConfigCommand::CfgUnset); - } else if (arg == "export") { + else if (arg == "export") setCommand(ConfigCommand::CfgExport); - } else if (arg == "import") { + else if (arg == "import") setCommand(ConfigCommand::CfgImport); - } else { + else throw ErrorInfo("Unknown option for config command."); - } } switch (command().command) { diff --git a/src/app/detect-toolchains/probe.cpp b/src/app/detect-toolchains/probe.cpp index 08f82a931..035186ec8 100644 --- a/src/app/detect-toolchains/probe.cpp +++ b/src/app/detect-toolchains/probe.cpp @@ -133,11 +133,10 @@ static void specific_probe(Settings *settings, QList &profiles, QString } architecture = compilerTripletl.at(0); - if (architecture.contains("arm")) { + if (architecture.contains("arm")) endianness = "big"; - } else { + else endianness = "little"; - } QStringList pathToGccL = pathToGcc.split('/'); QString compilerName = pathToGccL.takeLast().replace(cc, cxx); diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index 40c0fa3e2..3cd364dcd 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -359,9 +359,8 @@ void CommandLineParser::CommandLineParserPrivate::doParse() Command *CommandLineParser::CommandLineParserPrivate::commandFromString(const QString &commandString) const { foreach (Command * const command, allCommands()) { - if (command->representation() == commandString) { + if (command->representation() == commandString) return command; - } } return 0; } diff --git a/src/lib/buildgraph/automoc.cpp b/src/lib/buildgraph/automoc.cpp index 60a1ae318..d3a657669 100644 --- a/src/lib/buildgraph/automoc.cpp +++ b/src/lib/buildgraph/automoc.cpp @@ -97,11 +97,10 @@ void AutoMoc::apply(const ResolvedProductPtr &product) bool alreadyMocced = isVictimOfMoc(artifact, fileType, mocFileTag); bool hasQObjectMacro; scan(artifact, fileType, hasQObjectMacro, includedMocCppFiles); - if (hasQObjectMacro && !alreadyMocced) { + if (hasQObjectMacro && !alreadyMocced) artifactsToMoc += qMakePair(artifact, fileType); - } else if (!hasQObjectMacro && alreadyMocced) { + else if (!hasQObjectMacro && alreadyMocced) unmoc(artifact, mocFileTag); - } } Artifact *pluginHeaderFile = 0; diff --git a/src/lib/buildgraph/command.cpp b/src/lib/buildgraph/command.cpp index 456ca0d7c..c916d048f 100644 --- a/src/lib/buildgraph/command.cpp +++ b/src/lib/buildgraph/command.cpp @@ -259,11 +259,10 @@ void JavaScriptCommand::fillFromScriptValue(const QScriptValue *scriptValue, con m_codeLocation = codeLocation; AbstractCommand::fillFromScriptValue(scriptValue, codeLocation); QScriptValue sourceCode = scriptValue->property("sourceCode"); - if (sourceCode.isFunction()) { + if (sourceCode.isFunction()) m_sourceCode = "(" + sourceCode.toString() + ")()"; - } else { + else m_sourceCode = sourceCode.toString(); - } static QSet predefinedProperties = QSet() << "description" << "highlight" << "silent" << "className" << "sourceCode"; diff --git a/src/lib/jsextensions/textfile.cpp b/src/lib/jsextensions/textfile.cpp index 794f5e4e9..70b5a1009 100644 --- a/src/lib/jsextensions/textfile.cpp +++ b/src/lib/jsextensions/textfile.cpp @@ -91,13 +91,12 @@ TextFile::TextFile(QScriptContext *context, const QString &file, OpenMode mode, t->qfile = new QFile(file); QIODevice::OpenMode m = QIODevice::ReadOnly; - if (mode == ReadWrite) { + if (mode == ReadWrite) m = QIODevice::ReadWrite; - } else if (mode == ReadOnly) { + else if (mode == ReadOnly) m = QIODevice::ReadOnly; - } else if (mode == WriteOnly) { + else if (mode == WriteOnly) m = QIODevice::WriteOnly; - } if (Q_UNLIKELY(!t->qfile->open(m))) { delete t->qfile; t->qfile = 0; diff --git a/src/lib/language/language.cpp b/src/lib/language/language.cpp index 6e5462930..02a17525d 100644 --- a/src/lib/language/language.cpp +++ b/src/lib/language/language.cpp @@ -405,9 +405,8 @@ FileTags ResolvedProduct::fileTagsForFileName(const QString &fileName) const { FileTags result; foreach (FileTaggerConstPtr tagger, fileTaggers) { - if (FileInfo::globMatches(tagger->artifactExpression(), fileName)) { + if (FileInfo::globMatches(tagger->artifactExpression(), fileName)) result.unite(tagger->fileTags()); - } } return result; } diff --git a/src/lib/tools/scripttools.cpp b/src/lib/tools/scripttools.cpp index c6de25613..134f0aa1b 100644 --- a/src/lib/tools/scripttools.cpp +++ b/src/lib/tools/scripttools.cpp @@ -72,11 +72,10 @@ void setConfigProperty(QVariantMap &cfg, const QStringList &name, const QVariant QVariant getConfigProperty(const QVariantMap &cfg, const QStringList &name) { - if (name.length() == 1) { + if (name.length() == 1) return cfg.value(name.first()); - } else { + else return getConfigProperty(cfg.value(name.first()).toMap(), name.mid(1)); - } } QString toJSLiteral(const bool b) diff --git a/tests/manual/minimumSystemVersion/main.cpp b/tests/manual/minimumSystemVersion/main.cpp index 87dc09203..dab68af7e 100644 --- a/tests/manual/minimumSystemVersion/main.cpp +++ b/tests/manual/minimumSystemVersion/main.cpp @@ -27,9 +27,8 @@ int main(int argc, char *argv[]) while (dumpbin.waitForReadyRead()) { while (dumpbin.canReadLine()) { QString line = dumpbin.readLine(); - if (line.contains("version")) { + if (line.contains("version")) out << line.trimmed() << "\n"; - } } } -- cgit v1.2.3