more code cosmetics

author: hjk <[email protected]> 2008-12-02 16:19:05 +0100
committer: hjk <[email protected]> 2008-12-02 16:19:05 +0100
commit: cf11b696431d26920f54598c8f03f0a5cf822ffa (patch)
tree: 9387102d435481132b721fde8ca062c5b8a4f73f /src/plugins
parent: 10e963fb6134b3974901707daa99f5a94d696bed (diff)
378 files changed, 960 insertions, 669 deletions
diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp
index 52d423014ec..fe01a3acbb8 100644
--- a/src/plugins/help/docsettingspage.cpp
+++ b/src/plugins/help/docsettingspage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "docsettingspage.h"
 
 #include <QtGui/QFileDialog>
@@ -42,7 +43,6 @@ DocSettingsPage::DocSettingsPage(QHelpEngine *helpEngine)
     : m_helpEngine(helpEngine),
       m_registeredDocs(false)
 {
-
 }
 
 QString DocSettingsPage::name() const
diff --git a/src/plugins/help/docsettingspage.h b/src/plugins/help/docsettingspage.h
index 85e331691b1..93b518a7f44 100644
--- a/src/plugins/help/docsettingspage.h
+++ b/src/plugins/help/docsettingspage.h
@@ -34,10 +34,11 @@
 #ifndef DOCSETTINGSPAGE_H
 #define DOCSETTINGSPAGE_H
 
-#include <QtGui/QWidget>
+#include "ui_docsettingspage.h"
+
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include "ui_docsettingspage.h"
+#include <QtGui/QWidget>
 
 QT_FORWARD_DECLARE_CLASS(QHelpEngine)
 
diff --git a/src/plugins/help/help_global.h b/src/plugins/help/help_global.h
index 8f3e782e770..e0d66c58ec1 100644
--- a/src/plugins/help/help_global.h
+++ b/src/plugins/help/help_global.h
@@ -30,18 +30,6 @@
 ** version 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 HELP_GLOBAL_H
 #define HELP_GLOBAL_H
diff --git a/src/plugins/help/helpengine.cpp b/src/plugins/help/helpengine.cpp
index 49a48115a1b..db259f7aa03 100644
--- a/src/plugins/help/helpengine.cpp
+++ b/src/plugins/help/helpengine.cpp
@@ -30,14 +30,15 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+#include "helpengine.h"
+#include "config.h"
+
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QDateTime>
 #include <QtCore/QCoreApplication>
 
-#include "helpengine.h"
-#include "config.h"
-
 using namespace Help::Internal;
 
 static bool verifyDirectory(const QString &str)
@@ -52,7 +53,8 @@ static bool verifyDirectory(const QString &str)
     return true;
 }
 
-struct IndexKeyword {
+struct IndexKeyword
+{
     IndexKeyword(const QString &kw, const QString &l)
         : keyword(kw), link(l) {}
     IndexKeyword() : keyword(QString()), link(QString()) {}
@@ -193,12 +195,6 @@ QModelIndex IndexListModel::filter(const QString &s, const QString &real)
 
 
 
-
-
-
-
-
-
 HelpEngine::HelpEngine(QObject *parent, const QString &defaultQtVersionPath)
     : QObject(parent)
 {
@@ -344,13 +340,6 @@ QString HelpEngine::home() const
 
 
 
-
-
-
-
-
-
-
 TitleMapThread::TitleMapThread(HelpEngine *he)
     : QThread(he)
 {
@@ -488,9 +477,6 @@ void TitleMapThread::buildContentDict()
 }
 
 
-
-
-
 IndexThread::IndexThread(HelpEngine *he)
     : QThread(he)
 {
diff --git a/src/plugins/help/helpengine.h b/src/plugins/help/helpengine.h
index cbb9cc3f37b..e3cb08a1512 100644
--- a/src/plugins/help/helpengine.h
+++ b/src/plugins/help/helpengine.h
@@ -30,9 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef HELPENGINE_H
 #define HELPENGINE_H
 
+#include "docuparser.h"
+
 #include <QtCore/QThread>
 #include <QtCore/QPair>
 #include <QtCore/QMap>
@@ -40,8 +43,6 @@
 #include <QtCore/QMutex>
 #include <QtGui/QStringListModel>
 
-#include "docuparser.h"
-
 namespace Help {
 namespace Internal {
 
@@ -129,7 +130,7 @@ class HelpEngine : public QObject
     Q_OBJECT
 
 public:
-    HelpEngine(QObject *parent, const QString& defaultQtVersionPath);
+    HelpEngine(QObject *parent, const QString &defaultQtVersionPath);
     ~HelpEngine();
     void init();    
     QList<QPair<QString, ContentList> > contents() const { return contentList; }
@@ -176,7 +177,7 @@ private:
     bool contentsOnly;
 };
 
-} //namespace Internal
-} //namespace Help
+} // namespace Internal
+} // namespace Help
 
-#endif
+#endif // HELPENGINE_H
diff --git a/src/plugins/help/helpfindsupport.cpp b/src/plugins/help/helpfindsupport.cpp
index 56243c723ca..83ec2d1570d 100644
--- a/src/plugins/help/helpfindsupport.cpp
+++ b/src/plugins/help/helpfindsupport.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "helpfindsupport.h"
 #include "helpviewer.h"
 
@@ -48,6 +49,7 @@ bool HelpFindSupport::isEnabled() const
 {
     return true;
 }
+
 QString HelpFindSupport::currentFindString() const
 {
     Q_ASSERT(m_centralWidget);
@@ -61,8 +63,10 @@ QString HelpFindSupport::currentFindString() const
 #endif
 }
 
-
-QString HelpFindSupport::completedFindString() const { return QString(); }
+QString HelpFindSupport::completedFindString() const
+{
+    return QString();
+}
 
 bool HelpFindSupport::findIncremental(const QString &txt, QTextDocument::FindFlags findFlags)
 {
diff --git a/src/plugins/help/helpfindsupport.h b/src/plugins/help/helpfindsupport.h
index 51eef1f2dc7..a2105dfe293 100644
--- a/src/plugins/help/helpfindsupport.h
+++ b/src/plugins/help/helpfindsupport.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef HELPFINDSUPPORT_H
 #define HELPFINDSUPPORT_H
 
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index 0fc113c9a0a..989ed18f2a8 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "helpindexfilter.h"
 #include "helpplugin.h"
 
diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h
index 26f6b385664..0e4e2743dec 100644
--- a/src/plugins/help/helpindexfilter.h
+++ b/src/plugins/help/helpindexfilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef HELPINDEXFILTER_H
 #define HELPINDEXFILTER_H
 
diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp
index 49023da60b3..f206773f352 100644
--- a/src/plugins/help/helpmode.cpp
+++ b/src/plugins/help/helpmode.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "helpmode.h"
 #include "helpplugin.h"
 
@@ -43,7 +44,8 @@ using namespace Help::Internal;
 HelpMode::HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent):
     BaseMode(tr("Help"),
              Constants::ID_MODE_HELP,
-             QIcon((QLatin1String(":/fancyactionbar/images/mode_Reference.png"))), Constants::P_MODE_HELP, widget, parent),
+             QIcon((QLatin1String(":/fancyactionbar/images/mode_Reference.png"))),
+             Constants::P_MODE_HELP, widget, parent),
     m_centralWidget(centralWidget)
 {
     m_centralWidget->layout()->setSpacing(0);
diff --git a/src/plugins/help/helpmode.h b/src/plugins/help/helpmode.h
index 753c35d84a0..458b7dc5c4b 100644
--- a/src/plugins/help/helpmode.h
+++ b/src/plugins/help/helpmode.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef HELPMODE_H
 #define HELPMODE_H
 
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 73dc3cae066..c96fcf28472 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -44,6 +44,18 @@
 #include "helpfindsupport.h"
 #include "searchwidget.h"
 
+#include <extensionsystem/pluginmanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/modemanager.h>
+#include <coreplugin/uniqueidmanager.h>
+#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/minisplitter.h>
+#include <coreplugin/modemanager.h>
+#include <coreplugin/rightpane.h>
+#include <coreplugin/sidebar.h>
+#include <coreplugin/welcomemode.h>
+
 #include <QtCore/QDebug>
 #include <QtCore/qplugin.h>
 #include <QtCore/QFileInfo>
@@ -58,18 +70,6 @@
 #include <QtGui/QComboBox>
 #include <QtHelp/QHelpEngine>
 
-#include <extensionsystem/pluginmanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
-#include <coreplugin/minisplitter.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/rightpane.h>
-#include <coreplugin/sidebar.h>
-#include <coreplugin/welcomemode.h>
-
 using namespace Help;
 using namespace Help::Internal;
 
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 95845fb5d1d..5f50b48a565 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -35,6 +35,7 @@
 #define HELPPLUGIN_H
 
 #include "help_global.h"
+
 #include <extensionsystem/iplugin.h>
 
 #include <QtCore/QMap>
diff --git a/src/plugins/help/indextoolwindow.cpp b/src/plugins/help/indextoolwindow.cpp
index 6a6f8c5348a..07a4ee68cea 100644
--- a/src/plugins/help/indextoolwindow.cpp
+++ b/src/plugins/help/indextoolwindow.cpp
@@ -30,6 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+#include "indextoolwindow.h"
+#include "helpengine.h"
+#include "topicchooser.h"
+
 #include <QtCore/QDebug>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QFocusEvent>
@@ -39,10 +44,6 @@
 #include <QtGui/QListView>
 #include <QtGui/QApplication>
 
-#include "indextoolwindow.h"
-#include "helpengine.h"
-#include "topicchooser.h"
-
 using namespace Help::Internal;
 
 IndexToolWidget::IndexToolWidget()
diff --git a/src/plugins/help/indextoolwindow.h b/src/plugins/help/indextoolwindow.h
index 37c420184c6..6792ca5b92e 100644
--- a/src/plugins/help/indextoolwindow.h
+++ b/src/plugins/help/indextoolwindow.h
@@ -30,14 +30,15 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef INDEXTOOLWINDOW_H
 #define INDEXTOOLWINDOW_H
 
+#include <coreplugin/iview.h>
+
 #include <QtCore/QModelIndex>
 #include <QtGui/QWidget>
 
-#include <coreplugin/iview.h>
-
 class QListView;
 class QLineEdit;
 
diff --git a/src/plugins/help/indexwindow.h b/src/plugins/help/indexwindow.h
index d93a62b258e..51ebb06653d 100644
--- a/src/plugins/help/indexwindow.h
+++ b/src/plugins/help/indexwindow.h
@@ -31,8 +31,8 @@
 **
 ***************************************************************************/
 
-#ifndef INDEXWINDOW
-#define INDEXWINDOW
+#ifndef INDEXWINDOW_H
+#define INDEXWINDOW_H
 
 #include <QtCore/QUrl>
 #include <QtGui/QWidget>
@@ -79,4 +79,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif
+#endif // INDEXWINDOW_H
diff --git a/src/plugins/help/searchwidget.h b/src/plugins/help/searchwidget.h
index 6f6533f387e..09b73c26791 100644
--- a/src/plugins/help/searchwidget.h
+++ b/src/plugins/help/searchwidget.h
@@ -85,4 +85,4 @@ private:
 } // namespace Internal
 } // namespace Help
 
-#endif  // SEARCHWIDGET_H
+#endif // SEARCHWIDGET_H
diff --git a/src/plugins/perforce/annotationhighlighter.cpp b/src/plugins/perforce/annotationhighlighter.cpp
index a23e7b27851..196f8ef715f 100644
--- a/src/plugins/perforce/annotationhighlighter.cpp
+++ b/src/plugins/perforce/annotationhighlighter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "annotationhighlighter.h"
 
 namespace Perforce {
@@ -48,5 +49,5 @@ QString PerforceAnnotationHighlighter::changeNumber(const QString &block) const
     return pos > 1 ? block.left(pos) : QString();
 }
 
-}
-}
+} // Internal
+} // Perforce
diff --git a/src/plugins/perforce/annotationhighlighter.h b/src/plugins/perforce/annotationhighlighter.h
index d407a79750c..3d6119d402e 100644
--- a/src/plugins/perforce/annotationhighlighter.h
+++ b/src/plugins/perforce/annotationhighlighter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ANNOTATIONHIGHLIGHTER_H
 #define ANNOTATIONHIGHLIGHTER_H
 
@@ -52,7 +53,7 @@ private:
     const QChar m_colon;
 };
 
-} //namespace Perforce
-} //namespace Internal
+} // namespace Perforce
+} // namespace Internal
 
-#endif
+#endif // ANNOTATIONHIGHLIGHTER_H
diff --git a/src/plugins/perforce/changenumberdialog.cpp b/src/plugins/perforce/changenumberdialog.cpp
index a51b4adbe83..86823969b4a 100644
--- a/src/plugins/perforce/changenumberdialog.cpp
+++ b/src/plugins/perforce/changenumberdialog.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include <QtGui/QIntValidator>
 
 #include "changenumberdialog.h"
diff --git a/src/plugins/perforce/changenumberdialog.h b/src/plugins/perforce/changenumberdialog.h
index 8f5b5d0607c..c7fdaeee335 100644
--- a/src/plugins/perforce/changenumberdialog.h
+++ b/src/plugins/perforce/changenumberdialog.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CHANGENUMBERDIALOG_H
 #define CHANGENUMBERDIALOG_H
 
@@ -53,9 +54,7 @@ private:
 
 };
 
-} //namespace Perforce
-} //namespace Internal
-
-#endif
-
+} // namespace Perforce
+} // namespace Internal
 
+#endif // CHANGENUMBERDIALOG_H
diff --git a/src/plugins/perforce/p4.h b/src/plugins/perforce/p4.h
index 4f96d340575..5e9eca1f3e2 100644
--- a/src/plugins/perforce/p4.h
+++ b/src/plugins/perforce/p4.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef P4_API_INCL
 #define P4_API_INCL
 
diff --git a/src/plugins/perforce/pendingchangesdialog.cpp b/src/plugins/perforce/pendingchangesdialog.cpp
index 25aa1e907e6..92b3ec56e5c 100644
--- a/src/plugins/perforce/pendingchangesdialog.cpp
+++ b/src/plugins/perforce/pendingchangesdialog.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include <QtCore/QRegExp>
 
 #include "pendingchangesdialog.h"
diff --git a/src/plugins/perforce/pendingchangesdialog.h b/src/plugins/perforce/pendingchangesdialog.h
index b0b96cc799c..7e0b0cdddc2 100644
--- a/src/plugins/perforce/pendingchangesdialog.h
+++ b/src/plugins/perforce/pendingchangesdialog.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PENDINGCHANGESDIALOG_H
 #define PENDINGCHANGESDIALOG_H
 
@@ -52,8 +53,8 @@ private:
     Ui::PendingChangesDialog m_ui;
 };
 
-} //namespace Perforce
-} //namespace Internal
+} // namespace Perforce
+} // namespace Internal
 
-#endif
+#endif // PENDINGCHANGESDIALOG_H
 
diff --git a/src/plugins/perforce/perforceconstants.h b/src/plugins/perforce/perforceconstants.h
index eb6723d9dad..87072a01ad4 100644
--- a/src/plugins/perforce/perforceconstants.h
+++ b/src/plugins/perforce/perforceconstants.h
@@ -30,24 +30,27 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCE_CONSTANTS_H
 #define PERFORCE_CONSTANTS_H
 
 namespace Perforce {
-    namespace Constants {
-        const char * const C_PERFORCEEDITOR  = "Perforce Editor";
+namespace Constants {
+
+const char * const C_PERFORCEEDITOR  = "Perforce Editor";
+
+const char * const PERFORCEEDITOR_KIND  = "Perforce Editor";
+const char * const C_PERFORCESUBMITEDITOR  = "Perforce Submit Editor";
+const char * const PERFORCESUBMITEDITOR_KIND  = "Perforce Submit Editor";
+const char * const ICON_SUBMIT = ":/trolltech.perforce/images/submit.png";
+const char * const ICON_DIFF = ":/trolltech.perforce/images/diff.png";
+const char * const SUBMIT_CURRENT = "Nokia.Perforce.SubmitCurrentLog";
+const char * const DIFF_SELECTED = "Nokia.Perforce.DiffSelectedFilesInLog";
+const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.p4.submit";
 
-        const char * const PERFORCEEDITOR_KIND  = "Perforce Editor";
-        const char * const C_PERFORCESUBMITEDITOR  = "Perforce Submit Editor";
-        const char * const PERFORCESUBMITEDITOR_KIND  = "Perforce Submit Editor";
-        const char * const ICON_SUBMIT = ":/trolltech.perforce/images/submit.png";
-        const char * const ICON_DIFF = ":/trolltech.perforce/images/diff.png";
-        const char * const SUBMIT_CURRENT = "Nokia.Perforce.SubmitCurrentLog";
-        const char * const DIFF_SELECTED = "Nokia.Perforce.DiffSelectedFilesInLog";
-        const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.p4.submit";
+enum { debug = 0 };
 
-        enum { debug = 0 };
-    }
-}
+} // Internal
+} // Perforce
 
 #endif // PERFORCE_CONSTANTS_H
diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp
index 384afd28e52..8eda71843f4 100644
--- a/src/plugins/perforce/perforceeditor.cpp
+++ b/src/plugins/perforce/perforceeditor.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforceeditor.h"
 #include "annotationhighlighter.h"
 #include "perforceplugin.h"
diff --git a/src/plugins/perforce/perforceeditor.h b/src/plugins/perforce/perforceeditor.h
index 4e845124ac6..de35d213a8b 100644
--- a/src/plugins/perforce/perforceeditor.h
+++ b/src/plugins/perforce/perforceeditor.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCEEDITOR_H
 #define PERFORCEEDITOR_H
 
diff --git a/src/plugins/perforce/perforceoutputwindow.cpp b/src/plugins/perforce/perforceoutputwindow.cpp
index f6daaa311de..a228e2b586f 100644
--- a/src/plugins/perforce/perforceoutputwindow.cpp
+++ b/src/plugins/perforce/perforceoutputwindow.cpp
@@ -30,15 +30,16 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+#include "perforceoutputwindow.h"
+#include "perforceplugin.h"
+
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QMenu>
 #include <QtGui/QAction>
 #include <QtGui/QListWidget>
 
-#include "perforceoutputwindow.h"
-#include "perforceplugin.h"
-
 using namespace Perforce::Internal;
 
 PerforceOutputWindow::PerforceOutputWindow(PerforcePlugin *p4Plugin)
@@ -74,7 +75,6 @@ bool PerforceOutputWindow::canFocus()
 
 void PerforceOutputWindow::setFocus()
 {
-
 }
 
 QWidget *PerforceOutputWindow::outputWidget(QWidget *parent)
@@ -95,7 +95,6 @@ void PerforceOutputWindow::clearContents()
 
 void PerforceOutputWindow::visibilityChanged(bool /* b */)
 {
-
 }
 
 void PerforceOutputWindow::append(const QString &txt, bool doPopup)
diff --git a/src/plugins/perforce/perforceoutputwindow.h b/src/plugins/perforce/perforceoutputwindow.h
index 7264edffb66..b666d078ab5 100644
--- a/src/plugins/perforce/perforceoutputwindow.h
+++ b/src/plugins/perforce/perforceoutputwindow.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCEOUTPUTWINDOW_H
 #define PERFORCEOUTPUTWINDOW_H
 
@@ -84,4 +85,4 @@ private:
 } // namespace Perforce
 } // namespace Internal
 
-#endif
+#endif // PERFORCEOUTPUTWINDOW_H
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index b910b47e328..60ffa06e99c 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "p4.h"
 #include "perforceplugin.h"
 #include "perforceoutputwindow.h"
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 9d75bc7f88e..4c088563324 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCEPLUGIN_H
 #define PERFORCEPLUGIN_H
 
@@ -64,6 +65,7 @@ namespace Core {
 
 namespace Perforce {
 namespace Internal {
+
 class PerforceOutputWindow;
 class SettingsPage;
 class PerforceVersionControl;
diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp
index 78eafc7f7ed..6384f85e524 100644
--- a/src/plugins/perforce/perforcesettings.cpp
+++ b/src/plugins/perforce/perforcesettings.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforcesettings.h"
 
 #include <QtCore/QSettings>
@@ -90,6 +91,5 @@ bool PerforceSettings::equals(const PerforceSettings &s) const
         && defaultEnv == s.defaultEnv;
 }
 
-}
-}
-
+} // Internal
+} // Perforce
diff --git a/src/plugins/perforce/perforcesettings.h b/src/plugins/perforce/perforcesettings.h
index f251c7aceff..416620f7613 100644
--- a/src/plugins/perforce/perforcesettings.h
+++ b/src/plugins/perforce/perforcesettings.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFOCESETTINGS_H
 #define PERFOCESETTINGS_H
 
@@ -59,7 +60,8 @@ inline bool operator==(const PerforceSettings &p1, const PerforceSettings &p2)
     { return p1.equals(p2); }
 inline bool operator!=(const PerforceSettings &p1, const PerforceSettings &p2)
     { return !p1.equals(p2); }
-}
-}
 
-#endif
+} // Internal
+} // Perforce
+
+#endif // PERFOCESETTINGS_H
diff --git a/src/plugins/perforce/perforcesubmiteditor.cpp b/src/plugins/perforce/perforcesubmiteditor.cpp
index 8917a6028a9..4dc41e7fa5e 100644
--- a/src/plugins/perforce/perforcesubmiteditor.cpp
+++ b/src/plugins/perforce/perforcesubmiteditor.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforcesubmiteditor.h"
 #include "perforcesubmiteditorwidget.h"
 #include "perforceplugin.h"
@@ -190,5 +191,5 @@ void PerforceSubmitEditor::updateEntries()
     m_entries.insert(QLatin1String("Files"), files);
 }
 
-}
-}
+} // Internal
+} // Perforce
diff --git a/src/plugins/perforce/perforcesubmiteditor.h b/src/plugins/perforce/perforcesubmiteditor.h
index 80027a8206a..cc308122b01 100644
--- a/src/plugins/perforce/perforcesubmiteditor.h
+++ b/src/plugins/perforce/perforcesubmiteditor.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCESUBMITEDITOR_H
 #define PERFORCESUBMITEDITOR_H
 
diff --git a/src/plugins/perforce/perforcesubmiteditorwidget.cpp b/src/plugins/perforce/perforcesubmiteditorwidget.cpp
index a218b4ff8d7..c88556e4fed 100644
--- a/src/plugins/perforce/perforcesubmiteditorwidget.cpp
+++ b/src/plugins/perforce/perforcesubmiteditorwidget.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforcesubmiteditorwidget.h"
 
 namespace Perforce {
@@ -51,5 +52,6 @@ void PerforceSubmitEditorWidget::setData(const QString &change,
     m_submitPanelUi.clientName->setText(client);
     m_submitPanelUi.userName->setText(userName);
 }
-}
-}
+
+} // Internal
+} // Perforce
diff --git a/src/plugins/perforce/perforcesubmiteditorwidget.h b/src/plugins/perforce/perforcesubmiteditorwidget.h
index bcaa2be0a70..68c00a5896d 100644
--- a/src/plugins/perforce/perforcesubmiteditorwidget.h
+++ b/src/plugins/perforce/perforcesubmiteditorwidget.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCESUBMITEDITORWIDGET_H
 #define PERFORCESUBMITEDITORWIDGET_H
 
diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp
index 815a8ceed4a..a51930c1e6d 100644
--- a/src/plugins/perforce/perforceversioncontrol.cpp
+++ b/src/plugins/perforce/perforceversioncontrol.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforceversioncontrol.h"
 #include "perforceplugin.h"
 
@@ -65,5 +66,6 @@ QString PerforceVersionControl::findTopLevelForDirectory(const QString &director
 {
     return m_plugin->findTopLevelForDirectory(directory);
 }
-}
-}
+
+} // Internal
+} // Perforce
diff --git a/src/plugins/perforce/perforceversioncontrol.h b/src/plugins/perforce/perforceversioncontrol.h
index cd194967ef8..d87a7f15ae4 100644
--- a/src/plugins/perforce/perforceversioncontrol.h
+++ b/src/plugins/perforce/perforceversioncontrol.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCEVERSIONCONTROL_H
 #define PERFORCEVERSIONCONTROL_H
 
@@ -55,6 +56,7 @@ private:
     PerforcePlugin *m_plugin;
 };
 
-}
-}
-#endif
+} // Internal
+} // Perforce
+
+#endif // PERFORCEVERSIONCONTROL_H
diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp
index 25290fbc166..5fd7dda4862 100644
--- a/src/plugins/perforce/settingspage.cpp
+++ b/src/plugins/perforce/settingspage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "settingspage.h"
 #include "perforcesettings.h"
 #include "perforceplugin.h"
diff --git a/src/plugins/perforce/settingspage.h b/src/plugins/perforce/settingspage.h
index 12d5e5f51aa..f73a205e112 100644
--- a/src/plugins/perforce/settingspage.h
+++ b/src/plugins/perforce/settingspage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SETTINGSPAGE_H
 #define SETTINGSPAGE_H
 
diff --git a/src/plugins/perforce/workbenchclientuser.cpp b/src/plugins/perforce/workbenchclientuser.cpp
index 0ade14d3e83..9d7fe5574cf 100644
--- a/src/plugins/perforce/workbenchclientuser.cpp
+++ b/src/plugins/perforce/workbenchclientuser.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "workbenchclientuser.h"
 #include "perforceoutputwindow.h"
 #include "perforceplugin.h"
diff --git a/src/plugins/perforce/workbenchclientuser.h b/src/plugins/perforce/workbenchclientuser.h
index 244146b4ae6..85e3908cc95 100644
--- a/src/plugins/perforce/workbenchclientuser.h
+++ b/src/plugins/perforce/workbenchclientuser.h
@@ -30,16 +30,18 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef WORKBENCHCLIENTUSER_H
 #define WORKBENCHCLIENTUSER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <coreplugin/icorelistener.h>
 #include "p4.h"
-
 #include "ui_promptdialog.h"
 
+#include <coreplugin/icorelistener.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+
 QT_BEGIN_NAMESPACE
 class QRadioButton;
 class QEventLoop;
@@ -108,4 +110,4 @@ private:
 } // namespace Perforce
 } // namespace Internal
 
-#endif
+#endif // WORKBENCHCLIENTUSER_H
diff --git a/src/plugins/projectexplorer/abstractprocess.h b/src/plugins/projectexplorer/abstractprocess.h
index 2ab448e43bc..12e263ff626 100644
--- a/src/plugins/projectexplorer/abstractprocess.h
+++ b/src/plugins/projectexplorer/abstractprocess.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ABSTRACTPROCESS_H
 #define ABSTRACTPROCESS_H
 
@@ -68,5 +69,5 @@ private:
 } //namespace Internal
 } //namespace Qt4ProjectManager
 
-#endif
+#endif // ABSTRACTPROCESS_H
 
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 4fb4da909d9..09bd73fe767 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -30,9 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "abstractprocessstep.h"
 #include "buildstep.h"
 #include "project.h"
+
 #include <QtCore/QProcess>
 #include <QtCore/QEventLoop>
 #include <QtCore/QDebug>
@@ -41,7 +43,7 @@
 using namespace ProjectExplorer;
 
 AbstractProcessStep::AbstractProcessStep(Project *pro)
-        : BuildStep(pro)
+  : BuildStep(pro)
 {
 }
 
diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h
index 217daac1e5d..e5d40343bb0 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.h
+++ b/src/plugins/projectexplorer/abstractprocessstep.h
@@ -30,11 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ABSTRACTPROCESSSTEP_H
 #define ABSTRACTPROCESSSTEP_H
 
 #include "buildstep.h"
 #include "environment.h"
+
 #include <QtCore/QString>
 #include <QtCore/QProcess>
 
@@ -136,6 +138,6 @@ private:
     ProjectExplorer::Environment m_environment;
 };
 
-}
+} // namespace ProjectExplorer
 
 #endif // ABSTRACTPROCESSSTEP_H
diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp
index 008418b6201..059b41e730c 100644
--- a/src/plugins/projectexplorer/allprojectsfilter.cpp
+++ b/src/plugins/projectexplorer/allprojectsfilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "allprojectsfilter.h"
 #include "projectexplorer.h"
 #include "session.h"
@@ -42,8 +43,7 @@ using namespace QuickOpen;
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
 
-AllProjectsFilter::AllProjectsFilter(ProjectExplorerPlugin *pe,
-                                     ICore *core)
+AllProjectsFilter::AllProjectsFilter(ProjectExplorerPlugin *pe, ICore *core)
     : BaseFileFilter(core)
 {
     m_projectExplorer = pe;
diff --git a/src/plugins/projectexplorer/allprojectsfilter.h b/src/plugins/projectexplorer/allprojectsfilter.h
index 99eeee4f85e..3315e7b2de8 100644
--- a/src/plugins/projectexplorer/allprojectsfilter.h
+++ b/src/plugins/projectexplorer/allprojectsfilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ALLPROJECTSFILTER_H
 #define ALLPROJECTSFILTER_H
 
diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp
index 0ff920053e7..f892f5ff399 100644
--- a/src/plugins/projectexplorer/allprojectsfind.cpp
+++ b/src/plugins/projectexplorer/allprojectsfind.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "allprojectsfind.h"
 #include "projectexplorer.h"
 #include "project.h"
diff --git a/src/plugins/projectexplorer/allprojectsfind.h b/src/plugins/projectexplorer/allprojectsfind.h
index 7b0456ac654..77fb2e78eb8 100644
--- a/src/plugins/projectexplorer/allprojectsfind.h
+++ b/src/plugins/projectexplorer/allprojectsfind.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ALLPROJECTSFIND_H
 #define ALLPROJECTSFIND_H
 
diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h
index 53514bb83fd..049b689f446 100644
--- a/src/plugins/projectexplorer/applicationlauncher.h
+++ b/src/plugins/projectexplorer/applicationlauncher.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef APPLICATIONLAUNCHER_H
 #define APPLICATIONLAUNCHER_H
 
diff --git a/src/plugins/projectexplorer/applicationlauncher_win.cpp b/src/plugins/projectexplorer/applicationlauncher_win.cpp
index d3f6fb1d1ec..4d0221b087b 100644
--- a/src/plugins/projectexplorer/applicationlauncher_win.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher_win.cpp
@@ -30,12 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include <projectexplorer/ProjectExplorerInterfaces>
 
-#include <QDebug>
 #include "applicationlauncher.h"
 #include "consoleprocess.h"
 #include "winguiprocess.h"
+#include <projectexplorer/ProjectExplorerInterfaces>
+
+#include <QDebug>
 
 using namespace ProjectExplorer::Internal;
 
diff --git a/src/plugins/projectexplorer/applicationlauncher_x11.cpp b/src/plugins/projectexplorer/applicationlauncher_x11.cpp
index ea99ed942d7..7042c152d22 100644
--- a/src/plugins/projectexplorer/applicationlauncher_x11.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher_x11.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "applicationlauncher.h"
 #include "consoleprocess.h"
 
diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.cpp b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
index 697a4715d9f..ba459d563c1 100644
--- a/src/plugins/projectexplorer/applicationrunconfiguration.cpp
+++ b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
@@ -30,9 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "applicationrunconfiguration.h"
 #include "persistentsettings.h"
 #include "environment.h"
+
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <QtGui/QLabel>
diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.h b/src/plugins/projectexplorer/applicationrunconfiguration.h
index 780722fad2f..5915f9b7a2f 100644
--- a/src/plugins/projectexplorer/applicationrunconfiguration.h
+++ b/src/plugins/projectexplorer/applicationrunconfiguration.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef APPLICATIONRUNCONFIGURATION_H
 #define APPLICATIONRUNCONFIGURATION_H
 
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 58570845137..c9090723a19 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildconfiguration.h"
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index f61b7a84f29..b3ccc8adc96 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDCONFIGURATION_H
 #define BUILDCONFIGURATION_H
 
@@ -59,6 +60,6 @@ private:
     QString m_name;
 };
 
-}
+} // namespace ProjectExplorer
 
-#endif
+#endif // BUILDCONFIGURATION_H
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 08c29f865d6..98002f88270 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildmanager.h"
 #include "buildstep.h"
 #include "compileoutputwindow.h"
diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h
index 407b26d1a9a..2c7a443720a 100644
--- a/src/plugins/projectexplorer/buildmanager.h
+++ b/src/plugins/projectexplorer/buildmanager.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDMANAGER_H
 #define BUILDMANAGER_H
 
diff --git a/src/plugins/projectexplorer/buildparserinterface.cpp b/src/plugins/projectexplorer/buildparserinterface.cpp
index 9e9990c3b47..57bf588ca82 100644
--- a/src/plugins/projectexplorer/buildparserinterface.cpp
+++ b/src/plugins/projectexplorer/buildparserinterface.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildparserinterface.h"
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/buildparserinterface.h b/src/plugins/projectexplorer/buildparserinterface.h
index 969bbc1c955..217ce0bcaf5 100644
--- a/src/plugins/projectexplorer/buildparserinterface.h
+++ b/src/plugins/projectexplorer/buildparserinterface.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDPARSERINTERFACE_H
 #define BUILDPARSERINTERFACE_H
 
diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp
index d12d92c141e..7c893bb9ceb 100644
--- a/src/plugins/projectexplorer/buildprogress.cpp
+++ b/src/plugins/projectexplorer/buildprogress.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildprogress.h"
 
 #include <coreplugin/stylehelper.h>
diff --git a/src/plugins/projectexplorer/buildprogress.h b/src/plugins/projectexplorer/buildprogress.h
index f51972b09b0..12f2ff36da3 100644
--- a/src/plugins/projectexplorer/buildprogress.h
+++ b/src/plugins/projectexplorer/buildprogress.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDPROGRESS_H
 #define BUILDPROGRESS_H
 
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index ccb8be8e400..a713fdc773e 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildsettingspropertiespage.h"
 #include "buildstep.h"
 #include "buildstepspage.h"
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.h b/src/plugins/projectexplorer/buildsettingspropertiespage.h
index 57a3a973380..07e398dfc01 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDSETTINGSPROPERTIESPAGE_H
 #define BUILDSETTINGSPROPERTIESPAGE_H
 
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 0a96cb9e598..474306dd57a 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildstep.h"
 #include "buildconfiguration.h"
 
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index d531dc08fa1..54ac93af0b0 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDSTEP_H
 #define BUILDSTEP_H
 
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 2ac3709a7b4..38f804a6ff7 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildstepspage.h"
 #include "ui_buildstepspage.h"
 #include "project.h"
diff --git a/src/plugins/projectexplorer/buildstepspage.h b/src/plugins/projectexplorer/buildstepspage.h
index 9404d300a41..c612c9ca5f7 100644
--- a/src/plugins/projectexplorer/buildstepspage.h
+++ b/src/plugins/projectexplorer/buildstepspage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDSTEPSPAGE_H
 #define BUILDSTEPSPAGE_H
 
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index 4b6929183be..8b50f3e4fa8 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "compileoutputwindow.h"
 #include "buildmanager.h"
 
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index b5c4db1d1c7..658d73ca044 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef COMPILEOUTPUTWINDOW_H
 #define COMPILEOUTPUTWINDOW_H
 
diff --git a/src/plugins/projectexplorer/consoleprocess.h b/src/plugins/projectexplorer/consoleprocess.h
index 735d1084dae..28e24b92f99 100644
--- a/src/plugins/projectexplorer/consoleprocess.h
+++ b/src/plugins/projectexplorer/consoleprocess.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CONSOLEPROCESS_H
 #define CONSOLEPROCESS_H
 
diff --git a/src/plugins/projectexplorer/consoleprocess_unix.cpp b/src/plugins/projectexplorer/consoleprocess_unix.cpp
index e15f8bf1590..f50db814bc3 100644
--- a/src/plugins/projectexplorer/consoleprocess_unix.cpp
+++ b/src/plugins/projectexplorer/consoleprocess_unix.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "consoleprocess.h"
 
 using namespace ProjectExplorer::Internal;
diff --git a/src/plugins/projectexplorer/consoleprocess_win.cpp b/src/plugins/projectexplorer/consoleprocess_win.cpp
index 81ef72a1bf8..7e3a5d0a9c1 100644
--- a/src/plugins/projectexplorer/consoleprocess_win.cpp
+++ b/src/plugins/projectexplorer/consoleprocess_win.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include <QtCore/QDir>
 #include <QtCore/private/qwineventnotifier_p.h>
 #include <QtCore/QAbstractEventDispatcher>
diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp
index 6a901f77d4a..084bb4690dc 100644
--- a/src/plugins/projectexplorer/currentprojectfilter.cpp
+++ b/src/plugins/projectexplorer/currentprojectfilter.cpp
@@ -31,8 +31,6 @@
 **
 ***************************************************************************/
 
-
-
 #include "currentprojectfilter.h"
 #include "projectexplorer.h"
 #include "project.h"
@@ -40,7 +38,6 @@
 
 #include <QtCore/QVariant>
 #include <QtCore/QTimer>
-
 #include <QtCore/QThread>
 #include <QtDebug>
 
diff --git a/src/plugins/projectexplorer/currentprojectfilter.h b/src/plugins/projectexplorer/currentprojectfilter.h
index 4ce2de318d9..bacd3a73ea1 100644
--- a/src/plugins/projectexplorer/currentprojectfilter.h
+++ b/src/plugins/projectexplorer/currentprojectfilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CURRENTPROJECTFILTER_H
 #define CURRENTPROJECTFILTER_H
 
diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp
index 1f049c5864b..58300f4ca83 100644
--- a/src/plugins/projectexplorer/currentprojectfind.cpp
+++ b/src/plugins/projectexplorer/currentprojectfind.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "currentprojectfind.h"
 #include "projectexplorer.h"
 #include "project.h"
diff --git a/src/plugins/projectexplorer/currentprojectfind.h b/src/plugins/projectexplorer/currentprojectfind.h
index a5d22c7d619..37577a2a95d 100644
--- a/src/plugins/projectexplorer/currentprojectfind.h
+++ b/src/plugins/projectexplorer/currentprojectfind.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CURRENTPROJECTFIND_H
 #define CURRENTPROJECTFIND_H
 
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 44358053dd1..c52b86f488b 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "customexecutablerunconfiguration.h"
 #include "environment.h"
 #include "project.h"
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
index 18b0368c7ef..5d15009c022 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CUSTOMEXECUTABLERUNCONFIGURATION_H
 #define CUSTOMEXECUTABLERUNCONFIGURATION_H
 
diff --git a/src/plugins/projectexplorer/dependenciesdialog.cpp b/src/plugins/projectexplorer/dependenciesdialog.cpp
index c1fd2106b60..0fc776dcb16 100644
--- a/src/plugins/projectexplorer/dependenciesdialog.cpp
+++ b/src/plugins/projectexplorer/dependenciesdialog.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "dependenciesdialog.h"
 #include "project.h"
 #include "session.h"
diff --git a/src/plugins/projectexplorer/dependenciesdialog.h b/src/plugins/projectexplorer/dependenciesdialog.h
index f77607e1faa..bcb635dada3 100644
--- a/src/plugins/projectexplorer/dependenciesdialog.h
+++ b/src/plugins/projectexplorer/dependenciesdialog.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEPENDENCIESDIALOG_H
 #define DEPENDENCIESDIALOG_H
 
diff --git a/src/plugins/projectexplorer/directoryproject.cpp b/src/plugins/projectexplorer/directoryproject.cpp
index 56180729b98..7134763854e 100644
--- a/src/plugins/projectexplorer/directoryproject.cpp
+++ b/src/plugins/projectexplorer/directoryproject.cpp
@@ -30,5 +30,6 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "directoryproject.h"
 
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp
index 947745dcdb0..d2a016ef2bd 100644
--- a/src/plugins/projectexplorer/editorconfiguration.cpp
+++ b/src/plugins/projectexplorer/editorconfiguration.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "editorconfiguration.h"
 
 #include <QtCore/QTextCodec>
diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h
index 9a5d1331754..a968008a576 100644
--- a/src/plugins/projectexplorer/editorconfiguration.h
+++ b/src/plugins/projectexplorer/editorconfiguration.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef EDITORCONFIGURATION_H
 #define EDITORCONFIGURATION_H
 
@@ -54,6 +55,6 @@ private:
     QTextCodec *m_defaultTextCodec;
 };
 
-}
+} // ProjectExplorer
 
-#endif
+#endif // EDITORCONFIGURATION_H
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
index c8dd246f14a..e969079aca5 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "editorsettingspropertiespage.h"
 #include "editorconfiguration.h"
 
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.h b/src/plugins/projectexplorer/editorsettingspropertiespage.h
index 9cb4a762a5e..df9936fe0ec 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef EDITORSETTINGSPROPERTIESPAGE_H
 #define EDITORSETTINGSPROPERTIESPAGE_H
 
diff --git a/src/plugins/projectexplorer/environment.cpp b/src/plugins/projectexplorer/environment.cpp
index c2de8e6dfeb..a8470d3df5d 100644
--- a/src/plugins/projectexplorer/environment.cpp
+++ b/src/plugins/projectexplorer/environment.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "environment.h"
 
 #include <QtCore/QProcess>
diff --git a/src/plugins/projectexplorer/environment.h b/src/plugins/projectexplorer/environment.h
index e0de71b0318..3f7e68ea72e 100644
--- a/src/plugins/projectexplorer/environment.h
+++ b/src/plugins/projectexplorer/environment.h
@@ -30,8 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef ENVIRONMENT
-#define ENVIRONMENT
+
+#ifndef ENVIRONMENT_H
+#define ENVIRONMENT_H
 
 #include "projectexplorer_export.h"
 
@@ -96,6 +97,6 @@ private:
     QMap<QString, QString> m_values;
 };
 
-}
+} // namespace ProjectExplorer
 
-#endif
+#endif // ENVIRONMENT_H
diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index 2c123056a33..2405d86998e 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "environmenteditmodel.h"
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/environmenteditmodel.h b/src/plugins/projectexplorer/environmenteditmodel.h
index 5dd158b25d4..4f206520276 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.h
+++ b/src/plugins/projectexplorer/environmenteditmodel.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ENVIRONMENTEDITMODEL_H
 #define ENVIRONMENTEDITMODEL_H
 
@@ -40,8 +41,7 @@
 #include <QtCore/QDebug>
 #include <QtGui/QFont>
 
-namespace ProjectExplorer
-{
+namespace ProjectExplorer {
 
 class PROJECTEXPLORER_EXPORT EnvironmentModel : public QAbstractItemModel
 {
@@ -88,5 +88,6 @@ private:
     bool m_mergedEnvironments;
 };
 
-}
+} // namespace ProjectExplorer
+
 #endif // ENVIRONMENTEDITMODEL_H
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 7bd31a2157e..3a59aca76c6 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "foldernavigationwidget.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"
@@ -52,18 +53,21 @@ bool debug = false;
 }
 
 namespace ProjectExplorer {
-    namespace Internal {
-        class FirstRowFilter : public QSortFilterProxyModel {
-            Q_OBJECT
-        public:
-            FirstRowFilter(QObject *parent = 0) : QSortFilterProxyModel(parent) {}
-        protected:
-            bool filterAcceptsRow (int source_row, const QModelIndex & ) const {
-                return source_row != 0;
-            }
-        };
+namespace Internal {
+
+class FirstRowFilter : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    FirstRowFilter(QObject *parent = 0) : QSortFilterProxyModel(parent) {}
+protected:
+    bool filterAcceptsRow (int source_row, const QModelIndex & ) const {
+        return source_row != 0;
     }
-}
+};
+
+} // namespace Internal
+} // namespace ProjectExplorer
 
 /*!
   /class FolderNavigationWidget
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.h b/src/plugins/projectexplorer/foldernavigationwidget.h
index 37ba42fe3af..82e4493eec7 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.h
+++ b/src/plugins/projectexplorer/foldernavigationwidget.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef FOLDERNAVIGATIONWIDGET_H
 #define FOLDERNAVIGATIONWIDGET_H
 
diff --git a/src/plugins/projectexplorer/iprojectmanager.h b/src/plugins/projectexplorer/iprojectmanager.h
index 7238a5668fe..42d439e5978 100644
--- a/src/plugins/projectexplorer/iprojectmanager.h
+++ b/src/plugins/projectexplorer/iprojectmanager.h
@@ -30,10 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTMANAGERINTERFACE_H
 #define PROJECTMANAGERINTERFACE_H
 
 #include "projectexplorer_export.h"
+
 #include <QtCore/QObject>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/iprojectproperties.h b/src/plugins/projectexplorer/iprojectproperties.h
index dfcc5fe52e7..f3f13927bc8 100644
--- a/src/plugins/projectexplorer/iprojectproperties.h
+++ b/src/plugins/projectexplorer/iprojectproperties.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef IPROJECTPROPERTIES_H
 #define IPROJECTPROPERTIES_H
 
diff --git a/src/plugins/projectexplorer/metatypedeclarations.h b/src/plugins/projectexplorer/metatypedeclarations.h
index 3ab613361e0..e7c3576ffe4 100644
--- a/src/plugins/projectexplorer/metatypedeclarations.h
+++ b/src/plugins/projectexplorer/metatypedeclarations.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTEXPLORERMETATYPEDECLARATIONS_H
 #define PROJECTEXPLORERMETATYPEDECLARATIONS_H
 
@@ -63,5 +64,6 @@ Q_DECLARE_METATYPE(ProjectExplorer::IApplicationOutput*)
 Q_DECLARE_METATYPE(ProjectExplorer::Internal::CommandQObject*)
 Q_DECLARE_METATYPE(QList<ProjectExplorer::Internal::CommandQObject*>)
 Q_DECLARE_METATYPE(ProjectExplorer::BuildParserInterface*)
+
 Q_DECLARE_METATYPE(ProjectExplorer::GlobalConfigManagerInterface*)
 #endif // PROJECTEXPLORERMETATYPEDECLARATIONS_H
diff --git a/src/plugins/projectexplorer/nodesvisitor.cpp b/src/plugins/projectexplorer/nodesvisitor.cpp
index 91f18cc8e93..c2574f36f9d 100644
--- a/src/plugins/projectexplorer/nodesvisitor.cpp
+++ b/src/plugins/projectexplorer/nodesvisitor.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "nodesvisitor.h"
 #include "projectnodes.h"
 
diff --git a/src/plugins/projectexplorer/nodesvisitor.h b/src/plugins/projectexplorer/nodesvisitor.h
index 896d0d527be..86c3a772705 100644
--- a/src/plugins/projectexplorer/nodesvisitor.h
+++ b/src/plugins/projectexplorer/nodesvisitor.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef NODESVISITOR_H
 #define NODESVISITOR_H
 
@@ -82,6 +83,6 @@ private:
     QStringList m_filePaths;
 };
 
-}
+} // namespace ProjectExplorer
 
 #endif // NODESVISITOR_H
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index b92ae960e49..a2e0e206aee 100644
--- a/src/plugins/projectexplorer/outputwindow.cpp
+++ b/src/plugins/projectexplorer/outputwindow.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "outputwindow.h"
 #include "projectexplorerconstants.h"
 #include "runconfiguration.h"
diff --git a/src/plugins/projectexplorer/outputwindow.h b/src/plugins/projectexplorer/outputwindow.h
index c679a454b1a..69bd4ef9722 100644
--- a/src/plugins/projectexplorer/outputwindow.h
+++ b/src/plugins/projectexplorer/outputwindow.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef OUTPUTWINDOW_H
 #define OUTPUTWINDOW_H
 
@@ -192,7 +193,7 @@ protected:
     void contextMenuEvent(QContextMenuEvent * e);
 };
 #endif // 0
-} //namespace Internal
-} //namespace ProjectExplorer
+} // namespace Internal
+} // namespace ProjectExplorer
 
-#endif
+#endif // OUTPUTWINDOW_H
diff --git a/src/plugins/projectexplorer/persistentsettings.cpp b/src/plugins/projectexplorer/persistentsettings.cpp
index 19e6ad13ac5..38253f3ae0d 100644
--- a/src/plugins/projectexplorer/persistentsettings.cpp
+++ b/src/plugins/projectexplorer/persistentsettings.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "persistentsettings.h"
 
 #include <QtCore/QDebug>
diff --git a/src/plugins/projectexplorer/persistentsettings.h b/src/plugins/projectexplorer/persistentsettings.h
index ae0fea0c615..a1bb19b833d 100644
--- a/src/plugins/projectexplorer/persistentsettings.h
+++ b/src/plugins/projectexplorer/persistentsettings.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERSISTENTSETTINGS_H
 #define PERSISTENTSETTINGS_H
 
@@ -70,6 +71,6 @@ private:
     QMap<QString, QVariant> m_valueMap;
 };
 
-} //namespace ProjectExplorer
+} // namespace ProjectExplorer
 
-#endif //PERSISTENTSETTINGS_H
+#endif // PERSISTENTSETTINGS_H
diff --git a/src/plugins/projectexplorer/pluginfilefactory.cpp b/src/plugins/projectexplorer/pluginfilefactory.cpp
index f66133bbaf7..a3d712ff5ee 100644
--- a/src/plugins/projectexplorer/pluginfilefactory.cpp
+++ b/src/plugins/projectexplorer/pluginfilefactory.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "pluginfilefactory.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"
diff --git a/src/plugins/projectexplorer/pluginfilefactory.h b/src/plugins/projectexplorer/pluginfilefactory.h
index 294f0121006..5d3dc6b1f1a 100644
--- a/src/plugins/projectexplorer/pluginfilefactory.h
+++ b/src/plugins/projectexplorer/pluginfilefactory.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PLUGINFILEFACTORY_H
 #define PLUGINFILEFACTORY_H
 
@@ -69,8 +70,7 @@ private:
     ProjectExplorer::IProjectManager *m_manager;
 };
 
-
-} //namespace Internal
-} //namespace ProjectExplorer
+} // namespace Internal
+} // namespace ProjectExplorer
 
 #endif // PLUGINFILEFACTORY
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 6f3c34c9397..4a24efa7069 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "processstep.h"
 #include "buildstep.h"
 #include "project.h"
diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h
index 64772d3ed53..0cee08d071d 100644
--- a/src/plugins/projectexplorer/processstep.h
+++ b/src/plugins/projectexplorer/processstep.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROCESSSTEP_H
 #define PROCESSSTEP_H
 
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 44a6d9435ff..8c74fe6e564 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -30,8 +30,10 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include "buildstep.h"
+
 #include "project.h"
+
+#include "buildstep.h"
 #include "projectexplorer.h"
 #include "runconfiguration.h"
 #include "editorconfiguration.h"
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index f43be29457c..0d05234bd89 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -30,6 +30,8 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+
 #ifndef PROJECT_H
 #define PROJECT_H
 
@@ -177,6 +179,6 @@ private:
     EditorConfiguration *m_editorConfiguration;
 };
 
-} //namespace ProjectExplorer
+} // namespace ProjectExplorer
 
-#endif //PROJECTINTERFACE_H
+#endif // PROJECTINTERFACE_H
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 384e4392e31..e04553763a3 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "applicationrunconfiguration.h"
 #include "allprojectsfilter.h"
 #include "allprojectsfind.h"
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index f00260096d3..039def13052 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTEXPLORER_H
 #define PROJECTEXPLORER_H
 
@@ -56,9 +57,9 @@ class IContext;
 class ICore;
 class IMode;
 class IFileFactory;
-    namespace Internal {
-        class WelcomeMode;
-    }
+namespace Internal {
+    class WelcomeMode;
+}
 }
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/projectexplorer_export.h b/src/plugins/projectexplorer/projectexplorer_export.h
index b7c6dbb186d..43475aeb4fb 100644
--- a/src/plugins/projectexplorer/projectexplorer_export.h
+++ b/src/plugins/projectexplorer/projectexplorer_export.h
@@ -30,18 +30,6 @@
 ** version 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 PROJECTEXPLORER_EXPORT_H
 #define PROJECTEXPLORER_EXPORT_H
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index e778efd6829..11a3cf5c279 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTEXPLORERCONSTANTS_H
 #define PROJECTEXPLORERCONSTANTS_H
 
@@ -174,7 +175,7 @@ const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
 const char * const FORM_MIMETYPE = "application/x-designer";
 const char * const RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource";
 
-}
-}
+} // namespace Constants
+} // namespace ProjectExplorer
 
-#endif //PROJECTEXPLORERCONSTANTS_H
+#endif // PROJECTEXPLORERCONSTANTS_H
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index d28aff1d635..2cd220ef58e 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "projectfilewizardextension.h"
 #include "projectexplorer.h"
 #include "projectnodes.h"
@@ -194,6 +195,5 @@ bool ProjectFileWizardExtension::process(const QList<Core::GeneratedFile> &files
     return true;
 }
 
-
-}
-}
+} // namespace Internal
+} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.h b/src/plugins/projectexplorer/projectfilewizardextension.h
index eb5051a9b7f..8a591272569 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.h
+++ b/src/plugins/projectexplorer/projectfilewizardextension.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTFILEWIZARDEXTENSION2_H
 #define PROJECTFILEWIZARDEXTENSION2_H
 
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index f3b078c94bd..3e04069408c 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "project.h"
 #include "projectmodels.h"
 #include "projectexplorerconstants.h"
@@ -49,89 +50,92 @@ using namespace ProjectExplorer::Internal;
 using Core::FileIconProvider;
 
 namespace {
-    // sorting helper function
-    bool sortNodes(Node *n1, Node *n2) {
-        // Ordering is: project files, project, folder, file
-
-        const NodeType n1Type = n1->nodeType();
-        const NodeType n2Type = n2->nodeType();
-
-        // project files
-        FileNode *file1 = qobject_cast<FileNode*>(n1);
-        FileNode *file2 = qobject_cast<FileNode*>(n2);
-        if (file1 && file1->fileType() == ProjectFileType) {
-            if (file2 && file2->fileType() == ProjectFileType) {
-                const QString fileName1 = QFileInfo(file1->path()).fileName();
-                const QString fileName2 = QFileInfo(file2->path()).fileName();
-
-                if (fileName1 != fileName2)
-                    return fileName1 < fileName2;
-                else
-                    return file1 < file2;
-            } else {
-                return true; // project file is before everything else
-            }
-        } else {
-            if (file2 && file2->fileType() == ProjectFileType) {
-                return false;
-            }
-        }
 
-        // projects
-        if (n1Type == ProjectNodeType) {
-            if (n2Type == ProjectNodeType) {
-                ProjectNode *project1 = static_cast<ProjectNode*>(n1);
-                ProjectNode *project2 = static_cast<ProjectNode*>(n2);
+// sorting helper function
+bool sortNodes(Node *n1, Node *n2)
+{
+    // Ordering is: project files, project, folder, file
+
+    const NodeType n1Type = n1->nodeType();
+    const NodeType n2Type = n2->nodeType();
 
-                if (project1->name() != project2->name())
-                    return project1->name() < project2->name(); // sort by name
-                else
-                    return project1 < project2; // sort by pointer value
-            } else {
-               return true; // project is before folder & file
-           }
+    // project files
+    FileNode *file1 = qobject_cast<FileNode*>(n1);
+    FileNode *file2 = qobject_cast<FileNode*>(n2);
+    if (file1 && file1->fileType() == ProjectFileType) {
+        if (file2 && file2->fileType() == ProjectFileType) {
+            const QString fileName1 = QFileInfo(file1->path()).fileName();
+            const QString fileName2 = QFileInfo(file2->path()).fileName();
+
+            if (fileName1 != fileName2)
+                return fileName1 < fileName2;
+            else
+                return file1 < file2;
+        } else {
+            return true; // project file is before everything else
         }
-        if (n2Type == ProjectNodeType)
+    } else {
+        if (file2 && file2->fileType() == ProjectFileType) {
             return false;
+        }
+    }
 
-        if (n1Type == FolderNodeType) {
-            if (n2Type == FolderNodeType) {
-                FolderNode *folder1 = static_cast<FolderNode*>(n1);
-                FolderNode *folder2 = static_cast<FolderNode*>(n2);
+    // projects
+    if (n1Type == ProjectNodeType) {
+        if (n2Type == ProjectNodeType) {
+            ProjectNode *project1 = static_cast<ProjectNode*>(n1);
+            ProjectNode *project2 = static_cast<ProjectNode*>(n2);
 
-                if (folder1->name() != folder2->name())
-                    return folder1->name() < folder2->name();
-                else
-                    return folder1 < folder2;
-            } else {
-                return true; // folder is before file
-            }
+            if (project1->name() != project2->name())
+                return project1->name() < project2->name(); // sort by name
+            else
+                return project1 < project2; // sort by pointer value
+        } else {
+           return true; // project is before folder & file
+       }
+    }
+    if (n2Type == ProjectNodeType)
+        return false;
+
+    if (n1Type == FolderNodeType) {
+        if (n2Type == FolderNodeType) {
+            FolderNode *folder1 = static_cast<FolderNode*>(n1);
+            FolderNode *folder2 = static_cast<FolderNode*>(n2);
+
+            if (folder1->name() != folder2->name())
+                return folder1->name() < folder2->name();
+            else
+                return folder1 < folder2;
+        } else {
+            return true; // folder is before file
         }
-        if (n2Type == FolderNodeType)
-            return false;
+    }
+    if (n2Type == FolderNodeType)
+        return false;
 
-        // must be file nodes
-        {
-            const QString filePath1 = n1->path();
-            const QString filePath2 = n2->path();
+    // must be file nodes
+    {
+        const QString filePath1 = n1->path();
+        const QString filePath2 = n2->path();
 
-            const QString fileName1 = QFileInfo(filePath1).fileName();
-            const QString fileName2 = QFileInfo(filePath2).fileName();
+        const QString fileName1 = QFileInfo(filePath1).fileName();
+        const QString fileName2 = QFileInfo(filePath2).fileName();
 
-            if (fileName1 != fileName2) {
-                return fileName1 < fileName2; // sort by file names
+        if (fileName1 != fileName2) {
+            return fileName1 < fileName2; // sort by file names
+        } else {
+            if (filePath1 != filePath2) {
+                return filePath1 < filePath2; // sort by path names
             } else {
-                if (filePath1 != filePath2) {
-                    return filePath1 < filePath2; // sort by path names
-                } else {
-                    return n1 < n2; // sort by pointer value
-                }
+                return n1 < n2; // sort by pointer value
             }
         }
-        return false;
     }
+    return false;
 }
 
+} // namespace anon
+
 /*!
   \class DetailedModel
 
diff --git a/src/plugins/projectexplorer/projectmodels.h b/src/plugins/projectexplorer/projectmodels.h
index 2c9fc5f54d3..cb7376f932c 100644
--- a/src/plugins/projectexplorer/projectmodels.h
+++ b/src/plugins/projectexplorer/projectmodels.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTMODELS_H
 #define PROJECTMODELS_H
 
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index 5a51bf6a1f8..bf6174a4a36 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "nodesvisitor.h"
 #include "projectnodes.h"
 #include "projectexplorerconstants.h"
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index 11470121778..14297df8bee 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTNODES_H
 #define PROJECTNODES_H
 
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index cb960956ed4..50882e67d9e 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "projecttreewidget.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"
diff --git a/src/plugins/projectexplorer/projecttreewidget.h b/src/plugins/projectexplorer/projecttreewidget.h
index 51847ce09af..dcb26c2d9aa 100644
--- a/src/plugins/projectexplorer/projecttreewidget.h
+++ b/src/plugins/projectexplorer/projecttreewidget.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTTREEWIDGET_H
 #define PROJECTTREEWIDGET_H
 
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index e910e888394..38aa7f958a1 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -30,8 +30,10 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include "project.h"
+
 #include "projectwindow.h"
+
+#include "project.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"
 #include "iprojectproperties.h"
diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h
index 498ca4f03f5..e5e2dc4a818 100644
--- a/src/plugins/projectexplorer/projectwindow.h
+++ b/src/plugins/projectexplorer/projectwindow.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTWINDOW_H
 #define PROJECTWINDOW_H
 
diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp
index 704abcfe33c..8a2873c336d 100644
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "projectwizardpage.h"
 #include "ui_projectwizardpage.h"
 
diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h
index 7232e459769..2031923d37c 100644
--- a/src/plugins/projectexplorer/projectwizardpage.h
+++ b/src/plugins/projectexplorer/projectwizardpage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTWIZARDPAGE_H
 #define PROJECTWIZARDPAGE_H
 
@@ -77,7 +78,7 @@ private:
     Ui::WizardPage *m_ui;
 };
 
-}
-}
+} // namespace Internal
+} // namespace ProjectExplorer
 
 #endif // PROJECTWIZARDPAGE_H
diff --git a/src/plugins/projectexplorer/removefiledialog.cpp b/src/plugins/projectexplorer/removefiledialog.cpp
index 7230c096e6d..3d8f11345a2 100644
--- a/src/plugins/projectexplorer/removefiledialog.cpp
+++ b/src/plugins/projectexplorer/removefiledialog.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "removefiledialog.h"
 #include "ui_removefiledialog.h"
 
diff --git a/src/plugins/projectexplorer/removefiledialog.h b/src/plugins/projectexplorer/removefiledialog.h
index 2a9ec5fe8b5..7c43774d8b7 100644
--- a/src/plugins/projectexplorer/removefiledialog.h
+++ b/src/plugins/projectexplorer/removefiledialog.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef REMOVEFILEDIALOG_H
 #define REMOVEFILEDIALOG_H
 
@@ -42,7 +43,8 @@ namespace Ui {
     class RemoveFileDialog;
 }
 
-class RemoveFileDialog : public QDialog {
+class RemoveFileDialog : public QDialog
+{
     Q_OBJECT
     Q_DISABLE_COPY(RemoveFileDialog)
 public:
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index f7fcfb2912e..8c83e2c407b 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "runconfiguration.h"
 #include "project.h"
 
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index e7e3d3c20fe..8d2e7b45d6a 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RUNCONFIGURATION_H
 #define RUNCONFIGURATION_H
 
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index cf7e86efdaf..abbfd8c1d15 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "runsettingspropertiespage.h"
 #include "runconfiguration.h"
 
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h
index 1cb57fb01a2..c3882eaefb8 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.h
@@ -30,16 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RUNSETTINGSPROPERTIESPAGE_H
 #define RUNSETTINGSPROPERTIESPAGE_H
 
 #include "iprojectproperties.h"
-#include <QtGui/QWidget>
-
-QT_BEGIN_NAMESPACE
 
-
-QT_END_NAMESPACE
+#include <QtGui/QWidget>
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/scriptwrappers.cpp b/src/plugins/projectexplorer/scriptwrappers.cpp
index 4939bd66d3b..d026636017d 100644
--- a/src/plugins/projectexplorer/scriptwrappers.cpp
+++ b/src/plugins/projectexplorer/scriptwrappers.cpp
@@ -30,5 +30,6 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "scriptwrappers.h"
 
diff --git a/src/plugins/projectexplorer/scriptwrappers.h b/src/plugins/projectexplorer/scriptwrappers.h
index 71747269daf..2c8f3b42c13 100644
--- a/src/plugins/projectexplorer/scriptwrappers.h
+++ b/src/plugins/projectexplorer/scriptwrappers.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTEXPLORER_SCRIPT_WRAPPER_H
 #define PROJECTEXPLORER_SCRIPT_WRAPPER_H
 
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index eaf52f44b15..61ca7df05a9 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -30,12 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+#include "session.h"
+
 #include "dependenciesdialog.h"
 #include "project.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"
 #include "nodesvisitor.h"
-#include "session.h"
 #include "editorconfiguration.h"
 
 #include <coreplugin/icore.h>
@@ -49,7 +51,6 @@
 
 #include <texteditor/itexteditor.h>
 
-
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h
index 4f3d48c6632..fcf98a23ded 100644
--- a/src/plugins/projectexplorer/session.h
+++ b/src/plugins/projectexplorer/session.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SESSION_H
 #define SESSION_H
 
diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp
index edea072720a..f00697597ed 100644
--- a/src/plugins/projectexplorer/sessiondialog.cpp
+++ b/src/plugins/projectexplorer/sessiondialog.cpp
@@ -30,11 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "sessiondialog.h"
 #include "session.h"
 
 #include <QtGui/QInputDialog>
-
 #include <QtGui/QValidator>
 
 using namespace ProjectExplorer;
@@ -190,5 +190,5 @@ void SessionDialog::remove()
     m_ui.sessionList->addItems(m_sessionManager->sessions());
 }
 
-}
-}
+} // namespace Internal
+} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/sessiondialog.h b/src/plugins/projectexplorer/sessiondialog.h
index 963b15171b7..b06704e9596 100644
--- a/src/plugins/projectexplorer/sessiondialog.h
+++ b/src/plugins/projectexplorer/sessiondialog.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SESSIONDIALOG_H
 #define SESSIONDIALOG_H
 
@@ -66,8 +67,7 @@ private:
     bool m_startup;
 };
 
-}
-}
-
+} // namespace Internal
+} // namespace ProjectExplorer
 
 #endif // SESSIONDIALOG_H
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 2650df89d33..ed59f34ceb9 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "taskwindow.h"
 
 #include <coreplugin/editormanager/editormanager.h>
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h
index 6b9837d64a5..efd2752469e 100644
--- a/src/plugins/projectexplorer/taskwindow.h
+++ b/src/plugins/projectexplorer/taskwindow.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef TASKWINDOW_H
 #define TASKWINDOW_H
 
@@ -124,4 +125,4 @@ private:
 } //namespace Internal
 } //namespace ProjectExplorer
 
-#endif
+#endif // TASKWINDOW_H
diff --git a/src/plugins/projectexplorer/winguiprocess.cpp b/src/plugins/projectexplorer/winguiprocess.cpp
index 0845c9d7cac..d8231cea70f 100644
--- a/src/plugins/projectexplorer/winguiprocess.cpp
+++ b/src/plugins/projectexplorer/winguiprocess.cpp
@@ -30,11 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include <QtCore/QDir>
 
 #include "winguiprocess.h"
 #include "consoleprocess.h"
 
+#include <QtCore/QDir>
+
 using namespace ProjectExplorer::Internal;
 
 WinGuiProcess::WinGuiProcess(QObject *parent)
diff --git a/src/plugins/projectexplorer/winguiprocess.h b/src/plugins/projectexplorer/winguiprocess.h
index 265e6bcc77a..ffaefea8cbe 100644
--- a/src/plugins/projectexplorer/winguiprocess.h
+++ b/src/plugins/projectexplorer/winguiprocess.h
@@ -30,14 +30,16 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef WINGUIPROCESS_H
 #define WINGUIPROCESS_H
 
+#include "abstractprocess.h"
+
 #include <QtCore/QThread>
 #include <QtCore/QStringList>
-#include <windows.h>
 
-#include "abstractprocess.h"
+#include <windows.h>
 
 namespace ProjectExplorer {
 namespace Internal {
@@ -72,7 +74,7 @@ private:
     unsigned long m_exitCode;
 };
 
-} //namespace Internal
-} //namespace ProjectExplorer
+} // namespace Internal
+} // namespace ProjectExplorer
 
-#endif
+#endif // WINGUIPROCESS_H
diff --git a/src/plugins/qhelpproject/qhelpproject.cpp b/src/plugins/qhelpproject/qhelpproject.cpp
index 065ddfd982b..478b232981d 100644
--- a/src/plugins/qhelpproject/qhelpproject.cpp
+++ b/src/plugins/qhelpproject/qhelpproject.cpp
@@ -30,15 +30,16 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-
-#include <qhelpsystem.h>
 
 #include "qhelpproject.h"
 #include "qhelpprojectmanager.h"
 #include "qhelpprojectitems.h"
 
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+
+#include <qhelpsystem.h>
+
 using namespace ProjectExplorer;
 using namespace QHelpProjectPlugin::Internal;
 
diff --git a/src/plugins/qhelpproject/qhelpproject.h b/src/plugins/qhelpproject/qhelpproject.h
index 4ef76a5fc2b..275b21f5275 100644
--- a/src/plugins/qhelpproject/qhelpproject.h
+++ b/src/plugins/qhelpproject/qhelpproject.h
@@ -30,13 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QHELPPROJECT_H
 #define QHELPPROJECT_H
 
-#include <QtCore/QObject>
-
 #include <projectexplorer/ProjectExplorerInterfaces>
 
+#include <QtCore/QObject>
+
 namespace QHelpProjectPlugin {
 namespace Internal {
 
@@ -108,8 +109,7 @@ private:
     QStringList m_files;
 };
 
-}
-}
-}
+} // namespace Internal
+} // namespace QHelpProject
 
-#endif
+#endif // QHELPPROJECT_H
diff --git a/src/plugins/qhelpproject/qhelpprojectitems.cpp b/src/plugins/qhelpproject/qhelpprojectitems.cpp
index 0ddd05ac642..4d39139c443 100644
--- a/src/plugins/qhelpproject/qhelpprojectitems.cpp
+++ b/src/plugins/qhelpproject/qhelpprojectitems.cpp
@@ -30,10 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include <QtGui/QFileIconProvider>
 
 #include "qhelpprojectitems.h"
 
+#include <QtGui/QFileIconProvider>
+
 using namespace ProjectExplorer;
 using namespace QHelpProjectPlugin::Internal;
 
diff --git a/src/plugins/qhelpproject/qhelpprojectitems.h b/src/plugins/qhelpproject/qhelpprojectitems.h
index 730bd98ee44..e920de2e8c2 100644
--- a/src/plugins/qhelpproject/qhelpprojectitems.h
+++ b/src/plugins/qhelpproject/qhelpprojectitems.h
@@ -30,13 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QHELPPROJECTITEMS_H
 #define QHELPPROJECTITEMS_H
 
-#include <QtGui/QIcon>
-
 #include <projectexplorer/ProjectExplorerInterfaces>
 
+#include <QtGui/QIcon>
+
 namespace QHelpProjectPlugin {
 namespace Internal {
 
@@ -84,8 +85,7 @@ private:
     static QIcon m_icon;
 };
 
-}
-}
-}
+} // namespace Internal
+} // namespace QHelpProject
 
-#endif
+#endif // QHELPPROJECTITEMS_H
diff --git a/src/plugins/qhelpproject/qhelpprojectmanager.cpp b/src/plugins/qhelpproject/qhelpprojectmanager.cpp
index 73822c78943..015a6705ef6 100644
--- a/src/plugins/qhelpproject/qhelpprojectmanager.cpp
+++ b/src/plugins/qhelpproject/qhelpprojectmanager.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qhelpprojectmanager.h"
 #include "qhelpproject.h"
 
diff --git a/src/plugins/qhelpproject/qhelpprojectmanager.h b/src/plugins/qhelpproject/qhelpprojectmanager.h
index 5b153fbad34..56a9f21d554 100644
--- a/src/plugins/qhelpproject/qhelpprojectmanager.h
+++ b/src/plugins/qhelpproject/qhelpprojectmanager.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QHELPPROJECTMANAGER_H
 #define QHELPPROJECTMANAGER_H
 
diff --git a/src/plugins/qt4projectmanager/applicationlauncher.h b/src/plugins/qt4projectmanager/applicationlauncher.h
index d75d6a093e7..bb580ab10d9 100644
--- a/src/plugins/qt4projectmanager/applicationlauncher.h
+++ b/src/plugins/qt4projectmanager/applicationlauncher.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef APPLICATIONLAUNCHER_H
 #define APPLICATIONLAUNCHER_H
 
@@ -82,7 +83,7 @@ private:
     WinGuiProcess *m_winGuiProcess;
 };
 
-} //namespace Internal
-} //namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // APPLICATIONLAUNCHER_H
diff --git a/src/plugins/qt4projectmanager/buildoptionspage.cpp b/src/plugins/qt4projectmanager/buildoptionspage.cpp
index aa87e35f9e9..088af5fcd54 100644
--- a/src/plugins/qt4projectmanager/buildoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/buildoptionspage.cpp
@@ -30,11 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include <QtCore/QSettings>
-#include <QtGui/QLineEdit>
 
 #include "buildoptionspage.h"
 
+#include <QtCore/QSettings>
+#include <QtGui/QLineEdit>
+
 BuildOptionsPage::BuildOptionsPage(QWorkbench::PluginManager *app)
 {
     core = app;
diff --git a/src/plugins/qt4projectmanager/buildparserfactory.cpp b/src/plugins/qt4projectmanager/buildparserfactory.cpp
index 024ec999486..b7a56020242 100644
--- a/src/plugins/qt4projectmanager/buildparserfactory.cpp
+++ b/src/plugins/qt4projectmanager/buildparserfactory.cpp
@@ -32,6 +32,7 @@
 ***************************************************************************/
 
 #include "buildparserfactory.h"
+
 #include "qt4projectmanagerconstants.h"
 #include "gccparser.h"
 #include "msvcparser.h"
@@ -40,7 +41,6 @@ using namespace Qt4ProjectManager::Internal;
 
 GccParserFactory::~GccParserFactory()
 {
-
 }
 
 bool GccParserFactory::canCreate(const QString & name) const
@@ -56,7 +56,6 @@ ProjectExplorer::BuildParserInterface * GccParserFactory::create(const QString &
 
 MsvcParserFactory::~MsvcParserFactory()
 {
-
 }
 
 bool MsvcParserFactory::canCreate(const QString & name) const
diff --git a/src/plugins/qt4projectmanager/buildparserfactory.h b/src/plugins/qt4projectmanager/buildparserfactory.h
index 969b7a1cf70..269d0d77436 100644
--- a/src/plugins/qt4projectmanager/buildparserfactory.h
+++ b/src/plugins/qt4projectmanager/buildparserfactory.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDPARSERFACTORY_H
 #define BUILDPARSERFACTORY_H
 
@@ -62,7 +63,8 @@ public:
     virtual ProjectExplorer::BuildParserInterface * create(const QString & name) const;
 };
 
-}
-}
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
 
-#endif
+#endif // BUILDPARSERFACTORY_H
diff --git a/src/plugins/qt4projectmanager/cesdkhandler.cpp b/src/plugins/qt4projectmanager/cesdkhandler.cpp
index cb62c605e98..cb10cba5011 100644
--- a/src/plugins/qt4projectmanager/cesdkhandler.cpp
+++ b/src/plugins/qt4projectmanager/cesdkhandler.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cesdkhandler.h"
+
 #include <QtCore/QFile>
 #include <QtCore/QDebug>
 #include <QtCore/QXmlStreamReader>
@@ -38,7 +40,8 @@
 using namespace Qt4ProjectManager::Internal;
 using ProjectExplorer::Environment;
 
-CeSdkInfo::CeSdkInfo() : m_major(0) , m_minor(0)
+CeSdkInfo::CeSdkInfo()
+    : m_major(0) , m_minor(0)
 {
 }
 
diff --git a/src/plugins/qt4projectmanager/cesdkhandler.h b/src/plugins/qt4projectmanager/cesdkhandler.h
index 6c4a6b88a3d..f830564addc 100644
--- a/src/plugins/qt4projectmanager/cesdkhandler.h
+++ b/src/plugins/qt4projectmanager/cesdkhandler.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CE_SDK_HANDLER_INCL
 #define CE_SDK_HANDLER_INCL
 
@@ -67,13 +68,13 @@ private:
     int                             m_minor;
 };
 
-inline QString CeSdkInfo::name(){ return m_name; }
-inline QString CeSdkInfo::binPath(){ return m_bin; }
-inline QString CeSdkInfo::includePath(){ return m_include; }
-inline QString CeSdkInfo::libPath(){ return m_lib; }
-inline bool CeSdkInfo::isValid(){ return !m_name.isEmpty() && !m_bin.isEmpty() && !m_include.isEmpty() && !m_lib.isEmpty(); }
-inline int CeSdkInfo::majorVersion(){ return m_major; }
-inline int CeSdkInfo::minorVersion(){ return m_minor; }
+inline QString CeSdkInfo::name() { return m_name; }
+inline QString CeSdkInfo::binPath() { return m_bin; }
+inline QString CeSdkInfo::includePath() { return m_include; }
+inline QString CeSdkInfo::libPath() { return m_lib; }
+inline bool CeSdkInfo::isValid() { return !m_name.isEmpty() && !m_bin.isEmpty() && !m_include.isEmpty() && !m_lib.isEmpty(); }
+inline int CeSdkInfo::majorVersion() { return m_major; }
+inline int CeSdkInfo::minorVersion() { return m_minor; }
 inline bool CeSdkInfo::isSupported() { return m_major >= 5; }
 
 class CeSdkHandler
@@ -101,7 +102,7 @@ inline QString CeSdkHandler::fixPaths(QString path) const
     return QDir::toNativeSeparators(QDir::cleanPath(path.replace(VCINSTALL_MACRO, VCInstallDir).replace(VSINSTALL_MACRO, VSInstallDir).replace(QLatin1String(";$(PATH)"), QLatin1String(""))));
 }
 
-}
-}
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
-#endif
+#endif // CE_SDK_HANDLER_INCL
diff --git a/src/plugins/qt4projectmanager/deployhelper.cpp b/src/plugins/qt4projectmanager/deployhelper.cpp
index 393be015542..57386afd2ef 100644
--- a/src/plugins/qt4projectmanager/deployhelper.cpp
+++ b/src/plugins/qt4projectmanager/deployhelper.cpp
@@ -40,12 +40,13 @@
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
+
 DeployHelperRunStep::DeployHelperRunStep(Qt4Project *pro)
     : BuildStep(pro),  m_started(false), m_pro(pro)
 {
     QDir workbenchDir = QCoreApplication::applicationDirPath();
     workbenchDir.cdUp();
-    m_binary = QDir::convertSeparators( workbenchDir.absolutePath() + QLatin1String("/qtembeddedtools/qemudeployer"));
+    m_binary = QDir::convertSeparators(workbenchDir.absolutePath() + QLatin1String("/qtembeddedtools/qemudeployer"));
     m_id = "id";
 
 };
diff --git a/src/plugins/qt4projectmanager/deployhelper.h b/src/plugins/qt4projectmanager/deployhelper.h
index f3a562d8ca5..381353babc3 100644
--- a/src/plugins/qt4projectmanager/deployhelper.h
+++ b/src/plugins/qt4projectmanager/deployhelper.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEPLOYHELPER_H
 #define DEPLOYHELPER_H
 
diff --git a/src/plugins/qt4projectmanager/directorywatcher.cpp b/src/plugins/qt4projectmanager/directorywatcher.cpp
index 4025a22e9ed..689cd0dfd03 100644
--- a/src/plugins/qt4projectmanager/directorywatcher.cpp
+++ b/src/plugins/qt4projectmanager/directorywatcher.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "directorywatcher.h"
 
 #include <QtCore/QDebug>
diff --git a/src/plugins/qt4projectmanager/directorywatcher.h b/src/plugins/qt4projectmanager/directorywatcher.h
index 45680d33e27..3f5f5a846fa 100644
--- a/src/plugins/qt4projectmanager/directorywatcher.h
+++ b/src/plugins/qt4projectmanager/directorywatcher.h
@@ -30,15 +30,15 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef DIRECTORYWATCHER
-#define DIRECTORYWATCHER
+
+#ifndef DIRECTORYWATCHER_H
+#define DIRECTORYWATCHER_H
 
 #include <QtCore/QDateTime>
 #include <QtCore/QHash>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 
-
 QT_BEGIN_NAMESPACE
 class QTimer;
 class QFileSystemWatcher;
@@ -87,7 +87,7 @@ private:
     FileModificationTimeMap m_files;
 };
 
-}
-} //namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
-#endif
+#endif // DIRECTORYWATCHER_H
diff --git a/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp b/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp
index 1f37fb7c63f..1689a1bad51 100644
--- a/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp
+++ b/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "embeddedpropertiespage.h"
 #include "qt4project.h"
 
diff --git a/src/plugins/qt4projectmanager/embeddedpropertiespage.h b/src/plugins/qt4projectmanager/embeddedpropertiespage.h
index 59f313d2a77..238117a3d57 100644
--- a/src/plugins/qt4projectmanager/embeddedpropertiespage.h
+++ b/src/plugins/qt4projectmanager/embeddedpropertiespage.h
@@ -30,11 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef EMBEDDEDPROPERTIESPAGE_H
 #define EMBEDDEDPROPERTIESPAGE_H
 
 #include "ui_embeddedpropertiespage.h"
+
 #include <projectexplorer/iprojectproperties.h>
+
 #include <QtCore/QModelIndex>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/qt4projectmanager/gccparser.cpp b/src/plugins/qt4projectmanager/gccparser.cpp
index a3b25905f59..de69904ac80 100644
--- a/src/plugins/qt4projectmanager/gccparser.cpp
+++ b/src/plugins/qt4projectmanager/gccparser.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "gccparser.h"
 #include "qt4projectmanagerconstants.h"
 
diff --git a/src/plugins/qt4projectmanager/gccparser.h b/src/plugins/qt4projectmanager/gccparser.h
index cf918b19a2c..aca5bc36e45 100644
--- a/src/plugins/qt4projectmanager/gccparser.h
+++ b/src/plugins/qt4projectmanager/gccparser.h
@@ -30,12 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef GCCPARSER
-#define GCCPARSER
 
-#include <QtCore/QRegExp>
+#ifndef GCCPARSER_H
+#define GCCPARSER_H
+
 #include <projectexplorer/ProjectExplorerInterfaces>
 
+#include <QtCore/QRegExp>
+
 namespace Qt4ProjectManager {
 
 class GccParser : public ProjectExplorer::BuildParserInterface
@@ -55,6 +57,6 @@ private:
     bool m_linkIndent;
 };
 
-} //namespace ProjectExplorer
+} // namespace ProjectExplorer
 
-#endif
+#endif // GCCPARSER_H
diff --git a/src/plugins/qt4projectmanager/gccpreprocessor.cpp b/src/plugins/qt4projectmanager/gccpreprocessor.cpp
index 69b304538e6..79d16d47e07 100644
--- a/src/plugins/qt4projectmanager/gccpreprocessor.cpp
+++ b/src/plugins/qt4projectmanager/gccpreprocessor.cpp
@@ -32,6 +32,7 @@
 ***************************************************************************/
 
 #include "gccpreprocessor.h"
+
 #include <QProcess>
 #include <QString>
 #include <QFile>
diff --git a/src/plugins/qt4projectmanager/gccpreprocessor.h b/src/plugins/qt4projectmanager/gccpreprocessor.h
index b1f1f211f23..a99cfbb7a3e 100644
--- a/src/plugins/qt4projectmanager/gccpreprocessor.h
+++ b/src/plugins/qt4projectmanager/gccpreprocessor.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef GCCPREPROCESSOR_H
 #define GCCPREPROCESSOR_H
 
@@ -56,7 +57,7 @@ private:
     QList<HeaderPath> m_systemHeaderPaths;
 };
 
-} // end of namespace Internal
-} // end of namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // GCCPREPROCESSOR_H
diff --git a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
index fee51e30157..72530ebefaa 100644
--- a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
+++ b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "gdbmacrosbuildstep.h"
+
 #include "qt4projectmanagerconstants.h"
 #include "qt4project.h"
 #include "qmakestep.h"
@@ -42,7 +44,6 @@ using namespace Qt4ProjectManager::Internal;
 GdbMacrosBuildStep::GdbMacrosBuildStep(Qt4Project *project)
     : BuildStep(project), m_project(project), m_configWidget(new GdbMacrosBuildStepConfigWidget)
 {
-
 }
 
 GdbMacrosBuildStep::~GdbMacrosBuildStep()
diff --git a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.h b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.h
index a754771c740..94e21798b11 100644
--- a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.h
+++ b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef GDBMACROSBUILDSTEP_H
 #define GDBMACROSBUILDSTEP_H
 
@@ -76,7 +77,8 @@ class GdbMacrosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWi
     virtual QString displayName() const;
     virtual void init(const QString &buildConfiguration);
 };
-}
-}
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // GDBMACROSBUILDSTEP_H
diff --git a/src/plugins/qt4projectmanager/headerpath.h b/src/plugins/qt4projectmanager/headerpath.h
index af1b687b890..cb99c607077 100644
--- a/src/plugins/qt4projectmanager/headerpath.h
+++ b/src/plugins/qt4projectmanager/headerpath.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef HEADERPATH_H
 #define HEADERPATH_H
 
@@ -63,7 +64,8 @@ private:
     Kind _kind;
 };
 
-} // end of namespace Internal
-} // end of namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
 
 #endif // HEADERPATH_H
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index cbb7d685f8a..d88281ce596 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -30,13 +30,16 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "makestep.h"
+
 #include "qt4project.h"
 #include "qt4projectmanagerconstants.h"
 
+#include <extensionsystem/ExtensionSystemInterfaces>
+
 #include <QFileInfo>
 #include <QDir>
-#include <extensionsystem/ExtensionSystemInterfaces>
 
 using ProjectExplorer::IBuildParserFactory;
 using ProjectExplorer::BuildParserInterface;
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index 2455db5364c..617125e34e5 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -30,16 +30,16 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef MAKESTEP_H
 #define MAKESTEP_H
 
-#include <projectexplorer/ProjectExplorerInterfaces>
-#include <QDebug>
-
 #include "qtversionmanager.h"
-
 #include "ui_makestep.h"
 
+#include <projectexplorer/ProjectExplorerInterfaces>
+#include <QDebug>
+
 namespace Qt4ProjectManager {
 
 class Qt4Project;
diff --git a/src/plugins/qt4projectmanager/msvcenvironment.cpp b/src/plugins/qt4projectmanager/msvcenvironment.cpp
index 2de4ae24b4c..1c3a158d72f 100644
--- a/src/plugins/qt4projectmanager/msvcenvironment.cpp
+++ b/src/plugins/qt4projectmanager/msvcenvironment.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "msvcenvironment.h"
 
 #include <QSettings>
diff --git a/src/plugins/qt4projectmanager/msvcenvironment.h b/src/plugins/qt4projectmanager/msvcenvironment.h
index 7354e5706b9..85b4150f9a8 100644
--- a/src/plugins/qt4projectmanager/msvcenvironment.h
+++ b/src/plugins/qt4projectmanager/msvcenvironment.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef MSVCENVIRONMENT_H
 #define MSVCENVIRONMENT_H
 
@@ -59,6 +60,7 @@ private:
     mutable bool m_valuesSet;
 };
 
-}
-}
-#endif
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
+#endif // MSVCENVIRONMENT_H
diff --git a/src/plugins/qt4projectmanager/msvcparser.cpp b/src/plugins/qt4projectmanager/msvcparser.cpp
index 3a63948e0cf..ed7e4eacf47 100644
--- a/src/plugins/qt4projectmanager/msvcparser.cpp
+++ b/src/plugins/qt4projectmanager/msvcparser.cpp
@@ -30,11 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include <QtCore/QStringList>
 
 #include "msvcparser.h"
 #include "qt4projectmanagerconstants.h"
 
+#include <QtCore/QStringList>
+
 using namespace Qt4ProjectManager;
 
 MsvcParser::MsvcParser()
diff --git a/src/plugins/qt4projectmanager/msvcparser.h b/src/plugins/qt4projectmanager/msvcparser.h
index 0f01271cb4c..d19ee77d810 100644
--- a/src/plugins/qt4projectmanager/msvcparser.h
+++ b/src/plugins/qt4projectmanager/msvcparser.h
@@ -1,4 +1,4 @@
-/***************************************************************************
+/*************************************************************************** 
 **
 ** This file is part of Qt Creator
 **
@@ -30,12 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef MSVCPARSER_H
 #define MSVCPARSER_H
 
-#include <QtCore/QRegExp>
 #include <projectexplorer/ProjectExplorerInterfaces>
 
+#include <QtCore/QRegExp>
+
 namespace Qt4ProjectManager {
 
 class MsvcParser :  public ProjectExplorer::BuildParserInterface
@@ -54,6 +56,6 @@ private:
     QRegExp m_linkRegExp;
 };
 
-} //namespace ProjectExplorer
+} // namespace ProjectExplorer
 
-#endif
+#endif // MsvcParser
diff --git a/src/plugins/qt4projectmanager/profilecache.cpp b/src/plugins/qt4projectmanager/profilecache.cpp
index fc6ce31177a..e359c2c17dc 100644
--- a/src/plugins/qt4projectmanager/profilecache.cpp
+++ b/src/plugins/qt4projectmanager/profilecache.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qt4project.h"
 #include "qt4nodes.h"
 #include "qt4projectmanager.h"
diff --git a/src/plugins/qt4projectmanager/profilecache.h b/src/plugins/qt4projectmanager/profilecache.h
index 9936862fffd..993ae6a489e 100644
--- a/src/plugins/qt4projectmanager/profilecache.h
+++ b/src/plugins/qt4projectmanager/profilecache.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROFILECACHE_H
 #define PROFILECACHE_H
 
diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp
index 91046a883bb..79638d74fc0 100644
--- a/src/plugins/qt4projectmanager/profileeditor.cpp
+++ b/src/plugins/qt4projectmanager/profileeditor.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "profileeditor.h"
+
 #include "profilehighlighter.h"
 #include "qt4projectmanager.h"
 #include "qt4projectmanagerconstants.h"
diff --git a/src/plugins/qt4projectmanager/profileeditor.h b/src/plugins/qt4projectmanager/profileeditor.h
index 3fc90d84e9a..de52d8a0321 100644
--- a/src/plugins/qt4projectmanager/profileeditor.h
+++ b/src/plugins/qt4projectmanager/profileeditor.h
@@ -30,12 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef PROFILEEDITOR
-#define PROFILEEDITOR
+
+#ifndef PROFILEEDITOR_H
+#define PROFILEEDITOR_H
+
+#include "ui_proeditorcontainer.h"
 
 #include <texteditor/basetextdocument.h>
 #include <texteditor/basetexteditor.h>
-#include "ui_proeditorcontainer.h"
 
 namespace TextEditor {
 class FontSettings;
@@ -118,4 +120,4 @@ private:
 } // namespace Internal
 } // namespace Qt4ProjectManager
 
-#endif // PROFILEEDITOR
+#endif // PROFILEEDITOR_H
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
index 0b4818187ff..2ad95e995a3 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "profileeditorfactory.h"
+
 #include "qt4projectmanager.h"
 #include "qt4projectmanagerconstants.h"
 #include "profileeditor.h"
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.h b/src/plugins/qt4projectmanager/profileeditorfactory.h
index 16abbfd8b2b..4f6909ae69d 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.h
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.h
@@ -30,10 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROFILEEDITORFACTORY_H
 #define PROFILEEDITORFACTORY_H
 
 #include <coreplugin/editormanager/ieditorfactory.h>
+
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qt4projectmanager/profilehighlighter.cpp b/src/plugins/qt4projectmanager/profilehighlighter.cpp
index 2e75f2f1616..a21f0a7f5be 100644
--- a/src/plugins/qt4projectmanager/profilehighlighter.cpp
+++ b/src/plugins/qt4projectmanager/profilehighlighter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "profilehighlighter.h"
 
 #include <QtCore/QRegExp>
diff --git a/src/plugins/qt4projectmanager/profilehighlighter.h b/src/plugins/qt4projectmanager/profilehighlighter.h
index e503bac0232..b4ad5a72245 100644
--- a/src/plugins/qt4projectmanager/profilehighlighter.h
+++ b/src/plugins/qt4projectmanager/profilehighlighter.h
@@ -30,13 +30,15 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROFILEHIGHLIGHTER_H
 #define PROFILEHIGHLIGHTER_H
 
 #include "qt4projectmanagerenums.h"
+
+#include <QtCore/QtAlgorithms>
 #include <QtGui/QSyntaxHighlighter>
 #include <QtGui/QTextCharFormat>
-#include <QtCore/QtAlgorithms>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp
index 3af30f4338f..4c81c0aeec0 100644
--- a/src/plugins/qt4projectmanager/profilereader.cpp
+++ b/src/plugins/qt4projectmanager/profilereader.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "profilereader.h"
 #include "profilecache.h"
 
diff --git a/src/plugins/qt4projectmanager/profilereader.h b/src/plugins/qt4projectmanager/profilereader.h
index 51bbf56b732..50e2077c554 100644
--- a/src/plugins/qt4projectmanager/profilereader.h
+++ b/src/plugins/qt4projectmanager/profilereader.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROFILEREADER_H
 #define PROFILEREADER_H
 
@@ -40,7 +41,6 @@
 #include <QtCore/QMap>
 
 namespace Qt4ProjectManager {
-
 namespace Internal {
 
 class ProFileCache;
@@ -80,7 +80,7 @@ private:
     QMap<QString, ProFile *> m_includeFiles;
 };
 
-} //namespace Internal
-} //namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // PROFILEREADER_H
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp
index 35fe74db29c..9a75d2e9dd9 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.cpp
+++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp
@@ -32,17 +32,20 @@
 ***************************************************************************/
 
 #include "projectloadwizard.h"
+
 #include "qt4project.h"
 #include "qtversionmanager.h"
 #include "qt4projectmanager.h"
 #include "qmakestep.h"
 #include "makestep.h"
+
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QCheckBox>
 #include <QtGui/QComboBox>
+#include <QtGui/QFileDialog>
 #include <QtGui/QFormLayout>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QHeaderView>
@@ -55,7 +58,6 @@
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QWizard>
 #include <QtGui/QWizardPage>
-#include <QFileDialog>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.h b/src/plugins/qt4projectmanager/projectloadwizard.h
index 961941bb10d..c205b84510f 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.h
+++ b/src/plugins/qt4projectmanager/projectloadwizard.h
@@ -30,21 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-/********************************************************************************
-** Form generated from reading ui file 'projectloadwizard.ui'
-**
-** Created: Mon Nov 3 16:31:45 2008
-**      by: Qt User Interface Compiler version 4.5.0
-**
-** WARNING! All changes made in this file will be lost when recompiling ui file!
-********************************************************************************/
 
 #ifndef PROJECTLOADWIZARD_H
 #define PROJECTLOADWIZARD_H
 
 #include "qt4project.h"
-#include <QtGui/QWizard>
 
+#include <QtGui/QWizard>
 
 QT_BEGIN_NAMESPACE
 class QWizardPage;
@@ -74,6 +66,7 @@ public:
     virtual int nextId() const;
     virtual void done(int result);
     void execDialog();
+
 private:
     void addBuildConfiguration(QString name, QtVersion *qtversion, QtVersion::QmakeBuildConfig buildConfiguration);
     void setupImportPage(QtVersion *version, QtVersion::QmakeBuildConfig buildConfig);
@@ -96,7 +89,8 @@ private:
 
     void setupUi();
 };
-}
-}
 
-#endif // UI_PROJECTLOADWIZARD_H
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
+#endif // PROJECTLOADWIZARD_H
diff --git a/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp b/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp
index 01053ef50c6..4bf3b8ee98a 100644
--- a/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp
+++ b/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qmakebuildstepfactory.h"
+
 #include "qmakestep.h"
 #include "makestep.h"
 #include "qt4project.h"
diff --git a/src/plugins/qt4projectmanager/qmakebuildstepfactory.h b/src/plugins/qt4projectmanager/qmakebuildstepfactory.h
index 25e5dfeef57..3e06f864cad 100644
--- a/src/plugins/qt4projectmanager/qmakebuildstepfactory.h
+++ b/src/plugins/qt4projectmanager/qmakebuildstepfactory.h
@@ -30,10 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QMAKEBUILDSTEPFACTORY_H
 #define QMAKEBUILDSTEPFACTORY_H
 
 #include <projectexplorer/buildstep.h>
+
 #include <QString>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index aaf39ba6f8a..44654496dc8 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qmakestep.h"
+
 #include "qt4project.h"
 #include "qt4projectmanagerconstants.h"
 #include "qt4projectmanager.h"
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index 66a6c898485..af9bf743dda 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QMAKESTEP_H
 #define QMAKESTEP_H
 
diff --git a/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp
index e7f2478d288..a9d7753cfbb 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp
@@ -30,12 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qt4buildconfigwidget.h"
-#include "ui_qt4buildconfigwidget.h"
+
+#include "makestep.h"
+#include "qmakestep.h"
 #include "qt4project.h"
 #include "qt4projectmanager.h"
-#include "qmakestep.h"
-#include "makestep.h"
+#include "ui_qt4buildconfigwidget.h"
 
 #include <QtGui/QFileDialog>
 
diff --git a/src/plugins/qt4projectmanager/qt4buildconfigwidget.h b/src/plugins/qt4projectmanager/qt4buildconfigwidget.h
index 0055d99cbd1..5a14376d00e 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfigwidget.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QT4BUILDCONFIGWIDGET_H
 #define QT4BUILDCONFIGWIDGET_H
 
@@ -70,7 +71,7 @@ private:
     QString m_buildConfiguration;
 };
 
-} // Internal
-} // Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // QT4BUILDCONFIGWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp
index 5c439f570ab..98dbd196a1d 100644
--- a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp
@@ -30,10 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qt4buildenvironmentwidget.h"
-#include "ui_qt4buildenvironmentwidget.h"
 
+#include "ui_qt4buildenvironmentwidget.h"
 #include "qt4project.h"
+
 #include <projectexplorer/environmenteditmodel.h>
 
 namespace {
@@ -69,8 +71,8 @@ Qt4BuildEnvironmentWidget::Qt4BuildEnvironmentWidget(Qt4Project *project)
             this, SLOT(removeEnvironmentButtonClicked()));
     connect(m_ui->unsetButton, SIGNAL(clicked(bool)),
             this, SLOT(unsetEnvironmentButtonClicked()));
-    connect(m_ui->environmentTreeView->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, const QModelIndex &)),
-            this, SLOT(environmentCurrentIndexChanged(const QModelIndex &, const QModelIndex &)));
+    connect(m_ui->environmentTreeView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+            this, SLOT(environmentCurrentIndexChanged(QModelIndex, QModelIndex)));
     connect(m_ui->clearSystemEnvironmentCheckBox, SIGNAL(toggled(bool)),
             this, SLOT(clearSystemEnvironmentCheckBoxClicked(bool)));
 }
diff --git a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h
index 43b8f67a526..d5adbd8e6c6 100644
--- a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h
+++ b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QT4BUILDENVIRONMENTWIDGET_H
 #define QT4BUILDENVIRONMENTWIDGET_H
 
@@ -52,6 +53,7 @@ class Qt4BuildEnvironmentWidget;
 class Qt4BuildEnvironmentWidget : public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
+
 public:
     Qt4BuildEnvironmentWidget(Qt4Project *project);
     ~Qt4BuildEnvironmentWidget();
@@ -77,7 +79,7 @@ private:
     QString m_buildConfiguration;
 };
 
-} // Internal
-} // Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // QT4BUILDENVIRONMENTWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index e0e9ac1648d..f802738f65f 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "proeditormodel.h"
+
 #include "profilecache.h"
 #include "profilereader.h"
 #include "qt4nodes.h"
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index baecadfbc84..87cbdff28ac 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QT4NODES_H
 #define QT4NODES_H
 
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 526283aedcf..8ec4ea7f4be 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qt4project.h"
+
 #include "qt4projectmanager.h"
 #include "profilecache.h"
 #include "profilereader.h"
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index bd7711824a1..5284646ae49 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QT4PROJECT_H
 #define QT4PROJECT_H
 
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index 7d273dab5a3..7e19f36450d 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qt4projectmanager.h"
+
 #include "qt4projectmanagerconstants.h"
 #include "qt4projectmanagerplugin.h"
 #include "qt4nodes.h"
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.h b/src/plugins/qt4projectmanager/qt4projectmanager.h
index 72e9b488207..3ef99a694fc 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QT4PROJECTMANAGER_H
 #define QT4PROJECTMANAGER_H
 
@@ -118,6 +119,6 @@ private:
     Internal::ProFileCache *m_proFileCache;
 };
 
-} //namespace Qt4ProjectManager
+} // namespace Qt4ProjectManager
 
-#endif //QT4PROJECTMANAGER_H
+#endif // QT4PROJECTMANAGER_H
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index a8b8c2cdbb8..bce80c77134 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QT4PROJECTMANAGERCONSTANTS_H
 #define QT4PROJECTMANAGERCONSTANTS_H
 
@@ -84,6 +85,7 @@ const char * const BUILD_PARSER_GCC     = "BuildParser.Gcc";
 // views
 const char * const VIEW_DETAILED        = "Qt4.View.Detailed";
 const char * const VIEW_PROFILESONLY    = "Qt4.View.ProjectHierarchy";
+
 } // namespace Constants
 } // namespace Qt4ProjectManager
 
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerenums.h b/src/plugins/qt4projectmanager/qt4projectmanagerenums.h
index 6482775da8c..7f16692cef7 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerenums.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerenums.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QT4PRO_ENUMS_H
 #define QT4PRO_ENUMS_H
 
@@ -46,4 +47,4 @@ enum ProfileFormats {
 } // namespace Internal
 } // namespace Qt4ProjectManager
 
-#endif //QT4PRO_ENUMS_H
+#endif // QT4PRO_ENUMS_H
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 44c377bbddb..469df69dd38 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qt4projectmanagerplugin.h"
+
 #include "qt4projectmanager.h"
 #include "wizards/consoleappwizard.h"
 #include "wizards/guiappwizard.h"
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index 5c83f2c6c6f..207bc02befe 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QT4PROJECTMANAGERPLUGIN_H
 #define QT4PROJECTMANAGERPLUGIN_H
 
@@ -91,7 +92,7 @@ private:
     QAction *m_runQMakeActionContextMenu;
 };
 
-} //namespace Internal
-} //namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // QT4PROJECTMANAGERPLUGIN_H
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index e415a1ee527..28f7ca2a8c8 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -30,13 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qt4runconfiguration.h"
+
 #include "qt4project.h"
 #include "profilereader.h"
 #include "qt4nodes.h"
 #include "makestep.h"
 
-
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/variablemanager.h>
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 5d1bb397575..cd2cae85c0e 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QT4RUNCONFIGURATION_H
 #define QT4RUNCONFIGURATION_H
 
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 0ac191818b2..0c68fcd98eb 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qtversionmanager.h"
+
 #include "qt4projectmanagerconstants.h"
 #include "msvcenvironment.h"
 #include "cesdkhandler.h"
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index 6c2f64d60cc..5810cfa1c2d 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -30,17 +30,19 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QTVERSIONMANAGER_H
 #define QTVERSIONMANAGER_H
 
-#include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include "ui_qtversionmanager.h"
+
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
 #include <projectexplorer/ProjectExplorerInterfaces>
 
-#include <QDebug>
-#include "ui_qtversionmanager.h"
+#include <QtCore/QDebug>
+#include <QtCore/QPointer>
+#include <QtGui/QWidget>
 
 namespace Qt4ProjectManager {
 namespace Internal {
@@ -208,7 +210,7 @@ private:
     int m_idcount;
 };
 
-} //namespace Internal
-} //namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
-#endif //QTVERSIONMANAGER_H
+#endif // QTVERSIONMANAGER_H
diff --git a/src/plugins/qt4projectmanager/speinfo.cpp b/src/plugins/qt4projectmanager/speinfo.cpp
index 9cfd2acbb79..58c69769bd4 100644
--- a/src/plugins/qt4projectmanager/speinfo.cpp
+++ b/src/plugins/qt4projectmanager/speinfo.cpp
@@ -30,10 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "speinfo.h"
+
 #include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
 #include <QtCore/QVariant>
-#include <QtDebug>
 
 using namespace Qt4ProjectManager::Internal;
 
diff --git a/src/plugins/qt4projectmanager/speinfo.h b/src/plugins/qt4projectmanager/speinfo.h
index 891247adb4d..1da8f8502b0 100644
--- a/src/plugins/qt4projectmanager/speinfo.h
+++ b/src/plugins/qt4projectmanager/speinfo.h
@@ -30,12 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SIMPLEPROEDITORINFO_H
 #define SIMPLEPROEDITORINFO_H
 
-#include <QtGui/QPixmap>
-#include <QVariant>
 #include <QtCore/QHash>
+#include <QtCore/QVariant>
+#include <QtGui/QPixmap>
 
 namespace Qt4ProjectManager {
 namespace Internal {
@@ -110,7 +111,7 @@ private:
     static bool m_listsInitialized;
 };
 
-} //namespace Internal
-} //namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
-#endif
+#endif // SIMPLEPROEDITORINFO_H
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index 7e41a974046..a49d077d7cd 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "consoleappwizard.h"
+
 #include "consoleappwizarddialog.h"
 #include "qt4projectmanager.h"
 #include "qt4projectmanagerconstants.h"
@@ -54,7 +56,6 @@ static const char *mainCppC =
 static const char *mainSourceFileC = "main";
 
 namespace Qt4ProjectManager {
-
 namespace Internal {
 
 ConsoleAppWizard::ConsoleAppWizard(Core::ICore *core) :
@@ -101,5 +102,5 @@ Core::GeneratedFiles
     return Core::GeneratedFiles() <<  source << profile;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.h b/src/plugins/qt4projectmanager/wizards/consoleappwizard.h
index 863420d05a7..aecf20b667c 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CONSOLEAPPWIZARD_H
 #define CONSOLEAPPWIZARD_H
 
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
index 4affa79202c..14965f50187 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "consoleappwizarddialog.h"
 #include "consoleappwizard.h"
 #include "modulespage.h"
@@ -86,5 +87,5 @@ QtProjectParameters ConsoleAppWizardDialog::parameters() const
     return rc;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h
index afaa9c09e25..8e44923557d 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CONSOLEAPPWIZARDDIALOG_H
 #define CONSOLEAPPWIZARDDIALOG_H
 
diff --git a/src/plugins/qt4projectmanager/wizards/filespage.cpp b/src/plugins/qt4projectmanager/wizards/filespage.cpp
index 22f4bc582a3..58391a73958 100644
--- a/src/plugins/qt4projectmanager/wizards/filespage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/filespage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "filespage.h"
 
 #include <utils/newclasswidget.h>
@@ -178,8 +179,5 @@ void FilesPage::setFormInputChecked(bool checked)
     m_newClassWidget->setFormInputChecked(checked);
 }
 
-
-
-
 } // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/filespage.h b/src/plugins/qt4projectmanager/wizards/filespage.h
index 513c2b81a42..d670dabbece 100644
--- a/src/plugins/qt4projectmanager/wizards/filespage.h
+++ b/src/plugins/qt4projectmanager/wizards/filespage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef FILESPAGE_H
 #define FILESPAGE_H
 
@@ -40,10 +41,10 @@ class QLabel;
 QT_END_NAMESPACE
 
 namespace Core {
-    namespace Utils {
-        class NewClassWidget;
-    }
-}
+namespace Utils {
+class NewClassWidget;
+} // namespace Utils
+} // namespace Core
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index c5142d58ee7..28712aa4b62 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "guiappwizard.h"
 #include "guiappwizarddialog.h"
 #include "qt4projectmanager.h"
@@ -197,5 +198,6 @@ bool GuiAppWizard::parametrizeTemplate(const QString &templatePath, const QStrin
     *target = contents;
     return true;
 }
-}
-}
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.h b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
index c3f24fabdcb..6f25688dc86 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
@@ -30,11 +30,10 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef GUIAPPWIZARD_H
 #define GUIAPPWIZARD_H
 
-#include <QtGui/QWizard>
-
 #include "qtwizard.h"
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
index 457b9fed4c5..7b1ba073d34 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "guiappwizarddialog.h"
 #include "consoleappwizard.h"
 #include "modulespage.h"
@@ -45,14 +46,11 @@ enum PageId { IntroPageId, ModulesPageId, FilesPageId };
 namespace Qt4ProjectManager {
 namespace Internal {
 
-
-GuiAppParameters::GuiAppParameters() :
-    designerForm(true)
+GuiAppParameters::GuiAppParameters()
+    : designerForm(true)
 {
-
 }
 
-
 GuiAppWizardDialog::GuiAppWizardDialog(const QString &templateName,
                                        const QIcon &icon,
                                        const QList<QWizardPage*> &extensionPages,
@@ -132,5 +130,5 @@ GuiAppParameters GuiAppWizardDialog::parameters() const
     return rc;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
index a2e6c891713..1ca5b76ec7f 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef GUIAPPWIZARDDIALOG_H
 #define GUIAPPWIZARDDIALOG_H
 
diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
index 7f981df09b8..15e52ce68a2 100644
--- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
@@ -30,13 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "libraryparameters.h"
 
+#include <utils/codegeneration.h>
+
 #include <QtCore/QTextStream>
 #include <QtCore/QStringList>
 
-#include <utils/codegeneration.h>
-
 // Contents of the header defining the shared library export.
 #define GUARD_VARIABLE "<GUARD>"
 #define EXPORT_MACRO_VARIABLE "<EXPORT_MACRO>"
@@ -161,6 +162,6 @@ QString  LibraryParameters::generateSharedHeader(const QString &globalHeaderFile
     contents.replace(QLatin1String(LIBRARY_MACRO_VARIABLE), QtProjectParameters::libraryMacro(projectTarget));
     return contents;
 }
-}
-}
 
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.h b/src/plugins/qt4projectmanager/wizards/libraryparameters.h
index a52f8cc54ce..470443bd298 100644
--- a/src/plugins/qt4projectmanager/wizards/libraryparameters.h
+++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef LIBRARYPARAMETERS_H
 #define LIBRARYPARAMETERS_H
 
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
index f389725d993..30e7add3440 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "librarywizard.h"
 #include "librarywizarddialog.h"
 #include "qt4projectmanager.h"
@@ -124,5 +125,5 @@ Core::GeneratedFiles LibraryWizard::generateFiles(const QWizard *w,
     return rc;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.h b/src/plugins/qt4projectmanager/wizards/librarywizard.h
index d2de430c823..94732e5fb67 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.h
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef LIBRARYWIZARD_H
 #define LIBRARYWIZARD_H
 
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
index 4cac5a317a9..53972631c68 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "librarywizarddialog.h"
 #include "consoleappwizard.h"
 #include "modulespage.h"
@@ -264,5 +265,5 @@ LibraryParameters LibraryWizardDialog::libraryParameters() const
     return rc;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
index c50dd02236e..a95dce69862 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef LIBRARYWIZARDDIALOG_H
 #define LIBRARYWIZARDDIALOG_H
 
diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.cpp b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
index 60518d8d7ac..a2b5b3e4f09 100644
--- a/src/plugins/qt4projectmanager/wizards/modulespage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "modulespage.h"
 #include "speinfo.h"
 
diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.h b/src/plugins/qt4projectmanager/wizards/modulespage.h
index 3733c144204..34552fa6b2e 100644
--- a/src/plugins/qt4projectmanager/wizards/modulespage.h
+++ b/src/plugins/qt4projectmanager/wizards/modulespage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef MODULESPAGE_H
 #define MODULESPAGE_H
 
@@ -62,7 +63,7 @@ private:
     QString modules(bool selected = true) const;
 };
 
-} //namespace Internal
-} //namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace Qt4ProjectManager
 
-#endif
+#endif // MODULESPAGE_H
diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
index 2dd10700fe8..eca41422ad2 100644
--- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qtprojectparameters.h"
 
 #include <QtCore/QTextStream>
@@ -42,10 +43,10 @@ namespace Qt4ProjectManager {
 namespace Internal {
 
 // ----------- QtProjectParameters
-QtProjectParameters::QtProjectParameters() :
-   type(ConsoleApp)
+QtProjectParameters::QtProjectParameters()
+  : type(ConsoleApp)
 {
- }
+}
 
 QString QtProjectParameters::projectPath() const
 {
@@ -122,7 +123,5 @@ QString QtProjectParameters::libraryMacro(const QString &projectName)
      return createMacro(projectName, QLatin1String("_LIBRARY"));
 }
 
-
-
-}
-}
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
index f7fe314d2ad..1b5186526f1 100644
--- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
+++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QTPROJECTPARAMETERS_H
 #define QTPROJECTPARAMETERS_H
 
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index 381e6e8fef6..86c9c2a7902 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qtwizard.h"
 #include "qt4project.h"
 #include "qt4projectmanagerconstants.h"
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h
index 5097a847270..1ae6ce0dd54 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QTWIZARD_H
 #define QTWIZARD_H
 
diff --git a/src/plugins/qtestlib/qtestlibplugin.h b/src/plugins/qtestlib/qtestlibplugin.h
index 9d44c389fe5..bbb4bb2683e 100644
--- a/src/plugins/qtestlib/qtestlibplugin.h
+++ b/src/plugins/qtestlib/qtestlibplugin.h
@@ -30,11 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QTESTLIBPLUGIN_H
 #define QTESTLIBPLUGIN_H
 
 #include <coreplugin/ioutputpane.h>
 #include <projectexplorer/ProjectExplorerInterfaces>
+
 #include <QPixmap>
 #include <QStandardItem>
 #include <QWidget>
diff --git a/src/plugins/qtscripteditor/qtscripteditor.cpp b/src/plugins/qtscripteditor/qtscripteditor.cpp
index a6f812f65b3..fa10cdd5102 100644
--- a/src/plugins/qtscripteditor/qtscripteditor.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditor.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qtscripteditor.h"
 #include "qtscripteditorconstants.h"
 #include "qtscripthighlighter.h"
diff --git a/src/plugins/qtscripteditor/qtscripteditor.h b/src/plugins/qtscripteditor/qtscripteditor.h
index 1f3f776c9ad..1964ddea851 100644
--- a/src/plugins/qtscripteditor/qtscripteditor.h
+++ b/src/plugins/qtscripteditor/qtscripteditor.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QTSCRIPTDITORW_H
 #define QTSCRIPTDITORW_H
 
diff --git a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
index 001cf259a90..971ea9d4916 100644
--- a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qtscripteditoractionhandler.h"
 #include "qtscripteditorconstants.h"
 #include "qtscripteditor.h"
diff --git a/src/plugins/qtscripteditor/qtscripteditoractionhandler.h b/src/plugins/qtscripteditor/qtscripteditoractionhandler.h
index 06bf412a156..e5fb11c136c 100644
--- a/src/plugins/qtscripteditor/qtscripteditoractionhandler.h
+++ b/src/plugins/qtscripteditor/qtscripteditoractionhandler.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QTSCRIPTDITORACTIONHANDLER_H
 #define QTSCRIPTDITORACTIONHANDLER_H
 
diff --git a/src/plugins/qtscripteditor/qtscripteditorconstants.h b/src/plugins/qtscripteditor/qtscripteditorconstants.h
index ceecb830da1..9998dd4c273 100644
--- a/src/plugins/qtscripteditor/qtscripteditorconstants.h
+++ b/src/plugins/qtscripteditor/qtscripteditorconstants.h
@@ -30,17 +30,21 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QTSCRIPTEDITOR_CONSTANTS_H
 #define QTSCRIPTEDITOR_CONSTANTS_H
 
 namespace QtScriptEditor {
 namespace Constants {
+
 const char * const M_CONTEXT = "Qt Script Editor.ContextMenu";
 const char * const RUN = "Qt Script Editor.Run";
 const char * const RUN_SEP = "Qt Script Editor.Run.Separator";
 const char * const C_QTSCRIPTEDITOR = "Qt Script Editor";
+
 const char * const C_QTSCRIPTEDITOR_MIMETYPE = "application/javascript";
-}
-}
 
-#endif //QTSCRIPTEDITOR_CONSTANTS_H
+} // namespace Constants
+} // namespace QtScriptEditor
+
+#endif // QTSCRIPTEDITOR_CONSTANTS_H
diff --git a/src/plugins/qtscripteditor/qtscripteditorfactory.cpp b/src/plugins/qtscripteditor/qtscripteditorfactory.cpp
index 805256f4079..e8e7f64018b 100644
--- a/src/plugins/qtscripteditor/qtscripteditorfactory.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditorfactory.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qtscripteditorfactory.h"
 #include "qtscripteditor.h"
 #include "qtscripteditoractionhandler.h"
diff --git a/src/plugins/qtscripteditor/qtscripteditorfactory.h b/src/plugins/qtscripteditor/qtscripteditorfactory.h
index ece703ad631..c8442daea35 100644
--- a/src/plugins/qtscripteditor/qtscripteditorfactory.h
+++ b/src/plugins/qtscripteditor/qtscripteditorfactory.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RQTSCRIPTEDITORFACTORY_H
 #define RQTSCRIPTEDITORFACTORY_H
 
diff --git a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp
index abf9e415a79..0cc69b82c45 100644
--- a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qtscripteditorplugin.h"
 #include "qtscripteditorconstants.h"
 #include "qtscripteditorfactory.h"
diff --git a/src/plugins/qtscripteditor/qtscripteditorplugin.h b/src/plugins/qtscripteditor/qtscripteditorplugin.h
index 5d451af05e3..cd7a3365645 100644
--- a/src/plugins/qtscripteditor/qtscripteditorplugin.h
+++ b/src/plugins/qtscripteditor/qtscripteditorplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QTSCRIPTEDITORPLUGIN_H
 #define QTSCRIPTEDITORPLUGIN_H
 
diff --git a/src/plugins/qtscripteditor/qtscripthighlighter.cpp b/src/plugins/qtscripteditor/qtscripthighlighter.cpp
index 0bd40d76587..b362f6a2ad6 100644
--- a/src/plugins/qtscripteditor/qtscripthighlighter.cpp
+++ b/src/plugins/qtscripteditor/qtscripthighlighter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qtscripthighlighter.h"
 
 namespace QtScriptEditor {
diff --git a/src/plugins/qtscripteditor/qtscripthighlighter.h b/src/plugins/qtscripteditor/qtscripthighlighter.h
index ce1dfb5729e..374116e0893 100644
--- a/src/plugins/qtscripteditor/qtscripthighlighter.h
+++ b/src/plugins/qtscripteditor/qtscripthighlighter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QTSCRIPTSYNTAXHIGHLIGHTER_H
 #define QTSCRIPTSYNTAXHIGHLIGHTER_H
 
diff --git a/src/plugins/quickopen/basefilefilter.cpp b/src/plugins/quickopen/basefilefilter.cpp
index 5cfb3406a37..ca565350638 100644
--- a/src/plugins/quickopen/basefilefilter.cpp
+++ b/src/plugins/quickopen/basefilefilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "basefilefilter.h"
 
 #include <coreplugin/editormanager/editormanager.h>
diff --git a/src/plugins/quickopen/basefilefilter.h b/src/plugins/quickopen/basefilefilter.h
index 433674aeba5..e454b6b07e7 100644
--- a/src/plugins/quickopen/basefilefilter.h
+++ b/src/plugins/quickopen/basefilefilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BASEFILEFILTER_H
 #define BASEFILEFILTER_H
 
diff --git a/src/plugins/quickopen/directoryfilter.cpp b/src/plugins/quickopen/directoryfilter.cpp
index 74f4b40a814..afc22af054e 100644
--- a/src/plugins/quickopen/directoryfilter.cpp
+++ b/src/plugins/quickopen/directoryfilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "directoryfilter.h"
 
 #include <QtCore/QDir>
diff --git a/src/plugins/quickopen/directoryfilter.h b/src/plugins/quickopen/directoryfilter.h
index c2f249df0ea..c283dfe33f8 100644
--- a/src/plugins/quickopen/directoryfilter.h
+++ b/src/plugins/quickopen/directoryfilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DIRECTORYFILTER_H
 #define DIRECTORYFILTER_H
 
diff --git a/src/plugins/quickopen/directoryparser.cpp b/src/plugins/quickopen/directoryparser.cpp
index c1a467c22bc..5a420e35051 100644
--- a/src/plugins/quickopen/directoryparser.cpp
+++ b/src/plugins/quickopen/directoryparser.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "directoryparser.h"
 #include "quickopenplugin.h"
 
diff --git a/src/plugins/quickopen/directoryparser.h b/src/plugins/quickopen/directoryparser.h
index 54ace92bef4..13a0cbc5ef8 100644
--- a/src/plugins/quickopen/directoryparser.h
+++ b/src/plugins/quickopen/directoryparser.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DIRECTORYPARSER_H
 #define DIRECTORYPARSER_H
 
@@ -71,7 +72,7 @@ private:
     QSet<QString> m_runBlackList;
 };
 
-} //namespace Internal
-} //namespace QuickOpen
+} // namespace Internal
+} // namespace QuickOpen
 
 #endif // DIRECTORYPARSER_H
diff --git a/src/plugins/quickopen/filesystemfilter.cpp b/src/plugins/quickopen/filesystemfilter.cpp
index b6ce510450d..8265f6a07ef 100644
--- a/src/plugins/quickopen/filesystemfilter.cpp
+++ b/src/plugins/quickopen/filesystemfilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "filesystemfilter.h"
 #include "quickopentoolwindow.h"
 
diff --git a/src/plugins/quickopen/filesystemfilter.h b/src/plugins/quickopen/filesystemfilter.h
index 1489a7e8ca6..0e895a45aab 100644
--- a/src/plugins/quickopen/filesystemfilter.h
+++ b/src/plugins/quickopen/filesystemfilter.h
@@ -30,24 +30,21 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef FILESYSTEMFILTER_H
 #define FILESYSTEMFILTER_H
 
 #include "iquickopenfilter.h"
 #include "ui_filesystemfilter.h"
 
+#include <coreplugin/icore.h>
+#include <coreplugin/editormanager/editormanager.h>
+
 #include <QtCore/QString>
 #include <QtCore/QList>
 #include <QtCore/QByteArray>
 #include <QtCore/QFutureInterface>
 
-#include <coreplugin/icore.h>
-#include <coreplugin/editormanager/editormanager.h>
-
-QT_BEGIN_NAMESPACE
-class QWidget;
-QT_END_NAMESPACE
-
 namespace QuickOpen {
 namespace Internal {
 
diff --git a/src/plugins/quickopen/iquickopenfilter.cpp b/src/plugins/quickopen/iquickopenfilter.cpp
index 1361ab2403a..ad6441ca284 100644
--- a/src/plugins/quickopen/iquickopenfilter.cpp
+++ b/src/plugins/quickopen/iquickopenfilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "iquickopenfilter.h"
 
 #include <QtGui/QBoxLayout>
diff --git a/src/plugins/quickopen/iquickopenfilter.h b/src/plugins/quickopen/iquickopenfilter.h
index 00fa104b3eb..376b0d0fe91 100644
--- a/src/plugins/quickopen/iquickopenfilter.h
+++ b/src/plugins/quickopen/iquickopenfilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef IQUICKOPENFILTER_H
 #define IQUICKOPENFILTER_H
 
diff --git a/src/plugins/quickopen/opendocumentsfilter.cpp b/src/plugins/quickopen/opendocumentsfilter.cpp
index 8f833c98238..0ee4ad8e985 100644
--- a/src/plugins/quickopen/opendocumentsfilter.cpp
+++ b/src/plugins/quickopen/opendocumentsfilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "opendocumentsfilter.h"
 
 Q_DECLARE_METATYPE(Core::IEditor*);
diff --git a/src/plugins/quickopen/opendocumentsfilter.h b/src/plugins/quickopen/opendocumentsfilter.h
index e060fc48613..7b24aeeca02 100644
--- a/src/plugins/quickopen/opendocumentsfilter.h
+++ b/src/plugins/quickopen/opendocumentsfilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef OPENDOCUMENTSFILTER_H
 #define OPENDOCUMENTSFILTER_H
 
diff --git a/src/plugins/quickopen/quickopen_global.h b/src/plugins/quickopen/quickopen_global.h
index 77c51de2de2..5d0c896f56e 100644
--- a/src/plugins/quickopen/quickopen_global.h
+++ b/src/plugins/quickopen/quickopen_global.h
@@ -30,18 +30,6 @@
 ** version 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 QUICKOPEN_GLOBAL_H
 #define QUICKOPEN_GLOBAL_H
diff --git a/src/plugins/quickopen/quickopenconstants.h b/src/plugins/quickopen/quickopenconstants.h
index 41228bc752a..8ae0380f371 100644
--- a/src/plugins/quickopen/quickopenconstants.h
+++ b/src/plugins/quickopen/quickopenconstants.h
@@ -30,15 +30,18 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QUICKOPENCONSTANTS_H
 #define QUICKOPENCONSTANTS_H
 
 namespace QuickOpen {
 namespace Constants {
-    const char * const FILTER_OPTIONS_PAGE = "Filters";
-    const char * const QUICKOPEN_CATEGORY = "QuickOpen";
-    const char * const TASK_INDEX = "QuickOpen.Task.Index";
-}
-}
+
+const char * const FILTER_OPTIONS_PAGE = "Filters";
+const char * const QUICKOPEN_CATEGORY = "QuickOpen";
+const char * const TASK_INDEX = "QuickOpen.Task.Index";
+
+} // namespace Constants
+} // namespace QuickOpen
 
 #endif // QUICKOPENCONSTANTS_H
diff --git a/src/plugins/quickopen/quickopenfiltersfilter.cpp b/src/plugins/quickopen/quickopenfiltersfilter.cpp
index 86daf7b3c17..e8a487c7d94 100644
--- a/src/plugins/quickopen/quickopenfiltersfilter.cpp
+++ b/src/plugins/quickopen/quickopenfiltersfilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "quickopenfiltersfilter.h"
 #include "quickopenplugin.h"
 #include "quickopentoolwindow.h"
diff --git a/src/plugins/quickopen/quickopenfiltersfilter.h b/src/plugins/quickopen/quickopenfiltersfilter.h
index 674b39c1047..2e3c1dc906c 100644
--- a/src/plugins/quickopen/quickopenfiltersfilter.h
+++ b/src/plugins/quickopen/quickopenfiltersfilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QUICKOPENFILTERSFILTER_H
 #define QUICKOPENFILTERSFILTER_H
 
diff --git a/src/plugins/quickopen/quickopenmanager.cpp b/src/plugins/quickopen/quickopenmanager.cpp
index ad03ba8fef4..99e9bcc6f1d 100644
--- a/src/plugins/quickopen/quickopenmanager.cpp
+++ b/src/plugins/quickopen/quickopenmanager.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "quickopenmanager.h"
 #include "quickopentoolwindow.h"
 
diff --git a/src/plugins/quickopen/quickopenmanager.h b/src/plugins/quickopen/quickopenmanager.h
index bc2f822078a..72b85f72d56 100644
--- a/src/plugins/quickopen/quickopenmanager.h
+++ b/src/plugins/quickopen/quickopenmanager.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QUICKOPENMANAGER_H
 #define QUICKOPENMANAGER_H
 
diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp
index f8dea92816d..a2956eb3b59 100644
--- a/src/plugins/quickopen/quickopenplugin.cpp
+++ b/src/plugins/quickopen/quickopenplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "quickopenplugin.h"
 #include "quickopenfiltersfilter.h"
 #include "quickopenmanager.h"
diff --git a/src/plugins/quickopen/quickopenplugin.h b/src/plugins/quickopen/quickopenplugin.h
index 1a5130a5cad..58220368b4d 100644
--- a/src/plugins/quickopen/quickopenplugin.h
+++ b/src/plugins/quickopen/quickopenplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QUICKOPENPLUGIN_H
 #define QUICKOPENPLUGIN_H
 
diff --git a/src/plugins/quickopen/quickopentoolwindow.h b/src/plugins/quickopen/quickopentoolwindow.h
index 935492108bd..b4bcbf91729 100644
--- a/src/plugins/quickopen/quickopentoolwindow.h
+++ b/src/plugins/quickopen/quickopentoolwindow.h
@@ -30,14 +30,15 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QUICKOPENTOOLWINDOW_H
 #define QUICKOPENTOOLWINDOW_H
 
+#include "quickopenplugin.h"
+
 #include <QtCore/QEvent>
 #include <QtGui/QWidget>
 
-#include "quickopenplugin.h"
-
 QT_BEGIN_NAMESPACE
 class QAction;
 class QLabel;
diff --git a/src/plugins/quickopen/settingspage.cpp b/src/plugins/quickopen/settingspage.cpp
index b7e3470d15a..8fa032ffcac 100644
--- a/src/plugins/quickopen/settingspage.cpp
+++ b/src/plugins/quickopen/settingspage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "settingspage.h"
 #include "quickopenplugin.h"
 #include "iquickopenfilter.h"
diff --git a/src/plugins/quickopen/settingspage.h b/src/plugins/quickopen/settingspage.h
index eca50a87fb9..7acbdadf73f 100644
--- a/src/plugins/quickopen/settingspage.h
+++ b/src/plugins/quickopen/settingspage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SETTINGSPAGE_H
 #define SETTINGSPAGE_H
 
diff --git a/src/plugins/regexp/regexpplugin.cpp b/src/plugins/regexp/regexpplugin.cpp
index 275e39b98b3..42a8601821e 100644
--- a/src/plugins/regexp/regexpplugin.cpp
+++ b/src/plugins/regexp/regexpplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "regexpplugin.h"
 #include "settings.h"
 #include "regexpwindow.h"
diff --git a/src/plugins/regexp/regexpplugin.h b/src/plugins/regexp/regexpplugin.h
index 5d1f0eaa086..4a81ce347ee 100644
--- a/src/plugins/regexp/regexpplugin.h
+++ b/src/plugins/regexp/regexpplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef REGEXPPLUGIN_H
 #define REGEXPPLUGIN_H
 
@@ -63,7 +64,7 @@ private:
     QPointer<RegExpWindow> m_regexpWindow;
 };
 
-} //namespace Internal
-} //namespace RegExp
+} // namespace Internal
+} // namespace RegExp
 
-#endif
+#endif // REGEXPPLUGIN_H
diff --git a/src/plugins/regexp/regexpwindow.cpp b/src/plugins/regexp/regexpwindow.cpp
index 57d4345a836..cfa245a1c4e 100644
--- a/src/plugins/regexp/regexpwindow.cpp
+++ b/src/plugins/regexp/regexpwindow.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "regexpwindow.h"
 #include "settings.h"
 
diff --git a/src/plugins/regexp/regexpwindow.h b/src/plugins/regexp/regexpwindow.h
index c14217c6a43..73ae07e3aba 100644
--- a/src/plugins/regexp/regexpwindow.h
+++ b/src/plugins/regexp/regexpwindow.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef REGEXPWINDOW_H
 #define REGEXPWINDOW_H
 
@@ -86,7 +87,7 @@ private:
     QLineEdit *captureEdits[MaxCaptures];
 };
 
-} //namespace Internal
-} //namespace RegExp
+} // namespace Internal
+} // namespace RegExp
 
-#endif
+#endif // REGEXPWINDOW_H
diff --git a/src/plugins/regexp/settings.cpp b/src/plugins/regexp/settings.cpp
index 92d9304360d..d98795c375f 100644
--- a/src/plugins/regexp/settings.cpp
+++ b/src/plugins/regexp/settings.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "settings.h"
+
 #include <QtCore/QSettings>
 
 static const char *syntaxKey = "Syntax";
@@ -90,5 +92,5 @@ void Settings::toQSettings(QSettings *s) const
     s->endGroup();
 }
 
-}
-}
+} // namespace Internal
+} // namespace Settings;
diff --git a/src/plugins/regexp/settings.h b/src/plugins/regexp/settings.h
index 1b6bb292a1f..1c1a8a6ce79 100644
--- a/src/plugins/regexp/settings.h
+++ b/src/plugins/regexp/settings.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef REGEXP_SETTINGS_H
 #define REGEXP_SETTINGS_H
 
diff --git a/src/plugins/resourceeditor/resourceeditorconstants.h b/src/plugins/resourceeditor/resourceeditorconstants.h
index 013f3322ca1..739afefee7e 100644
--- a/src/plugins/resourceeditor/resourceeditorconstants.h
+++ b/src/plugins/resourceeditor/resourceeditorconstants.h
@@ -30,15 +30,18 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RESOURCEEDITOR_CONSTANTS_H
 #define RESOURCEEDITOR_CONSTANTS_H
 
 namespace ResourceEditor {
 namespace Constants {
+
 const char * const C_RESOURCEEDITOR = "Resource Editor";
 const char * const C_RESOURCEWINDOW = "Resourcewindow";
 const char * const C_RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource";
-}
-}
+
+} // namespace Constants
+} // namespace ResourceEditor
 
 #endif // RESOURCEEDITOR_CONSTANTS_H
diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp
index f2ac8c6e18b..a849bb0d202 100644
--- a/src/plugins/resourceeditor/resourceeditorfactory.cpp
+++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "resourceeditorfactory.h"
 #include "resourceeditorw.h"
 #include "resourceeditorplugin.h"
diff --git a/src/plugins/resourceeditor/resourceeditorfactory.h b/src/plugins/resourceeditor/resourceeditorfactory.h
index 14725cc87c2..e9b50af0986 100644
--- a/src/plugins/resourceeditor/resourceeditorfactory.h
+++ b/src/plugins/resourceeditor/resourceeditorfactory.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RRESOURCEEDITORFACTORY_H
 #define RRESOURCEEDITORFACTORY_H
 
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index f799a7cd730..43ad4ddd90c 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "resourceeditorplugin.h"
 #include "resourceeditorw.h"
 #include "resourceeditorconstants.h"
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.h b/src/plugins/resourceeditor/resourceeditorplugin.h
index 2de7431b433..94c7f6054c4 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.h
+++ b/src/plugins/resourceeditor/resourceeditorplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RESOURCEEDITORPLUGIN_H
 #define RESOURCEEDITORPLUGIN_H
 
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 77afc7b901c..7eefdcb7720 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -30,12 +30,16 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "resourceeditorw.h"
 #include "resourceeditorplugin.h"
 #include "resourceeditorconstants.h"
 
 #include <qrceditor.h>
 
+#include <coreplugin/icore.h>
+#include <utils/reloadpromptutils.h>
+
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QFileInfo>
 #include <QtCore/QDir>
@@ -43,9 +47,6 @@
 #include <QtGui/QMainWindow>
 #include <QtGui/QHBoxLayout>
 
-#include <coreplugin/icore.h>
-#include <utils/reloadpromptutils.h>
-
 namespace ResourceEditor {
 namespace Internal {
 
@@ -267,5 +268,5 @@ void ResourceEditorW::onRedo()
         m_resourceEditor.data()->onRedo();
 }
 
-}
-}
+} // namespace Internal
+} // namespace ResourceEditor
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index 603fe54defb..ed21cde8a51 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RESOURCEDITORW_H
 #define RESOURCEDITORW_H
 
@@ -140,4 +141,4 @@ public:
 } // namespace Internal
 } // namespace ResourceEditor
 
-#endif //RESOURCEDITORW_H
+#endif // RESOURCEDITORW_H
diff --git a/src/plugins/resourceeditor/resourcewizard.cpp b/src/plugins/resourceeditor/resourcewizard.cpp
index c492bdb4978..838e1c079be 100644
--- a/src/plugins/resourceeditor/resourcewizard.cpp
+++ b/src/plugins/resourceeditor/resourcewizard.cpp
@@ -30,12 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "resourcewizard.h"
 #include "resourceeditorw.h"
 #include "resourceeditorconstants.h"
 
-namespace ResourceEditor {
-namespace Internal {
+using namespace ResourceEditor;
+using namespace ResourceEditor::Internal;
 
 ResourceWizard::ResourceWizard(const BaseFileWizardParameters &parameters, Core::ICore *core, QObject *parent) :
     Core::StandardFileWizard(parameters, core, parent)
@@ -43,9 +44,9 @@ ResourceWizard::ResourceWizard(const BaseFileWizardParameters &parameters, Core:
 }
 
 Core::GeneratedFiles
-        ResourceWizard::generateFilesFromPath(const QString &path,
-                                              const QString &name,
-                                              QString * /*errorMessage*/) const
+ResourceWizard::generateFilesFromPath(const QString &path,
+                                      const QString &name,
+                                      QString * /*errorMessage*/) const
 {
     const QString suffix = preferredSuffix(QLatin1String(Constants::C_RESOURCE_MIMETYPE));
     const QString fileName = Core::BaseFileWizard::buildFileName(path, name, suffix);
@@ -54,6 +55,3 @@ Core::GeneratedFiles
     file.setEditorKind(QLatin1String(Constants::C_RESOURCEEDITOR));
     return Core::GeneratedFiles() << file;
 }
-
-}
-}
diff --git a/src/plugins/resourceeditor/resourcewizard.h b/src/plugins/resourceeditor/resourcewizard.h
index 4a4e3593d98..5681f640516 100644
--- a/src/plugins/resourceeditor/resourcewizard.h
+++ b/src/plugins/resourceeditor/resourcewizard.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RESOURCEWIZARD_H
 #define RESOURCEWIZARD_H
 
@@ -43,7 +44,6 @@ class ResourceWizard : public Core::StandardFileWizard
     Q_OBJECT
 
 public:
-
     typedef Core::BaseFileWizardParameters BaseFileWizardParameters;
     explicit ResourceWizard(const BaseFileWizardParameters &parameters, Core::ICore *core, QObject *parent);
 
diff --git a/src/plugins/snippets/inputwidget.cpp b/src/plugins/snippets/inputwidget.cpp
index 8321313a673..02abe97b37f 100644
--- a/src/plugins/snippets/inputwidget.cpp
+++ b/src/plugins/snippets/inputwidget.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include <QtCore/QDebug>
 #include <QtGui/QApplication>
 #include <QtGui/QLabel>
diff --git a/src/plugins/snippets/inputwidget.h b/src/plugins/snippets/inputwidget.h
index f7b605eccd5..59bf51c5e80 100644
--- a/src/plugins/snippets/inputwidget.h
+++ b/src/plugins/snippets/inputwidget.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef INPUTWIDGET_H
 #define INPUTWIDGET_H
 
@@ -64,7 +65,7 @@ private:
     QLineEdit *m_lineEdit;
 };
 
-} //namespace Internal
-} //namespace Snippets
+} // namespace Internal
+} // namespace Snippets
 
 #endif // INPUTWIDGET_H
diff --git a/src/plugins/snippets/snippetscompletion.cpp b/src/plugins/snippets/snippetscompletion.cpp
index d35a7d669c5..c09759e7f88 100644
--- a/src/plugins/snippets/snippetscompletion.cpp
+++ b/src/plugins/snippets/snippetscompletion.cpp
@@ -30,8 +30,8 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include "snippetscompletion.h"
 
+#include "snippetscompletion.h"
 #include "snippetswindow.h"
 #include "snippetspec.h"
 #include "snippetsplugin.h"
diff --git a/src/plugins/snippets/snippetscompletion.h b/src/plugins/snippets/snippetscompletion.h
index 005d1a96ac3..3bee53ff9d2 100644
--- a/src/plugins/snippets/snippetscompletion.h
+++ b/src/plugins/snippets/snippetscompletion.h
@@ -30,16 +30,17 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SNIPPETSCOMPLETION_H
 #define SNIPPETSCOMPLETION_H
 
+#include <texteditor/icompletioncollector.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QMap>
 #include <QtCore/QDir>
 #include <QtGui/QIcon>
 
-#include <texteditor/icompletioncollector.h>
-
 namespace Core {
 class ICore;
 }
diff --git a/src/plugins/snippets/snippetspec.cpp b/src/plugins/snippets/snippetspec.cpp
index 3aedaf334e5..19980f879a5 100644
--- a/src/plugins/snippets/snippetspec.cpp
+++ b/src/plugins/snippets/snippetspec.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "snippetspec.h"
 #include "persistentsettings.h"
 
diff --git a/src/plugins/snippets/snippetspec.h b/src/plugins/snippets/snippetspec.h
index ff7b63cd3cb..edc58578149 100644
--- a/src/plugins/snippets/snippetspec.h
+++ b/src/plugins/snippets/snippetspec.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SNIPPETSPEC_H
 #define SNIPPETSPEC_H
 
diff --git a/src/plugins/snippets/snippetsplugin.cpp b/src/plugins/snippets/snippetsplugin.cpp
index 7e90a028c54..caef9bfceac 100644
--- a/src/plugins/snippets/snippetsplugin.cpp
+++ b/src/plugins/snippets/snippetsplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "snippetswindow.h"
 #include "snippetscompletion.h"
 #include "snippetsplugin.h"
diff --git a/src/plugins/snippets/snippetsplugin.h b/src/plugins/snippets/snippetsplugin.h
index b7855696ad7..82af202d38b 100644
--- a/src/plugins/snippets/snippetsplugin.h
+++ b/src/plugins/snippets/snippetsplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SNIPPETS_H
 #define SNIPPETS_H
 
diff --git a/src/plugins/snippets/snippetswindow.cpp b/src/plugins/snippets/snippetswindow.cpp
index d13ce512dd8..d549a06cf7f 100644
--- a/src/plugins/snippets/snippetswindow.cpp
+++ b/src/plugins/snippets/snippetswindow.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "snippetswindow.h"
 #include "snippetspec.h"
 #include "inputwidget.h"
diff --git a/src/plugins/snippets/snippetswindow.h b/src/plugins/snippets/snippetswindow.h
index b9ecb190fa5..e225e6fb4e3 100644
--- a/src/plugins/snippets/snippetswindow.h
+++ b/src/plugins/snippets/snippetswindow.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SNIPPETSWINDOW_H
 #define SNIPPETSWINDOW_H
 
diff --git a/src/plugins/subversion/annotationhighlighter.cpp b/src/plugins/subversion/annotationhighlighter.cpp
index 1df4a259a23..d8ec2f59321 100644
--- a/src/plugins/subversion/annotationhighlighter.cpp
+++ b/src/plugins/subversion/annotationhighlighter.cpp
@@ -30,10 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "annotationhighlighter.h"
 
-namespace Subversion {
-namespace Internal {
+using namespace Subversion;
+using namespace Subversion::Internal;
 
 SubversionAnnotationHighlighter::SubversionAnnotationHighlighter(const ChangeNumbers &changeNumbers,
                                                              QTextDocument *document) :
@@ -47,6 +48,3 @@ QString SubversionAnnotationHighlighter::changeNumber(const QString &block) cons
     const int pos = block.indexOf(m_blank);
     return pos > 1 ? block.left(pos) : QString();
 }
-
-}
-}
diff --git a/src/plugins/subversion/annotationhighlighter.h b/src/plugins/subversion/annotationhighlighter.h
index b1e451aca90..d822d4b65e7 100644
--- a/src/plugins/subversion/annotationhighlighter.h
+++ b/src/plugins/subversion/annotationhighlighter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ANNOTATIONHIGHLIGHTER_H
 #define ANNOTATIONHIGHLIGHTER_H
 
@@ -52,7 +53,7 @@ private:
     const QChar m_blank;
 };
 
-} //namespace Subversion
-} //namespace Internal
+} // namespace Internal
+} // namespace Subversion
 
-#endif
+#endif // ANNOTATIONHIGHLIGHTER_H
diff --git a/src/plugins/subversion/changenumberdialog.cpp b/src/plugins/subversion/changenumberdialog.cpp
index 9b1861e76e5..70e8acf6667 100644
--- a/src/plugins/subversion/changenumberdialog.cpp
+++ b/src/plugins/subversion/changenumberdialog.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include <QtGui/QIntValidator>
 
 #include "changenumberdialog.h"
diff --git a/src/plugins/subversion/changenumberdialog.h b/src/plugins/subversion/changenumberdialog.h
index 3765f5ad1ce..9a6be9fa044 100644
--- a/src/plugins/subversion/changenumberdialog.h
+++ b/src/plugins/subversion/changenumberdialog.h
@@ -30,13 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CHANGENUMBERDIALOG_H
 #define CHANGENUMBERDIALOG_H
 
-#include <QtGui/QDialog>
-
 #include "ui_changenumberdialog.h"
 
+#include <QtGui/QDialog>
+
 namespace Subversion {
 namespace Internal {
 
@@ -49,12 +50,9 @@ public:
 
 private:
     Ui::ChangeNumberDialog m_ui;
-
 };
 
-} //namespace Subversion
-} //namespace Internal
-
-#endif
-
+} // namespace Subversion
+} // namespace Internal
 
+#endif // CHANGENUMBERDIALOG_H
diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index d59d4645670..ab785db796e 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "settingspage.h"
 #include "subversionsettings.h"
 #include "subversionplugin.h"
diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h
index a9c493c5adc..f32401b6d93 100644
--- a/src/plugins/subversion/settingspage.h
+++ b/src/plugins/subversion/settingspage.h
@@ -30,23 +30,24 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SETTINGSPAGE_H
 #define SETTINGSPAGE_H
 
-#include <QtGui/QWidget>
-#include <QtCore/QPointer>
-#include <QtCore/QString>
+#include "ui_settingspage.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include "ui_settingspage.h"
+#include <QtGui/QWidget>
+#include <QtCore/QPointer>
+#include <QtCore/QString>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
 
 namespace Subversion {
-    namespace Internal {
+namespace Internal {
 
 struct SubversionSettings;
 
@@ -84,7 +85,7 @@ private:
     QPointer<SettingsPageWidget> m_widget;
 };
 
-    }   //namespace Subversion
-}   //namespace Internal
+} // namespace Subversion
+} // namespace Internal
 
 #endif  // SETTINGSPAGE_H
diff --git a/src/plugins/subversion/subversionconstants.h b/src/plugins/subversion/subversionconstants.h
index 024896f2a88..9445926d838 100644
--- a/src/plugins/subversion/subversionconstants.h
+++ b/src/plugins/subversion/subversionconstants.h
@@ -30,22 +30,25 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SUBVERSION_CONSTANTS_H
 #define SUBVERSION_CONSTANTS_H
 
 namespace Subversion {
-    namespace Constants {
-        const char * const SUBVERSION_SUBMIT_MIMETYPE = "application/vnd.nokia.text.subversion.submit";
-        const char * const SUBVERSIONEDITOR  = "Subversion Editor";
-        const char * const SUBVERSIONEDITOR_KIND  = "Subversion Editor";
-        const char * const SUBVERSIONCOMMITEDITOR  = "Subversion Commit Editor";
-        const char * const SUBVERSIONCOMMITEDITOR_KIND  = "Subversion Commit Editor";
-        const char * const ICON_SUBMIT = ":/trolltech.subversion/images/submit.png";
-        const char * const ICON_DIFF = ":/trolltech.subversion/images/diff.png";
-        const char * const SUBMIT_CURRENT = "Nokia.Subversion.SubmitCurrentLog";
-        const char * const DIFF_SELECTED = "Nokia.Subversion.DiffSelectedFilesInLog";
-        enum { debug = 0 };
-    }
-}
+namespace Constants {
+
+const char * const SUBVERSION_SUBMIT_MIMETYPE = "application/vnd.nokia.text.subversion.submit";
+const char * const SUBVERSIONEDITOR  = "Subversion Editor";
+const char * const SUBVERSIONEDITOR_KIND  = "Subversion Editor";
+const char * const SUBVERSIONCOMMITEDITOR  = "Subversion Commit Editor";
+const char * const SUBVERSIONCOMMITEDITOR_KIND  = "Subversion Commit Editor";
+const char * const ICON_SUBMIT = ":/trolltech.subversion/images/submit.png";
+const char * const ICON_DIFF = ":/trolltech.subversion/images/diff.png";
+const char * const SUBMIT_CURRENT = "Nokia.Subversion.SubmitCurrentLog";
+const char * const DIFF_SELECTED = "Nokia.Subversion.DiffSelectedFilesInLog";
+enum { debug = 0 };
+
+} // namespace Constants
+} // namespace SubVersion
 
-#endif
+#endif // SUBVERSION_CONSTANTS_H
diff --git a/src/plugins/subversion/subversioncontrol.cpp b/src/plugins/subversion/subversioncontrol.cpp
index 03db872bd7e..ba2a2f2e8e9 100644
--- a/src/plugins/subversion/subversioncontrol.cpp
+++ b/src/plugins/subversion/subversioncontrol.cpp
@@ -30,11 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "subversioncontrol.h"
 #include "subversionplugin.h"
 
-namespace Subversion {
-namespace Internal {
+using namespace Subversion;
+using namespace Subversion::Internal;
 
 SubversionControl::SubversionControl(SubversionPlugin *plugin) :
     m_plugin(plugin)
@@ -66,5 +67,3 @@ QString SubversionControl::findTopLevelForDirectory(const QString &directory) co
 {
     return m_plugin->findTopLevelForDirectory(directory);
 }
-}
-}
diff --git a/src/plugins/subversion/subversioncontrol.h b/src/plugins/subversion/subversioncontrol.h
index 342a5c73441..f293852a3a1 100644
--- a/src/plugins/subversion/subversioncontrol.h
+++ b/src/plugins/subversion/subversioncontrol.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SUBVERSIONCONTROL_H
 #define SUBVERSIONCONTROL_H
 
@@ -37,6 +38,7 @@
 
 namespace Subversion {
 namespace Internal {
+
 class SubversionPlugin;
 
 // Just a proxy for SubversionPlugin
@@ -55,6 +57,7 @@ private:
     SubversionPlugin *m_plugin;
 };
 
-}
-}
-#endif
+} // namespace Internal
+} // namespace Subversion
+
+#endif // SUBVERSIONCONTROL_H
diff --git a/src/plugins/subversion/subversioneditor.cpp b/src/plugins/subversion/subversioneditor.cpp
index a01c3e7ebf6..82f8fd55513 100644
--- a/src/plugins/subversion/subversioneditor.cpp
+++ b/src/plugins/subversion/subversioneditor.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "subversioneditor.h"
 #include "annotationhighlighter.h"
 #include "subversionconstants.h"
@@ -39,8 +40,8 @@
 #include <QtCore/QDebug>
 #include <QtGui/QTextCursor>
 
-namespace  Subversion {
-namespace Internal {
+using namespace Subversion;
+using namespace Subversion::Internal;
 
 SubversionEditor::SubversionEditor(const VCSBase::VCSBaseEditorParameters *type,
                                    QWidget *parent) :
@@ -135,6 +136,3 @@ QString SubversionEditor::fileNameFromDiffSpecification(const QTextBlock &inBloc
     }
     return QString();
 }
-
-}
-}
diff --git a/src/plugins/subversion/subversioneditor.h b/src/plugins/subversion/subversioneditor.h
index 2ce3bd50aab..b4133890fb2 100644
--- a/src/plugins/subversion/subversioneditor.h
+++ b/src/plugins/subversion/subversioneditor.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SUBVERSIONEDITOR_H
 #define SUBVERSIONEDITOR_H
 
diff --git a/src/plugins/subversion/subversionoutputwindow.cpp b/src/plugins/subversion/subversionoutputwindow.cpp
index 794694dd054..8c3749ff5eb 100644
--- a/src/plugins/subversion/subversionoutputwindow.cpp
+++ b/src/plugins/subversion/subversionoutputwindow.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "subversionoutputwindow.h"
 #include "subversionplugin.h"
 
diff --git a/src/plugins/subversion/subversionoutputwindow.h b/src/plugins/subversion/subversionoutputwindow.h
index 2c91a33514b..f201beac4fd 100644
--- a/src/plugins/subversion/subversionoutputwindow.h
+++ b/src/plugins/subversion/subversionoutputwindow.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SUBVERSIONOUTPUTWINDOW_H
 #define SUBVERSIONOUTPUTWINDOW_H
 
@@ -40,7 +41,7 @@ class QListWidget;
 QT_END_NAMESPACE
 
 namespace Subversion {
-    namespace Internal {
+namespace Internal {
 
 class SubversionPlugin;
 
@@ -78,4 +79,4 @@ private:
 } // namespace Subversion
 } // namespace Internal
 
-#endif
+#endif // SUBVERSIONOUTPUTWINDOW_H
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index da480192e82..63c451f85c0 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "subversionplugin.h"
 
 #include "settingspage.h"
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 957aacdc893..af77baa6ea8 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SUBVERSIONPLUGIN_H
 #define SUBVERSIONPLUGIN_H
 
diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp
index 37bc04ed960..0fb800a5338 100644
--- a/src/plugins/subversion/subversionsettings.cpp
+++ b/src/plugins/subversion/subversionsettings.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "subversionsettings.h"
 
 #include <QtCore/QSettings>
@@ -54,8 +55,7 @@ static QString defaultCommand()
     return rc;
 }
 
-namespace Subversion {
-namespace Internal {
+using namespace Subversion::Internal;
 
 SubversionSettings::SubversionSettings() :
     svnCommand(defaultCommand()),
@@ -126,8 +126,3 @@ QString SubversionSettings::formatArguments(const QStringList &args)
     }
     return rc;
 }
-
-
-}
-}
-
diff --git a/src/plugins/subversion/subversionsettings.h b/src/plugins/subversion/subversionsettings.h
index c9a62432baf..4f4c073a034 100644
--- a/src/plugins/subversion/subversionsettings.h
+++ b/src/plugins/subversion/subversionsettings.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SUBVERSIONSETTINGS_H
 #define SUBVERSIONSETTINGS_H
 
@@ -43,7 +44,8 @@ namespace Subversion {
 namespace Internal {
 
 // Todo: Add user name and password?
-struct SubversionSettings {
+struct SubversionSettings
+{
     SubversionSettings();
 
     void fromSettings(QSettings *);
@@ -67,7 +69,8 @@ inline bool operator==(const SubversionSettings &p1, const SubversionSettings &p
     { return p1.equals(p2); }
 inline bool operator!=(const SubversionSettings &p1, const SubversionSettings &p2)
     { return !p1.equals(p2); }
-}
-}
 
-#endif
+} // namespace Internal
+} // namespace Subversion
+
+#endif // SUBVERSIONSETTINGS_H
diff --git a/src/plugins/subversion/subversionsubmiteditor.cpp b/src/plugins/subversion/subversionsubmiteditor.cpp
index c4739393914..01aac80a2b1 100644
--- a/src/plugins/subversion/subversionsubmiteditor.cpp
+++ b/src/plugins/subversion/subversionsubmiteditor.cpp
@@ -30,12 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+
 #include "subversionsubmiteditor.h"
 
 #include <utils/submiteditorwidget.h>
 
-namespace Subversion {
-namespace Internal {
+using namespace Subversion::Internal;
 
 SubversionSubmitEditor::SubversionSubmitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters,
                                                QWidget *parentWidget) :
@@ -58,6 +59,3 @@ QString SubversionSubmitEditor::fileFromStatusLine(const QString &statusLine)
     enum { filePos = 7 };
     return statusLine.mid(filePos, statusLine.size() - filePos);
 }
-
-}
-}
diff --git a/src/plugins/subversion/subversionsubmiteditor.h b/src/plugins/subversion/subversionsubmiteditor.h
index e08655ebdc4..efb97dade23 100644
--- a/src/plugins/subversion/subversionsubmiteditor.h
+++ b/src/plugins/subversion/subversionsubmiteditor.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SUBVERSIONSUBMITEDITOR_H
 #define SUBVERSIONSUBMITEDITOR_H
 
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index b8669182822..43606bf205a 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "basefilefind.h"
 
 #include <coreplugin/stylehelper.h>
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index fee6c0e78ba..0e3cce643b6 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BASEFILEFIND_H
 #define BASEFILEFIND_H
 
diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index 4e3c694bf63..81427e7024a 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "basetextdocument.h"
 #include "basetexteditor.h"
 #include "storagesettings.h"
diff --git a/src/plugins/texteditor/basetextdocument.h b/src/plugins/texteditor/basetextdocument.h
index df6fe58e3e8..ee8e5eb427a 100644
--- a/src/plugins/texteditor/basetextdocument.h
+++ b/src/plugins/texteditor/basetextdocument.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BASETEXTDOCUMENT_H
 #define BASETEXTDOCUMENT_H
 
@@ -158,4 +159,4 @@ private:
 
 } // namespace TextEditor
 
-#endif
+#endif // BASETEXTDOCUMENT_H
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index c3d8f23c070..df5fe410808 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "texteditor_global.h"
+
 #include "texteditorconstants.h"
 #ifndef TEXTEDITOR_STANDALONE
 #include "texteditorplugin.h"
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 3e61a43fe35..ced22900030 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -30,6 +30,8 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+
 #ifndef BASETEXTEDITOR_H
 #define BASETEXTEDITOR_H
 
diff --git a/src/plugins/texteditor/basetexteditor_p.h b/src/plugins/texteditor/basetexteditor_p.h
index 583717cc108..87d1af0de0f 100644
--- a/src/plugins/texteditor/basetexteditor_p.h
+++ b/src/plugins/texteditor/basetexteditor_p.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BASETEXTEDITOR_P_H
 #define BASETEXTEDITOR_P_H
 
diff --git a/src/plugins/texteditor/basetextmark.cpp b/src/plugins/texteditor/basetextmark.cpp
index 7dc3fd08739..07af3577187 100644
--- a/src/plugins/texteditor/basetextmark.cpp
+++ b/src/plugins/texteditor/basetextmark.cpp
@@ -30,10 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "basetextmark.h"
+
 #include <coreplugin/editormanager/editormanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
+
 #include <QtCore/QTimer>
 
 using namespace TextEditor;
@@ -42,7 +45,6 @@ using namespace TextEditor::Internal;
 BaseTextMark::BaseTextMark()
     : m_markableInterface(0), m_internalMark(0), m_init(false)
 {
-    
 }
 
 BaseTextMark::BaseTextMark(const QString &filename, int line)
diff --git a/src/plugins/texteditor/basetextmark.h b/src/plugins/texteditor/basetextmark.h
index 42930a1c165..3e1044d9a73 100644
--- a/src/plugins/texteditor/basetextmark.h
+++ b/src/plugins/texteditor/basetextmark.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BASETEXTMARK_H
 #define BASETEXTMARK_H
 
@@ -127,6 +128,8 @@ public:
 private:
     BaseTextMark *m_parent;
 };
-}
-}
+
+} // namespace Internal
+} // namespace TextEditor
+
 #endif // BASETEXTMARK_H
diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/texteditor/codecselector.cpp
index 26b445d91a1..a8ff2e68bc3 100644
--- a/src/plugins/texteditor/codecselector.cpp
+++ b/src/plugins/texteditor/codecselector.cpp
@@ -30,10 +30,10 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "codecselector.h"
 #include "basetextdocument.h"
 
-
 #include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextCodec>
@@ -44,22 +44,24 @@
 using namespace TextEditor;
 using namespace TextEditor::Internal;
 
-
 namespace TextEditor {
-    namespace Internal {
-
-        /* custom class to make sure the width is wide enough for the
-         * contents. Should be easier with Qt. */
-        class CodecListWidget : public QListWidget {
-        public:
-            CodecListWidget(QWidget *parent):QListWidget(parent){}
-            QSize sizeHint() const {
-                return QListWidget::sizeHint().expandedTo(
-                    QSize(sizeHintForColumn(0) + verticalScrollBar()->sizeHint().width() + 4, 0));
-            }
-        };
+namespace Internal {
+
+/* custom class to make sure the width is wide enough for the
+ * contents. Should be easier with Qt. */
+class CodecListWidget : public QListWidget
+{
+public:
+    CodecListWidget(QWidget *parent):QListWidget(parent){}
+    QSize sizeHint() const {
+        return QListWidget::sizeHint().expandedTo(
+            QSize(sizeHintForColumn(0) + verticalScrollBar()->sizeHint().width() + 4, 0));
     }
-}
+};
+
+} // namespace Internal
+} // namespace TextEditor
+
 
 CodecSelector::CodecSelector(QWidget *parent, BaseTextDocument *doc)
     : QDialog(parent)
@@ -134,8 +136,6 @@ CodecSelector::CodecSelector(QWidget *parent, BaseTextDocument *doc)
     updateButtons();
 }
 
-
-
 CodecSelector::~CodecSelector()
 {
 }
@@ -160,13 +160,11 @@ QTextCodec *CodecSelector::selectedCodec() const
     return 0;
 }
 
-
 CodecSelector::Result CodecSelector::exec()
 {
     return (Result) QDialog::exec();
 }
 
-
 void CodecSelector::buttonClicked(QAbstractButton *button)
 {
     Result result =  Cancel;
diff --git a/src/plugins/texteditor/codecselector.h b/src/plugins/texteditor/codecselector.h
index 8ff0a4b09d1..82ba9e515d5 100644
--- a/src/plugins/texteditor/codecselector.h
+++ b/src/plugins/texteditor/codecselector.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CODECSELECTOR_H
 #define CODECSELECTOR_H
 
@@ -75,11 +76,7 @@ private:
     QAbstractButton *m_saveButton;
 };
 
-
-
-
-
-}
-}
+} // namespace Internal
+} // namespace TextEditor
 
 #endif // CODECSELECTOR_H
diff --git a/src/plugins/texteditor/completionsupport.cpp b/src/plugins/texteditor/completionsupport.cpp
index 574a5d2b3d7..38c017040e9 100644
--- a/src/plugins/texteditor/completionsupport.cpp
+++ b/src/plugins/texteditor/completionsupport.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "completionsupport.h"
 #include "completionwidget.h"
 #include "icompletioncollector.h"
diff --git a/src/plugins/texteditor/completionsupport.h b/src/plugins/texteditor/completionsupport.h
index 1a70204ec16..b43a71aa721 100644
--- a/src/plugins/texteditor/completionsupport.h
+++ b/src/plugins/texteditor/completionsupport.h
@@ -30,10 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef COMPLETIONSUPPORT_H
 #define COMPLETIONSUPPORT_H
 
 #include <texteditor/texteditor_global.h>
+
 #include <QtCore/QObject>
 
 namespace Core { class ICore; }
diff --git a/src/plugins/texteditor/completionwidget.cpp b/src/plugins/texteditor/completionwidget.cpp
index 2d5ca19542e..ae296dca557 100644
--- a/src/plugins/texteditor/completionwidget.cpp
+++ b/src/plugins/texteditor/completionwidget.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "completionwidget.h"
 #include "completionsupport.h"
 #include "icompletioncollector.h"
diff --git a/src/plugins/texteditor/completionwidget.h b/src/plugins/texteditor/completionwidget.h
index 5c11f07ec66..db15d599dc4 100644
--- a/src/plugins/texteditor/completionwidget.h
+++ b/src/plugins/texteditor/completionwidget.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef COMPLETIONWIDGET_H
 #define COMPLETIONWIDGET_H
 
diff --git a/src/plugins/texteditor/displaysettings.cpp b/src/plugins/texteditor/displaysettings.cpp
index 3119f18e5e7..1d4d7a697b9 100644
--- a/src/plugins/texteditor/displaysettings.cpp
+++ b/src/plugins/texteditor/displaysettings.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "displaysettings.h"
 
 #include <QtCore/QSettings>
diff --git a/src/plugins/texteditor/displaysettings.h b/src/plugins/texteditor/displaysettings.h
index feb8993f75a..ebf486dc4b2 100644
--- a/src/plugins/texteditor/displaysettings.h
+++ b/src/plugins/texteditor/displaysettings.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DISPLAYSETTINGS_H
 #define DISPLAYSETTINGS_H
 
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 1945ae04677..55ecd01e5ad 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "findinfiles.h"
 
 #include <QtDebug>
diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h
index 799c8e4bf50..9aeaf57be89 100644
--- a/src/plugins/texteditor/findinfiles.h
+++ b/src/plugins/texteditor/findinfiles.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef FINDINFILES_H
 #define FINDINFILES_H
 
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index 78f55fe5420..bbde495f8dd 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "fontsettings.h"
 #include "fontsettingspage.h"
 
diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h
index 53db735d903..486385565da 100644
--- a/src/plugins/texteditor/fontsettings.h
+++ b/src/plugins/texteditor/fontsettings.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef FONTSETTINGS_H
 #define FONTSETTINGS_H
 
diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp
index b5f84ed47b8..0c6043a7c7e 100644
--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "fontsettingspage.h"
 #include "fontsettings.h"
 #include "texteditorconstants.h"
diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h
index 19ab0680a37..3a9c280c8a5 100644
--- a/src/plugins/texteditor/fontsettingspage.h
+++ b/src/plugins/texteditor/fontsettingspage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef FONTSETTINGSPAGE_H
 #define FONTSETTINGSPAGE_H
 
diff --git a/src/plugins/texteditor/generalsettingspage.cpp b/src/plugins/texteditor/generalsettingspage.cpp
index 18d63ac5b51..00ce472d663 100644
--- a/src/plugins/texteditor/generalsettingspage.cpp
+++ b/src/plugins/texteditor/generalsettingspage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "displaysettings.h"
 #include "generalsettingspage.h"
 #include "storagesettings.h"
diff --git a/src/plugins/texteditor/generalsettingspage.h b/src/plugins/texteditor/generalsettingspage.h
index b1dc25cf3b4..968f8309782 100644
--- a/src/plugins/texteditor/generalsettingspage.h
+++ b/src/plugins/texteditor/generalsettingspage.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef GENERALSETTINGSPAGE_H
 #define GENERALSETTINGSPAGE_H
 
diff --git a/src/plugins/texteditor/icompletioncollector.h b/src/plugins/texteditor/icompletioncollector.h
index 1ce8a3b0073..d04dc6fad44 100644
--- a/src/plugins/texteditor/icompletioncollector.h
+++ b/src/plugins/texteditor/icompletioncollector.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef COMPLETIONCOLLECTORINTERFACE_H
 #define COMPLETIONCOLLECTORINTERFACE_H
 
diff --git a/src/plugins/texteditor/itexteditable.h b/src/plugins/texteditor/itexteditable.h
index 2253bcf2149..864c280a3dd 100644
--- a/src/plugins/texteditor/itexteditable.h
+++ b/src/plugins/texteditor/itexteditable.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ITEXTEDITABLE_H
 #define ITEXTEDITABLE_H
 
diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h
index 9d6cd57b023..432c3c9c585 100644
--- a/src/plugins/texteditor/itexteditor.h
+++ b/src/plugins/texteditor/itexteditor.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ITEXTEDITOR_H
 #define ITEXTEDITOR_H
 
diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp
index 6c1c4f21ff8..1dd9e707206 100644
--- a/src/plugins/texteditor/linenumberfilter.cpp
+++ b/src/plugins/texteditor/linenumberfilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "linenumberfilter.h"
 #include "itexteditor.h"
 
diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h
index d6ddc00a3b3..c1e3a6af8f8 100644
--- a/src/plugins/texteditor/linenumberfilter.h
+++ b/src/plugins/texteditor/linenumberfilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef LINENUMBERFILTER_H
 #define LINENUMBERFILTER_H
 
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp
index bda40d62d37..88267dd53f5 100644
--- a/src/plugins/texteditor/plaintexteditor.cpp
+++ b/src/plugins/texteditor/plaintexteditor.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "plaintexteditor.h"
 #include "texteditorconstants.h"
 #include "texteditorplugin.h"
diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h
index 77665375be9..2e8c9b980c6 100644
--- a/src/plugins/texteditor/plaintexteditor.h
+++ b/src/plugins/texteditor/plaintexteditor.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PLAINTEXTEDITOR_H
 #define PLAINTEXTEDITOR_H
 
diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp
index ffe1194b243..67ceeb9e543 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.cpp
+++ b/src/plugins/texteditor/plaintexteditorfactory.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "plaintexteditor.h"
 #include "plaintexteditorfactory.h"
 #include "texteditorconstants.h"
diff --git a/src/plugins/texteditor/plaintexteditorfactory.h b/src/plugins/texteditor/plaintexteditorfactory.h
index b3baeb6abbe..25e975dbf57 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.h
+++ b/src/plugins/texteditor/plaintexteditorfactory.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PLAINTEXTEDITORFACTORY_H
 #define PLAINTEXTEDITORFACTORY_H
 
diff --git a/src/plugins/texteditor/storagesettings.cpp b/src/plugins/texteditor/storagesettings.cpp
index dc1c20c7606..c940ff641b0 100644
--- a/src/plugins/texteditor/storagesettings.cpp
+++ b/src/plugins/texteditor/storagesettings.cpp
@@ -30,7 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "storagesettings.h"
+
 #include <QSettings>
 #include <QString>
 
diff --git a/src/plugins/texteditor/storagesettings.h b/src/plugins/texteditor/storagesettings.h
index 65ed3f0ffb2..a7040dac41b 100644
--- a/src/plugins/texteditor/storagesettings.h
+++ b/src/plugins/texteditor/storagesettings.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef STORAGESETTINGS_H
 #define STORAGESETTINGS_H
 
@@ -41,7 +42,8 @@ QT_END_NAMESPACE
 
 namespace TextEditor {
 
-struct TEXTEDITOR_EXPORT StorageSettings {
+struct TEXTEDITOR_EXPORT StorageSettings
+{
     StorageSettings();
 
     void toSettings(const QString &category, QSettings *s) const;
diff --git a/src/plugins/texteditor/tabsettings.cpp b/src/plugins/texteditor/tabsettings.cpp
index cfe0a5c182e..f87ab2ac8cf 100644
--- a/src/plugins/texteditor/tabsettings.cpp
+++ b/src/plugins/texteditor/tabsettings.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "tabsettings.h"
 
 #include <QtCore/QSettings>
@@ -86,8 +87,6 @@ void TabSettings::fromSettings(const QString &category, const QSettings *s)
     m_indentSize      = s->value(group + QLatin1String(indentSizeKey), m_indentSize).toInt();
 }
 
-
-
 int TabSettings::lineIndentPosition(const QString &text) const
 {
     int i = 0;
@@ -145,7 +144,6 @@ bool TabSettings::isIndentationClean(const QString &text) const
     return true;
 }
 
-
 int TabSettings::columnAt(const QString &text, int position) const
 {
     int column = 0;
diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h
index 095d33991fd..f639cc6c8b6 100644
--- a/src/plugins/texteditor/tabsettings.h
+++ b/src/plugins/texteditor/tabsettings.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef TABSETTINGS_H
 #define TABSETTINGS_H
 
diff --git a/src/plugins/texteditor/textblockiterator.cpp b/src/plugins/texteditor/textblockiterator.cpp
index 27cc28b65ef..8581edc6275 100644
--- a/src/plugins/texteditor/textblockiterator.cpp
+++ b/src/plugins/texteditor/textblockiterator.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "textblockiterator.h"
 
 #include <QtGui/QTextDocument>
diff --git a/src/plugins/texteditor/textblockiterator.h b/src/plugins/texteditor/textblockiterator.h
index e15d50fa10a..22f1e623f1c 100644
--- a/src/plugins/texteditor/textblockiterator.h
+++ b/src/plugins/texteditor/textblockiterator.h
@@ -30,8 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef _TEXTBLOCKITERATOR_H
-#define _TEXTBLOCKITERATOR_H
+
+#ifndef TEXTBLOCKITERATOR_H
+#define TEXTBLOCKITERATOR_H
 
 #include "texteditor_global.h"
 
@@ -68,4 +69,4 @@ inline bool operator!=(const TextBlockIterator &i1, const TextBlockIterator &i2)
 
 } // namespace TextEditor
 
-#endif // _TEXTBLOCKITERATOR_H
+#endif // TEXTBLOCKITERATOR_H
diff --git a/src/plugins/texteditor/texteditor_global.h b/src/plugins/texteditor/texteditor_global.h
index e1d0830d920..4c0fd1a69f8 100644
--- a/src/plugins/texteditor/texteditor_global.h
+++ b/src/plugins/texteditor/texteditor_global.h
@@ -30,18 +30,6 @@
 ** version 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 TEXTEDITOR_GLOBAL_H
 #define TEXTEDITOR_GLOBAL_H
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index a9a7b5872f1..94cdca6cfda 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "texteditoractionhandler.h"
 #include "texteditorconstants.h"
 #include "basetexteditor.h"
diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h
index 5c43bbfde59..79ac67c2178 100644
--- a/src/plugins/texteditor/texteditoractionhandler.h
+++ b/src/plugins/texteditor/texteditoractionhandler.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef TEXTEDITORACTIONHANDLER_H
 #define TEXTEDITORACTIONHANDLER_H
 
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h
index 59240fe03b3..8313f61fc3d 100644
--- a/src/plugins/texteditor/texteditorconstants.h
+++ b/src/plugins/texteditor/texteditorconstants.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef TEXTEDITORCONSTANTS_H
 #define TEXTEDITORCONSTANTS_H
 
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 78ddf91d952..f50d6dacc96 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "texteditorplugin.h"
 
 #include "findinfiles.h"
diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h
index 3999bc9ad55..e5c6a830a71 100644
--- a/src/plugins/texteditor/texteditorplugin.h
+++ b/src/plugins/texteditor/texteditorplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef TEXTEDITORPLUGIN_H
 #define TEXTEDITORPLUGIN_H
 
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index c539939a2b5..3bab32ae0d8 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "texteditorsettings.h"
 
 #include "displaysettings.h"
diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h
index b665720f2b7..cbb0db1598a 100644
--- a/src/plugins/texteditor/texteditorsettings.h
+++ b/src/plugins/texteditor/texteditorsettings.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef TEXTEDITORSETTINGS_H
 #define TEXTEDITORSETTINGS_H
 
diff --git a/src/plugins/texteditor/textfilewizard.cpp b/src/plugins/texteditor/textfilewizard.cpp
index c012ed27b95..aa8e2b77470 100644
--- a/src/plugins/texteditor/textfilewizard.cpp
+++ b/src/plugins/texteditor/textfilewizard.cpp
@@ -30,11 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "textfilewizard.h"
 #include "basetexteditor.h"
 #include "texteditorconstants.h"
 
-namespace TextEditor {
+using namespace TextEditor;
 
 TextFileWizard::TextFileWizard(const QString &mimeType,
                                const QString &editorKind,
@@ -59,5 +60,3 @@ Core::GeneratedFiles
     file.setEditorKind(m_editorKind);
     return Core::GeneratedFiles() << file;
 }
-
-}
diff --git a/src/plugins/texteditor/textfilewizard.h b/src/plugins/texteditor/textfilewizard.h
index 8307c2a0f7d..d5593d50bda 100644
--- a/src/plugins/texteditor/textfilewizard.h
+++ b/src/plugins/texteditor/textfilewizard.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef TEXTFILEWIZARD_H
 #define TEXTFILEWIZARD_H
 
diff --git a/src/plugins/vcsbase/baseannotationhighlighter.cpp b/src/plugins/vcsbase/baseannotationhighlighter.cpp
index 977b02a26c8..5b02bc9ea1a 100644
--- a/src/plugins/vcsbase/baseannotationhighlighter.cpp
+++ b/src/plugins/vcsbase/baseannotationhighlighter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "baseannotationhighlighter.h"
 
 #include <math.h>
@@ -98,5 +99,4 @@ void BaseAnnotationHighlighter::highlightBlock(const QString &text)
         setFormat(0, text.length(), it.value());
 }
 
-}
-
+} // namespace VCSBase
diff --git a/src/plugins/vcsbase/baseannotationhighlighter.h b/src/plugins/vcsbase/baseannotationhighlighter.h
index e57e6c8d425..bedd11a12b0 100644
--- a/src/plugins/vcsbase/baseannotationhighlighter.h
+++ b/src/plugins/vcsbase/baseannotationhighlighter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BASEANNOTATIONHIGHLIGHTER_H
 #define BASEANNOTATIONHIGHLIGHTER_H
 
@@ -71,6 +72,6 @@ private:
     BaseAnnotationHighlighterPrivate *m_d;
 };
 
-} //namespace Internal
+} // namespace VCSBase
 
-#endif
+#endif // BASEANNOTATIONHIGHLIGHTER_H
diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp
index 9bf575bdb03..28fa74a737b 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.cpp
+++ b/src/plugins/vcsbase/basevcseditorfactory.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "basevcseditorfactory.h"
 #include "vcsbaseplugin.h"
 #include "vcsbaseeditor.h"
diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h
index fcb4a7fdf55..1f01f4fee7a 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.h
+++ b/src/plugins/vcsbase/basevcseditorfactory.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BASEVCSEDITORFACTORY_H
 #define BASEVCSEDITORFACTORY_H
 
@@ -49,6 +50,7 @@ namespace Core {
 }
 
 namespace VCSBase {
+
 struct BaseVCSEditorFactoryPrivate;
 
 // Base class for editor factories creating instances of VCSBaseEditor
@@ -116,6 +118,8 @@ VCSBaseEditor *VCSEditorFactory<Editor>::createVCSBaseEditor(const VCSBaseEditor
     return rc;
 
 }
-}
-#endif
+
+} // namespace VCSBase
+
+#endif // BASEVCSEDITORFACTORY_H
 
diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
index 7330c5b8002..ff4a9d4b1b9 100644
--- a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
+++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "basevcssubmiteditorfactory.h"
 #include "vcsbasesubmiteditor.h"
 
@@ -38,7 +39,8 @@
 
 namespace VCSBase {
 
-struct BaseVCSSubmitEditorFactoryPrivate {
+struct BaseVCSSubmitEditorFactoryPrivate
+{
     BaseVCSSubmitEditorFactoryPrivate(const VCSBaseSubmitEditorParameters *parameters);
 
     const VCSBaseSubmitEditorParameters *m_parameters;
@@ -86,4 +88,4 @@ Core::IFile *BaseVCSSubmitEditorFactory::open(const QString &fileName)
     return 0;
 }
 
-}
+} // namespace VCSBase
diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.h b/src/plugins/vcsbase/basevcssubmiteditorfactory.h
index aa33afb8ea0..1925317b375 100644
--- a/src/plugins/vcsbase/basevcssubmiteditorfactory.h
+++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.h
@@ -30,8 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef VCSBaseBASEEDITORFACTORY_H
-#define VCSBaseBASEEDITORFACTORY_H
+
+#ifndef VCSBASE_BASEEDITORFACTORY_H
+#define VCSBASE_BASEEDITORFACTORY_H
 
 #include "vcsbase_global.h"
 
@@ -95,6 +96,7 @@ VCSBaseSubmitEditor *VCSSubmitEditorFactory<Editor>::createBaseSubmitEditor(cons
 {
     return new Editor(parameters, parent);
 }
-}
 
-#endif // VCSBaseBASEEDITOR_H
+} // namespace VCSBase
+
+#endif // VCSBASE_BASEEDITOR_H
diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp
index 802fe75430d..60f219842fc 100644
--- a/src/plugins/vcsbase/diffhighlighter.cpp
+++ b/src/plugins/vcsbase/diffhighlighter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "diffhighlighter.h"
 
 #include <QtCore/QDebug>
diff --git a/src/plugins/vcsbase/diffhighlighter.h b/src/plugins/vcsbase/diffhighlighter.h
index b526c6227bd..3b3e47ed364 100644
--- a/src/plugins/vcsbase/diffhighlighter.h
+++ b/src/plugins/vcsbase/diffhighlighter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DIFFHIGHLIGHTER_H
 #define DIFFHIGHLIGHTER_H
 
@@ -86,6 +87,6 @@ private:
     DiffHighlighterPrivate *m_d;
 };
 
-} //namespace VCSBase
+} // namespace VCSBase
 
 #endif // DIFFHIGHLIGHTER_H
diff --git a/src/plugins/vcsbase/submiteditorfile.cpp b/src/plugins/vcsbase/submiteditorfile.cpp
index 71c223d7587..4fd9398881a 100644
--- a/src/plugins/vcsbase/submiteditorfile.cpp
+++ b/src/plugins/vcsbase/submiteditorfile.cpp
@@ -30,13 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "submiteditorfile.h"
 
-namespace VCSBase {
-namespace Internal {
+using namespace VCSBase;
+using namespace VCSBase::Internal;
 
-SubmitEditorFile::SubmitEditorFile(const QString &mimeType,
-                                   QObject *parent) :
+SubmitEditorFile::SubmitEditorFile(const QString &mimeType, QObject *parent) :
     Core::IFile(parent),
     m_mimeType(mimeType),
     m_modified(false)
@@ -66,6 +66,3 @@ QString SubmitEditorFile::mimeType() const
 {
     return m_mimeType;
 }
-
-}
-}
diff --git a/src/plugins/vcsbase/submiteditorfile.h b/src/plugins/vcsbase/submiteditorfile.h
index 6bda2f41ed7..a3e9704d7c3 100644
--- a/src/plugins/vcsbase/submiteditorfile.h
+++ b/src/plugins/vcsbase/submiteditorfile.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SUBMITEDITORFILE_H
 #define SUBMITEDITORFILE_H
 
@@ -72,6 +73,6 @@ private:
 
 
 } // namespace Internal
-}
+} // namespace VCSBase
 
 #endif // SUBMITEDITORFILE_H
diff --git a/src/plugins/vcsbase/vcsbase_global.h b/src/plugins/vcsbase/vcsbase_global.h
index 87c4e10b18a..f3bc7bac50f 100644
--- a/src/plugins/vcsbase/vcsbase_global.h
+++ b/src/plugins/vcsbase/vcsbase_global.h
@@ -30,18 +30,6 @@
 ** version 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 VCSBASEGLOBAL_H
 #define VCSBASEGLOBAL_H
diff --git a/src/plugins/vcsbase/vcsbaseconstants.h b/src/plugins/vcsbase/vcsbaseconstants.h
index fd85579cdb3..1a0765c72e1 100644
--- a/src/plugins/vcsbase/vcsbaseconstants.h
+++ b/src/plugins/vcsbase/vcsbaseconstants.h
@@ -30,17 +30,18 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef VCSBaseCONSTANTS_H
-#define VCSBaseCONSTANTS_H
+
+#ifndef VCSBASE_CONSTANTS_H
+#define VCSBASE_CONSTANTS_H
 
 namespace VCSBase {
-    namespace Constants {
+namespace Constants {
 
-        namespace Internal {
+namespace Internal {
+enum { debug = 0 };
+} // namespace Internal
 
-            enum { debug = 0 };
-        } // namespace Internal
-    } // namespace Constants
+} // namespace Constants
 } // VCSBase
 
-#endif // VCSBaseCONSTANTS_H
+#endif // VCSBASE_CONSTANTS_H
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index a2bdd2c74bf..dcfe55d195b 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "vcsbaseeditor.h"
 #include "diffhighlighter.h"
 #include "baseannotationhighlighter.h"
@@ -483,4 +484,4 @@ VCSBaseEditor *VCSBaseEditor::getVcsBaseEditor(const Core::IEditor *editor)
     return 0;
 }
 
-}
+} // namespace VCSBase
diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h
index 38c18fe9f21..f1de4f18777 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.h
+++ b/src/plugins/vcsbase/vcsbaseeditor.h
@@ -30,8 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef VCSBaseBASEEDITOR_H
-#define VCSBaseBASEEDITOR_H
+
+#ifndef VCSBASE_BASEEDITOR_H
+#define VCSBASE_BASEEDITOR_H
 
 #include "vcsbase_global.h"
 
@@ -168,6 +169,6 @@ private:
     VCSBaseEditorPrivate *m_d;
 };
 
-} // namespace Internal
+} // namespace VCSBase
 
-#endif // VCSBaseBASEEDITOR_H
+#endif // VCSBASE_BASEEDITOR_H
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index 51ce8472b34..f8a89c1eca3 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "vcsbaseplugin.h"
 #include "diffhighlighter.h"
 
diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h
index 81419cd7705..3036157e9d7 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.h
+++ b/src/plugins/vcsbase/vcsbaseplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef VCSBASEPLUGIN_H
 #define VCSBASEPLUGIN_H
 
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index dee2df7c42a..3960ca6c75f 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "vcsbasesubmiteditor.h"
 #include "submiteditorfile.h"
 
@@ -278,4 +279,4 @@ bool VCSBaseSubmitEditor::setFileContents(const QString &contents)
     return true;
 }
 
-}
+} // namespace VCSBase
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index 481cd63d07c..796f5c6129f 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -30,8 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef VCSBaseSUBMITEDITOR_H
-#define VCSBaseSUBMITEDITOR_H
+
+#ifndef VCSBASE_SUBMITEDITOR_H
+#define VCSBASE_SUBMITEDITOR_H
 
 #include "vcsbase_global.h"
 
@@ -141,6 +142,6 @@ private:
     VCSBaseSubmitEditorPrivate *m_d;
 };
 
-}
+} // namespace VCSBase
 
-#endif // VCSBaseSUBMITEDITOR_H
+#endif // VCSBASE_SUBMITEDITOR_H
diff --git a/src/plugins/vcsbase/vcsbasetextdocument.cpp b/src/plugins/vcsbase/vcsbasetextdocument.cpp
index 06b4f7ab6e1..9a720f4e070 100644
--- a/src/plugins/vcsbase/vcsbasetextdocument.cpp
+++ b/src/plugins/vcsbase/vcsbasetextdocument.cpp
@@ -30,10 +30,10 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "vcsbasetextdocument.h"
 
-namespace VCSBase {
-namespace Internal {
+using namespace VCSBase::Internal;
 
 VCSBaseTextDocument::VCSBaseTextDocument()
 {
@@ -48,6 +48,3 @@ bool VCSBaseTextDocument::isModified() const
 {
     return false;
 }
-
-}
-}
diff --git a/src/plugins/vcsbase/vcsbasetextdocument.h b/src/plugins/vcsbase/vcsbasetextdocument.h
index e6e66edc95f..d4a321be457 100644
--- a/src/plugins/vcsbase/vcsbasetextdocument.h
+++ b/src/plugins/vcsbase/vcsbasetextdocument.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef VCSBASETEXTDOCUMENT_H
 #define VCSBASETEXTDOCUMENT_H
author	hjk <[email protected]>	2008-12-02 16:19:05 +0100
committer	hjk <[email protected]>	2008-12-02 16:19:05 +0100
commit	cf11b696431d26920f54598c8f03f0a5cf822ffa (patch)
tree	9387102d435481132b721fde8ca062c5b8a4f73f /src/plugins
parent	10e963fb6134b3974901707daa99f5a94d696bed (diff)