more cosmetic changes

109 files changed, 555 insertions, 364 deletions

diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp
index bfd9e0f4dc..5ca8cc5355 100644
--- a/src/libs/aggregation/aggregate.cpp
+++ b/src/libs/aggregation/aggregate.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "aggregate.h"
 
 #include <QtCore/QWriteLocker>
@@ -262,4 +263,3 @@ void Aggregate::remove(QObject *component)
     m_components.removeAll(component);
     disconnect(component, SIGNAL(destroyed(QObject*)), this, SLOT(deleteSelf(QObject*)));
 }
-
diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h
index 5040aec8b2..20c9bfbca6 100644
--- a/src/libs/aggregation/aggregate.h
+++ b/src/libs/aggregation/aggregate.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef QAGGREGATION_H
 #define QAGGREGATION_H
 
@@ -131,4 +132,4 @@ template <typename T> QList<T *> query_all(QObject *obj)
 
 } // namespace Aggregation
 
-#endif // header guard
+#endif // QAGGREGATION_H
diff --git a/src/libs/aggregation/aggregation_global.h b/src/libs/aggregation/aggregation_global.h
index cae0917d65..0080813711 100644
--- a/src/libs/aggregation/aggregation_global.h
+++ b/src/libs/aggregation/aggregation_global.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef AGGREGATION_GLOBAL_H
 #define AGGREGATION_GLOBAL_H
 
@@ -41,4 +42,4 @@
 #  define AGGREGATION_EXPORT Q_DECL_IMPORT
 #endif
 
-#endif // header
+#endif // AGGREGATION_GLOBAL_H
diff --git a/src/libs/aggregation/examples/text/main.cpp b/src/libs/aggregation/examples/text/main.cpp
index 1a0ecac816..8de68c0ffb 100644
--- a/src/libs/aggregation/examples/text/main.cpp
+++ b/src/libs/aggregation/examples/text/main.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "main.h"
 
 #include <QtGui/QApplication>
@@ -107,4 +108,3 @@ int main(int argc, char *argv[])
     w.show();
     return app.exec();
 }
-
diff --git a/src/libs/aggregation/examples/text/main.h b/src/libs/aggregation/examples/text/main.h
index 3a458923b4..dba7256946 100644
--- a/src/libs/aggregation/examples/text/main.h
+++ b/src/libs/aggregation/examples/text/main.h
@@ -30,15 +30,16 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef MAIN_H
 #define MAIN_H
 
 #include "myinterfaces.h"
+#include "ui_main.h"
 
 #include <aggregate.h>
 
 #include <QtGui/QWidget>
-#include "ui_main.h"
 
 class MyMain : public QWidget
 {
diff --git a/src/libs/aggregation/examples/text/myinterfaces.h b/src/libs/aggregation/examples/text/myinterfaces.h
index 62dad429e2..150f60603b 100644
--- a/src/libs/aggregation/examples/text/myinterfaces.h
+++ b/src/libs/aggregation/examples/text/myinterfaces.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef MYINTERFACES_H
 #define MYINTERFACES_H
 
@@ -45,6 +46,7 @@ public:
     IComboEntry(QString title) : m_title(title) {}
     virtual ~IComboEntry() {}
     QString title() const { return m_title; }
+
 private:
     QString m_title;
 };
@@ -57,6 +59,7 @@ public:
     IText1(QString text) : m_text(text) {}
     virtual ~IText1() {}
     QString text() const { return m_text; }
+
 private:
     QString m_text;
 };
@@ -68,6 +71,7 @@ class IText2 : public QObject
 public:
     IText2(QString text) : m_text(text) {}
     QString text() const { return m_text; }
+
 private:
     QString m_text;
 };
@@ -80,6 +84,7 @@ public:
     IText3(QString text) : m_text(text) {}
     virtual ~IText3() {}
     QString text() const { return m_text; }
+
 private:
     QString m_text;
 };
diff --git a/src/libs/aggregation/test/tst_aggregate.cpp b/src/libs/aggregation/test/tst_aggregate.cpp
index 098cc723af..38447eaaf1 100644
--- a/src/libs/aggregation/test/tst_aggregate.cpp
+++ b/src/libs/aggregation/test/tst_aggregate.cpp
@@ -30,10 +30,11 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
-#include <QtTest/QtTest>
 
 #include <aggregate.h>
 
+#include <QtTest/QtTest>
+
 class tst_Aggregate : public QObject
 {
     Q_OBJECT
@@ -195,4 +196,5 @@ void tst_Aggregate::parentAggregate()
 }
 
 QTEST_MAIN(tst_Aggregate)
+
 #include "tst_aggregate.moc"
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index b2e0ca4be1..f422cbefc4 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -40,6 +40,7 @@
 #include <Symbols.h>
 #include <AST.h>
 #include <Scope.h>
+
 #include <QByteArray>
 #include <QFile>
 #include <QtDebug>
@@ -47,50 +48,52 @@
 using namespace CPlusPlus;
 
 namespace {
-    class DocumentDiagnosticClient: public DiagnosticClient
-    {
-        enum { MAX_MESSAGE_COUNT = 10 };
 
-    public:
-        DocumentDiagnosticClient(Document *doc, QList<Document::DiagnosticMessage> *messages)
-            : doc(doc),
-              messages(messages)
-        { }
+class DocumentDiagnosticClient : public DiagnosticClient
+{
+    enum { MAX_MESSAGE_COUNT = 10 };
+
+public:
+    DocumentDiagnosticClient(Document *doc, QList<Document::DiagnosticMessage> *messages)
+        : doc(doc),
+          messages(messages)
+    { }
+
+    virtual void report(int level,
+                        StringLiteral *fileId,
+                        unsigned line, unsigned column,
+                        const char *format, va_list ap)
+    {
+        if (messages->count() == MAX_MESSAGE_COUNT)
+            return;
 
-        virtual void report(int level,
-                            StringLiteral *fileId,
-                            unsigned line, unsigned column,
-                            const char *format, va_list ap)
-        {
-            if (messages->count() == MAX_MESSAGE_COUNT)
-                return;
+        const QString fileName = QString::fromUtf8(fileId->chars(), fileId->size());
 
-            const QString fileName = QString::fromUtf8(fileId->chars(), fileId->size());
+        if (fileName != doc->fileName())
+            return;
 
-            if (fileName != doc->fileName())
-                return;
+        QString message;
+        message.vsprintf(format, ap);
 
-            QString message;
-            message.vsprintf(format, ap);
+        Document::DiagnosticMessage m(convertLevel(level), doc->fileName(),
+                                      line, column, message);
+        messages->append(m);
+    }
 
-            Document::DiagnosticMessage m(convertLevel(level), doc->fileName(),
-                                          line, column, message);
-            messages->append(m);
+    static int convertLevel(int level) {
+        switch (level) {
+            case Warning: return Document::DiagnosticMessage::Warning;
+            case Error:   return Document::DiagnosticMessage::Error;
+            case Fatal:   return Document::DiagnosticMessage::Fatal;
+            default:      return Document::DiagnosticMessage::Error;
         }
+    }
 
-        static int convertLevel(int level) {
-            switch (level) {
-                case Warning: return Document::DiagnosticMessage::Warning;
-                case Error:   return Document::DiagnosticMessage::Error;
-                case Fatal:   return Document::DiagnosticMessage::Fatal;
-                default:      return Document::DiagnosticMessage::Error;
-            }
-        }
+    Document *doc;
+    QList<Document::DiagnosticMessage> *messages;
+};
 
-        Document *doc;
-        QList<Document::DiagnosticMessage> *messages;
-    };
-} // end of anonymous namespace
+} // anonymous namespace
 
 Document::Document(const QString &fileName)
     : _fileName(fileName),
@@ -116,19 +119,29 @@ Document::~Document()
 }
 
 Control *Document::control() const
-{ return _control; }
+{
+    return _control;
+}
 
 QString Document::fileName() const
-{ return _fileName; }
+{
+    return _fileName;
+}
 
 QStringList Document::includedFiles() const
-{ return _includedFiles; }
+{
+    return _includedFiles;
+}
 
 void Document::addIncludeFile(const QString &fileName)
-{ _includedFiles.append(fileName); }
+{
+    _includedFiles.append(fileName);
+}
 
 QByteArray Document::definedMacros() const
-{ return _definedMacros; }
+{
+    return _definedMacros;
+}
 
 void Document::appendMacro(const QByteArray &macroName, const QByteArray &text)
 {
@@ -141,13 +154,19 @@ void Document::appendMacro(const QByteArray &macroName, const QByteArray &text)
 }
 
 TranslationUnit *Document::translationUnit() const
-{ return _translationUnit; }
+{
+    return _translationUnit;
+}
 
 bool Document::skipFunctionBody() const
-{ return _translationUnit->skipFunctionBody(); }
+{
+    return _translationUnit->skipFunctionBody();
+}
 
 void Document::setSkipFunctionBody(bool skipFunctionBody)
-{ _translationUnit->setSkipFunctionBody(skipFunctionBody); }
+{
+    _translationUnit->setSkipFunctionBody(skipFunctionBody);
+}
 
 unsigned Document::globalSymbolCount() const
 {
@@ -158,7 +177,9 @@ unsigned Document::globalSymbolCount() const
 }
 
 Symbol *Document::globalSymbolAt(unsigned index) const
-{ return _globalNamespace->memberAt(index); }
+{
+    return _globalNamespace->memberAt(index);
+}
 
 Scope *Document::globalSymbols() const
 {
@@ -169,10 +190,14 @@ Scope *Document::globalSymbols() const
 }
 
 Namespace *Document::globalNamespace() const
-{ return _globalNamespace; }
+{
+    return _globalNamespace;
+}
 
 Symbol *Document::findSymbolAt(unsigned line, unsigned column) const
-{ return findSymbolAt(line, column, globalSymbols()); }
+{
+    return findSymbolAt(line, column, globalSymbols());
+}
 
 Symbol *Document::findSymbolAt(unsigned line, unsigned column, Scope *scope) const
 {
@@ -203,10 +228,14 @@ Document::Ptr Document::create(const QString &fileName)
 }
 
 void Document::setSource(const QByteArray &source)
-{ _translationUnit->setSource(source.constBegin(), source.size()); }
+{
+    _translationUnit->setSource(source.constBegin(), source.size());
+}
 
 void Document::startSkippingBlocks(unsigned start)
-{ _skippedBlocks.append(Block(start, 0)); }
+{
+    _skippedBlocks.append(Block(start, 0));
+}
 
 void Document::stopSkippingBlocks(unsigned stop)
 {
@@ -218,10 +247,14 @@ void Document::stopSkippingBlocks(unsigned stop)
 }
 
 QSet<QByteArray> Document::macroNames() const
-{ return _macroNames; }
+{
+    return _macroNames;
+}
 
 void Document::parse()
-{ _translationUnit->parse(); }
+{
+    _translationUnit->parse();
+}
 
 void Document::check()
 {
@@ -239,4 +272,6 @@ void Document::check()
 }
 
 void Document::releaseTranslationUnit()
-{ _translationUnit->release(); }
+{
+    _translationUnit->release();
+}
diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index 47f2366ddd..274ec4ba6a 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -30,16 +30,18 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef CPPDOCUMENT_H
 #define CPPDOCUMENT_H
 
 #include <CPlusPlusForwardDeclarations.h>
+
 #include <QByteArray>
+#include <QList>
+#include <QSet>
 #include <QSharedPointer>
 #include <QString>
 #include <QStringList>
-#include <QList>
-#include <QSet>
 
 namespace CPlusPlus {
 
diff --git a/src/libs/cplusplus/ExpressionUnderCursor.h b/src/libs/cplusplus/ExpressionUnderCursor.h
index e3fa442326..d1e307e6fc 100644
--- a/src/libs/cplusplus/ExpressionUnderCursor.h
+++ b/src/libs/cplusplus/ExpressionUnderCursor.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef EXPRESSIONUNDERCURSOR_H
 #define EXPRESSIONUNDERCURSOR_H
 
diff --git a/src/libs/cplusplus/Icons.h b/src/libs/cplusplus/Icons.h
index c549c1c429..2ecec8f228 100644
--- a/src/libs/cplusplus/Icons.h
+++ b/src/libs/cplusplus/Icons.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef CPLUSPLUS_ICONS_H
 #define CPLUSPLUS_ICONS_H
 
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 027cfb577d..157e15ad44 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -39,6 +39,7 @@
 #include <Scope.h>
 #include <Control.h>
 #include <cplusplus/Overview.h>
+
 #include <QFile>
 #include <QtDebug>
 
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h
index d2fe8b7bef..d234dfaef6 100644
--- a/src/libs/cplusplus/LookupContext.h
+++ b/src/libs/cplusplus/LookupContext.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef CPLUSPLUS_LOOKUPCONTEXT_H
 #define CPLUSPLUS_LOOKUPCONTEXT_H
 
@@ -45,8 +46,7 @@ namespace CPlusPlus {
 class CPLUSPLUS_EXPORT LookupUtils
 {
 public:
-    static bool isNameCompatibleWithIdentifier(Name *name,
-                                               Identifier *id);
+    static bool isNameCompatibleWithIdentifier(Name *name, Identifier *id);
 };
 
 class CPLUSPLUS_EXPORT LookupContext: LookupUtils
diff --git a/src/libs/cplusplus/NameOfExpression.cpp b/src/libs/cplusplus/NameOfExpression.cpp
index d54e7f5521..1d527d88ae 100644
--- a/src/libs/cplusplus/NameOfExpression.cpp
+++ b/src/libs/cplusplus/NameOfExpression.cpp
@@ -44,6 +44,7 @@
 #include <CoreTypes.h>
 #include <TypeVisitor.h>
 #include <NameVisitor.h>
+
 #include <QList>
 #include <QtDebug>
 
diff --git a/src/libs/cplusplus/NameOfExpression.h b/src/libs/cplusplus/NameOfExpression.h
index f68795cea0..3f2b15e56e 100644
--- a/src/libs/cplusplus/NameOfExpression.h
+++ b/src/libs/cplusplus/NameOfExpression.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef CPLUSPLUS_NAMEOFEXPRESSION_H
 #define CPLUSPLUS_NAMEOFEXPRESSION_H
 
diff --git a/src/libs/cplusplus/NamePrettyPrinter.cpp b/src/libs/cplusplus/NamePrettyPrinter.cpp
index 5d6fddfb63..0795e6f0e6 100644
--- a/src/libs/cplusplus/NamePrettyPrinter.cpp
+++ b/src/libs/cplusplus/NamePrettyPrinter.cpp
@@ -30,7 +30,9 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "NamePrettyPrinter.h"
+
 #include <Names.h>
 #include <Overview.h>
 #include <NameVisitor.h>
@@ -46,7 +48,9 @@ NamePrettyPrinter::~NamePrettyPrinter()
 { }
 
 const Overview *NamePrettyPrinter::overview() const
-{ return _overview; }
+{
+    return _overview;
+}
 
 QString NamePrettyPrinter::operator()(Name *name)
 {
diff --git a/src/libs/cplusplus/NamePrettyPrinter.h b/src/libs/cplusplus/NamePrettyPrinter.h
index 3868432650..8e8210fd3d 100644
--- a/src/libs/cplusplus/NamePrettyPrinter.h
+++ b/src/libs/cplusplus/NamePrettyPrinter.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef CPLUSPLUS_NAMEPRETTYPRINTER_H
 #define CPLUSPLUS_NAMEPRETTYPRINTER_H
 
diff --git a/src/libs/cplusplus/Overview.cpp b/src/libs/cplusplus/Overview.cpp
index ec40f75b51..9d561eae75 100644
--- a/src/libs/cplusplus/Overview.cpp
+++ b/src/libs/cplusplus/Overview.cpp
@@ -49,25 +49,39 @@ Overview::~Overview()
 { }
 
 bool Overview::showArgumentNames() const
-{ return _showArgumentNames; }
+{
+    return _showArgumentNames;
+}
 
 void Overview::setShowArgumentNames(bool showArgumentNames)
-{ _showArgumentNames = showArgumentNames; }
+{
+    _showArgumentNames = showArgumentNames;
+}
 
 void Overview::setShowReturnTypes(bool showReturnTypes)
-{ _showReturnTypes = showReturnTypes; }
+{
+    _showReturnTypes = showReturnTypes;
+}
 
 bool Overview::showReturnTypes() const
-{ return _showReturnTypes; }
+{
+    return _showReturnTypes;
+}
 
 void Overview::setMarkArgument(unsigned position)
-{ _markArgument = position; }
+{
+    _markArgument = position;
+}
 
 bool Overview::showFunctionSignatures() const
-{ return _showFunctionSignatures; }
+{
+    return _showFunctionSignatures;
+}
 
 void Overview::setShowFunctionSignatures(bool showFunctionSignatures)
-{ _showFunctionSignatures = showFunctionSignatures; }
+{
+    _showFunctionSignatures = showFunctionSignatures;
+}
 
 QString Overview::prettyName(Name *name) const
 {
@@ -75,9 +89,10 @@ QString Overview::prettyName(Name *name) const
     return pp(name);
 }
 
-QString Overview::prettyType(const FullySpecifiedType &ty,
-                             Name *name) const
-{ return prettyType(ty, prettyName(name)); }
+QString Overview::prettyType(const FullySpecifiedType &ty, Name *name) const
+{
+    return prettyType(ty, prettyName(name));
+}
 
 QString Overview::prettyType(const FullySpecifiedType &ty,
                              const QString &name) const
diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h
index 6b84a4b53f..c9c0a6222a 100644
--- a/src/libs/cplusplus/Overview.h
+++ b/src/libs/cplusplus/Overview.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef OVERVIEW_H
 #define OVERVIEW_H
 
diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp
index 028811e6ae..d56ab91e2f 100644
--- a/src/libs/cplusplus/OverviewModel.cpp
+++ b/src/libs/cplusplus/OverviewModel.cpp
@@ -33,10 +33,12 @@
 
 #include "OverviewModel.h"
 #include "Overview.h"
+
 #include <Scope.h>
 #include <Semantic.h>
 #include <Literals.h>
 #include <Symbols.h>
+
 #include <QFile>
 #include <QtDebug>
 
@@ -50,10 +52,14 @@ OverviewModel::~OverviewModel()
 { }
 
 bool OverviewModel::hasDocument() const
-{ return _cppDocument; }
+{
+    return _cppDocument;
+}
 
 Document::Ptr OverviewModel::document() const
-{ return _cppDocument; }
+{
+    return _cppDocument;
+}
 
 unsigned OverviewModel::globalSymbolCount() const
 {
@@ -124,7 +130,9 @@ int OverviewModel::rowCount(const QModelIndex &parent) const
 }
 
 int OverviewModel::columnCount(const QModelIndex &) const
-{ return 1; }
+{
+    return 1;
+}
 
 QVariant OverviewModel::data(const QModelIndex &index, int role) const
 {
@@ -174,7 +182,9 @@ QVariant OverviewModel::data(const QModelIndex &index, int role) const
 }
 
 Symbol *OverviewModel::symbolFromIndex(const QModelIndex &index) const
-{ return static_cast<Symbol *>(index.internalPointer()); }
+{
+    return static_cast<Symbol *>(index.internalPointer());
+}
 
 void OverviewModel::rebuild(Document::Ptr doc)
 {
diff --git a/src/libs/cplusplus/OverviewModel.h b/src/libs/cplusplus/OverviewModel.h
index 9ff920487b..8bb2bee8f5 100644
--- a/src/libs/cplusplus/OverviewModel.h
+++ b/src/libs/cplusplus/OverviewModel.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef CPLUSPLUS_OVERVIEWMODEL_H
 #define CPLUSPLUS_OVERVIEWMODEL_H
 
@@ -42,7 +43,7 @@
 
 namespace CPlusPlus {
 
-class CPLUSPLUS_EXPORT OverviewModel: public QAbstractItemModel
+class CPLUSPLUS_EXPORT OverviewModel : public QAbstractItemModel
 {
     Q_OBJECT
 
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 6071f235c4..43320d4664 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -44,6 +44,7 @@
 #include <CoreTypes.h>
 #include <TypeVisitor.h>
 #include <NameVisitor.h>
+
 #include <QList>
 #include <QtDebug>
 
diff --git a/src/libs/cplusplus/ResolveExpression.h b/src/libs/cplusplus/ResolveExpression.h
index 75963bb2fe..c68dba64d2 100644
--- a/src/libs/cplusplus/ResolveExpression.h
+++ b/src/libs/cplusplus/ResolveExpression.h
@@ -30,10 +30,12 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef CPLUSPLUS_RESOLVEEXPRESSION_H
 #define CPLUSPLUS_RESOLVEEXPRESSION_H
 
 #include "LookupContext.h"
+
 #include <ASTVisitor.h>
 #include <Semantic.h>
 #include <FullySpecifiedType.h>
diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp
index f047d540c9..70a8e19efa 100644
--- a/src/libs/cplusplus/SimpleLexer.cpp
+++ b/src/libs/cplusplus/SimpleLexer.cpp
@@ -32,6 +32,7 @@
 ***************************************************************************/
 
 #include "SimpleLexer.h"
+
 #include <Lexer.h>
 #include <Token.h>
 #include <QtDebug>
@@ -39,13 +40,19 @@
 using namespace CPlusPlus;
 
 bool SimpleToken::isLiteral() const
-{ return _kind >= T_FIRST_LITERAL && _kind <= T_LAST_LITERAL; }
+{
+    return _kind >= T_FIRST_LITERAL && _kind <= T_LAST_LITERAL;
+}
 
 bool SimpleToken::isOperator() const
-{ return _kind >= T_FIRST_OPERATOR && _kind <= T_LAST_OPERATOR; }
+{
+    return _kind >= T_FIRST_OPERATOR && _kind <= T_LAST_OPERATOR;
+}
 
 bool SimpleToken::isKeyword() const
-{ return _kind >= T_FIRST_KEYWORD && _kind < T_FIRST_QT_KEYWORD; }
+{
+    return _kind >= T_FIRST_KEYWORD && _kind < T_FIRST_QT_KEYWORD;
+}
 
 SimpleLexer::SimpleLexer()
     : _lastState(0),
@@ -57,16 +64,24 @@ SimpleLexer::~SimpleLexer()
 { }
 
 bool SimpleLexer::qtMocRunEnabled() const
-{ return _qtMocRunEnabled; }
+{
+    return _qtMocRunEnabled;
+}
 
 void SimpleLexer::setQtMocRunEnabled(bool enabled)
-{ _qtMocRunEnabled = enabled; }
+{
+    _qtMocRunEnabled = enabled;
+}
 
 bool SimpleLexer::skipComments() const
-{ return _skipComments; }
+{
+    return _skipComments;
+}
 
 void SimpleLexer::setSkipComments(bool skipComments)
-{ _skipComments = skipComments; }
+{
+    _skipComments = skipComments;
+}
 
 QList<SimpleToken> SimpleLexer::operator()(const QString &text, int state)
 {
diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h
index 9bbba41950..82236fc565 100644
--- a/src/libs/cplusplus/SimpleLexer.h
+++ b/src/libs/cplusplus/SimpleLexer.h
@@ -34,6 +34,7 @@
 #define SIMPLELEXER_H
 
 #include <CPlusPlusForwardDeclarations.h>
+
 #include <QString>
 #include <QList>
 
diff --git a/src/libs/extensionsystem/extensionsystem_global.h b/src/libs/extensionsystem/extensionsystem_global.h
index ebd1f34da2..fdadf50e63 100644
--- a/src/libs/extensionsystem/extensionsystem_global.h
+++ b/src/libs/extensionsystem/extensionsystem_global.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef EXTENSIONSYSTEM_GLOBAL_H
 #define EXTENSIONSYSTEM_GLOBAL_H
 
@@ -41,4 +42,4 @@
 #  define EXTENSIONSYSTEM_EXPORT Q_DECL_IMPORT
 #endif
 
-#endif // header
+#endif // EXTENSIONSYSTEM_GLOBAL_H
diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp
index 47cb702e16..d35ba9d4a2 100644
--- a/src/libs/extensionsystem/iplugin.cpp
+++ b/src/libs/extensionsystem/iplugin.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "iplugin.h"
 #include "iplugin_p.h"
 #include "pluginmanager.h"
diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h
index b263e7b0d2..e2b3113026 100644
--- a/src/libs/extensionsystem/iplugin.h
+++ b/src/libs/extensionsystem/iplugin.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef IPLUGIN_H
 #define IPLUGIN_H
 
diff --git a/src/libs/extensionsystem/iplugin_p.h b/src/libs/extensionsystem/iplugin_p.h
index 461a903a39..cb10c06b0b 100644
--- a/src/libs/extensionsystem/iplugin_p.h
+++ b/src/libs/extensionsystem/iplugin_p.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef IPLUGIN_P_H
 #define IPLUGIN_P_H
 
@@ -55,4 +56,4 @@ public:
 } // namespace Internal
 } // namespace ExtensionSystem
 
-#endif // header guard
+#endif // IPLUGIN_P_H
diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp
index 77b6ed869e..9b6bdcb658 100644
--- a/src/libs/extensionsystem/optionsparser.cpp
+++ b/src/libs/extensionsystem/optionsparser.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "optionsparser.h"
 
 #include <QtCore/QCoreApplication>
diff --git a/src/libs/extensionsystem/optionsparser.h b/src/libs/extensionsystem/optionsparser.h
index 65ea70c9ba..4702a953fa 100644
--- a/src/libs/extensionsystem/optionsparser.h
+++ b/src/libs/extensionsystem/optionsparser.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef OPTIONSPARSER_H
 #define OPTIONSPARSER_H
 
diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp
index 349cc48a12..47de68db2f 100644
--- a/src/libs/extensionsystem/plugindetailsview.cpp
+++ b/src/libs/extensionsystem/plugindetailsview.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "plugindetailsview.h"
 #include "ui_plugindetailsview.h"
 
diff --git a/src/libs/extensionsystem/plugindetailsview.h b/src/libs/extensionsystem/plugindetailsview.h
index 99386f29d0..2e64111731 100644
--- a/src/libs/extensionsystem/plugindetailsview.h
+++ b/src/libs/extensionsystem/plugindetailsview.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGINDETAILSVIEW_H_
 #define PLUGINDETAILSVIEW_H_
 
@@ -38,8 +39,7 @@
 
 #include <QtGui/QWidget>
 
-namespace ExtensionSystem
-{
+namespace ExtensionSystem {
 
 namespace Internal {
 namespace Ui {
diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp
index c1572d8829..820d4b7cfc 100644
--- a/src/libs/extensionsystem/pluginerrorview.cpp
+++ b/src/libs/extensionsystem/pluginerrorview.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "pluginerrorview.h"
 #include "ui_pluginerrorview.h"
 
diff --git a/src/libs/extensionsystem/pluginerrorview.h b/src/libs/extensionsystem/pluginerrorview.h
index 87b4097d03..f8e3beca9c 100644
--- a/src/libs/extensionsystem/pluginerrorview.h
+++ b/src/libs/extensionsystem/pluginerrorview.h
@@ -30,16 +30,16 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
-#ifndef PLUGINERRORVIEW_H_
-#define PLUGINERRORVIEW_H_
+
+#ifndef PLUGINERRORVIEW_H
+#define PLUGINERRORVIEW_H
 
 #include "extensionsystem_global.h"
 #include "pluginspec.h"
 
 #include <QtGui/QWidget>
 
-namespace ExtensionSystem
-{
+namespace ExtensionSystem {
 
 namespace Internal {
 namespace Ui {
@@ -63,4 +63,4 @@ private:
 
 } // namespace ExtensionSystem
 
-#endif /*PLUGINERRORVIEW_H_*/
+#endif // PLUGINERRORVIEW_H
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index daf4169a80..802c56b693 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "pluginmanager.h"
 #include "pluginmanager_p.h"
 #include "pluginspec.h"
diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h
index 7f003b4f89..85ac5e69dd 100644
--- a/src/libs/extensionsystem/pluginmanager.h
+++ b/src/libs/extensionsystem/pluginmanager.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef EXTENSIONSYSTEM_PLUGINMANAGER_H
 #define EXTENSIONSYSTEM_PLUGINMANAGER_H
 
@@ -133,6 +134,6 @@ private:
     friend class Internal::PluginManagerPrivate;
 };
 
-} //namespace
+} // namespace ExtensionSystem
 
-#endif // PLUGINMANAGER_H
+#endif // EXTENSIONSYSTEM_PLUGINMANAGER_H
diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h
index 6b8df8d2be..28ba1ee858 100644
--- a/src/libs/extensionsystem/pluginmanager_p.h
+++ b/src/libs/extensionsystem/pluginmanager_p.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGINMANAGER_P_H
 #define PLUGINMANAGER_P_H
 
diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index dfa7bdbe7c..91f10d6c1d 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "pluginspec.h"
 #include "pluginspec.h"
 #include "pluginspec_p.h"
diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h
index 06a219fe2d..53f08cef49 100644
--- a/src/libs/extensionsystem/pluginspec.h
+++ b/src/libs/extensionsystem/pluginspec.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGINSPEC_H
 #define PLUGINSPEC_H
 
diff --git a/src/libs/extensionsystem/pluginspec_p.h b/src/libs/extensionsystem/pluginspec_p.h
index a11167e85e..1ecd70bb95 100644
--- a/src/libs/extensionsystem/pluginspec_p.h
+++ b/src/libs/extensionsystem/pluginspec_p.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGINSPEC_P_H
 #define PLUGINSPEC_P_H
 
@@ -103,4 +104,4 @@ private:
 } // namespace Internal
 } // namespace ExtensionSystem
 
-#endif // header guard
+#endif // PLUGINSPEC_P_H
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index d75911ea37..f1b3a97a7f 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "pluginview.h"
 #include "pluginview_p.h"
 #include "pluginmanager.h"
diff --git a/src/libs/extensionsystem/pluginview.h b/src/libs/extensionsystem/pluginview.h
index eacf38edaa..77245c2ad4 100644
--- a/src/libs/extensionsystem/pluginview.h
+++ b/src/libs/extensionsystem/pluginview.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGINVIEW_H
 #define PLUGINVIEW_H
 
@@ -79,4 +80,4 @@ private:
 
 } // namespae ExtensionSystem
 
-#endif
+#endif // PLUGIN_VIEW_H
diff --git a/src/libs/extensionsystem/pluginview_p.h b/src/libs/extensionsystem/pluginview_p.h
index 48d63ba359..adca251d3b 100644
--- a/src/libs/extensionsystem/pluginview_p.h
+++ b/src/libs/extensionsystem/pluginview_p.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGINVIEW_P_H
 #define PLUGINVIEW_P_H
 
@@ -45,7 +46,7 @@ public:
     PluginManager *manager;
 };
 
-} // namespace
-} // namespace
+} // namespace Internal
+} // namespace ExtensionSystem
 
-#endif
+#endif PLUGINVIEW_P_H
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp
index 69b9821b3b..7c93c49b6f 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "plugin1.h"
 
 #include <QtCore/qplugin.h>
@@ -40,8 +41,10 @@ MyPlugin1::MyPlugin1()
 {
 }
 
-bool MyPlugin1::initialize(const QStringList & /*arguments*/, QString *errorString)
+bool MyPlugin1::initialize(const QStringList &arguments, QString *errorString)
 {
+    Q_UNUSED(arguments);
+    Q_UNUSED(errorString);
     return true;
 }
 
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h
index d3c493aeba..27f63a72b1 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGIN1_H
 #define PLUGIN1_H
 
@@ -50,6 +51,6 @@ public:
     void extensionsInitialized();
 };
 
-} // namespace
+} // namespace Plugin1
 
-#endif // header guard
+#endif // PLUGIN1_H
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp
index c5af5f39a3..7c230d4ab0 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "plugin2.h"
 
 #include <QtCore/qplugin.h>
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h
index b1cd95c762..e95cf049e0 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGIN2_H
 #define PLUGIN2_H
 
@@ -50,6 +51,6 @@ public:
     void extensionsInitialized();
 };
 
-} // namespace
+} // Plugin2
 
-#endif // header guard
+#endif // PLUGIN2_H
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h
index 7514d63bd7..06d81410d6 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGIN3_H
 #define PLUGIN3_H
 
@@ -50,6 +51,6 @@ public:
     void extensionsInitialized();
 };
 
-} // namespace
+} // namespace Plugin3
 
-#endif // header guard
+#endif // PLUGIN3_H
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp
index 8149d046d2..2747a051e0 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp
@@ -28,8 +28,9 @@
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception version
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
-** 
+**
 ***************************************************************************/
+
 #include "plugin1.h"
 
 #include <extensionsystem/pluginmanager.h>
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h
index 4be9f9bbf7..72baefe0bb 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGIN1_H
 #define PLUGIN1_H
 
@@ -53,6 +54,6 @@ private:
     bool initializeCalled;
 };
 
-} // namespace
+} // namespace Plugin1
 
-#endif // header guard
+#endif // PLUGIN1_H
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp
index 99f192766a..2cbf925f99 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "plugin2.h"
 
 #include <extensionsystem/pluginmanager.h>
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h
index 08d77a38c7..029e38fb35 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGIN2_H
 #define PLUGIN2_H
 
@@ -53,6 +54,6 @@ private:
     bool initializeCalled;
 };
 
-} // namespace
+} // namespace Plugin2
 
-#endif // header guard
+#endif // PLUGIN2_H
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp
index 4410c34511..c3c49fd62b 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "plugin3.h"
 
 #include <extensionsystem/pluginmanager.h>
@@ -74,4 +75,3 @@ void MyPlugin3::extensionsInitialized()
 }
 
 Q_EXPORT_PLUGIN(MyPlugin3)
-
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h
index 0991b7a152..dbd43db261 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h
@@ -53,6 +53,6 @@ private:
     bool initializeCalled;
 };
 
-} // namespace
+} // namespace Plugin3
 
-#endif // header guard
+#endif // PLUGIN3_H
diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp
index f54b978e9a..e693749430 100644
--- a/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp
+++ b/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp
@@ -30,14 +30,15 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
-#include <QtTest/QtTest>
-
-#include <QtCore/QObject>
 
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
 #include <extensionsystem/iplugin.h>
 
+#include <QtTest/QtTest>
+
+#include <QtCore/QObject>
+
 using namespace ExtensionSystem;
 
 class SignalReceiver;
@@ -263,5 +264,6 @@ void tst_PluginManager::correctPlugins1()
 }
 
 QTEST_MAIN(tst_PluginManager)
+
 #include "tst_pluginmanager.moc"
 
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp
index 8c3db6c189..639bd33b61 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp
+++ b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "testplugin.h"
 
 #include <QtCore/qplugin.h>
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h
index 10fc0acf50..1029e21109 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h
+++ b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef TESTPLUGIN_H
 #define TESTPLUGIN_H
 
@@ -59,4 +60,4 @@ private:
 
 } // namespace
 
-#endif // header guard
+#endif // TESTPLUGIN_H
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h
index ae40ac8ea8..be5ae3bc45 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h
+++ b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef TESTPLUGIN_GLOBAL_H
 #define TESTPLUGIN_GLOBAL_H
 
@@ -41,4 +42,4 @@
 #  define MYPLUGIN_EXPORT Q_DECL_IMPORT
 #endif
 
-#endif // header
+#endif // TESTPLUGIN_GLOBAL_H
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp b/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp
index f3471edcaa..1e59535d57 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp
+++ b/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp
@@ -30,7 +30,6 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
-#include <QtTest/QtTest>
 
 #include "testplugin/testplugin.h"
 
@@ -40,6 +39,7 @@
 #include <extensionsystem/pluginmanager.h>
 
 #include <QtCore/QObject>
+#include <QtTest/QtTest>
 
 using namespace ExtensionSystem;
 
@@ -275,4 +275,5 @@ void tst_PluginSpec::initializeExtensions()
 }
 
 QTEST_MAIN(tst_PluginSpec)
+
 #include "tst_pluginspec.moc"
diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp
index 3282d9862e..bced61f40c 100644
--- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp
+++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp
@@ -30,7 +30,9 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "plugindialog.h"
+
 #include <extensionsystem/plugindetailsview.h>
 #include <extensionsystem/pluginerrorview.h>
 #include <extensionsystem/pluginspec.h>
@@ -139,4 +141,3 @@ int main(int argc, char *argv[])
     dialog.show();
     app.exec();
 }
-
diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h
index 8987230681..89ab9fcc7a 100644
--- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h
+++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h
@@ -30,11 +30,13 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGINDIALOG_H
 #define PLUGINDIALOG_H
 
 #include <extensionsystem/pluginview.h>
 #include <extensionsystem/pluginmanager.h>
+
 #include <QtGui/QWidget>
 #include <QtGui/QPushButton>
 
@@ -58,4 +60,4 @@ private:
     QPushButton *m_errorDetailsButton;
 };
 
-#endif
+#endif // PLUGINDIALOG_H
diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp
index 32d3bdf070..88704e9bc0 100644
--- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp
+++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "plugin1.h"
 
 #include <extensionsystem/pluginmanager.h>
@@ -83,4 +84,3 @@ void MyPlugin1::extensionsInitialized()
 }
 
 Q_EXPORT_PLUGIN(MyPlugin1)
-
diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h
index f993b25c9f..28440c2733 100644
--- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h
+++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGIN1_H
 #define PLUGIN1_H
 
@@ -54,6 +55,6 @@ private:
     bool initializeCalled;
 };
 
-} // namespace
+} // namespace Plugin1
 
-#endif // header guard
+#endif // PLUGIN1_H
diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp
index 3ce6f258fa..d48f717e1d 100644
--- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp
+++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "plugin2.h"
 
 #include <extensionsystem/pluginmanager.h>
@@ -66,4 +67,3 @@ void MyPlugin2::extensionsInitialized()
 }
 
 Q_EXPORT_PLUGIN(MyPlugin2)
-
diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h
index 5120038754..d65d7f6999 100644
--- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h
+++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGIN2_H
 #define PLUGIN2_H
 
@@ -54,6 +55,6 @@ private:
     bool initializeCalled;
 };
 
-} // namespace
+} // namespace Plugin2
 
-#endif // header guard
+#endif // PLUGIN2_H
diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp
index ff37d06096..9f1da813b5 100644
--- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp
+++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp
@@ -28,8 +28,9 @@
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception version
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
-** 
+**
 ***************************************************************************/
+
 #include "plugin3.h"
 
 #include <extensionsystem/pluginmanager.h>
@@ -74,4 +75,3 @@ void MyPlugin3::extensionsInitialized()
 }
 
 Q_EXPORT_PLUGIN(MyPlugin3)
-
diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h
index 00bd642912..19666f89a7 100644
--- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h
+++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PLUGIN3_H
 #define PLUGIN3_H
 
@@ -54,6 +55,6 @@ private:
     bool initializeCalled;
 };
 
-} // namespace
+} // namespace Plugin3
 
-#endif // header guard
+#endif // PLUGIN3_H
diff --git a/src/libs/qtconcurrent/multitask.h b/src/libs/qtconcurrent/multitask.h
index fc66de1715..889753533b 100644
--- a/src/libs/qtconcurrent/multitask.h
+++ b/src/libs/qtconcurrent/multitask.h
@@ -30,11 +30,13 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef MULTITASK_H
 #define MULTITASK_H
 
 #include "qtconcurrent_global.h"
 #include "runextensions.h"
+
 #include <QtCore/QObject>
 #include <QtCore/QList>
 #include <QtCore/QEventLoop>
@@ -184,14 +186,15 @@ private:
 };
 
 template <typename Class, typename T>
-QFuture<T> run(void (Class::*fn)(QFutureInterface<T> &), const QList<Class *> &objects, int priority = 0) {
+QFuture<T> run(void (Class::*fn)(QFutureInterface<T> &), const QList<Class *> &objects, int priority = 0)
+{
     MultiTask<Class, T> *task = new MultiTask<Class, T>(fn, objects);
     QFuture<T> future = task->future();
     QThreadPool::globalInstance()->start(task, priority);
     return future;
 }
 
-} //namespace
+} // namespace QtConcurrent
 
 QT_END_NAMESPACE
 
diff --git a/src/libs/qtconcurrent/qtconcurrent_global.h b/src/libs/qtconcurrent/qtconcurrent_global.h
index 15d47af5f3..0a5a109d4e 100644
--- a/src/libs/qtconcurrent/qtconcurrent_global.h
+++ b/src/libs/qtconcurrent/qtconcurrent_global.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef QTCONCURRENT_GLOBAL_H
 #define QTCONCURRENT_GLOBAL_H
 
diff --git a/src/libs/qtconcurrent/runextensions.h b/src/libs/qtconcurrent/runextensions.h
index 43707c14d5..c17153131b 100644
--- a/src/libs/qtconcurrent/runextensions.h
+++ b/src/libs/qtconcurrent/runextensions.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef QTCONCURRENT_RUNEX_H
 #define QTCONCURRENT_RUNEX_H
 
@@ -390,8 +391,8 @@ QFuture<T> run(void (Class::*fn)(QFutureInterface<T> &), Class *object)
     return (new StoredInterfaceMemberFunctionCall0<T, void (Class::*)(QFutureInterface<T> &), Class>(fn, object))->start();
 }
 
-} //namespace QtConcurrent
+} // namespace QtConcurrent
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QTCONCURRENT_RUNEX_H
diff --git a/src/libs/utils/basevalidatinglineedit.cpp b/src/libs/utils/basevalidatinglineedit.cpp
index cb936e3c2d..fb09d95745 100644
--- a/src/libs/utils/basevalidatinglineedit.cpp
+++ b/src/libs/utils/basevalidatinglineedit.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "basevalidatinglineedit.h"
 
 #include <QtCore/QDebug>
@@ -153,5 +154,5 @@ void BaseValidatingLineEdit::slotReturnPressed()
         emit validReturnPressed();
 }
 
-}
-}
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h
index 3482687011..40b5503819 100644
--- a/src/libs/utils/basevalidatinglineedit.h
+++ b/src/libs/utils/basevalidatinglineedit.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef BASEVALIDATINGLINEEDIT_H
 #define BASEVALIDATINGLINEEDIT_H
 
@@ -95,6 +96,6 @@ private:
     BaseValidatingLineEditPrivate *m_bd;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
 #endif // BASEVALIDATINGLINEEDIT_H
diff --git a/src/libs/utils/classnamevalidatinglineedit.cpp b/src/libs/utils/classnamevalidatinglineedit.cpp
index b52758eda5..9e36203b0e 100644
--- a/src/libs/utils/classnamevalidatinglineedit.cpp
+++ b/src/libs/utils/classnamevalidatinglineedit.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "classnamevalidatinglineedit.h"
 
 #include <QtCore/QDebug>
@@ -133,5 +134,5 @@ QString ClassNameValidatingLineEdit::createClassName(const QString &name)
     return className;
 }
 
-}
-}
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h
index c0a209d0d7..2271a9cd31 100644
--- a/src/libs/utils/classnamevalidatinglineedit.h
+++ b/src/libs/utils/classnamevalidatinglineedit.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef CLASSNAMEVALIDATINGLINEEDIT_H
 #define CLASSNAMEVALIDATINGLINEEDIT_H
 
@@ -44,8 +45,9 @@ struct ClassNameValidatingLineEditPrivate;
 /* A Line edit that validates a C++ class name and emits a signal
  * to derive suggested file names from it. */
 
-class QWORKBENCH_UTILS_EXPORT  ClassNameValidatingLineEdit :
-    public Core::Utils::BaseValidatingLineEdit {
+class QWORKBENCH_UTILS_EXPORT ClassNameValidatingLineEdit
+  : public Core::Utils::BaseValidatingLineEdit
+{
     Q_DISABLE_COPY(ClassNameValidatingLineEdit)
     Q_PROPERTY(bool namespacesEnabled READ namespacesEnabled WRITE setNamespacesEnabled DESIGNABLE true)
     Q_OBJECT
@@ -73,7 +75,7 @@ private:
     ClassNameValidatingLineEditPrivate *m_d;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
 
 #endif // CLASSNAMEVALIDATINGLINEEDIT_H
diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp
index 3af484935a..8956396acc 100644
--- a/src/libs/utils/codegeneration.cpp
+++ b/src/libs/utils/codegeneration.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "codegeneration.h"
 
 #include <QtCore/QTextStream>
diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h
index 1a20c76d08..c804365bce 100644
--- a/src/libs/utils/codegeneration.h
+++ b/src/libs/utils/codegeneration.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef CODEGENERATION_H
 #define CODEGENERATION_H
 
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index e7e930c544..8adb3a5bb4 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "fancylineedit.h"
 
 #include <QtCore/QEvent>
diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h
index 24a109eada..634eefa8c0 100644
--- a/src/libs/utils/fancylineedit.h
+++ b/src/libs/utils/fancylineedit.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef FANCYLINEEDIT_H
 #define FANCYLINEEDIT_H
 
@@ -77,11 +78,11 @@ public:
     bool useLayoutDirection() const;
     void setUseLayoutDirection(bool v);
 
-    /* Set whether tabbing in will trigger the menu. */
+    // Set whether tabbing in will trigger the menu.
     bool hasMenuTabFocusTrigger() const;
     void setMenuTabFocusTrigger(bool v);
 
-    /* Hint text that is displayed when no focus is set */
+    // Hint text that is displayed when no focus is set.
     QString hintText() const;
 
     bool isShowingHintText() const;
diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp
index 1beed717ef..388d271795 100644
--- a/src/libs/utils/filenamevalidatinglineedit.cpp
+++ b/src/libs/utils/filenamevalidatinglineedit.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "filenamevalidatinglineedit.h"
 
 namespace Core {
@@ -93,5 +94,5 @@ bool  FileNameValidatingLineEdit::validate(const QString &value, QString *errorM
     return validateFileName(value, errorMessage);
 }
 
-}
-}
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/filenamevalidatinglineedit.h b/src/libs/utils/filenamevalidatinglineedit.h
index 7535fc196d..c263a94d6c 100644
--- a/src/libs/utils/filenamevalidatinglineedit.h
+++ b/src/libs/utils/filenamevalidatinglineedit.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef FILENAMEVALIDATINGLINEEDIT_H
 #define FILENAMEVALIDATINGLINEEDIT_H
 
@@ -38,7 +39,8 @@
 namespace Core {
 namespace Utils {
 
-class QWORKBENCH_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit {
+class QWORKBENCH_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit
+{
     Q_OBJECT
     Q_DISABLE_COPY(FileNameValidatingLineEdit)
 
@@ -51,6 +53,7 @@ protected:
     virtual bool validate(const QString &value, QString *errorMessage) const;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
+
 #endif // FILENAMEVALIDATINGLINEEDIT_H
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index 9756984b4b..6bcbf26671 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "filesearch.h"
 
 #include <QtCore/QFile>
@@ -44,162 +45,164 @@
 using namespace Core::Utils;
 
 namespace {
-    void runFileSearch(QFutureInterface<FileSearchResult> &future,
-                       QString searchTerm,
-                       QStringList files,
-                       QTextDocument::FindFlags flags)
-    {
-        future.setProgressRange(0, files.size());
-        int numFilesSearched = 0;
-        int numMatches = 0;
-
-        bool caseInsensitive = !(flags & QTextDocument::FindCaseSensitively);
-        bool wholeWord = (flags & QTextDocument::FindWholeWords);
-
-        QByteArray sa = searchTerm.toUtf8();
-        int scMaxIndex = sa.length()-1;
-        const char *sc = sa.constData();
-
-        QByteArray sal = searchTerm.toLower().toUtf8();
-        const char *scl = sal.constData();
-
-        QByteArray sau = searchTerm.toUpper().toUtf8();
-        const char *scu = sau.constData();
-
-        int chunkSize = qMax(100000, sa.length());
-
-        foreach (QString s, files) {
-            if (future.isPaused())
-                future.waitForResume();
-            if (future.isCanceled()) {
-                future.setProgressValueAndText(numFilesSearched,
-                                               qApp->translate("FileSearch", "%1: canceled. %2 occurrences found in %3 files.").
-                                               arg(searchTerm).arg(numMatches).arg(numFilesSearched));
-                break;
-            }
-            QFile file(s);
-            if (!file.open(QIODevice::ReadOnly))
-                continue;
-            int lineNr = 1;
-            const char *startOfLastLine = NULL;
-
-            bool firstChunk = true;
-            while (!file.atEnd()) {
-                if (!firstChunk)
-                    file.seek(file.pos()-sa.length()+1);
-
-                const QByteArray chunk = file.read(chunkSize);
-                const char *chunkPtr = chunk.constData();
-                startOfLastLine = chunkPtr;
-                for (const char *regionPtr = chunkPtr; regionPtr < chunkPtr + chunk.length()-scMaxIndex; ++regionPtr) {
-                    const char *regionEnd = regionPtr + scMaxIndex;
-
-                    if (*regionPtr == '\n') {
-                        startOfLastLine = regionPtr + 1;
-                        ++lineNr;
+
+void runFileSearch(QFutureInterface<FileSearchResult> &future,
+                   QString searchTerm,
+                   QStringList files,
+                   QTextDocument::FindFlags flags)
+{
+    future.setProgressRange(0, files.size());
+    int numFilesSearched = 0;
+    int numMatches = 0;
+
+    bool caseInsensitive = !(flags & QTextDocument::FindCaseSensitively);
+    bool wholeWord = (flags & QTextDocument::FindWholeWords);
+
+    QByteArray sa = searchTerm.toUtf8();
+    int scMaxIndex = sa.length()-1;
+    const char *sc = sa.constData();
+
+    QByteArray sal = searchTerm.toLower().toUtf8();
+    const char *scl = sal.constData();
+
+    QByteArray sau = searchTerm.toUpper().toUtf8();
+    const char *scu = sau.constData();
+
+    int chunkSize = qMax(100000, sa.length());
+
+    foreach (QString s, files) {
+        if (future.isPaused())
+            future.waitForResume();
+        if (future.isCanceled()) {
+            future.setProgressValueAndText(numFilesSearched,
+                                           qApp->translate("FileSearch", "%1: canceled. %2 occurrences found in %3 files.").
+                                           arg(searchTerm).arg(numMatches).arg(numFilesSearched));
+            break;
+        }
+        QFile file(s);
+        if (!file.open(QIODevice::ReadOnly))
+            continue;
+        int lineNr = 1;
+        const char *startOfLastLine = NULL;
+
+        bool firstChunk = true;
+        while (!file.atEnd()) {
+            if (!firstChunk)
+                file.seek(file.pos()-sa.length()+1);
+
+            const QByteArray chunk = file.read(chunkSize);
+            const char *chunkPtr = chunk.constData();
+            startOfLastLine = chunkPtr;
+            for (const char *regionPtr = chunkPtr; regionPtr < chunkPtr + chunk.length()-scMaxIndex; ++regionPtr) {
+                const char *regionEnd = regionPtr + scMaxIndex;
+
+                if (*regionPtr == '\n') {
+                    startOfLastLine = regionPtr + 1;
+                    ++lineNr;
+                }
+                else if (
+                        // case sensitive
+                        (!caseInsensitive && *regionPtr == sc[0] && *regionEnd == sc[scMaxIndex])
+                        ||
+                        // case insensitive
+                        (caseInsensitive && (*regionPtr == scl[0] || *regionPtr == scu[0])
+                        && (*regionEnd == scl[scMaxIndex] || *regionEnd == scu[scMaxIndex]))
+                         ) {
+                    const char *afterRegion = regionEnd + 1;
+                    const char *beforeRegion = regionPtr - 1;
+                    bool equal = true;
+                    if (wholeWord &&
+                        ( ((*beforeRegion >= '0' && *beforeRegion <= '9') || *beforeRegion >= 'A')
+                        || ((*afterRegion >= '0' && *afterRegion <= '9') || *afterRegion >= 'A')))
+                    {
+                        equal = false;
                     }
-                    else if (
-                            // case sensitive
-                            (!caseInsensitive && *regionPtr == sc[0] && *regionEnd == sc[scMaxIndex])
-                            ||
-                            // case insensitive
-                            (caseInsensitive && (*regionPtr == scl[0] || *regionPtr == scu[0])
-                            && (*regionEnd == scl[scMaxIndex] || *regionEnd == scu[scMaxIndex]))
-                             ) {
-                        const char *afterRegion = regionEnd + 1;
-                        const char *beforeRegion = regionPtr - 1;
-                        bool equal = true;
-                        if (wholeWord &&
-                            ( ((*beforeRegion >= '0' && *beforeRegion <= '9') || *beforeRegion >= 'A')
-                            || ((*afterRegion >= '0' && *afterRegion <= '9') || *afterRegion >= 'A')))
-                        {
-                            equal = false;
-                        }
 
-                        int regionIndex = 1;
-                        for (const char *regionCursor = regionPtr + 1; regionCursor < regionEnd; ++regionCursor, ++regionIndex) {
-                            if (  // case sensitive
-                                  (!caseInsensitive && equal && *regionCursor != sc[regionIndex])
-                                  ||
-                                  // case insensitive
-                                  (caseInsensitive && equal && *regionCursor != sc[regionIndex] && *regionCursor != scl[regionIndex] && *regionCursor != scu[regionIndex])
-                                   ) {
-                             equal = false;
-                            }
+                    int regionIndex = 1;
+                    for (const char *regionCursor = regionPtr + 1; regionCursor < regionEnd; ++regionCursor, ++regionIndex) {
+                        if (  // case sensitive
+                              (!caseInsensitive && equal && *regionCursor != sc[regionIndex])
+                              ||
+                              // case insensitive
+                              (caseInsensitive && equal && *regionCursor != sc[regionIndex] && *regionCursor != scl[regionIndex] && *regionCursor != scu[regionIndex])
+                               ) {
+                         equal = false;
                         }
-                        if (equal) {
-                            int textLength = chunk.length() - (startOfLastLine - chunkPtr);
-                            if (textLength > 0) {
-                                QByteArray res;
-                                res.reserve(256);
-                                int i = 0;
-                                int n = 0;
-                                while (startOfLastLine[i] != '\n' && startOfLastLine[i] != '\r' && i < textLength && n++ < 256)
-                                    res.append(startOfLastLine[i++]);
-                                future.reportResult(FileSearchResult(QDir::toNativeSeparators(s), lineNr, QString(res),
-                                                              regionPtr - startOfLastLine, sa.length()));
-                                ++numMatches;
-                            }
+                    }
+                    if (equal) {
+                        int textLength = chunk.length() - (startOfLastLine - chunkPtr);
+                        if (textLength > 0) {
+                            QByteArray res;
+                            res.reserve(256);
+                            int i = 0;
+                            int n = 0;
+                            while (startOfLastLine[i] != '\n' && startOfLastLine[i] != '\r' && i < textLength && n++ < 256)
+                                res.append(startOfLastLine[i++]);
+                            future.reportResult(FileSearchResult(QDir::toNativeSeparators(s), lineNr, QString(res),
+                                                          regionPtr - startOfLastLine, sa.length()));
+                            ++numMatches;
                         }
                     }
                 }
-                firstChunk = false;
             }
-            ++numFilesSearched;
-            future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 of %4 files.").
-                                    arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(files.size()));
+            firstChunk = false;
         }
-        if (!future.isCanceled())
-            future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 files.").
-                                    arg(searchTerm).arg(numMatches).arg(numFilesSearched));
+        ++numFilesSearched;
+        future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 of %4 files.").
+                                arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(files.size()));
     }
+    if (!future.isCanceled())
+        future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 files.").
+                                arg(searchTerm).arg(numMatches).arg(numFilesSearched));
+}
 
-    void runFileSearchRegExp(QFutureInterface<FileSearchResult> &future,
-                       QString searchTerm,
-                       QStringList files,
-                       QTextDocument::FindFlags flags)
-    {
-        future.setProgressRange(0, files.size());
-        int numFilesSearched = 0;
-        int numMatches = 0;
-        if (flags & QTextDocument::FindWholeWords)
-            searchTerm = QString("\b%1\b").arg(searchTerm);
-        Qt::CaseSensitivity caseSensitivity = (flags & QTextDocument::FindCaseSensitively) ? Qt::CaseSensitive : Qt::CaseInsensitive;
-        QRegExp expression(searchTerm, caseSensitivity);
-
-        foreach (QString s, files) {
-            if (future.isPaused())
-                future.waitForResume();
-            if (future.isCanceled()) {
-                future.setProgressValueAndText(numFilesSearched,
-                                               qApp->translate("FileSearch", "%1: canceled. %2 occurrences found in %3 files.").
-                                               arg(searchTerm).arg(numMatches).arg(numFilesSearched));
-                break;
-            }
-            QFile file(s);
-            if (!file.open(QIODevice::ReadOnly))
-                continue;
-            QTextStream stream(&file);
-            int lineNr = 1;
-            QString line;
-            while (!stream.atEnd()) {
-                line = stream.readLine();
-                int pos = 0;
-                while ((pos = expression.indexIn(line, pos)) != -1) {
-                    future.reportResult(FileSearchResult(QDir::toNativeSeparators(s), lineNr, line,
-                                                  pos, expression.matchedLength()));
-                    pos += expression.matchedLength();
-                }
-                ++lineNr;
+void runFileSearchRegExp(QFutureInterface<FileSearchResult> &future,
+                   QString searchTerm,
+                   QStringList files,
+                   QTextDocument::FindFlags flags)
+{
+    future.setProgressRange(0, files.size());
+    int numFilesSearched = 0;
+    int numMatches = 0;
+    if (flags & QTextDocument::FindWholeWords)
+        searchTerm = QString("\b%1\b").arg(searchTerm);
+    Qt::CaseSensitivity caseSensitivity = (flags & QTextDocument::FindCaseSensitively) ? Qt::CaseSensitive : Qt::CaseInsensitive;
+    QRegExp expression(searchTerm, caseSensitivity);
+
+    foreach (QString s, files) {
+        if (future.isPaused())
+            future.waitForResume();
+        if (future.isCanceled()) {
+            future.setProgressValueAndText(numFilesSearched,
+                                           qApp->translate("FileSearch", "%1: canceled. %2 occurrences found in %3 files.").
+                                           arg(searchTerm).arg(numMatches).arg(numFilesSearched));
+            break;
+        }
+        QFile file(s);
+        if (!file.open(QIODevice::ReadOnly))
+            continue;
+        QTextStream stream(&file);
+        int lineNr = 1;
+        QString line;
+        while (!stream.atEnd()) {
+            line = stream.readLine();
+            int pos = 0;
+            while ((pos = expression.indexIn(line, pos)) != -1) {
+                future.reportResult(FileSearchResult(QDir::toNativeSeparators(s), lineNr, line,
+                                              pos, expression.matchedLength()));
+                pos += expression.matchedLength();
             }
-            ++numFilesSearched;
-            future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 of %4 files.").
-                                    arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(files.size()));
+            ++lineNr;
         }
-        if (!future.isCanceled())
-            future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 files.").
-                                    arg(searchTerm).arg(numMatches).arg(numFilesSearched));
+        ++numFilesSearched;
+        future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 of %4 files.").
+                                arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(files.size()));
     }
+    if (!future.isCanceled())
+        future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 files.").
+                                arg(searchTerm).arg(numMatches).arg(numFilesSearched));
+}
+
 } // namespace
 
 
diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h
index 3b747fb548..4f6d260286 100644
--- a/src/libs/utils/filesearch.h
+++ b/src/libs/utils/filesearch.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef FILESEARCH_H
 #define FILESEARCH_H
 
@@ -63,7 +64,7 @@ QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &sea
 QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString &searchTerm, const QStringList &files,
     QTextDocument::FindFlags flags);
 
-} //Utils
-} //Core
+} // namespace Utils
+} // namespace Core
 
-#endif
+#endif // FILESEARCH_H
diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp
index 2843a304e5..d9454c52a1 100644
--- a/src/libs/utils/filewizarddialog.cpp
+++ b/src/libs/utils/filewizarddialog.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "filewizarddialog.h"
 #include "filewizardpage.h"
 
diff --git a/src/libs/utils/filewizarddialog.h b/src/libs/utils/filewizarddialog.h
index 6a4a7d9ba6..20dd98e350 100644
--- a/src/libs/utils/filewizarddialog.h
+++ b/src/libs/utils/filewizarddialog.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef FILEWIZARDDIALOG_H
 #define FILEWIZARDDIALOG_H
 
@@ -64,6 +65,7 @@ private:
     FileWizardPage *m_filePage;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
+
 #endif // FILEWIZARDDIALOG_H
diff --git a/src/libs/utils/filewizardpage.cpp b/src/libs/utils/filewizardpage.cpp
index a448ebe739..a796f7bafd 100644
--- a/src/libs/utils/filewizardpage.cpp
+++ b/src/libs/utils/filewizardpage.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "filewizardpage.h"
 #include "ui_filewizardpage.h"
 
diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h
index b2ae28a9d0..984b10b5da 100644
--- a/src/libs/utils/filewizardpage.h
+++ b/src/libs/utils/filewizardpage.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef FILEWIZARDPAGE_H
 #define FILEWIZARDPAGE_H
 
@@ -81,6 +82,7 @@ private:
     FileWizardPagePrivate *m_d;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
+
 #endif // FILEWIZARDPAGE_H
diff --git a/src/libs/utils/linecolumnlabel.cpp b/src/libs/utils/linecolumnlabel.cpp
index c6028ab13f..3a25c36f96 100644
--- a/src/libs/utils/linecolumnlabel.cpp
+++ b/src/libs/utils/linecolumnlabel.cpp
@@ -30,14 +30,14 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "linecolumnlabel.h"
 
 namespace Core {
 namespace Utils {
 
-LineColumnLabel::LineColumnLabel(QWidget *parent) :
-    QLabel(parent),
-    m_unused(0)
+LineColumnLabel::LineColumnLabel(QWidget *parent)
+  : QLabel(parent), m_unused(0)
 {
 }
 
@@ -65,5 +65,5 @@ void LineColumnLabel::setMaxText(const QString &maxText)
      m_maxText = maxText;
 }
 
-}
-}
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h
index d5dea084cc..ba7f9e4078 100644
--- a/src/libs/utils/linecolumnlabel.h
+++ b/src/libs/utils/linecolumnlabel.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef LINECOLUMNLABEL_H
 #define LINECOLUMNLABEL_H
 
@@ -42,7 +43,8 @@ namespace Utils {
 /* A label suitable for displaying cursor positions, etc. with a fixed
  * with derived from a sample text. */
 
-class  QWORKBENCH_UTILS_EXPORT LineColumnLabel : public QLabel {
+class  QWORKBENCH_UTILS_EXPORT LineColumnLabel : public QLabel
+{
     Q_DISABLE_COPY(LineColumnLabel)
     Q_OBJECT
     Q_PROPERTY(QString maxText READ maxText WRITE setMaxText DESIGNABLE true)
@@ -62,7 +64,7 @@ private:
     void *m_unused;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
 
 #endif // LINECOLUMNLABEL_H
diff --git a/src/libs/utils/listutils.h b/src/libs/utils/listutils.h
index 3b688f336d..cbd307937d 100644
--- a/src/libs/utils/listutils.h
+++ b/src/libs/utils/listutils.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef LISTUTILS_H
 #define LISTUTILS_H
 
@@ -48,7 +49,7 @@ QList<T1> qwConvertList(const QList<T2> &list)
     return convertedList;
 }
 
-} // Utils
-} // Core
+} // namespace Utils
+} // namespace Core
 
 #endif // LISTUTILS_H
diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp
index 67cd1f8691..1224ba3270 100644
--- a/src/libs/utils/newclasswidget.cpp
+++ b/src/libs/utils/newclasswidget.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "newclasswidget.h"
 #include "ui_newclasswidget.h"
 
@@ -457,6 +458,5 @@ QStringList NewClassWidget::files() const
     return rc;
 }
 
-
 } // namespace Utils
 } // namespace Core
diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h
index e534189d77..138f7bc9af 100644
--- a/src/libs/utils/newclasswidget.h
+++ b/src/libs/utils/newclasswidget.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef NEWCLASSWIDGET_H
 #define NEWCLASSWIDGET_H
 
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 188aa3b126..16d26b0f56 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "pathchooser.h"
 #include "basevalidatinglineedit.h"
 
@@ -181,5 +182,5 @@ QString PathChooser::homePath()
 #endif
 }
 
-}
-}
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index e09040c4c0..d8b33077ba 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -84,7 +84,7 @@ private:
     PathChooserPrivate *m_d;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
 
 #endif // PATHCHOOSER_H
diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp
index bc17333fb9..4e9dd365a8 100644
--- a/src/libs/utils/projectintropage.cpp
+++ b/src/libs/utils/projectintropage.cpp
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "projectintropage.h"
 #include "filewizardpage.h"
 #include "ui_projectintropage.h"
@@ -211,5 +212,5 @@ void ProjectIntroPage::hideStatusLabel()
     displayStatusMessage(Hint, QString());
 }
 
-}
-}
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h
index 56dcc25327..a145590dfd 100644
--- a/src/libs/utils/projectintropage.h
+++ b/src/libs/utils/projectintropage.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PROJECTINTROPAGE_H
 #define PROJECTINTROPAGE_H
 
@@ -55,7 +56,8 @@ struct ProjectIntroPagePrivate;
  * layout, otherwise, QWizard will squeeze it due to its strange expanding
  * hacks. */
 
-class QWORKBENCH_UTILS_EXPORT ProjectIntroPage : public QWizardPage {
+class QWORKBENCH_UTILS_EXPORT ProjectIntroPage : public QWizardPage
+{
     Q_OBJECT
     Q_DISABLE_COPY(ProjectIntroPage)
     Q_PROPERTY(QString description READ description WRITE setPath DESIGNABLE true)
@@ -102,6 +104,7 @@ private:
     ProjectIntroPagePrivate *m_d;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
+
 #endif // PROJECTINTROPAGE_H
diff --git a/src/libs/utils/projectnamevalidatinglineedit.cpp b/src/libs/utils/projectnamevalidatinglineedit.cpp
index fb979d3934..b6c1ccd505 100644
--- a/src/libs/utils/projectnamevalidatinglineedit.cpp
+++ b/src/libs/utils/projectnamevalidatinglineedit.cpp
@@ -30,14 +30,15 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "projectnamevalidatinglineedit.h"
 #include "filenamevalidatinglineedit.h"
 
 namespace Core {
 namespace Utils {
 
-ProjectNameValidatingLineEdit::ProjectNameValidatingLineEdit(QWidget *parent) :
-    BaseValidatingLineEdit(parent)
+ProjectNameValidatingLineEdit::ProjectNameValidatingLineEdit(QWidget *parent)
+  : BaseValidatingLineEdit(parent)
 {
 }
 
@@ -62,5 +63,5 @@ bool ProjectNameValidatingLineEdit::validate(const QString &value, QString *erro
     return validateProjectName(value, errorMessage);
 }
 
-}
-}
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/projectnamevalidatinglineedit.h b/src/libs/utils/projectnamevalidatinglineedit.h
index c677cea141..c42b8e4a35 100644
--- a/src/libs/utils/projectnamevalidatinglineedit.h
+++ b/src/libs/utils/projectnamevalidatinglineedit.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef PROJECTNAMEVALIDATINGLINEEDIT_H
 #define PROJECTNAMEVALIDATINGLINEEDIT_H
 
@@ -38,7 +39,8 @@
 namespace Core {
 namespace Utils {
 
-class QWORKBENCH_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit {
+class QWORKBENCH_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit
+{
     Q_OBJECT
     Q_DISABLE_COPY(ProjectNameValidatingLineEdit)
 
@@ -51,6 +53,7 @@ protected:
     virtual bool validate(const QString &value, QString *errorMessage) const;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
+
 #endif // PROJECTNAMEVALIDATINGLINEEDIT_H
diff --git a/src/libs/utils/qtcolorbutton.cpp b/src/libs/utils/qtcolorbutton.cpp
index 8b54bdda1d..8f67fc0975 100644
--- a/src/libs/utils/qtcolorbutton.cpp
+++ b/src/libs/utils/qtcolorbutton.cpp
@@ -30,12 +30,14 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "qtcolorbutton.h"
-#include <QtGui/QColorDialog>
-#include <QtGui/QPainter>
+
 #include <QtCore/QMimeData>
-#include <QtGui/QDragEnterEvent>
 #include <QtGui/QApplication>
+#include <QtGui/QColorDialog>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QPainter>
 
 namespace Core {
 namespace Utils {
diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h
index 07355c883e..930aef1579 100644
--- a/src/libs/utils/qtcolorbutton.h
+++ b/src/libs/utils/qtcolorbutton.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef QTCOLORBUTTON_H
 #define QTCOLORBUTTON_H
 
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp
index ca1d9e23de..9c4111a7db 100644
--- a/src/libs/utils/reloadpromptutils.cpp
+++ b/src/libs/utils/reloadpromptutils.cpp
@@ -30,7 +30,9 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "reloadpromptutils.h"
+
 #include <QtGui/QMessageBox>
 
 using namespace Core;
@@ -47,7 +49,8 @@ QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
 QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
     Core::Utils::reloadPrompt(const QString &title, const QString &prompt, QWidget *parent)
 {
-    switch (QMessageBox::question(parent,  title, prompt, QMessageBox::Yes|QMessageBox::YesToAll|QMessageBox::No|QMessageBox::NoToAll,
+    switch (QMessageBox::question(parent, title, prompt,
+                                  QMessageBox::Yes|QMessageBox::YesToAll|QMessageBox::No|QMessageBox::NoToAll,
                                   QMessageBox::YesToAll)) {
     case QMessageBox::Yes:
         return  ReloadCurrent;
diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h
index deaf4b920a..5d6fc87002 100644
--- a/src/libs/utils/reloadpromptutils.h
+++ b/src/libs/utils/reloadpromptutils.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef RELOADPROMPTUTILS_H
 #define RELOADPROMPTUTILS_H
 
diff --git a/src/libs/utils/settingsutils.cpp b/src/libs/utils/settingsutils.cpp
index ca8de01828..0f77b397cc 100644
--- a/src/libs/utils/settingsutils.cpp
+++ b/src/libs/utils/settingsutils.cpp
@@ -30,7 +30,9 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "settingsutils.h"
+
 #include <QtCore/QString>
 
 namespace Core {
@@ -41,13 +43,13 @@ QWORKBENCH_UTILS_EXPORT QString settingsKey(const QString &category)
     QString rc(category);
     const QChar underscore = QLatin1Char('_');
     const int size = rc.size();
-    for (int i = 0; i < size;i++) {
+    for (int i = 0; i < size; i++) {
         const QChar c = rc.at(i);
-        if (!c.isLetterOrNumber() && c !=  underscore)
+        if (!c.isLetterOrNumber() && c != underscore)
             rc[i] = underscore;
     }
     return rc;
 }
 
-}
-}
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h
index 734a2f02f9..abce76ee2f 100644
--- a/src/libs/utils/settingsutils.h
+++ b/src/libs/utils/settingsutils.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef SETTINGSTUTILS_H
 #define SETTINGSTUTILS_H
 
diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp
index aeafcd828d..b2c7995686 100644
--- a/src/libs/utils/submiteditorwidget.cpp
+++ b/src/libs/utils/submiteditorwidget.cpp
@@ -30,18 +30,20 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #include "submiteditorwidget.h"
 #include "ui_submiteditorwidget.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QPointer>
 
-enum { debug= 0 };
+enum { debug = 0 };
 
 namespace Core {
 namespace Utils {
 
-struct SubmitEditorWidgetPrivate {
+struct SubmitEditorWidgetPrivate
+{
     SubmitEditorWidgetPrivate();
 
     Ui::SubmitEditorWidget m_ui;
diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h
index 3c40ccecba..b034b549e4 100644
--- a/src/libs/utils/submiteditorwidget.h
+++ b/src/libs/utils/submiteditorwidget.h
@@ -30,6 +30,7 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef SUBMITEDITORWIDGET_H
 #define SUBMITEDITORWIDGET_H
 
@@ -65,7 +66,8 @@ struct SubmitEditorWidgetPrivate;
  * Care should be taken to ensure the widget is deleted properly when the
  * editor closes. */
 
-class QWORKBENCH_UTILS_EXPORT SubmitEditorWidget : public QWidget {
+class QWORKBENCH_UTILS_EXPORT SubmitEditorWidget : public QWidget
+{
     Q_OBJECT
     Q_DISABLE_COPY(SubmitEditorWidget)
     Q_PROPERTY(QString descriptionText READ descriptionText WRITE setDescriptionText DESIGNABLE true)
@@ -117,6 +119,7 @@ private:
     SubmitEditorWidgetPrivate *m_d;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
+
 #endif // SUBMITEDITORWIDGET_H
diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp
index 71bcdffb6c..049fd0f574 100644
--- a/src/libs/utils/synchronousprocess.cpp
+++ b/src/libs/utils/synchronousprocess.cpp
@@ -352,5 +352,5 @@ void SynchronousProcess::processStdErr(bool emitSignals)
     }
 }
 
-}
-}
+} // namespace Utils
+} // namespace Core
diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h
index 9458655d6b..356dec2643 100644
--- a/src/libs/utils/synchronousprocess.h
+++ b/src/libs/utils/synchronousprocess.h
@@ -30,15 +30,16 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
+
 #ifndef SYNCHRONOUSPROCESS_H
 #define SYNCHRONOUSPROCESS_H
 
+#include "utils_global.h"
+
 #include <QtCore/QObject>
 #include <QtCore/QProcess>
 #include <QtCore/QStringList>
 
-#include "utils_global.h"
-
 QT_BEGIN_NAMESPACE
 class QTextCodec;
 class QDebug;
@@ -51,7 +52,8 @@ namespace Utils {
 struct SynchronousProcessPrivate;
 
 /* Result of SynchronousProcess execution */
-struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse {
+struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse
+{
     enum Result {
         // Finished with return code 0
         Finished,
@@ -87,7 +89,8 @@ QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessRe
  * stdOutBufferedSignalsEnabled()/setStdErrBufferedSignalsEnabled().
  * They would typically be used for log windows. */
 
-class QWORKBENCH_UTILS_EXPORT SynchronousProcess : public QObject {
+class QWORKBENCH_UTILS_EXPORT SynchronousProcess : public QObject
+{
     Q_OBJECT
 public:
     SynchronousProcess();
@@ -134,6 +137,7 @@ private:
     SynchronousProcessPrivate *m_d;
 };
 
-}
-}
+} // namespace Utils
+} // namespace Core
+
 #endif
diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h
index 3a91f77a2b..fa967e6397 100644
--- a/src/libs/utils/utils_global.h
+++ b/src/libs/utils/utils_global.h
@@ -30,18 +30,6 @@
 ** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
 ** 
 ***************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 1992-$THISYEAR$ Trolltech AS. All rights reserved.
-**
-** This file is part of the $MODULE$ of the Qt Toolkit.
-**
-** $LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
 
 #ifndef UTILS_GLOBAL_H
 #define UTILS_GLOBAL_H