more code cosmetics

97 files changed, 243 insertions, 156 deletions

diff --git a/src/plugins/projectexplorer/abstractprocess.h b/src/plugins/projectexplorer/abstractprocess.h
index 2ab448e43b..12e263ff62 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 4fb4da909d..09bd73fe76 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 217daac1e5..e5d40343bb 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 008418b620..059b41e730 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 99eeee4f85..3315e7b2de 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 0ff920053e..f892f5ff39 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 7b0456ac65..77fb2e78eb 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 53514bb83f..049b689f44 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 d3f6fb1d1e..4d0221b087 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 ea99ed942d..7042c152d2 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 697a4715d9..ba459d563c 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 780722fad2..5915f9b7a2 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 5857084513..c9090723a1 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 f61b7a84f2..b3ccc8adc9 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 08c29f865d..98002f8827 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 407b26d1a9..2c7a443720 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 9e9990c3b4..57bf588ca8 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 969bbc1c95..217ce0bcaf 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 d12d92c141..7c893bb9ce 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 f51972b09b..12f2ff36da 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 ccb8be8e40..a713fdc773 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 57a3a97338..07e398dfc0 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 0a96cb9e59..474306dd57 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 d531dc08fa..54ac93af0b 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 2ac3709a7b..38f804a6ff 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 9404d300a4..c612c9ca5f 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 4b6929183b..8b50f3e4fa 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 b5c4db1d1c..658d73ca04 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 735d1084da..28e24b92f9 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 e15f8bf159..f50db814bc 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 81ef72a1bf..7e3a5d0a9c 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 6a901f77d4..084bb4690d 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 4ce2de318d..bacd3a73ea 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 1f049c5864..58300f4ca8 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 a5d22c7d61..37577a2a95 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 44358053dd..c52b86f488 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 18b0368c7e..5d15009c02 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 c1fd2106b6..0fc776dcb1 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 f77607e1fa..bcb635dada 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 56180729b9..7134763854 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 947745dcdb..d2a016ef2b 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 9a5d133175..a968008a57 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 c8dd246f14..e969079aca 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 9cb4a762a5..df9936fe0e 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 c2de8e6dfe..a8470d3df5 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 e0de71b031..3f7e68ea72 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 2c123056a3..2405d86998 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 5dd158b25d..4f20652027 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 7bd31a2157..3a59aca76c 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 37ba42fe3a..82e4493eec 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 7238a5668f..42d439e597 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 dfcc5fe52e..f3f13927bc 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 3ab613361e..e7c3576ffe 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 91f18cc8e9..c2574f36f9 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 896d0d527b..86c3a77270 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 b92ae960e4..a2e0e206ae 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 c679a454b1..69bd4ef972 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 19e6ad13ac..38253f3ae0 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 ae0fea0c61..a1bb19b833 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 f66133bbaf..a3d712ff5e 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 294f012100..5d3dc6b1f1 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 6f3c34c939..4a24efa706 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 64772d3ed5..0cee08d071 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 44a6d9435f..8c74fe6e56 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 f43be29457..0d05234bd8 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 384e4392e3..e04553763a 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 f00260096d..039def1305 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 b7c6dbb186..43475aeb4f 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 e778efd682..11a3cf5c27 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 d28aff1d63..2cd220ef58 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 eb5051a9b7..8a59127256 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 f3b078c94b..3e04069408 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 2c9fc5f54d..cb7376f932 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 5a51bf6a1f..bf6174a4a3 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 1147012177..14297df8be 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 cb960956ed..50882e67d9 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 51847ce09a..dcb26c2d9a 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 e910e88839..38aa7f958a 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 498ca4f03f..e5e2dc4a81 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 704abcfe33..8a2873c336 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 7232e45976..2031923d37 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 7230c096e6..3d8f11345a 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 2a9ec5fe8b..7c43774d8b 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 f7fcfb2912..8c83e2c407 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 e7e3d3c20f..8d2e7b45d6 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 cf7e86efda..abbfd8c1d1 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 1cb57fb01a..c3882eaefb 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 4939bd66d3..d026636017 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 71747269da..2c8f3b42c1 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 eaf52f44b1..61ca7df05a 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 4f3d48c663..fcf98a23de 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 edea072720..f00697597e 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 963b15171b..b06704e959 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 2650df89d3..ed59f34ceb 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 6b9837d64a..efd2752469 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 0845c9d7ca..d8231cea70 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 265e6bcc77..ffaefea8cb 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