Remove braces for single lines of conditions

#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>

src/libs/3rdparty/cplusplus/Bind.cpp

@@ -129,9 +129,8 @@ void Bind::setDeclSpecifiers(Symbol *symbol, const FullySpecifiedType &declSpeci
     symbol->setStorage(storage);
 
     if (Function *funTy = symbol->asFunction()) {
-        if (declSpecifiers.isVirtual()) {
+        if (declSpecifiers.isVirtual())
             funTy->setVirtual(true);
-        }
     }
 
     if (declSpecifiers.isDeprecated())
@@ -466,9 +465,8 @@ void Bind::enumerator(EnumeratorAST *ast, Enum *symbol)
         EnumeratorDeclaration *e = control()->newEnumeratorDeclaration(ast->identifier_token, name);
         e->setType(control()->integerType(IntegerType::Int)); // ### introduce IntegerType::Enumerator
 
-        if (ExpressionAST *expr = ast->expression) {
+        if (ExpressionAST *expr = ast->expression)
             e->setConstantValue(asStringLiteral(expr->firstToken(), expr->lastToken()));
-        }
 
         symbol->addMember(e);
     }
@@ -1845,9 +1843,8 @@ bool Bind::visit(SimpleDeclarationAST *ast)
 
         const Name *declName = 0;
         unsigned sourceLocation = location(it->value, ast->firstToken());
-        if (declaratorId && declaratorId->name) {
+        if (declaratorId && declaratorId->name)
             declName = declaratorId->name->name;
-        }
 
         Declaration *decl = control()->newDeclaration(sourceLocation, declName);
         decl->setType(declTy);

src/libs/3rdparty/cplusplus/Literals.cpp

@@ -206,9 +206,8 @@ bool Identifier::isEqualTo(const Name *other) const
         return true;
 
     else if (other) {
-        if (const Identifier *nameId = other->asNameId()) {
+        if (const Identifier *nameId = other->asNameId())
             return equalTo(nameId);
-        }
     }
     return false;
 }

src/libs/3rdparty/cplusplus/Parser.cpp

@@ -898,9 +898,8 @@ bool Parser::parseConversionFunctionId(NameAST *&node)
         return false;
     unsigned operator_token = consumeToken();
     SpecifierListAST *type_specifier = 0;
-    if (! parseTypeSpecifier(type_specifier)) {
+    if (! parseTypeSpecifier(type_specifier))
         return false;
-    }
     PtrOperatorListAST *ptr_operators = 0, **ptr_operators_tail = &ptr_operators;
     while (parsePtrOperator(*ptr_operators_tail))
         ptr_operators_tail = &(*ptr_operators_tail)->next;
@@ -1550,9 +1549,8 @@ bool Parser::parseDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specif
                 for (SpecifierListAST *iter = decl_specifier_list; !hasAuto && iter; iter = iter->next) {
                     SpecifierAST *spec = iter->value;
                     if (SimpleSpecifierAST *simpleSpec = spec->asSimpleSpecifier()) {
-                        if (_translationUnit->tokenKind(simpleSpec->specifier_token) == T_AUTO) {
+                        if (_translationUnit->tokenKind(simpleSpec->specifier_token) == T_AUTO)
                             hasAuto = true;
-                        }
                     }
                 }
 
@@ -1567,9 +1565,8 @@ bool Parser::parseDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specif
         } else if (LA() == T_LBRACKET) {
             ArrayDeclaratorAST *ast = new (_pool) ArrayDeclaratorAST;
             ast->lbracket_token = consumeToken();
-            if (LA() == T_RBRACKET || parseConstantExpression(ast->expression)) {
+            if (LA() == T_RBRACKET || parseConstantExpression(ast->expression))
                 match(T_RBRACKET, &ast->rbracket_token);
-            }
             *postfix_ptr = new (_pool) PostfixDeclaratorListAST(ast);
             postfix_ptr = &(*postfix_ptr)->next;
         } else
@@ -1715,9 +1712,8 @@ bool Parser::parseEnumSpecifier(SpecifierListAST *&node)
                     skipUntil(T_IDENTIFIER);
                 }
 
-                if (parseEnumerator(*enumerator_ptr)) {
+                if (parseEnumerator(*enumerator_ptr))
                     enumerator_ptr = &(*enumerator_ptr)->next;
-                }
 
                 if (LA() == T_COMMA && LA(2) == T_RBRACE)
                     ast->stray_comma_token = consumeToken();
@@ -2182,11 +2178,10 @@ bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node)
 
         SimpleNameAST *property_name = new (_pool) SimpleNameAST;
         // special case: keywords are allowed for property names!
-        if (tok().isKeyword()) {
+        if (tok().isKeyword())
             property_name->identifier_token = consumeToken();
-        } else {
+        else
             match(T_IDENTIFIER, &property_name->identifier_token);
-        }
 
         ast->property_name = property_name;
         QtPropertyDeclarationItemListAST **iter = &ast->property_declaration_item_list;
@@ -3484,11 +3479,10 @@ bool Parser::parseForStatement(StatementAST *&node)
             ast->colon_token = consumeToken();
             blockErrors(blocked);
 
-            if (LA() == T_LBRACE) {
+            if (LA() == T_LBRACE)
                 parseBracedInitList0x(ast->expression);
-            } else {
+            else
                 parseExpression(ast->expression);
-            }
             match(T_RPAREN, &ast->rparen_token);
             parseStatement(ast->statement);
 
@@ -5093,11 +5087,10 @@ bool Parser::parseNewArrayDeclarator(NewArrayDeclaratorListAST *&node)
 bool Parser::parseNewInitializer(ExpressionAST *&node)
 {
     DEBUG_THIS_RULE();
-    if (LA() == T_LPAREN) {
+    if (LA() == T_LPAREN)
         return parseExpressionListParen(node);
-    } else if (_cxx0xEnabled && LA() == T_LBRACE) {
+    else if (_cxx0xEnabled && LA() == T_LBRACE)
         return parseBracedInitList0x(node);
-    }
     return false;
 }
 
@@ -5787,9 +5780,8 @@ bool Parser::parseObjCMethodDefinition(DeclarationAST *&node)
     // - (void) foo; { body; }
     // so a method is a forward declaration when it doesn't have a _body_.
     // However, we still need to read the semicolon.
-    if (LA() == T_SEMICOLON) {
+    if (LA() == T_SEMICOLON)
         ast->semicolon_token = consumeToken();
-    }
 
     parseFunctionBody(ast->function_body);
 

src/libs/3rdparty/cplusplus/Templates.cpp

@@ -499,9 +499,8 @@ Symbol *Clone::instantiate(Template *templ, const FullySpecifiedType *const args
     if (argc < templ->templateParameterCount()) {
         for (unsigned i = argc; i < templ->templateParameterCount(); ++i) {
             Symbol *formal = templ->templateParameterAt(i);
-            if (TypenameArgument *tn = formal->asTypenameArgument()) {
+            if (TypenameArgument *tn = formal->asTypenameArgument())
                 subst.bind(name(formal->name(), &subst), type(tn->type(), &subst));
-            }
         }
     }
     if (Symbol *inst = symbol(templ->declaration(), &subst)) {

src/libs/cplusplus/CppDocument.cpp

@@ -89,9 +89,8 @@ protected:
     bool preVisit(Symbol *s)
     {
         if (s->asBlock()) {
-            if (s->line() < line || (s->line() == line && s->column() <= column)) {
+            if (s->line() < line || (s->line() == line && s->column() <= column))
                 return true;
-            }
             // skip blocks
         } if (s->line() < line || (s->line() == line && s->column() <= column)) {
             symbol = s;
@@ -594,13 +593,12 @@ void Document::check(CheckMode mode)
     if (! _translationUnit->ast())
         return; // nothing to do.
 
-    if (TranslationUnitAST *ast = _translationUnit->ast()->asTranslationUnit()) {
+    if (TranslationUnitAST *ast = _translationUnit->ast()->asTranslationUnit())
         semantic(ast, _globalNamespace);
-    } else if (ExpressionAST *ast = _translationUnit->ast()->asExpression()) {
+    else if (ExpressionAST *ast = _translationUnit->ast()->asExpression())
         semantic(ast, _globalNamespace);
-    } else if (DeclarationAST *ast = translationUnit()->ast()->asDeclaration()) {
+    else if (DeclarationAST *ast = translationUnit()->ast()->asDeclaration())
         semantic(ast, _globalNamespace);
-    }
 }
 
 void Document::keepSourceAndAST()

src/libs/cplusplus/CppRewriter.cpp

@@ -406,9 +406,8 @@ FullySpecifiedType UseMinimalNames::apply(const Name *name, Rewrite *rewrite) co
 
     const QList<LookupItem> results = context.lookup(name, scope);
     foreach (const LookupItem &r, results) {
-        if (Symbol *d = r.declaration()) {
+        if (Symbol *d = r.declaration())
             return control->namedType(LookupContext::minimalName(d, _target, control));
-        }
 
         return r.type();
     }
@@ -605,9 +604,8 @@ CPLUSPLUS_EXPORT QString simplifySTLType(const QString &typeIn)
                 QRegExp mapRE2(QString::fromLatin1("map<const %1, ?%2, ?std::less<const %3>, ?%4\\s*>")
                     .arg(keyEsc, valueEsc, keyEsc, allocEsc));
                 mapRE2.setMinimal(true);
-                if (mapRE2.indexIn(type) != -1) {
+                if (mapRE2.indexIn(type) != -1)
                     type.replace(mapRE2.cap(0), QString::fromLatin1("map<const %1, %2>").arg(key, value));
-                }
             }
         }
     }

src/libs/cplusplus/Dumpers.cpp

@@ -83,18 +83,14 @@ QString CPlusPlus::toString(const Symbol *s, QString id)
 QString CPlusPlus::toString(LookupItem it, QString id)
 {
     QString result = QString::fromLatin1("%1:").arg(id);
-    if (it.declaration()) {
+    if (it.declaration())
         result.append(QString::fromLatin1("\n%1").arg(indent(toString(it.declaration(), QLatin1String("Decl")))));
-    }
+    if (it.type().isValid())
-    if (it.type().isValid()) {
         result.append(QString::fromLatin1("\n%1").arg(indent(toString(it.type()))));
-    }
+    if (it.scope())
-    if (it.scope()) {
         result.append(QString::fromLatin1("\n%1").arg(indent(toString(it.scope(), QLatin1String("Scope")))));
-    }
+    if (it.binding())
-    if (it.binding()) {
         result.append(QString::fromLatin1("\n%1").arg(indent(toString(it.binding(), QLatin1String("Binding")))));
-    }
     return result;
 }
 
@@ -106,9 +102,8 @@ QString CPlusPlus::toString(const ClassOrNamespace *binding, QString id)
     QString result = QString::fromLatin1("%0: %1 symbols").arg(
                 id,
                 QString::number(binding->symbols().length()));
-    if (binding->templateId()) {
+    if (binding->templateId())
         result.append(QString::fromLatin1("\n%1").arg(indent(toString(binding->templateId(), QLatin1String("Template")))));
-    }
     return result;
 }
 

src/libs/cplusplus/ExpressionUnderCursor.cpp

@@ -98,11 +98,10 @@ int ExpressionUnderCursor::startOfExpression_helper(BackwardsScanner &tk, int in
         return index - 1;
     } else if (tk[index - 1].is(T_IDENTIFIER)) {
         if (tk[index - 2].is(T_TILDE)) {
-            if (tk[index - 3].is(T_COLON_COLON)) {
+            if (tk[index - 3].is(T_COLON_COLON))
                 return startOfExpression(tk, index - 3);
-            } else if (tk[index - 3].is(T_DOT) || tk[index - 3].is(T_ARROW)) {
+            else if (tk[index - 3].is(T_DOT) || tk[index - 3].is(T_ARROW))
                 return startOfExpression(tk, index - 3);
-            }
             return index - 2;
         } else if (tk[index - 2].is(T_COLON_COLON)) {
             return startOfExpression(tk, index - 1);

src/libs/cplusplus/Icons.cpp

@@ -88,13 +88,12 @@ Icons::IconType Icons::iconTypeForSymbol(const Symbol *symbol)
             function = symbol->type()->asFunctionType();
 
         if (function->isSlot()) {
-            if (function->isPublic()) {
+            if (function->isPublic())
                 return SlotPublicIconType;
-            } else if (function->isProtected()) {
+            else if (function->isProtected())
                 return SlotProtectedIconType;
-            } else if (function->isPrivate()) {
+            else if (function->isPrivate())
                 return SlotPrivateIconType;
-            }
         } else if (function->isSignal()) {
             return SignalIconType;
         } else if (symbol->isPublic()) {
@@ -107,13 +106,12 @@ Icons::IconType Icons::iconTypeForSymbol(const Symbol *symbol)
     } else if (symbol->enclosingScope() && symbol->enclosingScope()->isEnum()) {
         return EnumeratorIconType;
     } else if (symbol->isDeclaration() || symbol->isArgument()) {
-        if (symbol->isPublic()) {
+        if (symbol->isPublic())
             return VarPublicIconType;
-        } else if (symbol->isProtected()) {
+        else if (symbol->isProtected())
             return VarProtectedIconType;
-        } else if (symbol->isPrivate()) {
+        else if (symbol->isPrivate())
             return VarPrivateIconType;
-        }
     } else if (symbol->isEnum()) {
         return EnumIconType;
     } else if (symbol->isClass() || symbol->isForwardClassDeclaration()) {

src/libs/cplusplus/LookupContext.cpp

@@ -643,13 +643,11 @@ ClassOrNamespace *ClassOrNamespace::lookupType_helper(const Name *name,
     if (const QualifiedNameId *q = name->asQualifiedNameId()) {
 
         QSet<ClassOrNamespace *> innerProcessed;
-        if (! q->base()) {
+        if (! q->base())
             return globalNamespace()->lookupType_helper(q->name(), &innerProcessed, true, origin);
-        }
 
-        if (ClassOrNamespace *binding = lookupType_helper(q->base(), processed, true, origin)) {
+        if (ClassOrNamespace *binding = lookupType_helper(q->base(), processed, true, origin))
             return binding->lookupType_helper(q->name(), &innerProcessed, false, origin);
-        }
 
         return 0;
 
@@ -966,9 +964,8 @@ bool ClassOrNamespace::NestedClassInstantiator::containsTemplateType(Declaration
     NamedType *memberNamedType = findMemberNamedType(memberType);
     if (memberNamedType) {
         const Name *name = memberNamedType->name();
-        if (_subst.contains(name)) {
+        if (_subst.contains(name))
             return true;
-        }
     }
     return false;
 }
@@ -981,15 +978,12 @@ bool ClassOrNamespace::NestedClassInstantiator::containsTemplateType(Function *
 
 NamedType *ClassOrNamespace::NestedClassInstantiator::findMemberNamedType(Type *memberType) const
 {
-    if (NamedType *namedType = memberType->asNamedType()) {
+    if (NamedType *namedType = memberType->asNamedType())
         return namedType;
-    }
+    else if (PointerType *pointerType = memberType->asPointerType())
-    else if (PointerType *pointerType = memberType->asPointerType()) {
         return findMemberNamedType(pointerType->elementType().type());
-    }
+    else if (ReferenceType *referenceType = memberType->asReferenceType())
-    else if (ReferenceType *referenceType = memberType->asReferenceType()) {
         return findMemberNamedType(referenceType->elementType().type());
-    }
 
     return 0;
 }

src/libs/cplusplus/OverviewModel.cpp

@@ -123,9 +123,8 @@ int OverviewModel::rowCount(const QModelIndex &parent) const
                     parentSymbol = templateParentSymbol;
 
             if (Scope *parentScope = parentSymbol->asScope()) {
-                if (!parentScope->isFunction() && !parentScope->isObjCMethod()) {
+                if (!parentScope->isFunction() && !parentScope->isObjCMethod())
                     return parentScope->memberCount();
-                }
             }
             return 0;
         }

src/libs/cplusplus/ResolveExpression.cpp

@@ -357,9 +357,8 @@ void ResolveExpression::thisObject()
 bool ResolveExpression::visit(CompoundExpressionAST *ast)
 {
     CompoundStatementAST *cStmt = ast->statement;
-    if (cStmt && cStmt->statement_list) {
+    if (cStmt && cStmt->statement_list)
         accept(cStmt->statement_list->lastValue());
-    }
     return false;
 }
 

src/libs/cplusplus/pp-engine.cpp

@@ -368,9 +368,8 @@ protected:
                                                     env, client)
                                     != 0);
                     ++(*_lex);
-                    if ((*_lex)->is(T_RPAREN)) {
+                    if ((*_lex)->is(T_RPAREN))
                         ++(*_lex);
-                    }
                 }
             }
         } else if ((*_lex)->is(T_IDENTIFIER)) {
@@ -1539,9 +1538,8 @@ void Preprocessor::handleDefineDirective(PPToken *tk)
                 }
             }
         } else if (macroReference) {
-            if (tk->is(T_LPAREN)) {
+            if (tk->is(T_LPAREN))
                 m_client->notifyMacroReference(previousOffset, previousLine, *macroReference);
-            }
             macroReference = 0;
         }
 

src/libs/extensionsystem/optionsparser.cpp

@@ -174,9 +174,8 @@ bool OptionsParser::checkForPluginOption()
     if (!spec)
         return false;
     spec->addArgument(m_currentArg);
-    if (requiresParameter && nextToken(RequiredToken)) {
+    if (requiresParameter && nextToken(RequiredToken))
         spec->addArgument(m_currentArg);
-    }
     return true;
 }
 

src/libs/extensionsystem/pluginmanager.cpp

@@ -335,9 +335,8 @@ bool PluginManager::hasError()
 {
     foreach (PluginSpec *spec, plugins()) {
         // only show errors on startup if plugin is enabled.
-        if (spec->hasError() && spec->isEnabled() && !spec->isDisabledIndirectly()) {
+        if (spec->hasError() && spec->isEnabled() && !spec->isDisabledIndirectly())
             return true;
-        }
     }
     return false;
 }
@@ -505,11 +504,10 @@ QString PluginManager::serializedArguments()
         foreach (const QString &argument, m_instance->d->arguments) {
             rc += separator;
             const QFileInfo fi(argument);
-            if (fi.exists() && fi.isRelative()) {
+            if (fi.exists() && fi.isRelative())
                 rc += fi.absoluteFilePath();
-            } else {
+            else
                 rc += argument;
-            }
         }
     }
     return rc;
@@ -857,9 +855,8 @@ void PluginManagerPrivate::writeSettings()
 */
 void PluginManagerPrivate::readSettings()
 {
-    if (globalSettings) {
+    if (globalSettings)
         defaultDisabledPlugins = globalSettings->value(QLatin1String(C_IGNORED_PLUGINS)).toStringList();
-    }
     if (settings) {
         disabledPlugins = settings->value(QLatin1String(C_IGNORED_PLUGINS)).toStringList();
         forceEnabledPlugins = settings->value(QLatin1String(C_FORCEENABLED_PLUGINS)).toStringList();
@@ -996,9 +993,8 @@ void PluginManagerPrivate::shutdown()
         shutdownEventLoop->exec();
     }
     deleteAll();
-    if (!allObjects.isEmpty()) {
+    if (!allObjects.isEmpty())
         qDebug() << "There are" << allObjects.size() << "objects left in the plugin manager pool: " << allObjects;
-    }
 }
 
 /*!
@@ -1270,11 +1266,10 @@ void PluginManagerPrivate::profilingReport(const char *what, const PluginSpec *s
         const int absoluteElapsedMS = m_profileTimer->elapsed();
         const int elapsedMS = absoluteElapsedMS - m_profileElapsedMS;
         m_profileElapsedMS = absoluteElapsedMS;
-        if (spec) {
+        if (spec)
             qDebug("%-22s %-22s %8dms (%8dms)", what, qPrintable(spec->name()), absoluteElapsedMS, elapsedMS);
-        } else {
+        else
             qDebug("%-45s %8dms (%8dms)", what, absoluteElapsedMS, elapsedMS);
-        }
     }
 }
 

src/libs/extensionsystem/pluginspec.cpp

@@ -667,11 +667,10 @@ void PluginSpecPrivate::readArgumentDescriptions(QXmlStreamReader &reader)
         switch (reader.tokenType()) {
         case QXmlStreamReader::StartElement:
             element = reader.name().toString();
-            if (element == QLatin1String(ARGUMENT)) {
+            if (element == QLatin1String(ARGUMENT))
                 readArgumentDescription(reader);
-            } else {
+            else
                 reader.raiseError(msgInvalidElement(name));
-            }
             break;
         case QXmlStreamReader::Comment:
         case QXmlStreamReader::Characters:
@@ -720,11 +719,10 @@ void PluginSpecPrivate::readDependencies(QXmlStreamReader &reader)
         switch (reader.tokenType()) {
         case QXmlStreamReader::StartElement:
             element = reader.name().toString();
-            if (element == QLatin1String(DEPENDENCY)) {
+            if (element == QLatin1String(DEPENDENCY))
                 readDependencyEntry(reader);
-            } else {
+            else
                 reader.raiseError(msgInvalidElement(name));
-            }
             break;
         case QXmlStreamReader::Comment:
         case QXmlStreamReader::Characters:
@@ -1019,9 +1017,8 @@ bool PluginSpecPrivate::delayedInitialize()
 {
     if (hasError)
         return false;
-    if (state != PluginSpec::Running) {
+    if (state != PluginSpec::Running)
         return false;
-    }
     if (!plugin) {
         errorString = QCoreApplication::translate("PluginSpec", "Internal error: have no plugin instance to perform delayedInitialize");
         hasError = true;

src/libs/glsl/glslsemantic.cpp

@@ -184,11 +184,10 @@ bool Semantic::visit(StructTypeAST::Field *ast)
 bool Semantic::visit(IdentifierExpressionAST *ast)
 {
     if (ast->name) {
-        if (Symbol *s = _scope->lookup(*ast->name)) {
+        if (Symbol *s = _scope->lookup(*ast->name))
             _expr.type = s->type();
-        } else {
+        else
             _engine->error(ast->lineno, QString::fromLatin1("`%1' was not declared in this scope").arg(*ast->name));
-        }
     }
     return false;
 }
@@ -291,17 +290,15 @@ bool Semantic::visit(MemberAccessExpressionAST *ast)
     ExprResult expr = expression(ast->expr);
     if (expr.type && ast->field) {
         if (const VectorType *vecTy = expr.type->asVectorType()) {
-            if (Symbol *s = vecTy->find(*ast->field)) {
+            if (Symbol *s = vecTy->find(*ast->field))
                 _expr.type = s->type();
-            } else {
+            else
                 _engine->error(ast->lineno, QString::fromLatin1("`%1' has no member named `%2'").arg(vecTy->name()).arg(*ast->field));
-            }
         } else if (const Struct *structTy = expr.type->asStructType()) {
-            if (Symbol *s = structTy->find(*ast->field)) {
+            if (Symbol *s = structTy->find(*ast->field))
                 _expr.type = s->type();
-            } else {
+            else
                 _engine->error(ast->lineno, QString::fromLatin1("`%1' has no member named `%2'").arg(structTy->name()).arg(*ast->field));
-            }
         } else {
             _engine->error(ast->lineno, QString::fromLatin1("Requested for member `%1', in a non class or vec instance").arg(*ast->field));
         }

src/libs/qmldebug/declarativetoolsclient.cpp

@@ -173,13 +173,12 @@ void DeclarativeToolsClient::messageReceived(const QByteArray &message)
 
         log(LogReceive, type, QString::number(toolId));
 
-        if (toolId == Constants::ZoomMode) {
+        if (toolId == Constants::ZoomMode)
             emit zoomToolActivated();
-        } else if (toolId == Constants::SelectionToolMode) {
+        else if (toolId == Constants::SelectionToolMode)
             emit selectToolActivated();
-        } else if (toolId == Constants::MarqueeSelectionToolMode) {
+        else if (toolId == Constants::MarqueeSelectionToolMode)
             emit selectMarqueeToolActivated();
-        }
         break;
     }
     case InspectorProtocol::AnimationSpeedChanged: {

src/libs/qmldebug/qmldebugclient.cpp

@@ -203,11 +203,10 @@ void QmlDebugConnectionPrivate::readyRead()
 
             QHash<QString, QmlDebugClient *>::Iterator iter =
                     plugins.find(name);
-            if (iter == plugins.end()) {
+            if (iter == plugins.end())
                 qWarning() << "QML Debug Client: Message received for missing plugin" << name;
-            } else {
+            else
                 (*iter)->messageReceived(message);
-            }
         }
     }
 }

src/libs/qmldebug/qmlprofilertraceclient.cpp

@@ -118,9 +118,8 @@ void QmlProfilerTraceClient::setRecording(bool v)
 
     d->recording = v;
 
-    if (status() == Enabled) {
+    if (status() == Enabled)
         sendRecordingStatus();
-    }
 
     emit recordingChanged(v);
 }
@@ -225,9 +224,8 @@ void QmlProfilerTraceClient::messageReceived(const QByteArray &data)
             if (!stream.atEnd())
                 stream >> column;
 
-            if (d->rangeCount[range] > 0) {
+            if (d->rangeCount[range] > 0)
                 d->rangeLocations[range].push(QmlEventLocation(fileName, line, column));
-            }
         } else {
             if (d->rangeCount[range] > 0) {
                 --d->rangeCount[range];

src/libs/qmldebug/qv8profilerclient.cpp

@@ -57,11 +57,10 @@ void QV8ProfilerClientPrivate::sendRecordingStatus()
     QByteArray option("");
     QByteArray title("");
 
-    if (recording) {
+    if (recording)
         option = "start";
-    } else {
+    else
         option = "stop";
-    }
     stream << cmd << option << title;
     q->sendMessage(ba);
 }
@@ -108,9 +107,8 @@ void QV8ProfilerClient::setRecording(bool v)
 
     d->recording = v;
 
-    if (status() == Enabled) {
+    if (status() == Enabled)
         sendRecordingStatus();
-    }
 
     emit recordingChanged(v);
 }

src/libs/qmleditorwidgets/contextpanetextwidget.cpp

@@ -169,17 +169,15 @@ void ContextPaneTextWidget::setProperties(QmlJS::PropertyReader *propertyReader)
         ui->strikeoutButton->setChecked(false);
     }
 
-    if (propertyReader->hasProperty(QLatin1String("color"))) {
+    if (propertyReader->hasProperty(QLatin1String("color")))
         ui->colorButton->setColor(propertyReader->readProperty(QLatin1String("color")).toString());
-    } else {
+    else
         ui->colorButton->setColor(QLatin1String("black"));
-    }
 
-    if (propertyReader->hasProperty(QLatin1String("styleColor"))) {
+    if (propertyReader->hasProperty(QLatin1String("styleColor")))
         ui->textColorButton->setColor(propertyReader->readProperty(QLatin1String("styleColor")).toString());
-    } else {
+    else
         ui->textColorButton->setColor(QLatin1String("black"));
-    }
 
     if (propertyReader->hasProperty(QLatin1String("font.family"))) {
         QString familyName = propertyReader->readProperty(QLatin1String("font.family")).toString();
@@ -310,11 +308,10 @@ void ContextPaneTextWidget::onFontSizeChanged(int)
 void ContextPaneTextWidget::onFontFormatChanged()
 {
     int size = ui->fontSizeSpinBox->value();
-    if (ui->fontSizeSpinBox->isPointSize()) {
+    if (ui->fontSizeSpinBox->isPointSize())
         emit removeAndChangeProperty(QLatin1String("font.pixelSize"), QLatin1String("font.pointSize"), size, true);
-    } else {
+    else
         emit removeAndChangeProperty(QLatin1String("font.pointSize"), QLatin1String("font.pixelSize"), size, true);
-    }
 
 }
 

src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp

@@ -231,9 +231,8 @@ void ContextPaneWidgetRectangle::onBorderNoneClicked()
 
 void ContextPaneWidgetRectangle::onBorderSolidClicked()
 {
-    if (ui->borderSolid->isChecked()) {
+    if (ui->borderSolid->isChecked())
         emit propertyChanged(QLatin1String("border.color"), QLatin1String("\"black\""));
-    }
 }
 
 void ContextPaneWidgetRectangle::onGradientLineDoubleClicked(const QPoint &p)

src/libs/qmljs/qmljscheck.cpp

@@ -82,9 +82,8 @@ public:
             if (StringLiteral *stringLiteral = cast<StringLiteral *>(_ast)) {
                 const QString valueName = stringLiteral->value.toString();
 
-                if (!enumValue->keys().contains(valueName)) {
+                if (!enumValue->keys().contains(valueName))
                     setMessage(ErrInvalidEnumValue);
-                }
             } else if (! _rhsValue->asStringValue() && ! _rhsValue->asNumberValue()
                        && ! _rhsValue->asUnknownValue()) {
                 setMessage(ErrEnumValueMustBeStringOrNumber);
@@ -131,9 +130,8 @@ public:
                             fileName.prepend(QDir::separator());
                             fileName.prepend(_doc->path());
                         }
-                        if (!QFileInfo(fileName).exists()) {
+                        if (!QFileInfo(fileName).exists())
                             setMessage(WarnFileOrDirectoryDoesNotExist);
-                        }
                     }
                 }
             }
@@ -421,9 +419,8 @@ protected:
 
     bool visit(VariableStatement *ast)
     {
-        if (_seenNonDeclarationStatement) {
+        if (_seenNonDeclarationStatement)
             addMessage(HintDeclarationsShouldBeAtStartOfFunction, ast->declarationKindToken);
-        }
         return true;
     }
 
@@ -433,13 +430,12 @@ protected:
             return true;
         const QString &name = ast->name.toString();
 
-        if (_formalParameterNames.contains(name)) {
+        if (_formalParameterNames.contains(name))
             addMessage(WarnAlreadyFormalParameter, ast->identifierToken, name);
-        } else if (_declaredFunctions.contains(name)) {
+        else if (_declaredFunctions.contains(name))
             addMessage(WarnAlreadyFunction, ast->identifierToken, name);
-        } else if (_declaredVariables.contains(name)) {
+        else if (_declaredVariables.contains(name))
             addMessage(WarnDuplicateDeclaration, ast->identifierToken, name);
-        }
 
         if (_possiblyUndeclaredUses.contains(name)) {
             foreach (const SourceLocation &loc, _possiblyUndeclaredUses.value(name)) {
@@ -454,9 +450,8 @@ protected:
 
     bool visit(FunctionDeclaration *ast)
     {
-        if (_seenNonDeclarationStatement) {
+        if (_seenNonDeclarationStatement)
             addMessage(HintDeclarationsShouldBeAtStartOfFunction, ast->functionToken);
-        }
 
         return visit(static_cast<FunctionExpression *>(ast));
     }
@@ -467,13 +462,12 @@ protected:
             return false;
         const QString &name = ast->name.toString();
 
-        if (_formalParameterNames.contains(name)) {
+        if (_formalParameterNames.contains(name))
             addMessage(WarnAlreadyFormalParameter, ast->identifierToken, name);
-        } else if (_declaredVariables.contains(name)) {
+        else if (_declaredVariables.contains(name))
             addMessage(WarnAlreadyVar, ast->identifierToken, name);
-        } else if (_declaredFunctions.contains(name)) {
+        else if (_declaredFunctions.contains(name))
             addMessage(WarnDuplicateDeclaration, ast->identifierToken, name);
-        }
 
         if (FunctionDeclaration *decl = cast<FunctionDeclaration *>(ast)) {
             if (_possiblyUndeclaredUses.contains(name)) {
@@ -642,9 +636,8 @@ void Check::checkProperty(UiQualifiedId *qualifiedId)
 {
     const QString id = toString(qualifiedId);
     if (id.at(0).isLower()) {
-        if (m_propertyStack.top().contains(id)) {
+        if (m_propertyStack.top().contains(id))
             addMessage(ErrPropertiesCanOnlyHaveOneBinding, fullLocationForQualifiedId(qualifiedId));
-        }
         m_propertyStack.top().insert(id);
     }
 }
@@ -1155,9 +1148,8 @@ bool Check::visit(ExpressionStatement *ast)
             default: break;
             }
         }
-        if (!ok) {
+        if (!ok)
             ok = _inStatementBinding;
-        }
 
         if (!ok) {
             addMessage(WarnConfusingExpressionStatement,
@@ -1242,9 +1234,8 @@ void Check::checkNewExpression(ExpressionNode *ast)
     const QString name = functionName(ast, &location);
     if (name.isEmpty())
         return;
-    if (!name.at(0).isUpper()) {
+    if (!name.at(0).isUpper())
         addMessage(WarnNewWithLowercaseFunction, location);
-    }
 }
 
 void Check::checkBindingRhs(Statement *statement)
@@ -1261,9 +1252,8 @@ void Check::checkBindingRhs(Statement *statement)
 
 void Check::checkExtraParentheses(ExpressionNode *expression)
 {
-    if (NestedExpression *nested = cast<NestedExpression *>(expression)) {
+    if (NestedExpression *nested = cast<NestedExpression *>(expression))
         addMessage(HintExtraParentheses, nested->lparenToken);
-    }
 }
 
 void Check::addMessages(const QList<Message> &messages)
@@ -1311,9 +1301,8 @@ void Check::scanCommentsForAnnotations()
         const QString &comment = _doc->source().mid(commentLoc.begin(), commentLoc.length);
 
         // enable all checks annotation
-        if (comment.contains(QLatin1String("@enable-all-checks"))) {
+        if (comment.contains(QLatin1String("@enable-all-checks")))
             _enabledMessages = Message::allMessageTypes().toSet();
-        }
 
         // find all disable annotations
         int lastOffset = -1;

src/libs/qmljs/qmljscodeformatter.cpp

@@ -833,11 +833,10 @@ int CodeFormatter::column(int index) const
     const QChar tab = QLatin1Char('\t');
 
     for (int i = 0; i < index; i++) {
-        if (m_currentLine[i] == tab) {
+        if (m_currentLine[i] == tab)
             col = ((col / m_tabSize) + 1) * m_tabSize;
-        } else {
+        else
             col++;
-        }
     }
     return col;
 }
@@ -1318,9 +1317,8 @@ void QtStyleCodeFormatter::adjustIndent(const QList<Token> &tokens, int startLex
         break;
 
     case Colon:
-        if (topState.type == ternary_op) {
+        if (topState.type == ternary_op)
             *indentDepth -= 2;
-        }
         break;
 
     case Question:

src/libs/qmljs/qmljscompletioncontextfinder.cpp

@@ -238,9 +238,8 @@ void CompletionContextFinder::checkImport()
                     break;
                 }
             } else if (tokenString == QLatin1String("import")) {
-                if (state == Unknown || (state & ExpectImport)) {
+                if (state == Unknown || (state & ExpectImport))
                     m_inImport = true;
-                }
             } else {
                 if (state == Unknown || (state & ExpectAnyTarget)
                         || (state & ExpectTargetIdentifier)) {

src/libs/qmljs/qmljsdelta.cpp

@@ -61,9 +61,8 @@ private:
 
 bool BuildParentHash::preVisit(Node* ast)
 {
-    if (ast->uiObjectMemberCast()) {
+    if (ast->uiObjectMemberCast())
         stack.append(ast->uiObjectMemberCast());
-    }
     return true;
 }
 
@@ -71,9 +70,8 @@ void BuildParentHash::postVisit(Node* ast)
 {
     if (ast->uiObjectMemberCast()) {
         stack.removeLast();
-        if (!stack.isEmpty()) {
+        if (!stack.isEmpty())
             parent.insert(ast->uiObjectMemberCast(), stack.last());
-        }
     }
 }
 
@@ -291,9 +289,8 @@ static QString _propertyName(UiQualifiedId *id)
 static QString _methodName(UiSourceElement *source)
 {
     if (source) {
-        if (FunctionDeclaration *declaration = cast<FunctionDeclaration*>(source->sourceElement)) {
+        if (FunctionDeclaration *declaration = cast<FunctionDeclaration*>(source->sourceElement))
             return declaration->name.toString();
-        }
     }
     return QString();
 }
@@ -415,9 +412,8 @@ void Delta::update(UiObjectMember* oldObject, const QmlJS::Document::Ptr& oldDoc
             const QString scriptCode = _scriptCode(script, newDoc);
             UiScriptBinding *previousScript = cast<UiScriptBinding *>(oldMember);
             if (!previousScript || _scriptCode(previousScript, oldDoc) != scriptCode) {
-                if (debugReferences.count()==0) {
+                if (debugReferences.count()==0)
                     notifyUnsyncronizableElementChange(newObject);
-                }
                 foreach (DebugId ref, debugReferences) {
                     if (ref != -1)
                         updateScriptBinding(ref, newObject, script, property, scriptCode);
@@ -429,9 +425,8 @@ void Delta::update(UiObjectMember* oldObject, const QmlJS::Document::Ptr& oldDoc
             UiSourceElement *previousSource = cast<UiSourceElement*>(oldMember);
 
             if (!previousSource || _methodCode(previousSource, oldDoc) != methodCode) {
-                if (debugReferences.count()==0) {
+                if (debugReferences.count()==0)
                     notifyUnsyncronizableElementChange(newObject);
-                }
                 foreach (DebugId ref, debugReferences) {
                     if (ref != -1)
                         updateMethodBody(ref, newObject, script, methodName, methodCode);

src/libs/qmljs/qmljsdocument.cpp

@@ -378,9 +378,8 @@ Document::MutablePtr Snapshot::documentFromSource(
 {
     Document::MutablePtr newDoc = Document::create(fileName, language);
 
-    if (Document::Ptr thisDocument = document(fileName)) {
+    if (Document::Ptr thisDocument = document(fileName))
         newDoc->_editorRevision = thisDocument->_editorRevision;
-    }
 
     newDoc->setSource(code);
     return newDoc;

src/libs/qmljs/qmljsevaluate.cpp

@@ -318,9 +318,8 @@ bool Evaluate::visit(AST::FieldMemberExpression *ast)
         return false;
 
     if (const Value *base = _valueOwner->convertToObject(value(ast->base))) {
-        if (const ObjectValue *obj = base->asObjectValue()) {
+        if (const ObjectValue *obj = base->asObjectValue())
             _result = obj->lookupMember(ast->name.toString(), _context);
-        }
     }
 
     return false;
@@ -328,26 +327,23 @@ bool Evaluate::visit(AST::FieldMemberExpression *ast)
 
 bool Evaluate::visit(AST::NewMemberExpression *ast)
 {
-    if (const FunctionValue *ctor = value_cast<FunctionValue>(value(ast->base))) {
+    if (const FunctionValue *ctor = value_cast<FunctionValue>(value(ast->base)))
         _result = ctor->returnValue();
-    }
     return false;
 }
 
 bool Evaluate::visit(AST::NewExpression *ast)
 {
-    if (const FunctionValue *ctor = value_cast<FunctionValue>(value(ast->expression))) {
+    if (const FunctionValue *ctor = value_cast<FunctionValue>(value(ast->expression)))
         _result = ctor->returnValue();
-    }
     return false;
 }
 
 bool Evaluate::visit(AST::CallExpression *ast)
 {
     if (const Value *base = value(ast->base)) {
-        if (const FunctionValue *obj = base->asFunctionValue()) {
+        if (const FunctionValue *obj = base->asFunctionValue())
             _result = obj->returnValue();
-        }
     }
     return false;
 }

src/libs/qmljs/qmljsicons.cpp

@@ -119,12 +119,10 @@ QIcon Icons::icon(const QString &packageName, const QString typeName) const
 
 QIcon Icons::icon(Node *node) const
 {
-    if (dynamic_cast<AST::UiObjectDefinition*>(node)) {
+    if (dynamic_cast<AST::UiObjectDefinition*>(node))
         return objectDefinitionIcon();
-    }
+    if (dynamic_cast<AST::UiScriptBinding*>(node))
-    if (dynamic_cast<AST::UiScriptBinding*>(node)) {
         return scriptBindingIcon();
-    }
 
     return QIcon();
 }

src/libs/qmljs/qmljsindenter.cpp

@@ -147,11 +147,10 @@ int QmlJSIndenter::columnForIndex(const QString &t, int index) const
         index = t.length();
 
     for (int i = 0; i < index; i++) {
-        if (t.at(i) == QLatin1Char('\t')) {
+        if (t.at(i) == QLatin1Char('\t'))
             col = ((col / ppHardwareTabSize) + 1) * ppHardwareTabSize;
-        } else {
+        else
             col++;
-        }
     }
     return col;
 }
@@ -288,11 +287,10 @@ int QmlJSIndenter::indentForContinuationLine()
                     delimiters.
                 */
                 if (braceDepth == -1) {
-                    if (j < yyLine->length() - 1) {
+                    if (j < yyLine->length() - 1)
                         hook = j;
-                    } else {
+                    else
                         return 0; // shouldn't happen
-                    }
                 }
                 break;
             case '=':
@@ -587,17 +585,15 @@ int QmlJSIndenter::indentForBottomLine(QTextBlock begin, QTextBlock end, QChar t
             smartly, unless the user has already played around with it,
             in which case it's better to leave her stuff alone.
         */
-        if (isOnlyWhiteSpace(bottomLine)) {
+        if (isOnlyWhiteSpace(bottomLine))
             indent = indentWhenBottomLineStartsInMultiLineComment();
-        } else {
+        else
             indent = indentOfLine(bottomLine);
-        }
     } else {
-        if (isUnfinishedLine()) {
+        if (isUnfinishedLine())
             indent = indentForContinuationLine();
-        } else {
+        else
             indent = indentForStandaloneLine();
-        }
 
         if ((okay(typedIn, QLatin1Char('}')) && firstCh == QLatin1Char('}'))
             || (okay(typedIn, QLatin1Char(']')) && firstCh == QLatin1Char(']'))) {

src/libs/qmljs/qmljsinterpreter.cpp

@@ -357,9 +357,8 @@ const Value *CppComponentValue::valueForCppName(const QString &typeName) const
     // might be an enum
     const CppComponentValue *base = this;
     const QStringList components = typeName.split(QLatin1String("::"));
-    if (components.size() == 2) {
+    if (components.size() == 2)
         base = valueOwner()->cppQmlTypes().objectByCppName(components.first());
-    }
     if (base) {
         if (const QmlEnumValue *value = base->getEnumValue(components.last()))
             return value;
@@ -413,9 +412,8 @@ QString CppComponentValue::propertyType(const QString &propertyName) const
     foreach (const CppComponentValue *it, prototypes()) {
         FakeMetaObject::ConstPtr iter = it->_metaObject;
         int propIdx = iter->propertyIndex(propertyName);
-        if (propIdx != -1) {
+        if (propIdx != -1)
             return iter->property(propIdx).typeName();
-        }
     }
     return QString();
 }
@@ -425,9 +423,8 @@ bool CppComponentValue::isListProperty(const QString &propertyName) const
     foreach (const CppComponentValue *it, prototypes()) {
         FakeMetaObject::ConstPtr iter = it->_metaObject;
         int propIdx = iter->propertyIndex(propertyName);
-        if (propIdx != -1) {
+        if (propIdx != -1)
             return iter->property(propIdx).isList();
-        }
     }
     return false;
 }
@@ -510,9 +507,8 @@ bool CppComponentValue::isWritable(const QString &propertyName) const
     foreach (const CppComponentValue *it, prototypes()) {
         FakeMetaObject::ConstPtr iter = it->_metaObject;
         int propIdx = iter->propertyIndex(propertyName);
-        if (propIdx != -1) {
+        if (propIdx != -1)
             return iter->property(propIdx).isWritable();
-        }
     }
     return false;
 }
@@ -522,9 +518,8 @@ bool CppComponentValue::isPointer(const QString &propertyName) const
     foreach (const CppComponentValue *it, prototypes()) {
         FakeMetaObject::ConstPtr iter = it->_metaObject;
         int propIdx = iter->propertyIndex(propertyName);
-        if (propIdx != -1) {
+        if (propIdx != -1)
             return iter->property(propIdx).isPointer();
-        }
     }
     return false;
 }
@@ -542,9 +537,8 @@ bool CppComponentValue::hasProperty(const QString &propertyName) const
     foreach (const CppComponentValue *it, prototypes()) {
         FakeMetaObject::ConstPtr iter = it->_metaObject;
         int propIdx = iter->propertyIndex(propertyName);
-        if (propIdx != -1) {
+        if (propIdx != -1)
             return true;
-        }
     }
     return false;
 }
@@ -956,9 +950,8 @@ const ObjectValue *ObjectValue::prototype(const Context *context) const
 {
     const ObjectValue *prototypeObject = value_cast<ObjectValue>(_prototype);
     if (! prototypeObject) {
-        if (const Reference *prototypeReference = value_cast<Reference>(_prototype)) {
+        if (const Reference *prototypeReference = value_cast<Reference>(_prototype))
             prototypeObject = value_cast<ObjectValue>(context->lookupReference(prototypeReference));
-        }
     }
     return prototypeObject;
 }
@@ -1110,9 +1103,8 @@ const ObjectValue *PrototypeIterator::next()
 
 const ObjectValue *PrototypeIterator::peekNext()
 {
-    if (hasNext()) {
+    if (hasNext())
         return m_next;
-    }
     return 0;
 }
 
@@ -1299,11 +1291,10 @@ void CppQmlTypesLoader::parseQmlTypeDescriptions(const QByteArray &xml,
     warningMessage->clear();
     TypeDescriptionReader reader(QString::fromUtf8(xml));
     if (!reader(newObjects, newModuleApis)) {
-        if (reader.errorMessage().isEmpty()) {
+        if (reader.errorMessage().isEmpty())
             *errorMessage = QLatin1String("unknown error");
-        } else {
+        else
             *errorMessage = reader.errorMessage();
-        }
     }
     *warningMessage = reader.warningMessage();
 }
@@ -2106,18 +2097,16 @@ ImportInfo ImportInfo::pathImport(const QString &docPath, const QString &path,
     info._name = path;
 
     QFileInfo importFileInfo(path);
-    if (!importFileInfo.isAbsolute()) {
+    if (!importFileInfo.isAbsolute())
         importFileInfo = QFileInfo(docPath + QDir::separator() + path);
-    }
     info._path = importFileInfo.absoluteFilePath();
 
-    if (importFileInfo.isFile()) {
+    if (importFileInfo.isFile())
         info._type = FileImport;
-    } else if (importFileInfo.isDir()) {
+    else if (importFileInfo.isDir())
         info._type = DirectoryImport;
-    } else {
+    else
         info._type = UnknownFileImport;
-    }
 
     info._version = version;
     info._as = as;
@@ -2230,11 +2219,10 @@ void TypeScope::processMembers(MemberProcessor *processor) const
         if (info.type() == ImportInfo::FileImport)
             continue;
 
-        if (!info.as().isEmpty()) {
+        if (!info.as().isEmpty())
             processor->processProperty(info.as(), import);
-        } else {
+        else
             import->processMembers(processor);
-        }
     }
 }
 

src/libs/qmljs/qmljslineinfo.cpp

@@ -205,11 +205,10 @@ QString LineInfo::trimmedCodeLine(const QString &t)
                 while (i >= 2) {
                     const Token &prev = yyLinizerState.tokens.at(i-1);
                     const Token &prevPrev = yyLinizerState.tokens.at(i-2);
-                    if (prev.kind == Token::Dot && prevPrev.kind == Token::Identifier) {
+                    if (prev.kind == Token::Dot && prevPrev.kind == Token::Identifier)
                         i -= 2;
-                    } else {
+                    else
                         break;
-                    }
                 }
 
                 // it could also be 'a = \n Foo \n {', but that sounds unlikely

src/libs/qmljs/qmljslink.cpp

@@ -460,11 +460,10 @@ bool LinkPrivate::importLibrary(Document::Ptr doc,
             // all but no-uri module apis become available for import
             QList<ModuleApiInfo> noUriModuleApis;
             foreach (const ModuleApiInfo &moduleApi, libraryInfo.moduleApis()) {
-                if (moduleApi.uri.isEmpty()) {
+                if (moduleApi.uri.isEmpty())
                     noUriModuleApis += moduleApi;
-                } else {
+                else
                     importableModuleApis[moduleApi.uri] += moduleApi;
-                }
             }
 
             // if a module api has no uri, it shares the same name
@@ -501,9 +500,8 @@ void LinkPrivate::loadQmldirComponents(ObjectValue *import, ComponentVersion ver
                                 const LibraryInfo &libraryInfo, const QString &libraryPath)
 {
     // if the version isn't valid, import the latest
-    if (!version.isValid()) {
+    if (!version.isValid())
         version = ComponentVersion(ComponentVersion::MaxVersion, ComponentVersion::MaxVersion);
-    }
 
 
     QSet<QString> importedTypes;
@@ -535,9 +533,8 @@ void LinkPrivate::loadImplicitDirectoryImports(Imports *imports, Document::Ptr d
         if (directoryImport.object)
             importCache.insert(ImportCacheKey(implcitDirectoryImportInfo), directoryImport);
     }
-    if (directoryImport.object) {
+    if (directoryImport.object)
         imports->append(directoryImport);
-    }
 }
 
 void LinkPrivate::loadImplicitDefaultImports(Imports *imports)

src/libs/qmljs/qmljspropertyreader.cpp

@@ -143,9 +143,8 @@ static bool isEnum(AST::Statement *ast)
     if (!ast)
         return false;
 
-    if (ExpressionStatement *exprStmt = cast<ExpressionStatement*>(ast)) {
+    if (ExpressionStatement *exprStmt = cast<ExpressionStatement*>(ast))
         return isEnum(exprStmt->expression);
-    }
     return false;
 }
 

src/libs/qmljs/qmljsreformatter.cpp

@@ -166,11 +166,10 @@ protected:
         if (precededByEmptyLine(fixedLoc))
             newLine();
         out(toString(fixedLoc)); // don't use the sourceloc overload here
-        if (followedByNewLine(fixedLoc)) {
+        if (followedByNewLine(fixedLoc))
             newLine();
-        } else {
+        else
             out(" ");
-        }
     }
 
     void out(const QString &str, const SourceLocation &lastLoc = SourceLocation())
@@ -260,9 +259,8 @@ protected:
             qreal result = badnessFromSplits;
             foreach (const QString &line, lines) {
                 // really long lines should be avoided at all cost
-                if (line.size() > strongMaxLineLength) {
+                if (line.size() > strongMaxLineLength)
                     result += 50 + (line.size() - strongMaxLineLength);
-                }
                 // having long lines is bad
                 else if (line.size() > maxLineLength) {
                     result += 3 + (line.size() - maxLineLength);
@@ -446,22 +444,20 @@ protected:
     virtual bool preVisit(Node *ast)
     {
         SourceLocation firstLoc;
-        if (ExpressionNode *expr = ast->expressionCast()) {
+        if (ExpressionNode *expr = ast->expressionCast())
             firstLoc = expr->firstSourceLocation();
-        } else if (Statement *stmt = ast->statementCast()) {
+        else if (Statement *stmt = ast->statementCast())
             firstLoc = stmt->firstSourceLocation();
-        } else if (UiObjectMember *mem = ast->uiObjectMemberCast()) {
+        else if (UiObjectMember *mem = ast->uiObjectMemberCast())
             firstLoc = mem->firstSourceLocation();
-        } else if (UiImport *import = cast<UiImport *>(ast)) {
+        else if (UiImport *import = cast<UiImport *>(ast))
             firstLoc = import->firstSourceLocation();
-        }
 
         if (firstLoc.isValid() && int(firstLoc.offset) != _lastNewlineOffset) {
             _lastNewlineOffset = firstLoc.offset;
 
-            if (precededByEmptyLine(firstLoc) && !_result.endsWith(QLatin1String("\n\n"))) {
+            if (precededByEmptyLine(firstLoc) && !_result.endsWith(QLatin1String("\n\n")))
                 newLine();
-            }
         }
 
         return true;
@@ -470,15 +466,14 @@ protected:
     virtual void postVisit(Node *ast)
     {
         SourceLocation lastLoc;
-        if (ExpressionNode *expr = ast->expressionCast()) {
+        if (ExpressionNode *expr = ast->expressionCast())
             lastLoc = expr->lastSourceLocation();
-        } else if (Statement *stmt = ast->statementCast()) {
+        else if (Statement *stmt = ast->statementCast())
             lastLoc = stmt->lastSourceLocation();
-        } else if (UiObjectMember *mem = ast->uiObjectMemberCast()) {
+        else if (UiObjectMember *mem = ast->uiObjectMemberCast())
             lastLoc = mem->lastSourceLocation();
-        } else if (UiImport *import = cast<UiImport *>(ast)) {
+        else if (UiImport *import = cast<UiImport *>(ast))
             lastLoc = import->lastSourceLocation();
-        }
 
         if (lastLoc.isValid()) {
             const QList<SourceLocation> &comments = _doc->engine()->comments();
@@ -510,11 +505,10 @@ protected:
     virtual bool visit(UiImport *ast)
     {
         out("import ", ast->importToken);
-        if (!ast->fileName.isNull()) {
+        if (!ast->fileName.isNull())
             out(QString::fromLatin1("\"%1\"").arg(ast->fileName.toString()));
-        } else {
+        else
             accept(ast->importUri);
-        }
         if (ast->versionToken.isValid()) {
             out(" ");
             out(ast->versionToken);

src/libs/qmljs/qmljsrewriter.cpp

@@ -288,9 +288,8 @@ void Rewriter::changeBinding(UiObjectInitializer *ast,
         // for grouped properties:
         else if (!prefix.isEmpty()) {
             if (UiObjectDefinition *def = cast<UiObjectDefinition *>(member)) {
-                if (toString(def->qualifiedTypeNameId) == prefix) {
+                if (toString(def->qualifiedTypeNameId) == prefix)
                     changeBinding(def->initializer, suffix, newValue, binding);
-                }
             }
         }
     }
@@ -353,11 +352,10 @@ bool Rewriter::isMatchingPropertyMember(const QString &propertyName,
 
 bool Rewriter::nextMemberOnSameLine(UiObjectMemberList *members)
 {
-    if (members && members->next && members->next->member) {
+    if (members && members->next && members->next->member)
         return members->next->member->firstSourceLocation().startLine == members->member->lastSourceLocation().startLine;
-    } else {
+    else
         return false;
-    }
 }
 
 void Rewriter::insertIntoArray(UiArrayBinding *ast, const QString &newValue)
@@ -388,15 +386,13 @@ void Rewriter::removeBindingByName(UiObjectInitializer *ast, const QString &prop
         UiObjectMember *member = it->member;
 
         // run full name match (for ungrouped properties):
-        if (isMatchingPropertyMember(propertyName, member)) {
+        if (isMatchingPropertyMember(propertyName, member))
             removeMember(member);
-        }
         // check for grouped properties:
         else if (!prefix.isEmpty()) {
             if (UiObjectDefinition *def = cast<UiObjectDefinition *>(member)) {
-                if (toString(def->qualifiedTypeNameId) == prefix) {
+                if (toString(def->qualifiedTypeNameId) == prefix)
                     removeGroupedProperty(def, propertyName);
-                }
             }
         }
     }
@@ -417,9 +413,8 @@ void Rewriter::removeGroupedProperty(UiObjectDefinition *ast,
         ++memberCount;
         UiObjectMember *member = it->member;
 
-        if (!wanted && isMatchingPropertyMember(propName, member)) {
+        if (!wanted && isMatchingPropertyMember(propName, member))
             wanted = member;
-        }
     }
 
     if (!wanted)
@@ -517,9 +512,8 @@ void Rewriter::includeEmptyGroupedProperty(UiObjectDefinition *groupedProperty,
         // grouped property
         UiObjectMemberList *memberIter = groupedProperty->initializer->members;
         while (memberIter) {
-            if (memberIter->member != memberToBeRemoved) {
+            if (memberIter->member != memberToBeRemoved)
                 return;
-            }
             memberIter = memberIter->next;
         }
         start = groupedProperty->firstSourceLocation().begin();
@@ -670,9 +664,8 @@ void Rewriter::removeObjectMember(UiObjectMember *member, UiObjectMember *parent
     if (UiArrayBinding *parentArray = cast<UiArrayBinding *>(parent)) {
         extendToLeadingOrTrailingComma(parentArray, member, start, end);
     } else {
-        if (UiObjectDefinition *parentObjectDefinition = cast<UiObjectDefinition *>(parent)) {
+        if (UiObjectDefinition *parentObjectDefinition = cast<UiObjectDefinition *>(parent))
             includeEmptyGroupedProperty(parentObjectDefinition, member, start, end);
-        }
         includeSurroundingWhitespace(m_originalText, start, end);
     }
 

src/libs/qmljs/qmljsscopeastpath.cpp

@@ -55,13 +55,12 @@ void ScopeAstPath::accept(Node *node)
 
 bool ScopeAstPath::preVisit(Node *node)
 {
-    if (Statement *stmt = node->statementCast()) {
+    if (Statement *stmt = node->statementCast())
         return containsOffset(stmt->firstSourceLocation(), stmt->lastSourceLocation());
-    } else if (ExpressionNode *exp = node->expressionCast()) {
+    else if (ExpressionNode *exp = node->expressionCast())
         return containsOffset(exp->firstSourceLocation(), exp->lastSourceLocation());
-    } else if (UiObjectMember *ui = node->uiObjectMemberCast()) {
+    else if (UiObjectMember *ui = node->uiObjectMemberCast())
         return containsOffset(ui->firstSourceLocation(), ui->lastSourceLocation());
-    }
     return true;
 }
 

src/libs/qmljs/qmljsscopebuilder.cpp

@@ -81,14 +81,12 @@ void ScopeBuilder::push(AST::Node *node)
                     break;
             }
             // signals defined in QML
-            if (const ASTSignal *astsig = value_cast<ASTSignal>(value)) {
+            if (const ASTSignal *astsig = value_cast<ASTSignal>(value))
                 _scopeChain->appendJsScope(astsig->bodyScope());
-            }
             // signals defined in C++
             else if (const CppComponentValue *qmlObject = value_cast<CppComponentValue>(owner)) {
-                if (const ObjectValue *scope = qmlObject->signalScope(name)) {
+                if (const ObjectValue *scope = qmlObject->signalScope(name))
                     _scopeChain->appendJsScope(scope);
-                }
             }
         }
     }
@@ -170,11 +168,10 @@ void ScopeBuilder::setQmlScopeObject(Node *node)
     }
 
     const ObjectValue *scopeObject = _scopeChain->document()->bind()->findQmlObject(node);
-    if (scopeObject) {
+    if (scopeObject)
         qmlScopeObjects += scopeObject;
-    } else {
+    else
         return; // Probably syntax errors, where we're working with a "recovered" AST.
-    }
 
     // check if the object has a Qt.ListElement or Qt.Connections ancestor
     // ### allow only signal bindings for Connections
@@ -208,11 +205,10 @@ void ScopeBuilder::setQmlScopeObject(Node *node)
                         Evaluate evaluator(_scopeChain);
                         const Value *targetValue = evaluator(scriptBinding->statement);
 
-                        if (const ObjectValue *target = value_cast<ObjectValue>(targetValue)) {
+                        if (const ObjectValue *target = value_cast<ObjectValue>(targetValue))
                             qmlScopeObjects.prepend(target);
-                        } else {
+                        else
                             qmlScopeObjects.clear();
-                        }
                     }
                 }
             }

src/libs/qmljs/qmljstypedescriptionreader.cpp

@@ -157,11 +157,10 @@ void TypeDescriptionReader::readModule(UiObjectDefinition *ast)
             continue;
         }
 
-        if (typeName == QLatin1String("Component")) {
+        if (typeName == QLatin1String("Component"))
             readComponent(component);
-        } else if (typeName == QLatin1String("ModuleApi")) {
+        else if (typeName == QLatin1String("ModuleApi"))
             readModuleApi(component);
-        }
     }
 }
 
@@ -191,15 +190,14 @@ void TypeDescriptionReader::readComponent(UiObjectDefinition *ast)
         UiScriptBinding *script = dynamic_cast<UiScriptBinding *>(member);
         if (component) {
             QString name = toString(component->qualifiedTypeNameId);
-            if (name == QLatin1String("Property")) {
+            if (name == QLatin1String("Property"))
                 readProperty(component, fmo);
-            } else if (name == QLatin1String("Method") || name == QLatin1String("Signal")) {
+            else if (name == QLatin1String("Method") || name == QLatin1String("Signal"))
                 readSignalOrMethod(component, name == QLatin1String("Method"), fmo);
-            } else if (name == QLatin1String("Enum")) {
+            else if (name == QLatin1String("Enum"))
                 readEnum(component, fmo);
-            } else {
+            else
                 addWarning(component->firstSourceLocation(), tr("Expected only Property, Method, Signal and Enum object definitions"));
-            }
         } else if (script) {
             QString name = toString(script->qualifiedId);
             if (name == QLatin1String("name")) {
@@ -283,22 +281,20 @@ void TypeDescriptionReader::readSignalOrMethod(UiObjectDefinition *ast, bool isM
         UiScriptBinding *script = dynamic_cast<UiScriptBinding *>(member);
         if (component) {
             QString name = toString(component->qualifiedTypeNameId);
-            if (name == QLatin1String("Parameter")) {
+            if (name == QLatin1String("Parameter"))
                 readParameter(component, &fmm);
-            } else {
+            else
                 addWarning(component->firstSourceLocation(), tr("Expected only Parameter object definitions"));
-            }
         } else if (script) {
             QString name = toString(script->qualifiedId);
-            if (name == QLatin1String("name")) {
+            if (name == QLatin1String("name"))
                 fmm.setMethodName(readStringBinding(script));
-            } else if (name == QLatin1String("type")) {
+            else if (name == QLatin1String("type"))
                 fmm.setReturnType(readStringBinding(script));
-            } else if (name == QLatin1String("revision")) {
+            else if (name == QLatin1String("revision"))
                 fmm.setRevision(readIntBinding(script));
-            } else {
+            else
                 addWarning(script->firstSourceLocation(), tr("Expected only name and type script bindings"));
-            }
 
         } else {
             addWarning(member->firstSourceLocation(), tr("Expected only script bindings and object definitions"));
@@ -331,21 +327,20 @@ void TypeDescriptionReader::readProperty(UiObjectDefinition *ast, FakeMetaObject
         }
 
         QString id = toString(script->qualifiedId);
-        if (id == QLatin1String("name")) {
+        if (id == QLatin1String("name"))
             name = readStringBinding(script);
-        } else if (id == QLatin1String("type")) {
+        else if (id == QLatin1String("type"))
             type = readStringBinding(script);
-        } else if (id == QLatin1String("isPointer")) {
+        else if (id == QLatin1String("isPointer"))
             isPointer = readBoolBinding(script);
-        } else if (id == QLatin1String("isReadonly")) {
+        else if (id == QLatin1String("isReadonly"))
             isReadonly = readBoolBinding(script);
-        } else if (id == QLatin1String("isList")) {
+        else if (id == QLatin1String("isList"))
             isList = readBoolBinding(script);
-        } else if (id == QLatin1String("revision")) {
+        else if (id == QLatin1String("revision"))
             revision = readIntBinding(script);
-        } else {
+        else
             addWarning(script->firstSourceLocation(), tr("Expected only type, name, revision, isPointer, isReadonly and isList script bindings"));
-        }
     }
 
     if (name.isEmpty() || type.isEmpty()) {
@@ -369,13 +364,12 @@ void TypeDescriptionReader::readEnum(UiObjectDefinition *ast, FakeMetaObject::Pt
         }
 
         QString name = toString(script->qualifiedId);
-        if (name == QLatin1String("name")) {
+        if (name == QLatin1String("name"))
             fme.setName(readStringBinding(script));
-        } else if (name == QLatin1String("values")) {
+        else if (name == QLatin1String("values"))
             readEnumValues(script, &fme);
-        } else {
+        else
             addWarning(script->firstSourceLocation(), tr("Expected only name and values script bindings"));
-        }
     }
 
     fmo->addEnum(fme);

src/libs/qtcomponents/styleitem/qstyleitem.cpp

@@ -132,16 +132,14 @@ void QStyleItem::initStyleOption()
         break;
 
     case Splitter: {
-            if (!m_styleoption) {
+            if (!m_styleoption)
                 m_styleoption = new QStyleOption;
-            }
         }
         break;
 
     case Item: {
-            if (!m_styleoption) {
+            if (!m_styleoption)
                 m_styleoption = new QStyleOptionViewItemV4();
-            }
             QStyleOptionViewItemV4 *opt = qstyleoption_cast<QStyleOptionViewItemV4*>(m_styleoption);
             opt->features = QStyleOptionViewItemV4::HasDisplay;
             opt->text = text();
@@ -446,11 +444,10 @@ void QStyleItem::initStyleOption()
         m_styleoption->fontMetrics = widget()->fontMetrics();
         if (!m_styleoption->palette.resolve())
             m_styleoption->palette = widget()->palette();
-        if (m_hint.contains("mac.mini")) {
+        if (m_hint.contains("mac.mini"))
             widget()->setAttribute(Qt::WA_MacMiniSize);
-        } else if (m_hint.contains("mac.small")) {
+        else if (m_hint.contains("mac.small"))
             widget()->setAttribute(Qt::WA_MacSmallSize);
-        }
     }
 }
 
@@ -1018,9 +1015,8 @@ void QStyleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWid
         qApp->style()->drawComplexControl(QStyle::CC_ScrollBar, qstyleoption_cast<QStyleOptionComplex*>(m_styleoption), painter, widget());
         break;
     case Menu: {
-            if (QMenu *menu = qobject_cast<QMenu*>(widget())) {
+            if (QMenu *menu = qobject_cast<QMenu*>(widget()))
                 m_styleoption->palette = menu->palette();
-            }
             QStyleHintReturnMask val;
             qApp->style()->styleHint(QStyle::SH_Menu_Mask, m_styleoption, widget(), &val);
             painter->save();

src/libs/qtcreatorcdbext/containers.cpp

@@ -360,11 +360,10 @@ AbstractSymbolGroupNodePtrVector
             block -= blockArraySize;
         const ULONG64 blockOffset = offset % dequeSize;
         const ULONG64 address = blockArray[block] + innerTypeSize * blockOffset;
-        if (SymbolGroupNode *n = sg->addSymbol(module, SymbolGroupValue::pointedToSymbolName(address, innerType), std::string(), &errorMessage)) {
+        if (SymbolGroupNode *n = sg->addSymbol(module, SymbolGroupValue::pointedToSymbolName(address, innerType), std::string(), &errorMessage))
             rc.push_back(ReferenceSymbolGroupNode::createArrayNode(i, n));
-        } else {
+        else
             return AbstractSymbolGroupNodePtrVector();
-        }
     }
     return rc;
 }
@@ -842,11 +841,10 @@ SymbolGroupValueVector qHashNodes(const SymbolGroupValue &v,
     nodeList.reserve(count);
     const SymbolGroupValueVector::const_iterator dcend = dummyNodeList.end();
     for (SymbolGroupValueVector::const_iterator it = dummyNodeList.begin(); it != dcend; ++it) {
-        if (const SymbolGroupValue n = (*it).typeCast(nodeType.c_str())) {
+        if (const SymbolGroupValue n = (*it).typeCast(nodeType.c_str()))
             nodeList.push_back(n);
-        }  else {
+        }  else
             return SymbolGroupValueVector();
-        }
     }
     return nodeList;
 }
@@ -865,11 +863,10 @@ static inline AbstractSymbolGroupNodePtrVector
         return rc;
     rc.reserve(count);
     for (int i = 0; i < count; i++) {
-        if (const SymbolGroupValue key = nodes.at(i)["key"]) {
+        if (const SymbolGroupValue key = nodes.at(i)["key"])
             rc.push_back(ReferenceSymbolGroupNode::createArrayNode(i, key.node()));
-        } else {
+        else
             return AbstractSymbolGroupNodePtrVector();
-        }
     }
     return rc;
 }

src/libs/qtcreatorcdbext/extensioncontext.cpp

@@ -88,11 +88,10 @@ void ExtensionContext::hookCallbacks(CIDebugClient *client)
 
 void ExtensionContext::startRecordingOutput()
 {
-    if (m_creatorOutputCallback) {
+    if (m_creatorOutputCallback)
         m_creatorOutputCallback->startRecording();
-    } else {
+    else
         report('X', 0, 0, "Error", "ExtensionContext::startRecordingOutput() called with no output hooked.\n");
-    }
 }
 
 std::wstring ExtensionContext::stopRecordingOutput()
@@ -189,18 +188,16 @@ void ExtensionContext::notifyIdleCommand(CIDebugClient *client)
         formatGdbmiHash(str, stopReasons, false);
         const std::string threadInfo = gdbmiThreadList(exc.systemObjects(), exc.symbols(),
                                                        exc.control(), exc.advanced(), &errorMessage);
-        if (threadInfo.empty()) {
+        if (threadInfo.empty())
             str << ",threaderror=" << gdbmiStringFormat(errorMessage);
-        } else {
+        else
             str << ",threads=" << threadInfo;
-        }
         const std::string stackInfo = gdbmiStack(exc.control(), exc.symbols(),
                                                  maxStackFrames, false, &errorMessage);
-        if (stackInfo.empty()) {
+        if (stackInfo.empty())
             str << ",stackerror=" << gdbmiStringFormat(errorMessage);
-        } else {
+        else
             str << ",stack=" << stackInfo;
-        }
         str << '}';
         reportLong('E', 0, "session_idle", str.str());
     }

src/libs/qtcreatorcdbext/gdbmihelpers.cpp

@@ -107,11 +107,10 @@ void getFrame(CIDebugSymbols *debugSymbols,
     WCHAR wBuf[MAX_PATH];
     f->address = s.InstructionOffset;
     HRESULT hr = debugSymbols->GetNameByOffsetWide(f->address, wBuf, MAX_PATH, 0, 0);
-    if (SUCCEEDED(hr)) {
+    if (SUCCEEDED(hr))
         f->function = wBuf;
-    } else {
+    else
         f->function.clear();
-    }
     ULONG64 ul64Displacement = 0;
     hr = debugSymbols->GetLineByOffsetWide(f->address, &(f->line), wBuf, MAX_PATH, 0, &ul64Displacement);
     if (SUCCEEDED(hr)) {

src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp

@@ -277,11 +277,10 @@ extern "C" HRESULT CALLBACK pid(CIDebugClient *client, PCSTR args)
     commandTokens<StringList>(args, &token);
     dprintf("Qt Creator CDB extension version 2.7 (Qt 5 support) %d bit built %s.\n",
             sizeof(void *) * 8, __DATE__);
-    if (const ULONG pid = currentProcessId(client)) {
+    if (const ULONG pid = currentProcessId(client))
         ExtensionContext::instance().report('R', token, 0, "pid", "%u", pid);
-    } else {
+    else
         ExtensionContext::instance().report('N', token, 0, "pid", "0");
-    }
     return S_OK;
 }
 
@@ -564,11 +563,10 @@ extern "C" HRESULT CALLBACK locals(CIDebugClient *client, PCSTR args)
     int token;
     const std::string output = commmandLocals(exc, args, &token, &errorMessage);
     SymbolGroupValue::verbose = 0;
-    if (output.empty()) {
+    if (output.empty())
         ExtensionContext::instance().report('N', token, 0, "locals", errorMessage.c_str());
-    } else {
+    else
         ExtensionContext::instance().reportLong('R', token, "locals", output);
-    }
     return S_OK;
 }
 
@@ -619,11 +617,10 @@ extern "C" HRESULT CALLBACK watches(CIDebugClient *client, PCSTR args)
     int token = 0;
     const std::string output = commmandWatches(exc, args, &token, &errorMessage);
     SymbolGroupValue::verbose = 0;
-    if (output.empty()) {
+    if (output.empty())
         ExtensionContext::instance().report('N', token, 0, "locals", errorMessage.c_str());
-    } else {
+    else
         ExtensionContext::instance().reportLong('R', token, "locals", output);
-    }
     return S_OK;
 }
 
@@ -670,11 +667,10 @@ extern "C" HRESULT CALLBACK dumplocal(CIDebugClient *client, PCSTR  argsIn)
     std::string errorMessage;
     int token = 0;
     const std::string value = dumplocalHelper(exc,argsIn, &token, &errorMessage);
-    if (value.empty()) {
+    if (value.empty())
         ExtensionContext::instance().report('N', token, 0, "dumplocal", errorMessage.c_str());
-    } else {
+    else
         ExtensionContext::instance().reportLong('R', token, "dumplocal", value);
-    }
     return S_OK;
 }
 
@@ -699,11 +695,10 @@ extern "C" HRESULT CALLBACK typecast(CIDebugClient *client, PCSTR args)
     } else {
         errorMessage = singleLineUsage(commandDescriptions[CmdTypecast]);
     }
-    if (symGroup != 0 && symGroup->typeCast(iname, desiredType, &errorMessage)) {
+    if (symGroup != 0 && symGroup->typeCast(iname, desiredType, &errorMessage))
         ExtensionContext::instance().report('R', token, 0, "typecast", "OK");
-    } else {
+    else
         ExtensionContext::instance().report('N', token, 0, "typecast", errorMessage.c_str());
-    }
     return S_OK;
 }
 
@@ -729,11 +724,10 @@ extern "C" HRESULT CALLBACK addsymbol(CIDebugClient *client, PCSTR args)
     } else {
         errorMessage = singleLineUsage(commandDescriptions[CmdAddsymbol]);
     }
-    if (symGroup != 0 && symGroup->addSymbol(std::string(), name, iname, &errorMessage)) {
+    if (symGroup != 0 && symGroup->addSymbol(std::string(), name, iname, &errorMessage))
         ExtensionContext::instance().report('R', token, 0, "addsymbol", "OK");
-    } else {
+    else
         ExtensionContext::instance().report('N', token, 0, "addsymbol", errorMessage.c_str());
-    }
     return S_OK;
 }
 
@@ -763,11 +757,10 @@ extern "C" HRESULT CALLBACK addwatch(CIDebugClient *client, PCSTR argsIn)
         success = watchesSymGroup->addWatch(exc.symbols(), iname, watchExpression, &errorMessage);
     } while (false);
 
-    if (success) {
+    if (success)
         ExtensionContext::instance().report('R', token, 0, "addwatch", "Ok");
-    } else {
+    else
         ExtensionContext::instance().report('N', token, 0, "addwatch", errorMessage.c_str());
-    }
     return S_OK;
 }
 
@@ -824,11 +817,10 @@ extern "C" HRESULT CALLBACK assign(CIDebugClient *client, PCSTR argsIn)
                                    &errorMessage);
     } while (false);
 
-    if (success) {
+    if (success)
         ExtensionContext::instance().report('R', token, 0, "assign", "Ok");
-    } else {
+    else
         ExtensionContext::instance().report('N', token, 0, "assign", errorMessage.c_str());
-    }
     return S_OK;
 }
 
@@ -848,11 +840,10 @@ extern "C" HRESULT CALLBACK threads(CIDebugClient *client, PCSTR  argsIn)
                                               exc.control(),
                                               exc.advanced(),
                                               &errorMessage);
-    if (gdbmi.empty()) {
+    if (gdbmi.empty())
         ExtensionContext::instance().report('N', token, 0, "threads", errorMessage.c_str());
-    } else {
+    else
         ExtensionContext::instance().reportLong('R', token, "threads", gdbmi);
-    }
     return S_OK;
 }
 
@@ -868,11 +859,10 @@ extern "C" HRESULT CALLBACK registers(CIDebugClient *Client, PCSTR argsIn)
     const StringList tokens = commandTokens<StringList>(argsIn, &token);
     const bool humanReadable = !tokens.empty() && tokens.front() == "-h";
     const std::string regs = gdbmiRegisters(exc.registers(), exc.control(), humanReadable, IncludePseudoRegisters, &errorMessage);
-    if (regs.empty()) {
+    if (regs.empty())
         ExtensionContext::instance().report('N', token, 0, "registers", errorMessage.c_str());
-    } else {
+    else
         ExtensionContext::instance().reportLong('R', token, "registers", regs);
-    }
     return S_OK;
 }
 
@@ -888,11 +878,10 @@ extern "C" HRESULT CALLBACK modules(CIDebugClient *Client, PCSTR argsIn)
     const StringList tokens = commandTokens<StringList>(argsIn, &token);
     const bool humanReadable = !tokens.empty() && tokens.front() == "-h";
     const std::string modules = gdbmiModules(exc.symbols(), humanReadable, &errorMessage);
-    if (modules.empty()) {
+    if (modules.empty())
         ExtensionContext::instance().report('N', token, 0, "modules", errorMessage.c_str());
-    } else {
+    else
         ExtensionContext::instance().reportLong('R', token, "modules", modules);
-    }
     return S_OK;
 }
 
@@ -969,11 +958,10 @@ extern "C" HRESULT CALLBACK expression(CIDebugClient *Client, PCSTR argsIn)
             break;
     } while (false);
 
-    if (errorMessage.empty()) {
+    if (errorMessage.empty())
         ExtensionContext::instance().reportLong('R', token, "expression", toString(value));
-    } else {
+    else
         ExtensionContext::instance().report('N', token, 0, "expression", errorMessage.c_str());
-    }
     return S_OK;
 }
 
@@ -1000,11 +988,10 @@ extern "C" HRESULT CALLBACK stack(CIDebugClient *Client, PCSTR argsIn)
     const std::string stack = gdbmiStack(exc.control(), exc.symbols(),
                                          maxFrames, humanReadable, &errorMessage);
 
-    if (stack.empty()) {
+    if (stack.empty())
         ExtensionContext::instance().report('N', token, 0, "stack", errorMessage.c_str());
-    } else {
+    else
         ExtensionContext::instance().reportLong('R', token, "stack", stack);
-    }
     return S_OK;
 }
 
@@ -1041,11 +1028,10 @@ extern "C" HRESULT CALLBACK widgetat(CIDebugClient *client, PCSTR argsIn)
                                  x, y, &errorMessage);
     } while (false);
 
-    if (widgetAddress.empty()) {
+    if (widgetAddress.empty())
         ExtensionContext::instance().report('N', token, 0, "widgetat", errorMessage.c_str());
-    } else {
+    else
         ExtensionContext::instance().reportLong('R', token, "widgetat", widgetAddress);
-    }
     return S_OK;
 }
 
@@ -1070,11 +1056,10 @@ extern "C" HRESULT CALLBACK breakpoints(CIDebugClient *client, PCSTR argsIn)
     }
     const std::string bp = gdbmiBreakpoints(exc.control(), exc.symbols(), exc.dataSpaces(),
                                             humanReadable, verbose, &errorMessage);
-    if (bp.empty()) {
+    if (bp.empty())
         ExtensionContext::instance().report('N', token, 0, "breakpoints", errorMessage.c_str());
-    } else {
+    else
         ExtensionContext::instance().reportLong('R', token, "breakpoints", bp);
-    }
     return S_OK;
 }
 

src/libs/qtcreatorcdbext/stringutils.cpp

@@ -268,11 +268,10 @@ std::string dumpMemory(const unsigned char *p, size_t size,
         case '\n':
             str << "\\n";
         default:
-            if (u >= 32 && u < 128) {
+            if (u >= 32 && u < 128)
                 str << (char(u));
-            } else {
+            else
                 str  << '\\' << std::setw(3) << unsigned(u);
-            }
         }
     }
     if (wantQuotes)

src/libs/qtcreatorcdbext/symbolgroup.cpp

@@ -239,11 +239,10 @@ std::string SymbolGroup::debug(const std::string &iname,
     if (iname.empty()) {
         accept(*visitor);
     } else {
-        if (AbstractSymbolGroupNode *const node = find(iname)) {
+        if (AbstractSymbolGroupNode *const node = find(iname))
             node->accept(*visitor, SymbolGroupNodeVisitor::parentIname(iname), 0, 0);
-        } else {
+        else
             str << msgNotFound(iname);
-        }
     }
     return str.str();
 }

src/libs/qtcreatorcdbext/symbolgroupnode.cpp

@@ -251,11 +251,10 @@ void BaseSymbolGroupNode::addChild(AbstractSymbolGroupNode *c)
 std::ostream &operator<<(std::ostream &str, const DEBUG_SYMBOL_PARAMETERS &parameters)
 {
     str << "parent=";
-    if (parameters.ParentSymbol == DEBUG_ANY_ID) {
+    if (parameters.ParentSymbol == DEBUG_ANY_ID)
         str << "DEBUG_ANY_ID";
-    } else {
+    else
         str << parameters.ParentSymbol ;
-    }
     if (parameters.Flags != 0 && parameters.Flags != 1)
         str << " flags=" << parameters.Flags;
     // Detailed flags:
@@ -669,17 +668,15 @@ bool SymbolGroupNode::notifyIndexesMoved(ULONG index, bool inserted, ULONG offse
     if (m_index == DEBUG_ANY_ID || m_index < index)
         return false;
 
-    if (inserted) {
+    if (inserted)
         m_index += offset;
-    } else {
+    else
         m_index -= offset;
-    }
     if (m_parameters.ParentSymbol != DEBUG_ANY_ID && m_parameters.ParentSymbol >= index) {
-        if (inserted) {
+        if (inserted)
             m_parameters.ParentSymbol += offset;
-        } else {
+        else
             m_parameters.ParentSymbol -= offset;
-        }
     }
     return true;
 }
@@ -732,9 +729,8 @@ static inline void fixNames(bool isTopLevel, StringVector *names, StringVector *
      * 3) For toplevels: Fix shadowed variables in the order the debugger expects them:
        \code
        int x;             // Occurrence (1), should be reported as name="x <shadowed 1>"/iname="x#1"
-       if (true) {
+       if (true)
           int x = 5; (2)  // Occurrence (2), should be reported as name="x"/iname="x"
-       }
       \endcode */
     StringVector::iterator nameIt = names->begin();
     const StringVector::iterator namesEnd = names->end();
@@ -1103,11 +1099,10 @@ int SymbolGroupNode::dumpNode(std::ostream &str,
         // Emulate gdb's behaviour of returning the referenced address
         // for pointers.
         str << std::hex << std::showbase;
-        if (referencedAddr) {
+        if (referencedAddr)
             str << ",addr=\"" << referencedAddr << "\",origaddr=\"" << addr << '"';
-        } else {
+        else
             str << ",addr=\"" << addr << '"';
-        }
         str << std::noshowbase << std::dec;
     }
     const ULONG s = size();
@@ -1141,11 +1136,10 @@ int SymbolGroupNode::dumpNode(std::ostream &str,
         if (m_dumperContainerSize > 0) {
             childCountGuess = m_dumperContainerSize; // See Obscured handling
         } else {
-            if (children().empty()) {
+            if (children().empty())
                 childCountGuess = m_parameters.SubElements; // Guess
-            } else {
+            else
                 childCountGuess = unsigned(children().size());
-            }
         }
     }
     // No children..suppose we are editable and enabled.
@@ -1646,11 +1640,10 @@ SymbolGroupNodeVisitor::VisitResult
             if (!realNode->isExpanded() || realNode->testFlags(SymbolGroupNode::Uninitialized|SymbolGroupNode::ExpandedByDumper))
                     visitChildren = false;
     // Comma between same level children given obscured children
-    if (depth == m_lastDepth) {
+    if (depth == m_lastDepth)
         m_os << ',';
-    } else {
+    else
         m_lastDepth = depth;
-    }
     if (m_parameters.humanReadable()) {
         m_os << '\n';
         indentStream(m_os, depth * 2);

src/libs/qtcreatorcdbext/symbolgroupvalue.cpp

@@ -701,11 +701,10 @@ const QtInfo &QtInfo::get(const SymbolGroupValueContext &ctx)
         }
         rc.libInfix = qualifiedSymbol.substr(libPos + 4, exclPos - libPos - 4);
         // 'Qt5Cored!qstrdup' or 'QtCored4!qstrdup'.
-        if (isdigit(qualifiedSymbol.at(2))) {
+        if (isdigit(qualifiedSymbol.at(2)))
             rc.version = qualifiedSymbol.at(2) - '0';
-        } else {
+        else
             rc.version = qualifiedSymbol.at(exclPos - 1) - '0';
-        }
         // Any namespace? 'QtCored4!nsp::qstrdup'
         const std::string::size_type nameSpaceStart = exclPos + 1;
         const std::string::size_type colonPos = qualifiedSymbol.find(':', nameSpaceStart);
@@ -1585,11 +1584,10 @@ static inline bool dumpQString(const SymbolGroupValue &v, std::wostream &str,
     } else {
         str << L"\"\"";
     }
-    if (memoryHandle)  {
+    if (memoryHandle)
         *memoryHandle = new MemoryHandle(memory, size);
-    } else {
+    else
         delete [] memory;
-    }
     return true;
 }
 
@@ -1691,11 +1689,10 @@ static inline bool dumpQByteArray(const SymbolGroupValue &v, std::wostream &str,
     } else {
         str << L"<empty>";
     }
-    if (memoryHandle) {
+    if (memoryHandle)
         *memoryHandle = new MemoryHandle(reinterpret_cast<unsigned char *>(memory), size);
-    } else {
+    else
         delete [] memory;
-    }
     return true;
 }
 
@@ -2012,13 +2009,12 @@ static inline bool dumpQFlags(const SymbolGroupValue &v, std::wostream &str)
 
 static bool dumpJulianDate(int julianDay, std::wostream &str)
 {
-    if (julianDay < 0) {
+    if (julianDay < 0)
         return false;
-    } else if (!julianDay) {
+    else if (!julianDay)
         str << L"<null>";
-    } else {
+    else
         formatJulianDate(str, julianDay);
-    }
     return true;
 }
 
@@ -2292,11 +2288,10 @@ static bool dumpStd_W_String(const SymbolGroupValue &v, int type, std::wostream
     str << (type == KT_StdString ?
         quotedWStringFromCharData(memory, memSize) :
         quotedWStringFromWCharData(memory, memSize));
-    if (memoryHandle) {
+    if (memoryHandle)
         *memoryHandle = new MemoryHandle(memory, memSize);
-    } else {
+    else
         delete [] memory;
-    }
     return true;
 }
 
@@ -2403,9 +2398,8 @@ static bool dumpQVariant(const SymbolGroupValue &v, std::wostream &str, void **s
         break;
     case 10: // String
         str << L"(QString) ";
-        if (const SymbolGroupValue sv = dataV.typeCast(qtInfo.prependQtCoreModule("QString *").c_str())) {
+        if (const SymbolGroupValue sv = dataV.typeCast(qtInfo.prependQtCoreModule("QString *").c_str()))
             dumpQString(sv, str);
-        }
         break;
     case 11: //StringList: Dump container size
         str << L"(QStringList) ";

src/libs/ssh/sshconnection.cpp

@@ -472,9 +472,8 @@ void SshConnectionPrivate::handleKeyExchangeInitPacket()
     // If the server sends a guessed packet, the guess must be wrong,
     // because the algorithms we support require us to initiate the
     // key exchange.
-    if (m_keyExchange->sendDhInitPacket(m_incomingPacket)) {
+    if (m_keyExchange->sendDhInitPacket(m_incomingPacket))
         m_ignoreNextPacket = true;
-    }
 
     m_keyExchangeState = DhInitSent;
 }

src/libs/ssh/sshkeycreationdialog.cpp

@@ -81,11 +81,10 @@ void SshKeyCreationDialog::generateKeys()
         m_ui->comboBox->currentText().toUShort());
     QApplication::restoreOverrideCursor();
 
-    if (success) {
+    if (success)
         saveKeys();
-    } else {
+    else
         QMessageBox::critical(this, tr("Key Generation Failed"), m_keyGenerator->error());
-    }
 }
 
 void SshKeyCreationDialog::handleBrowseButtonClicked()

src/libs/utils/buildablehelperlibrary.cpp

@@ -56,9 +56,8 @@ Utils::FileName BuildableHelperLibrary::findSystemQt(const Utils::Environment &e
         foreach (const QString &possibleCommand, possibleQMakeCommands()) {
             const QFileInfo qmake(prefix + possibleCommand);
             if (qmake.exists()) {
-                if (!qtVersionForQMake(qmake.absoluteFilePath()).isNull()) {
+                if (!qtVersionForQMake(qmake.absoluteFilePath()).isNull())
                     return Utils::FileName(qmake);
-                }
             }
         }
     }
@@ -158,9 +157,8 @@ bool BuildableHelperLibrary::copyFiles(const QString &sourcePath,
                 return false;
             }
         }
-        if (!destInfo.dir().exists()) {
+        if (!destInfo.dir().exists())
             QDir().mkpath(destInfo.dir().absolutePath());
-        }
 
         if (!QFile::copy(source, dest)) {
             *errorMessage = QCoreApplication::translate("ProjectExplorer::DebuggingHelperLibrary", "The file %1 could not be copied to %2.").arg(source, dest);

src/libs/utils/crumblepath.cpp

@@ -124,27 +124,24 @@ void CrumblePathButton::paintEvent(QPaintEvent *)
     }
 
     if (m_isEnd) {
-        if (m_isPressed || m_isSelected) {
+        if (m_isPressed || m_isSelected)
             Utils::StyleHelper::drawCornerImage(m_segmentSelectedEnd, &p, geom, 2, 0, 2, 0);
-        } else if (m_isHovering) {
+        else if (m_isHovering)
             Utils::StyleHelper::drawCornerImage(m_segmentHoverEnd, &p, geom, 2, 0, 2, 0);
-        } else {
+        else
             Utils::StyleHelper::drawCornerImage(m_segmentEnd, &p, geom, 2, 0, 2, 0);
-        }
     } else {
-        if (m_isPressed || m_isSelected) {
+        if (m_isPressed || m_isSelected)
             Utils::StyleHelper::drawCornerImage(m_segmentSelected, &p, geom, 2, 0, 12, 0);
-        } else if (m_isHovering) {
+        else if (m_isHovering)
             Utils::StyleHelper::drawCornerImage(m_segmentHover, &p, geom, 2, 0, 12, 0);
-        } else {
+        else
             Utils::StyleHelper::drawCornerImage(m_segment, &p, geom, 2, 0, 12, 0);
-        }
     }
-    if (isEnabled()) {
+    if (isEnabled())
         p.setPen(StyleHelper::panelTextColor());
-    } else {
+    else
         p.setPen(StyleHelper::panelTextColor().darker());
-    }
     QFontMetrics fm(p.font());
     QString textToDraw = fm.elidedText(text(), Qt::ElideRight, geom.width() - m_textPos.x());
 

src/libs/utils/environmentmodel.cpp

@@ -48,9 +48,8 @@ public:
         // Add removed variables again and mark them as "<UNSET>" so
         // that the user can actually see those removals:
         foreach (const Utils::EnvironmentItem &item, m_items) {
-            if (item.unset) {
+            if (item.unset)
                 m_resultEnvironment.set(item.name, EnvironmentModel::tr("<UNSET>"));
-            }
         }
     }
 

src/libs/utils/fancylineedit.cpp

@@ -58,18 +58,16 @@ static void execMenuAtWidget(QMenu *menu, QWidget *widget)
     QSize sh = menu->sizeHint();
     QRect rect = widget->rect();
     if (widget->isRightToLeft()) {
-        if (widget->mapToGlobal(QPoint(0, rect.bottom())).y() + sh.height() <= screen.height()) {
+        if (widget->mapToGlobal(QPoint(0, rect.bottom())).y() + sh.height() <= screen.height())
             p = widget->mapToGlobal(rect.bottomRight());
-        } else {
+        else
             p = widget->mapToGlobal(rect.topRight() - QPoint(0, sh.height()));
-        }
         p.rx() -= sh.width();
     } else {
-        if (widget->mapToGlobal(QPoint(0, rect.bottom())).y() + sh.height() <= screen.height()) {
+        if (widget->mapToGlobal(QPoint(0, rect.bottom())).y() + sh.height() <= screen.height())
             p = widget->mapToGlobal(rect.bottomLeft());
-        } else {
+        else
             p = widget->mapToGlobal(rect.topLeft() - QPoint(0, sh.height()));
-        }
     }
     p.rx() = qMax(screen.left(), qMin(p.x(), screen.right() - sh.width()));
     p.ry() += 1;

src/libs/utils/fancymainwindow.cpp

@@ -105,11 +105,10 @@ QDockWidget *FancyMainWindow::addDockForWidget(QWidget *widget)
     dockWidget->setWidget(widget);
     // Set an object name to be used in settings, derive from widget name
     const QString objectName = widget->objectName();
-    if (objectName.isEmpty()) {
+    if (objectName.isEmpty())
         dockWidget->setObjectName(QLatin1String("dockWidget") + QString::number(dockWidgets().size() + 1));
-    } else {
+    else
         dockWidget->setObjectName(objectName + QLatin1String("DockWidget"));
-    }
     connect(dockWidget->toggleViewAction(), SIGNAL(triggered()),
         this, SLOT(onDockActionTriggered()), Qt::QueuedConnection);
     connect(dockWidget, SIGNAL(visibilityChanged(bool)),

src/libs/utils/filenamevalidatinglineedit.cpp

@@ -114,11 +114,10 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name,
         if (name.contains(QLatin1Char(*c))) {
             if (errorMessage) {
                 const QChar qc = QLatin1Char(*c);
-                if (qc.isSpace()) {
+                if (qc.isSpace())
                     *errorMessage = tr("Name contains white space.");
-                } else {
+                else
                     *errorMessage = tr("Invalid character '%1'.").arg(qc);
-                }
             }
             return false;
         }
@@ -171,17 +170,15 @@ bool FileNameValidatingLineEdit::validateFileNameExtension(const QString &fileNa
     if (!requiredExtensions.isEmpty()) {
         foreach (const QString &requiredExtension, requiredExtensions) {
             QString extension = QLatin1String(".") + requiredExtension;
-            if (fileName.endsWith(extension, Qt::CaseSensitive) && extension.count() < fileName.count()) {
+            if (fileName.endsWith(extension, Qt::CaseSensitive) && extension.count() < fileName.count())
                 return true;
-            }
         }
 
         if (errorMessage) {
-            if (requiredExtensions.count() == 1) {
+            if (requiredExtensions.count() == 1)
                 *errorMessage = tr("File extension %1 is required:").arg(requiredExtensions.first());
-            } else {
+            else
                 *errorMessage = tr("File extensions %1 are required:").arg(requiredExtensions.join(QLatin1String(", ")));
-            }
         }
 
         return false;

src/libs/utils/filesearch.cpp

@@ -499,9 +499,8 @@ bool SubDirFileIterator::hasNext() const
         const bool processed = m_processedValues.pop();
         if (dir.exists()) {
             QStringList subDirs;
-            if (!processed) {
+            if (!processed)
                 subDirs = dir.entryList(QDir::Dirs|QDir::Hidden|QDir::NoDotAndDotDot);
-            }
             if (subDirs.isEmpty()) {
                 QStringList fileEntries = dir.entryList(m_filters,
                     QDir::Files|QDir::Hidden);

src/libs/utils/filesystemwatcher.cpp

@@ -284,9 +284,8 @@ void FileSystemWatcher::removeFiles(const QStringList &files)
         const int count = --(d->m_staticData->m_fileCount[file]);
         Q_ASSERT(count >= 0);
 
-        if (!count) {
+        if (!count)
             toRemove << file;
-        }
     }
 
     if (!toRemove.isEmpty())
@@ -362,9 +361,8 @@ void FileSystemWatcher::removeDirectories(const QStringList &directories)
         const int count = --d->m_staticData->m_directoryCount[directory];
         Q_ASSERT(count >= 0);
 
-        if (!count) {
+        if (!count)
             toRemove << directory;
-        }
     }
     if (!toRemove.isEmpty())
         d->m_staticData->m_watcher->removePaths(toRemove);

src/libs/utils/flowlayout.cpp

@@ -61,20 +61,18 @@ void FlowLayout::addItem(QLayoutItem *item)
 
 int FlowLayout::horizontalSpacing() const
 {
-    if (m_hSpace >= 0) {
+    if (m_hSpace >= 0)
         return m_hSpace;
-    } else {
+    else
         return smartSpacing(QStyle::PM_LayoutHorizontalSpacing);
-    }
 }
 
 int FlowLayout::verticalSpacing() const
 {
-    if (m_vSpace >= 0) {
+    if (m_vSpace >= 0)
         return m_vSpace;
-    } else {
+    else
         return smartSpacing(QStyle::PM_LayoutVerticalSpacing);
-    }
 }
 
 int FlowLayout::count() const

src/libs/utils/json.cpp

@@ -730,9 +730,8 @@ JsonSchema *JsonSchemaManager::parseSchema(const QString &schemaFileName) const
     if (reader.fetch(schemaFileName, QIODevice::Text)) {
         const QString &contents = QString::fromUtf8(reader.data());
         JsonValue *json = JsonValue::create(contents);
-        if (json && json->kind() == JsonValue::Object) {
+        if (json && json->kind() == JsonValue::Object)
             return new JsonSchema(json->toObject(), this);
-        }
     }
 
     return 0;

src/libs/utils/parameteraction.cpp

@@ -93,11 +93,10 @@ void ParameterAction::setEnablingMode(EnablingMode m)
 void ParameterAction::setParameter(const QString &p)
 {
     const bool enabled = !p.isEmpty();
-    if (enabled) {
+    if (enabled)
         setText(m_parameterText.arg(p));
-    } else {
+    else
         setText(m_emptyText);
-    }
     if (m_enablingMode == EnabledWithParameter)
         setEnabled(enabled);
 }

src/libs/utils/pathlisteditor.cpp

@@ -174,11 +174,10 @@ QAction *PathListEditor::insertAction(int index /* -1 */, const QString &text, Q
             beforeAction = actions.at(index);
     }
     QAction *rc = createAction(this, text, receiver, slotFunc);
-    if (beforeAction) {
+    if (beforeAction)
         d->buttonMenu->insertAction(beforeAction, rc);
-    } else {
+    else
         d->buttonMenu->addAction(rc);
-    }
     return rc;
 }
 

src/libs/utils/reloadpromptutils.cpp

@@ -97,12 +97,11 @@ QTCREATOR_UTILS_EXPORT Utils::FileDeletedPromptAnswer
     box.setDefaultButton(saveas);
     box.exec();
     QAbstractButton *clickedbutton = box.clickedButton();
-    if (clickedbutton == close) {
+    if (clickedbutton == close)
         return FileDeletedClose;
-    } else if (clickedbutton == saveas) {
+    else if (clickedbutton == saveas)
         return FileDeletedSaveAs;
-    } else if (clickedbutton == save) {
+    else if (clickedbutton == save)
         return FileDeletedSave;
-    }
     return FileDeletedClose;
 }

src/libs/utils/synchronousprocess.cpp

@@ -256,11 +256,10 @@ SynchronousProcess::~SynchronousProcess()
 
 void SynchronousProcess::setTimeout(int timeoutMS)
 {
-    if (timeoutMS >= 0) {
+    if (timeoutMS >= 0)
         d->m_maxHangTimerCount = qMax(2, timeoutMS / 1000);
-    } else {
+    else
         d->m_maxHangTimerCount = INT_MAX;
-    }
 }
 
 int SynchronousProcess::timeout() const

src/libs/utils/textfileformat.cpp

@@ -103,13 +103,12 @@ TextFileFormat TextFileFormat::detect(const QByteArray &data)
     }
     // end code taken from qtextstream
     const int newLinePos = data.indexOf('\n');
-    if (newLinePos == -1) {
+    if (newLinePos == -1)
         result.lineTerminationMode = NativeLineTerminator;
-    } else if (newLinePos == 0) {
+    else if (newLinePos == 0)
         result.lineTerminationMode = LFLineTerminator;
-    } else {
+    else
         result.lineTerminationMode = data.at(newLinePos - 1) == '\r' ? CRLFLineTerminator : LFLineTerminator;
-    }
     return result;
 }
 
@@ -286,11 +285,10 @@ bool TextFileFormat::writeFile(const QString &fileName, QString plainText, QStri
     // let QFile do the work, else manually add.
     QIODevice::OpenMode fileMode = QIODevice::NotOpen;
     if (lineTerminationMode == CRLFLineTerminator) {
-        if (NativeLineTerminator == CRLFLineTerminator) {
+        if (NativeLineTerminator == CRLFLineTerminator)
             fileMode |= QIODevice::Text;
-        } else {
+        else
             plainText.replace(QLatin1Char('\n'), QLatin1String("\r\n"));
-        }
     }
 
     Utils::FileSaver saver(fileName, fileMode);

src/libs/utils/wizard.cpp

@@ -553,9 +553,8 @@ QList<WizardProgressItem *> WizardProgressPrivate::singlePathBetween(WizardProgr
         if (itItem.value().count() != 1)
             return QList<WizardProgressItem *>();
         it = itItem.value().constBegin().key();
-        if (it == item) {
+        if (it == item)
             return path;
-        }
         itItem = visitedItemsToParents.constFind(it);
     }
     return QList<WizardProgressItem *>();

src/libs/zeroconf/avahiLib.cpp

@@ -506,9 +506,8 @@ extern "C" void cAvahiBrowseReply(
     }
 
     ServiceBrowserPrivate *browser = reinterpret_cast<ServiceBrowserPrivate *>(context);
-    if (browser == 0) {
+    if (browser == 0)
         qDebug() << "Error context is null in cAvahiBrowseReply";
-    }
     switch (event) {
         case AVAHI_BROWSER_FAILURE:
             browser->browseReply(kDNSServiceFlagsMoreComing, 0, protocol, kDNSServiceErr_Unknown,

src/libs/zeroconf/servicebrowser.cpp

@@ -113,9 +113,8 @@ int fromFullNameC(const char * const fullName, QString &service, QString &regtyp
                 fullNameDecoded[decodedI++] = c;
             }
         } else if (c == '.') {
-            if (iPos < 4) {
+            if (iPos < 4)
                 oldPos[iPos++] = decodedI;
-            }
             fullNameDecoded[decodedI++] = c;
         } else {
             fullNameDecoded[decodedI++] = c;
@@ -387,11 +386,10 @@ QDebug operator<<(QDebug dbg, const Service &service)
 }
 
 QDebug operator<<(QDebug dbg, const Service::ConstPtr &service){
-    if (service.data() == 0){
+    if (service.data() == 0)
         dbg << "Service{*NULL*}";
-    } else {
+    else
         dbg << *service.data();
-    }
     return dbg;
 }
 
@@ -718,9 +716,8 @@ extern "C" void DNSSD_API cAddrReply(DNSServiceRef                    sdRef,
                  << interfaceIndex << ", " << ((int)errorCode) << ", " << hostname << ", "
                  << QHostAddress(address).toString() << ", " << ttl << ", " << ((size_t)context);
     ServiceGatherer *ctxGatherer = reinterpret_cast<ServiceGatherer *>(context);
-    if (ctxGatherer){
+    if (ctxGatherer)
         ctxGatherer->addrReply(flags, errorCode, hostname, address, ttl);
-    }
 }
 
 /// callback for service browsing
@@ -856,9 +853,8 @@ void ServiceGatherer::restartResolve(ZK_IP_Protocol protocol)
                     changed = true;
                 }
             }
-            if (changed) {
+            if (changed)
                 currentService->m_host->setAddresses(addrNow);
-            }
         }
         DNSServiceErrorType err = lib()->resolve(
                     serviceBrowser->mainRef(),
@@ -889,9 +885,8 @@ void ServiceGatherer::restartResolve(ZK_IP_Protocol protocol)
                         changed = true;
                     }
                 }
-                if (changed) {
+                if (changed)
                     currentService->m_host->setAddresses(addrNow);
-                }
             }
         }
         DNSServiceErrorType err = lib()->resolve(
@@ -1085,9 +1080,8 @@ void ServiceGatherer::serviceResolveReply(DNSServiceFlags                     fl
         else
             currentService->m_host->setAddresses(QList<QHostAddress>());
         currentService->m_host->setHostName(hostName);
-        if (serviceBrowser->autoResolveAddresses){
+        if (serviceBrowser->autoResolveAddresses)
             restartHostResolution();
-        }
     }
     if (currentServiceCanBePublished())
         serviceBrowser->pendingGathererAdd(gatherer());
@@ -1144,9 +1138,8 @@ void ServiceGatherer::txtRecordReply(DNSServiceFlags                     flags,
             currentService->m_txtRecord.remove(QString::fromUtf8(keyBuf)); // check value???
         }
     }
-    if ((flags & kDNSServiceFlagsAdd) != 0) {
+    if ((flags & kDNSServiceFlagsAdd) != 0)
         status |= TxtConnectionSuccess;
-    }
     if (currentService->m_txtRecord.count() != 0 && currentServiceCanBePublished())
         serviceBrowser->pendingGathererAdd(gatherer());
 }
@@ -1373,12 +1366,10 @@ ServiceBrowserPrivate::~ServiceBrowserPrivate()
 {
     if (DEBUG_ZEROCONF)
         qDebug() << "destroying ServiceBrowserPrivate " << serviceType;
-    if (browsing){
+    if (browsing)
         stopBrowsing();
-    }
+    if (mainConnection)
-    if (mainConnection){
         mainConnection->removeBrowser(this);
-    }
 }
 
 void ServiceBrowserPrivate::insertGatherer(const QString &fullName)
@@ -1498,9 +1489,8 @@ void ServiceBrowserPrivate::browseReply(DNSServiceFlags                     flag
         if (pos == knownServices.end() || *pos != fullName)
             knownServices.insert(pos, fullName);
     } else {
-        if (gatherers.contains(fullName)){
+        if (gatherers.contains(fullName))
             gatherers[fullName]->maybeRemove();
-        }
         knownServices.removeOne(fullName);
     }
     maybeUpdateLists(); // avoid?

src/plugins/analyzerbase/analyzersettings.cpp

@@ -209,11 +209,10 @@ void AnalyzerRunConfigurationAspect::setUsingGlobalSettings(bool value)
     if (value == m_useGlobalSettings)
         return;
     m_useGlobalSettings = value;
-    if (m_useGlobalSettings) {
+    if (m_useGlobalSettings)
         m_subConfigs = AnalyzerGlobalSettings::instance()->subConfigs();
-    } else {
+    else
         m_subConfigs = m_customConfigurations;
-    }
 }
 
 void AnalyzerRunConfigurationAspect::resetCustomToGlobalSettings()

src/plugins/android/androidmanager.cpp

@@ -606,11 +606,10 @@ QStringList AndroidManager::availableQtLibs(ProjectExplorer::Target *target)
         int it = 0;
         while (it < mapLibs[key].dependencies.size()) {
             const QString &dependName = mapLibs[key].dependencies[it];
-            if (!mapLibs.keys().contains(dependName) && dependName.startsWith(QLatin1String("lib")) && dependName.endsWith(QLatin1String(".so"))) {
+            if (!mapLibs.keys().contains(dependName) && dependName.startsWith(QLatin1String("lib")) && dependName.endsWith(QLatin1String(".so")))
                 mapLibs[key].dependencies.removeAt(it);
-            } else {
+            else
                 ++it;
-            }
         }
         if (!mapLibs[key].dependencies.size())
             mapLibs[key].level = 0;

src/plugins/autotoolsprojectmanager/autotoolsproject.cpp

@@ -315,11 +315,10 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
 
         // Add file node
         const QString filePath = directory.absoluteFilePath(file);
-        if (nodeHash.contains(filePath)) {
+        if (nodeHash.contains(filePath))
             nodeHash.remove(filePath);
-        } else {
+        else
             fileNodes.append(new FileNode(filePath, ResourceType, false));
-        }
     }
 
     if (!fileNodes.isEmpty())

src/plugins/bineditor/bineditor.cpp

@@ -73,9 +73,8 @@ static QByteArray calculateHexPattern(const QByteArray &pattern)
         int i = 0;
         while (i < pattern.size()) {
             ushort s = pattern.mid(i, 2).toUShort(&ok, 16);
-            if (!ok) {
+            if (!ok)
                 return QByteArray();
-            }
             result.append(s);
             i += 2;
         }
@@ -1061,11 +1060,10 @@ bool BinEditor::event(QEvent *e)
     case QEvent::ToolTip: {
         const QHelpEvent *helpEvent = static_cast<const QHelpEvent *>(e);
         const QString tt = toolTip(helpEvent);
-        if (tt.isEmpty()) {
+        if (tt.isEmpty())
             QToolTip::hideText();
-        } else {
+        else
             QToolTip::showText(helpEvent->globalPos(), tt, this);
-        }
         e->accept();
         return true;
     }
@@ -1437,9 +1435,8 @@ void BinEditor::changeData(int position, uchar character, bool highNibble)
     changeDataAt(position, (char) character);
     bool emitModificationChanged = (m_undoStack.size() == m_unmodifiedState);
     m_undoStack.push(cmd);
-    if (emitModificationChanged) {
+    if (emitModificationChanged)
         emit modificationChanged(m_undoStack.size() != m_unmodifiedState);
-    }
 
     if (m_undoStack.size() == 1)
         emit undoAvailable(true);

src/plugins/bookmarks/bookmarkmanager.cpp

@@ -803,11 +803,10 @@ void BookmarkManager::operateTooltip(TextEditor::ITextEditor *textEditor, const
     if (!mark)
         return;
 
-    if (mark->note().isEmpty()) {
+    if (mark->note().isEmpty())
         TextEditor::ToolTip::instance()->hide();
-    } else {
+    else
         TextEditor::ToolTip::instance()->show(pos, TextEditor::TextContent(mark->note()), textEditor->widget());
-    }
 }
 
 /* Loads the bookmarks from the session settings. */

src/plugins/classview/classviewutils.cpp

@@ -82,9 +82,8 @@ QSet<SymbolLocation> Utils::roleToLocations(const QList<QVariant> &locationsVar)
 {
     QSet<SymbolLocation> locations;
     foreach (const QVariant &loc, locationsVar) {
-        if (loc.canConvert<SymbolLocation>()) {
+        if (loc.canConvert<SymbolLocation>())
             locations.insert(loc.value<SymbolLocation>());
-        }
     }
 
     return locations;

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -260,9 +260,8 @@ ProjectExplorer::BuildConfiguration::BuildType CMakeBuildConfiguration::buildTyp
         while (!cmakeCache.atEnd()) {
             QByteArray line = cmakeCache.readLine();
             if (line.startsWith("CMAKE_BUILD_TYPE")) {
-                if (int pos = line.indexOf('=')) {
+                if (int pos = line.indexOf('='))
                     cmakeBuildType = QString::fromLocal8Bit(line.mid(pos + 1).trimmed());
-                }
                 break;
             }
         }

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -284,9 +284,8 @@ bool CMakeProject::parseCMakeLists()
     while (!cmakeCache.atEnd()) {
         QByteArray line = cmakeCache.readLine();
         if (line.startsWith("QT_UIC_EXECUTABLE")) {
-            if (int pos = line.indexOf('=')) {
+            if (int pos = line.indexOf('='))
                 m_uicCommand = QString::fromLocal8Bit(line.mid(pos + 1).trimmed());
-            }
             break;
         }
     }
@@ -977,11 +976,10 @@ bool CMakeCbpParser::parseCbpFile(const QString &fileName)
 
         while (!atEnd()) {
             readNext();
-            if (name() == QLatin1String("CodeBlocks_project_file")) {
+            if (name() == QLatin1String("CodeBlocks_project_file"))
                 parseCodeBlocks_project_file();
-            } else if (isStartElement()) {
+            else if (isStartElement())
                 parseUnknownElement();
-            }
         }
         fi.close();
         m_includeFiles.sort();
@@ -995,13 +993,12 @@ void CMakeCbpParser::parseCodeBlocks_project_file()
 {
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (name() == QLatin1String("Project")) {
+        else if (name() == QLatin1String("Project"))
             parseProject();
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 
@@ -1009,17 +1006,16 @@ void CMakeCbpParser::parseProject()
 {
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (name() == QLatin1String("Option")) {
+        else if (name() == QLatin1String("Option"))
             parseOption();
-        } else if (name() == QLatin1String("Unit")) {
+        else if (name() == QLatin1String("Unit"))
             parseUnit();
-        } else if (name() == QLatin1String("Build")) {
+        else if (name() == QLatin1String("Build"))
             parseBuild();
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 
@@ -1027,13 +1023,12 @@ void CMakeCbpParser::parseBuild()
 {
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (name() == QLatin1String("Target")) {
+        else if (name() == QLatin1String("Target"))
             parseBuildTarget();
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 
@@ -1047,9 +1042,8 @@ void CMakeCbpParser::parseBuildTarget()
     while (!atEnd()) {
         readNext();
         if (isEndElement()) {
-            if (m_buildTargetType || m_buildTarget.title == QLatin1String("all") || m_buildTarget.title == QLatin1String("install")) {
+            if (m_buildTargetType || m_buildTarget.title == QLatin1String("all") || m_buildTarget.title == QLatin1String("install"))
                 m_buildTargets.append(m_buildTarget);
-            }
             return;
         } else if (name() == QLatin1String("Compiler")) {
             parseCompiler();
@@ -1079,13 +1073,12 @@ void CMakeCbpParser::parseBuildTargetOption()
     }
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (name() == QLatin1String("MakeCommand")) {
+        else if (name() == QLatin1String("MakeCommand"))
             parseMakeCommand();
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 
@@ -1104,11 +1097,10 @@ void CMakeCbpParser::parseOption()
 
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 
@@ -1116,15 +1108,14 @@ void CMakeCbpParser::parseMakeCommand()
 {
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (name() == QLatin1String("Build")) {
+        else if (name() == QLatin1String("Build"))
             parseBuildTargetBuild();
-        } else if (name() == QLatin1String("Clean")) {
+        else if (name() == QLatin1String("Clean"))
             parseBuildTargetClean();
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 
@@ -1134,11 +1125,10 @@ void CMakeCbpParser::parseBuildTargetBuild()
         m_buildTarget.makeCommand = attributes().value(QLatin1String("command")).toString();
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 
@@ -1148,11 +1138,10 @@ void CMakeCbpParser::parseBuildTargetClean()
         m_buildTarget.makeCleanCommand = attributes().value(QLatin1String("command")).toString();
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 
@@ -1160,13 +1149,12 @@ void CMakeCbpParser::parseCompiler()
 {
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (name() == QLatin1String("Add")) {
+        else if (name() == QLatin1String("Add"))
             parseAdd();
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 
@@ -1177,9 +1165,8 @@ void CMakeCbpParser::parseAdd()
 
     const QString includeDirectory = addAttributes.value(QLatin1String("directory")).toString();
     // allow adding multiple times because order happens
-    if (!includeDirectory.isEmpty()) {
+    if (!includeDirectory.isEmpty())
         m_includeFiles.append(includeDirectory);
-    }
 
     QString compilerOption = addAttributes.value(QLatin1String("option")).toString();
     // defining multiple times a macro to the same value makes no sense
@@ -1188,9 +1175,8 @@ void CMakeCbpParser::parseAdd()
         int macroNameIndex = compilerOption.indexOf(QLatin1String("-D")) + 2;
         if (macroNameIndex != 1) {
             int assignIndex = compilerOption.indexOf(QLatin1Char('='), macroNameIndex);
-            if (assignIndex != -1) {
+            if (assignIndex != -1)
                 compilerOption[assignIndex] = ' ';
-            }
             m_defines.append("#define ");
             m_defines.append(compilerOption.mid(macroNameIndex).toLatin1());
             m_defines.append('\n');
@@ -1199,11 +1185,10 @@ void CMakeCbpParser::parseAdd()
 
     while (!atEnd()) {
         readNext();
-        if (isEndElement()) {
+        if (isEndElement())
             return;
-        } else if (isStartElement()) {
+        else if (isStartElement())
             parseUnknownElement();
-        }
     }
 }
 

src/plugins/cmakeprojectmanager/cmakevalidator.cpp

@@ -180,17 +180,15 @@ static void extractKeywords(const QByteArray &input, QStringList *destination)
                 keyword += chr;
             } else {
                 if (!keyword.isEmpty()) {
-                    if (keyword.size() > 1) {
+                    if (keyword.size() > 1)
                         *destination << keyword;
-                    }
                     keyword.clear();
                 }
             }
         }
     }
-    if (keyword.size() > 1) {
+    if (keyword.size() > 1)
         *destination << keyword;
-    }
 }
 
 void CMakeValidator::parseFunctionOutput(const QByteArray &output)

src/plugins/coreplugin/actionmanager/command.cpp

@@ -462,11 +462,10 @@ void Action::removeOverrideAction(QAction *action)
     QMutableMapIterator<int, QPointer<QAction> > it(m_contextActionMap);
     while (it.hasNext()) {
         it.next();
-        if (it.value() == 0) {
+        if (it.value() == 0)
             it.remove();
-        } else if (it.value() == action) {
+        else if (it.value() == action)
             it.remove();
-        }
     }
     setCurrentContext(m_context);
 }

src/plugins/coreplugin/dialogs/externaltoolconfig.cpp

@@ -181,9 +181,8 @@ QModelIndex ExternalToolModel::index(int row, int column, const QModelIndex &par
         QString category = categoryForIndex(parent, &found);
         if (found) {
             QList<ExternalTool *> items = m_tools.value(category);
-            if (row < items.count()) {
+            if (row < items.count())
                 return createIndex(row, 0, items.at(row));
-            }
         }
     } else if (column == 0 && row < m_tools.keys().count()) {
         return createIndex(row, 0);
@@ -210,14 +209,12 @@ int ExternalToolModel::rowCount(const QModelIndex &parent) const
 {
     if (!parent.isValid())
         return m_tools.keys().count();
-    if (toolForIndex(parent)) {
+    if (toolForIndex(parent))
         return 0;
-    }
     bool found;
     QString category = categoryForIndex(parent, &found);
-    if (found) {
+    if (found)
         return m_tools.value(category).count();
-    }
 
     return 0;
 }

src/plugins/coreplugin/dialogs/newdialog.cpp

@@ -262,9 +262,8 @@ void NewDialog::setWizards(QList<IWizard*> wizards)
     parentItem->appendRow(projectKindItem);
     parentItem->appendRow(filesClassesKindItem);
 
-    if (m_dummyIcon.isNull()) {
+    if (m_dummyIcon.isNull())
         m_dummyIcon = QIcon(QLatin1String(Core::Constants::ICON_NEWFILE));
-    }
 
     QStringList availablePlatforms = IWizard::allAvailablePlatforms();
 
@@ -312,9 +311,8 @@ Core::IWizard *NewDialog::showDialog()
 
     if (!lastCategory.isEmpty())
         foreach (QStandardItem* item, m_categoryItems) {
-            if (item->data(Qt::UserRole) == lastCategory) {
+            if (item->data(Qt::UserRole) == lastCategory)
                 idx = m_twoLevelProxyModel->mapToSource(m_model->indexFromItem(item));
-        }
     }
     if (!idx.isValid())
         idx = m_twoLevelProxyModel->index(0,0, m_twoLevelProxyModel->index(0,0));
@@ -390,11 +388,10 @@ void NewDialog::addItem(QStandardItem *topLEvelCategoryItem, IWizard *wizard)
     QIcon wizardIcon;
 
     // spacing hack. Add proper icons instead
-    if (wizard->icon().isNull()) {
+    if (wizard->icon().isNull())
         wizardIcon = m_dummyIcon;
-    } else {
+    else
         wizardIcon = wizard->icon();
-    }
     wizardItem->setIcon(wizardIcon);
     wizardItem->setData(QVariant::fromValue(WizardContainer(wizard, 0)), Qt::UserRole);
     wizardItem->setFlags(Qt::ItemIsEnabled|Qt::ItemIsSelectable);

src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp

@@ -127,11 +127,10 @@ void PromptOverwriteDialog::setFileEnabled(const QString &f, bool e)
 {
     if (QStandardItem *item = itemForFile(f)) {
         Qt::ItemFlags flags = item->flags();
-        if (e) {
+        if (e)
             flags |= Qt::ItemIsEnabled;
-        } else {
+        else
             flags &= ~Qt::ItemIsEnabled;
-        }
         item->setFlags(flags);
     }
 }

src/plugins/coreplugin/documentmanager.cpp

@@ -244,10 +244,9 @@ static void addFileInfo(const QString &fileName, IDocument *document, bool isLin
         state.modified = fi.lastModified();
         state.permissions = fi.permissions();
         // Add watcher if we don't have that already
-        if (!d->m_states.contains(fileName)) {
+        if (!d->m_states.contains(fileName))
             d->m_states.insert(fileName, FileState());
 
-        }
         QFileSystemWatcher *watcher = 0;
         if (isLink)
             watcher = d->linkWatcher();
@@ -860,9 +859,8 @@ void DocumentManager::changedFile(const QString &fileName)
     if (d->m_states.contains(fileName))
         d->m_changedFiles.insert(fileName);
 
-    if (wasempty && !d->m_changedFiles.isEmpty()) {
+    if (wasempty && !d->m_changedFiles.isEmpty())
         QTimer::singleShot(200, this, SLOT(checkForReload()));
-    }
 }
 
 void DocumentManager::mainWindowActivated()
@@ -963,11 +961,10 @@ void DocumentManager::checkForReload()
 
             // find out the type
             IDocument::ChangeType fileChange = changeTypes.value(fileName);
-            if (fileChange == IDocument::TypeRemoved) {
+            if (fileChange == IDocument::TypeRemoved)
                 type = IDocument::TypeRemoved;
-            } else if (fileChange == IDocument::TypeContents && type == IDocument::TypePermissions) {
+            else if (fileChange == IDocument::TypeContents && type == IDocument::TypePermissions)
                 type = IDocument::TypeContents;
-            }
         }
 
         if (!changed) // probably because the change was blocked with (un)blockFileChange

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -506,11 +506,10 @@ void EditorManager::handleContextChange(Core::IContext *context)
     if (debugEditorManager)
         qDebug() << Q_FUNC_INFO;
     IEditor *editor = context ? qobject_cast<IEditor*>(context) : 0;
-    if (editor) {
+    if (editor)
         setCurrentEditor(editor);
-    } else {
+    else
         updateActions();
-    }
 }
 
 void EditorManager::setCurrentEditor(IEditor *editor, bool ignoreNavigationHistory)
@@ -645,9 +644,8 @@ void EditorManager::closeView(Core::Internal::EditorView *view)
         */
         if (!d->m_editorModel->isDuplicate(e)) {
             QList<IEditor *> duplicates = d->m_editorModel->duplicatesFor(e);
-            if (!duplicates.isEmpty()) {
+            if (!duplicates.isEmpty())
                 d->m_editorModel->makeOriginal(duplicates.first());
-            }
         }
     }
 
@@ -665,11 +663,10 @@ void EditorManager::closeView(Core::Internal::EditorView *view)
 
     SplitterOrView *newCurrent = splitter->findFirstView();
     if (newCurrent) {
-        if (IEditor *e = newCurrent->editor()) {
+        if (IEditor *e = newCurrent->editor())
             activateEditor(newCurrent->view(), e);
-        } else {
+        else
             setCurrentView(newCurrent);
-        }
     }
 }
 
@@ -680,9 +677,8 @@ QList<IEditor*>
     QSet<IEditor *> found;
     foreach (IDocument *document, documents) {
         foreach (IEditor *editor, editors) {
-            if (editor->document() == document && !found.contains(editor)) {
+            if (editor->document() == document && !found.contains(editor))
                     found << editor;
-            }
         }
     }
     return found.toList();
@@ -1045,9 +1041,8 @@ Core::IEditor *EditorManager::placeEditor(Core::Internal::EditorView *view, Core
                 view->addEditor(editor);
                 view->setCurrentEditor(editor);
                 if (!sourceView->editor()) {
-                    if (IEditor *replacement = pickUnusedEditor()) {
+                    if (IEditor *replacement = pickUnusedEditor())
                         sourceView->view()->addEditor(replacement);
-                    }
                 }
                 return editor;
             } else if (duplicateSupported) {
@@ -1085,9 +1080,8 @@ Core::IEditor *EditorManager::activateEditor(Core::Internal::EditorView *view, C
 
     if (!(flags & NoActivate)) {
         setCurrentEditor(editor, (flags & IgnoreNavigationHistory));
-        if (flags & ModeSwitch) {
+        if (flags & ModeSwitch)
             switchToPreferedMode();
-        }
         if (isVisible())
             editor->widget()->setFocus();
     }
@@ -1456,11 +1450,10 @@ IEditor *EditorManager::openEditorWithContents(const Id &editorId,
             QSet<QString> docnames;
             foreach (IEditor *editor, m_instance->openedEditors()) {
                 QString name = editor->document()->fileName();
-                if (name.isEmpty()) {
+                if (name.isEmpty())
                     name = editor->displayName();
-                } else {
+                else
                     name = QFileInfo(name).completeBaseName();
-                }
                 docnames << name;
             }
 
@@ -1547,9 +1540,8 @@ bool EditorManager::saveDocument(IDocument *documentParam)
         success = DocumentManager::saveDocument(document);
     }
 
-    if (success) {
+    if (success)
         addDocumentToRecentFiles(document);
-    }
 
     return success;
 }
@@ -1629,9 +1621,8 @@ bool EditorManager::saveDocumentAs(IDocument *documentParam)
     if (absoluteFilePath != document->fileName()) {
         // close existing editors for the new file name
         const QList<IEditor *> existList = editorsForFileName(absoluteFilePath);
-        if (!existList.isEmpty()) {
+        if (!existList.isEmpty())
             closeEditors(existList, false);
-        }
     }
 
     const bool success = DocumentManager::saveDocument(document, absoluteFilePath);
@@ -1720,9 +1711,8 @@ void EditorManager::updateWindowTitle()
 {
     QString windowTitle = tr("Qt Creator");
     const QString dashSep = QLatin1String(" - ");
-    if (!d->m_titleAddition.isEmpty()) {
+    if (!d->m_titleAddition.isEmpty())
         windowTitle.prepend(d->m_titleAddition + dashSep);
-    }
     IEditor *curEditor = currentEditor();
     if (curEditor) {
         QString editorName = curEditor->displayName();
@@ -1896,9 +1886,8 @@ QList<IEditor*> EditorManager::visibleEditors() const
             } while (view && view != firstView);
         }
     } else {
-        if (d->m_splitter->editor()) {
+        if (d->m_splitter->editor())
             editors.append(d->m_splitter->editor());
-        }
     }
     return editors;
 }
@@ -2029,11 +2018,10 @@ bool EditorManager::restoreState(const QByteArray &state)
             if (!fi.exists())
                 continue;
             QFileInfo rfi(autoSaveName(fileName));
-            if (rfi.exists() && fi.lastModified() < rfi.lastModified()) {
+            if (rfi.exists() && fi.lastModified() < rfi.lastModified())
                 openEditor(fileName, Id(QString::fromUtf8(id)));
-            } else {
+            else
                 d->m_editorModel->addRestoredEditor(fileName, displayName, Id(QString::fromUtf8(id)));
-            }
         }
     }
 

src/plugins/coreplugin/editormanager/editorview.cpp

@@ -320,9 +320,8 @@ QRect EditorView::editorArea() const
 
 void EditorView::addCurrentPositionToNavigationHistory(IEditor *editor, const QByteArray &saveState)
 {
-    if (editor && editor != currentEditor()) {
+    if (editor && editor != currentEditor())
         return; // we only save editor sate for the current editor, when the user interacts
-    }
 
     if (!editor)
         editor = currentEditor();
@@ -334,11 +333,10 @@ void EditorView::addCurrentPositionToNavigationHistory(IEditor *editor, const QB
         return;
 
     QByteArray state;
-    if (saveState.isNull()) {
+    if (saveState.isNull())
         state = editor->saveState();
-    } else {
+    else
         state = saveState;
-    }
 
     EditLocation location;
     location.document = document;
@@ -606,9 +604,8 @@ SplitterOrView *SplitterOrView::findNextView(SplitterOrView *view)
 
 SplitterOrView *SplitterOrView::findNextView_helper(SplitterOrView *view, bool *found)
 {
-    if (*found && m_view) {
+    if (*found && m_view)
         return this;
-    }
 
     if (this == view) {
         *found = true;
@@ -721,9 +718,8 @@ void SplitterOrView::unsplitAll_helper()
         ICore::editorManager()->emptyView(m_view);
     if (m_splitter) {
         for (int i = 0; i < m_splitter->count(); ++i) {
-            if (SplitterOrView *splitterOrView = qobject_cast<SplitterOrView*>(m_splitter->widget(i))) {
+            if (SplitterOrView *splitterOrView = qobject_cast<SplitterOrView*>(m_splitter->widget(i)))
                 splitterOrView->unsplitAll_helper();
-            }
         }
     }
 }

src/plugins/coreplugin/editormanager/openeditorsmodel.cpp

@@ -235,9 +235,8 @@ QList<OpenEditorsModel::Entry> OpenEditorsModel::restoredEditors() const
 {
     QList<Entry> result;
     for (int i = d->m_editors.count()-1; i >= 0; --i) {
-        if (!d->m_editors.at(i).editor) {
+        if (!d->m_editors.at(i).editor)
             result.append(d->m_editors.at(i));
-        }
     }
     return result;
 }

src/plugins/coreplugin/editormanager/openeditorsview.cpp

@@ -178,11 +178,10 @@ bool OpenEditorsWidget::eventFilter(QObject *obj, QEvent *event)
 
 void OpenEditorsWidget::handlePressed(const QModelIndex &index)
 {
-    if (index.column() == 0) {
+    if (index.column() == 0)
         activateEditor(index);
-    } else if (index.column() == 1) {
+    else if (index.column() == 1)
         m_delegate->pressedIndex = index;
-    }
 }
 
 void OpenEditorsWidget::handleClicked(const QModelIndex &index)

src/plugins/coreplugin/editormanager/openeditorswindow.cpp

@@ -88,9 +88,8 @@ void OpenEditorsWindow::selectAndHide()
 void OpenEditorsWindow::setVisible(bool visible)
 {
     QWidget::setVisible(visible);
-    if (visible) {
+    if (visible)
         setFocus();
-    }
 }
 
 bool OpenEditorsWindow::isCentering()

src/plugins/coreplugin/editortoolbar.cpp

@@ -337,9 +337,8 @@ void EditorToolBar::listContextMenu(QPoint pos)
     menu.addSeparator();
     EditorManager::instance()->addNativeDirActions(&menu, index);
     QAction *result = menu.exec(d->m_editorList->mapToGlobal(pos));
-    if (result == copyPath) {
+    if (result == copyPath)
         QApplication::clipboard()->setText(QDir::toNativeSeparators(fileName));
-    }
 }
 
 void EditorToolBar::makeEditorWritable()

src/plugins/coreplugin/externaltool.cpp

@@ -441,9 +441,8 @@ ExternalTool * ExternalTool::createFromFile(const QString &fileName, QString *er
     if (!reader.fetch(absFileName, errorMessage))
         return 0;
     ExternalTool *tool = ExternalTool::createFromXml(reader.data(), errorMessage, locale);
-    if (!tool) {
+    if (!tool)
         return 0;
-    }
     tool->m_fileName = absFileName;
     return tool;
 }
@@ -624,9 +623,8 @@ void ExternalToolRunner::run()
 
 void ExternalToolRunner::started()
 {
-    if (!m_resolvedInput.isEmpty()) {
+    if (!m_resolvedInput.isEmpty())
         m_process->write(m_resolvedInput.toLocal8Bit());
-    }
     m_process->closeWriteChannel();
 }
 
@@ -637,9 +635,8 @@ void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status)
                 || m_tool->errorHandling() == ExternalTool::ReplaceSelection) {
             emit ExternalToolManager::instance()->replaceSelectionRequested(m_processOutput);
         }
-        if (m_tool->modifiesCurrentDocument()) {
+        if (m_tool->modifiesCurrentDocument())
             DocumentManager::unexpectFileChange(m_expectedFileName);
-        }
     }
     ICore::messageManager()->printToOutputPane(
                 tr("'%1' finished").arg(m_resolvedExecutable), false);
@@ -661,11 +658,10 @@ void ExternalToolRunner::readStandardOutput()
         return;
     QByteArray data = m_process->readAllStandardOutput();
     QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_outputCodecState);
-    if (m_tool->outputHandling() == ExternalTool::ShowInPane) {
+    if (m_tool->outputHandling() == ExternalTool::ShowInPane)
         ICore::messageManager()->printToOutputPane(output, true);
-    } else if (m_tool->outputHandling() == ExternalTool::ReplaceSelection) {
+    else if (m_tool->outputHandling() == ExternalTool::ReplaceSelection)
         m_processOutput.append(output);
-    }
 }
 
 void ExternalToolRunner::readStandardError()
@@ -674,11 +670,10 @@ void ExternalToolRunner::readStandardError()
         return;
     QByteArray data = m_process->readAllStandardError();
     QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_errorCodecState);
-    if (m_tool->errorHandling() == ExternalTool::ShowInPane) {
+    if (m_tool->errorHandling() == ExternalTool::ShowInPane)
         ICore::messageManager()->printToOutputPane(output, true);
-    } else if (m_tool->errorHandling() == ExternalTool::ReplaceSelection) {
+    else if (m_tool->errorHandling() == ExternalTool::ReplaceSelection)
         m_processOutput.append(output);
-    }
 }
 
 // #pragma mark -- ExternalToolManager
@@ -777,9 +772,8 @@ void ExternalToolManager::menuActivated()
     ExternalTool *tool = m_tools.value(action->data().toString());
     QTC_ASSERT(tool, return);
     ExternalToolRunner *runner = new ExternalToolRunner(tool);
-    if (runner->hasError()) {
+    if (runner->hasError())
         ICore::messageManager()->printToOutputPane(runner->errorString(), true);
-    }
 }
 
 QMap<QString, QList<Internal::ExternalTool *> > ExternalToolManager::toolsByCategory() const
@@ -839,11 +833,10 @@ void ExternalToolManager::setToolsByCategory(const QMap<QString, QList<Internal:
         if (containerName.isEmpty()) { // no displayCategory, so put into external tools menu directly
             container = mexternaltools;
         } else {
-            if (m_containers.contains(containerName)) {
+            if (m_containers.contains(containerName))
                 container = m_containers.take(containerName); // remove to avoid deletion below
-            } else {
+            else
                 container = ActionManager::createMenu(Id(QLatin1String("Tools.External.Category.") + containerName));
-            }
             newContainers.insert(containerName, container);
             mexternaltools->addMenu(container, Constants::G_DEFAULT_ONE);
             container->menu()->setTitle(containerName);

src/plugins/coreplugin/fancyactionbar.cpp

@@ -109,11 +109,10 @@ static QVector<QString> splitInTwoLines(const QString &text, const QFontMetrics
                                       nextSplitPos - text.length() - 1);
         if (nextSplitPos != -1) {
             int splitCandidate = nextSplitPos + rx.matchedLength();
-            if (fontMetrics.width(text.mid(splitCandidate)) <= availableWidth) {
+            if (fontMetrics.width(text.mid(splitCandidate)) <= availableWidth)
                 splitPos = splitCandidate;
-            } else {
+            else
                 break;
-            }
         }
     } while (nextSplitPos > 0 && fontMetrics.width(text.left(nextSplitPos)) > availableWidth);
     // check if we could split at white space at all

src/plugins/coreplugin/fileiconprovider.cpp

@@ -180,11 +180,10 @@ void FileIconProvider::registerIconOverlayForSuffix(const QIcon &icon,
     const QPixmap fileIconPixmap = overlayIcon(QStyle::SP_FileIcon, icon, QSize(16, 16));
     // replace old icon, if it exists
     const CacheIterator it = findBySuffix(suffix, d->m_cache.begin(), d->m_cache.end());
-    if (it == d->m_cache.end()) {
+    if (it == d->m_cache.end())
         d->m_cache.append(StringIconPair(suffix, fileIconPixmap));
-    } else {
+    else
        (*it).second = fileIconPixmap;
-    }
 }
 
 /*!

src/plugins/coreplugin/mainwindow.cpp

@@ -430,11 +430,10 @@ static bool isDesktopFileManagerDrop(const QMimeData *d, QStringList *files = 0)
         const QString fileName = it->toLocalFile();
         if (!fileName.isEmpty()) {
             hasFiles = true;
-            if (files) {
+            if (files)
                 files->push_back(fileName);
-            } else {
+            else
                 break; // No result list, sufficient for checking
-            }
         }
     }
     return hasFiles;
@@ -442,11 +441,10 @@ static bool isDesktopFileManagerDrop(const QMimeData *d, QStringList *files = 0)
 
 void MainWindow::dragEnterEvent(QDragEnterEvent *event)
 {
-    if (isDesktopFileManagerDrop(event->mimeData()) && m_filesToOpenDelayed.isEmpty()) {
+    if (isDesktopFileManagerDrop(event->mimeData()) && m_filesToOpenDelayed.isEmpty())
         event->accept();
-    } else {
+    else
         event->ignore();
-    }
 }
 
 void MainWindow::dropEvent(QDropEvent *event)
@@ -992,11 +990,10 @@ void MainWindow::openFileWith()
         const Id editorId = editorManager()->getOpenWithEditorId(fileName, &isExternal);
         if (!editorId.isValid())
             continue;
-        if (isExternal) {
+        if (isExternal)
             EditorManager::openExternalEditor(fileName, editorId);
-        } else {
+        else
             EditorManager::openEditor(fileName, editorId, Core::EditorManager::ModeSwitch);
-        }
     }
 }
 
@@ -1178,9 +1175,8 @@ void MainWindow::readSettings()
                                   QColor(Utils::StyleHelper::DEFAULT_BASE_COLOR)).value<QColor>());
     }
 
-    if (!restoreGeometry(m_settings->value(QLatin1String(windowGeometryKey)).toByteArray())) {
+    if (!restoreGeometry(m_settings->value(QLatin1String(windowGeometryKey)).toByteArray()))
         resize(1008, 700); // size without window decoration
-    }
     restoreState(m_settings->value(QLatin1String(windowStateKey)).toByteArray());
 
     m_settings->endGroup();

src/plugins/coreplugin/manhattanstyle.cpp

@@ -865,9 +865,8 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
 
             State bflags = toolbutton->state;
             if (bflags & State_AutoRaise) {
-                if (!(bflags & State_MouseOver)) {
+                if (!(bflags & State_MouseOver))
                     bflags &= ~State_Raised;
-                }
             }
 
             State mflags = bflags;

src/plugins/coreplugin/mimedatabase.cpp

@@ -1073,11 +1073,10 @@ bool BaseMimeTypeParser::parse(QIODevice *dev, const QString &fileName, QString
             switch (ps) {
             case ParseMimeType: { // start parsing a type
                 const QString type = atts.value(QLatin1String(mimeTypeAttributeC)).toString();
-                if (type.isEmpty()) {
+                if (type.isEmpty())
                     reader.raiseError(QString::fromLatin1("Missing 'type'-attribute"));
-                } else {
+                else
                     data.type = type;
-                }
             }
                 break;
             case ParseGlobPattern:
@@ -1094,11 +1093,10 @@ bool BaseMimeTypeParser::parse(QIODevice *dev, const QString &fileName, QString
                 // comments have locale attributes. We want the default, English one
                 QString locale = atts.value(QLatin1String(localeAttributeC)).toString();
                 const QString comment = QCoreApplication::translate("MimeType", reader.readElementText().toLatin1());
-                if (locale.isEmpty()) {
+                if (locale.isEmpty())
                     data.comment = comment;
-                } else {
+                else
                     data.localeComments.insert(locale, comment);
-                }
             }
                 break;
             case ParseAlias: {
@@ -1467,11 +1465,10 @@ MimeType MimeDatabasePrivate::findByFile(const QFileInfo &f) const
         qDebug() << '>' << Q_FUNC_INFO << f.absoluteFilePath();
     const MimeType rc = findByFile(f, &priority);
     if (debugMimeDB) {
-        if (rc) {
+        if (rc)
             qDebug() << "<MimeDatabase::findByFile: match prio=" << priority << rc.type();
-        } else {
+        else
             qDebug() << "<MimeDatabase::findByFile: no match";
-        }
     }
     return rc;
 }
@@ -1536,11 +1533,10 @@ MimeType MimeDatabasePrivate::findByData(const QByteArray &data) const
         qDebug() << '>' << Q_FUNC_INFO << data.left(20).toHex();
     const MimeType rc = findByData(data, &priority);
     if (debugMimeDB) {
-        if (rc) {
+        if (rc)
             qDebug() << "<MimeDatabase::findByData: match prio=" << priority << rc.type();
-        } else {
+        else
             qDebug() << "<MimeDatabase::findByData: no match";
-        }
     }
     return rc;
 }

src/plugins/coreplugin/navigationwidget.cpp

@@ -420,9 +420,8 @@ void NavigationWidget::setSuppressed(bool b)
 int NavigationWidget::factoryIndex(const Id &id)
 {
     for (int row = 0; row < d->m_factoryModel->rowCount(); ++row) {
-        if (d->m_factoryModel->data(d->m_factoryModel->index(row, 0), FactoryIdRole).value<Core::Id>() == id) {
+        if (d->m_factoryModel->data(d->m_factoryModel->index(row, 0), FactoryIdRole).value<Core::Id>() == id)
             return row;
-        }
     }
     return -1;
 }

src/plugins/coreplugin/outputpanemanager.cpp

@@ -317,11 +317,10 @@ void OutputPaneManager::shortcutTriggered()
     // then just give it focus.
     int current = currentIndex();
     if (OutputPanePlaceHolder::isCurrentVisible() && current == idx) {
-        if (!outputPane->hasFocus() && outputPane->canFocus()) {
+        if (!outputPane->hasFocus() && outputPane->canFocus())
             outputPane->setFocus();
-        } else {
+        else
             slotHide();
-        }
     } else {
         // Else do the same as clicking on the button does.
         buttonTriggered(idx);

src/plugins/coreplugin/outputwindow.cpp

@@ -174,9 +174,8 @@ void OutputWindow::setFormatter(OutputFormatter *formatter)
 void OutputWindow::showEvent(QShowEvent *e)
 {
     QPlainTextEdit::showEvent(e);
-    if (m_scrollToBottom) {
+    if (m_scrollToBottom)
         verticalScrollBar()->setValue(verticalScrollBar()->maximum());
-    }
     m_scrollToBottom = false;
 }
 

src/plugins/coreplugin/progressmanager/futureprogress.cpp

@@ -247,11 +247,10 @@ void FutureProgress::setFinished()
 
     d->m_progress->setFinished(true);
 
-    if (d->m_watcher.future().isCanceled()) {
+    if (d->m_watcher.future().isCanceled())
         d->m_progress->setError(true);
-    } else {
+    else
         d->m_progress->setError(false);
-    }
     emit finished();
     d->tryToFadeAway();
 }
@@ -363,15 +362,13 @@ QString FutureProgress::type() const
 
 void FutureProgress::setKeepOnFinish(KeepOnFinishType keepType)
 {
-    if (d->m_keep == keepType) {
+    if (d->m_keep == keepType)
         return;
-    }
     d->m_keep = keepType;
 
     //if it is not finished tryToFadeAway is called by setFinished at the end
-    if (d->m_watcher.isFinished()) {
+    if (d->m_watcher.isFinished())
         d->tryToFadeAway();
-    }
 }
 
 bool FutureProgress::keepOnFinish() const

src/plugins/coreplugin/progressmanager/progressmanager.cpp

@@ -272,9 +272,8 @@ void ProgressManagerPrivate::cancelTasks(const QString &type)
         delete task.key();
         task = m_runningTasks.erase(task);
     }
-    if (found) {
+    if (found)
         emit allTasksFinished(type);
-    }
 }
 
 void ProgressManagerPrivate::cancelAllRunningTasks()
@@ -330,9 +329,8 @@ void ProgressManagerPrivate::taskFinished()
     m_runningTasks.remove(task);
     delete task;
 
-    if (!m_runningTasks.key(type, 0)) {
+    if (!m_runningTasks.key(type, 0))
         emit allTasksFinished(type);
-    }
 }
 
 void ProgressManagerPrivate::disconnectApplicationTask()