more file cosmetics

src/plugins/coreplugin/rightpane.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "rightpane.h"
 
 #include <QtGui/QVBoxLayout>

src/plugins/coreplugin/rightpane.h

@@ -30,16 +30,18 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RIGHTPANE_H
 #define RIGHTPANE_H
 
 #include "core_global.h"
+
 #include <QtGui/QWidget>
 #include <QtCore/QSettings>
 
 namespace Core {
-class IMode;
 
+class IMode;
 class RightPaneWidget;
 
 // TODO: The right pane works only for the help plugin atm.
@@ -104,5 +106,4 @@ private:
 
 } // namespace Core
 
-
 #endif // RIGHTPANE_H

src/plugins/coreplugin/scriptmanager/metatypedeclarations.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef METATYPEDECLARATIONS_H
 #define METATYPEDECLARATIONS_H
 

src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp

@@ -30,9 +30,14 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "qworkbench_wrapper.h"
+
 #include <wrap_helpers.h>
 
+#include <coreplugin/messagemanager.h>
+#include <coreplugin/editormanager/editorgroup.h>
+
 #include <QtCore/QDebug>
 #include <QtCore/QSettings>
 
@@ -41,9 +46,6 @@
 #include <QtGui/QToolBar>
 #include <QtScript/QScriptEngine>
 
-#include <coreplugin/messagemanager.h>
-#include <coreplugin/editormanager/editorgroup.h>
-
 namespace {
     enum { debugQWorkbenchWrappers = 0 };
 }
@@ -377,5 +379,5 @@ Core::EditorGroup *EditorGroupPrototype::callee() const
     return rc;
 }
 
-}
+} // namespace Internal
-}
+} // namespace Core

src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef QWORKBENCH_WRAPPER_H
 #define QWORKBENCH_WRAPPER_H
 
@@ -45,7 +46,8 @@ namespace Internal {
 
 // Script prototype for the core interface.
 
-class CorePrototype : public QObject, public QScriptable {
+class CorePrototype : public QObject, public QScriptable
+{
     Q_OBJECT
 
     Q_PROPERTY(Core::MessageManager* messageManager READ messageManager DESIGNABLE false SCRIPTABLE true STORED false)
@@ -97,7 +99,8 @@ public slots:
 
 // Script prototype for the file manager interface.
 
-class FileManagerPrototype : public QObject, public QScriptable {
+class FileManagerPrototype : public QObject, public QScriptable
+{
     Q_OBJECT
 
     Q_PROPERTY(QStringList recentFiles READ recentFiles DESIGNABLE false SCRIPTABLE true STORED false)
@@ -163,7 +166,8 @@ private:
 
 // Script prototype for the editor manager interface.
 
-class EditorManagerPrototype : public QObject, public QScriptable {
+class EditorManagerPrototype : public QObject, public QScriptable
+{
     Q_OBJECT
     Q_PROPERTY(Core::IEditor* currentEditor READ currentEditor WRITE setCurrentEditor DESIGNABLE false SCRIPTABLE true STORED false)
     Q_PROPERTY(QList<Core::IEditor*> openedEditors READ openedEditors DESIGNABLE false SCRIPTABLE true STORED false)
@@ -195,7 +199,8 @@ private:
 
 // Script prototype for the editor interface.
 
-class EditorPrototype :  public QObject, public QScriptable {
+class EditorPrototype :  public QObject, public QScriptable
+{
     Q_OBJECT
     Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName DESIGNABLE false SCRIPTABLE true STORED false)
     Q_PROPERTY(QString kind READ kind DESIGNABLE false SCRIPTABLE true STORED false)
@@ -228,7 +233,8 @@ private:
 
 // Script prototype for the editor group interface with Script-managed life cycle.
 
-class EditorGroupPrototype :  public QObject, public QScriptable {
+class EditorGroupPrototype :  public QObject, public QScriptable
+{
     Q_OBJECT
     Q_PROPERTY(int editorCount READ editorCount DESIGNABLE false SCRIPTABLE true STORED false)
     Q_PROPERTY(Core::IEditor* currentEditor READ currentEditor WRITE setCurrentEditor DESIGNABLE false SCRIPTABLE true STORED false)

src/plugins/coreplugin/scriptmanager/scriptmanager.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "scriptmanager.h"
 #include "qworkbench_wrapper.h"
 #include "metatypedeclarations.h"
@@ -309,5 +310,5 @@ QString ScriptManager::engineError(QScriptEngine &scriptEngine)
     return QObject::tr("Unknown error");
 }
 
-}
+} // namespace Internal
-}
+} // namespace Core

src/plugins/coreplugin/scriptmanager/scriptmanager.h

@@ -30,16 +30,17 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SCRIPTMANAGER_H
 #define SCRIPTMANAGER_H
 
+#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
+#include <coreplugin/icore.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QList>
 #include <QtScript/QScriptEngine>
 
-#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
-#include <coreplugin/icore.h>
-
 namespace Core {
 namespace Internal {
 

src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SCRIPTMANAGERINTERFACE_H
 #define SCRIPTMANAGERINTERFACE_H
 

src/plugins/coreplugin/sidebar.cpp

@@ -30,9 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "sidebar.h"
 #include "imode.h"
 #include "modemanager.h"
+
 #include "actionmanager/actionmanagerinterface.h"
 
 #include <QtCore/QDebug>

src/plugins/coreplugin/sidebar.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SIDEBAR_H
 #define SIDEBAR_H
 

src/plugins/coreplugin/styleanimator.cpp

@@ -30,11 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "styleanimator.h"
 
 #include <QtGui/QStyleOption>
 
-
 Animation * StyleAnimator::widgetAnimation(const QWidget *widget) const
 {
     if (!widget)

src/plugins/coreplugin/styleanimator.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ANIMATION_H
 #define ANIMATION_H
 

src/plugins/coreplugin/stylehelper.cpp

@@ -30,20 +30,23 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "stylehelper.h"
 
 #include <QtGui/QPixmapCache>
 #include <QtGui/QWidget>
 
 // Clamps float color values within (0, 255)
-static int clamp(float x) {
+static int clamp(float x)
+{
     const int val = x > 255 ? 255 : static_cast<int>(x);
     return val < 0 ? 0 : val;
 }
 
 // Clamps float color values within (0, 255)
 /*
-static int range(float x, int min, int max) {
+static int range(float x, int min, int max)
+{
     int val = x > max ? max : x;
     return val < min ? min : val;
 }

src/plugins/coreplugin/stylehelper.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef STYLEHELPER_H
 #define STYLEHELPER_H
 
@@ -43,7 +44,8 @@
 
 // Helper class holding all custom color values
 
-class CORE_EXPORT StyleHelper {
+class CORE_EXPORT StyleHelper
+{
 public:
     // Height of the project explorer navigation bar
     static int navigationWidgetHeight() { return 24; }

src/plugins/coreplugin/tabpositionindicator.cpp

@@ -30,19 +30,19 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+#include "tabpositionindicator.h"
+
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QBrush>
 #include <QtGui/QPalette>
 
-#include "tabpositionindicator.h"
-
 using namespace Core::Internal;
 
 TabPositionIndicator::TabPositionIndicator()
     : QWidget(0, Qt::ToolTip)
 {
-
 }
 
 void TabPositionIndicator::paintEvent(QPaintEvent *event)

src/plugins/coreplugin/tabpositionindicator.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef TABPOSITIONINDICATOR_H
 #define TABPOSITIONINDICATOR_H
 
@@ -43,9 +44,10 @@ namespace Internal {
 class TabPositionIndicator : public QWidget
 {
     Q_OBJECT
+
 public:
     TabPositionIndicator();
-    inline int indicatorWidth() { return TABPOSITIONINDICATOR_WIDTH; }
+    int indicatorWidth() { return TABPOSITIONINDICATOR_WIDTH; }
 
 private:
     void paintEvent(QPaintEvent *event);

src/plugins/coreplugin/uniqueidmanager.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "uniqueidmanager.h"
 #include "coreconstants.h"
 

src/plugins/coreplugin/uniqueidmanager.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef UNIQUEIDMANAGER_H
 #define UNIQUEIDMANAGER_H
 

src/plugins/coreplugin/variablemanager.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "variablemanager.h"
 
 using namespace Core;

src/plugins/coreplugin/variablemanager.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef VARIABLEMANAGER_H
 #define VARIABLEMANAGER_H
 

src/plugins/coreplugin/vcsmanager.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "vcsmanager.h"
 #include "iversioncontrol.h"
 
@@ -110,4 +111,4 @@ void VCSManager::showDeleteDialog(const QString &fileName)
     }
 }
 
-}
+} // namespace Core

src/plugins/coreplugin/vcsmanager.h

@@ -30,11 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef VCSMANAGER_H
 #define VCSMANAGER_H
 
-
 #include "core_global.h"
+
 #include <QtCore/QString>
 
 namespace Core {

src/plugins/coreplugin/versiondialog.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "versiondialog.h"
 #include "coreconstants.h"
 #include "coreimpl.h"
@@ -46,8 +47,8 @@ using namespace Core::Constants;
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QTextBrowser>
 
-VersionDialog::VersionDialog(QWidget *parent):
+VersionDialog::VersionDialog(QWidget *parent)
-    QDialog(parent)
+    : QDialog(parent)
 {
     // We need to set the window icon explicitly here since for some reason the
     // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME)

src/plugins/coreplugin/versiondialog.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef VERSIONDIALOG_H
 #define VERSIONDIALOG_H
 

src/plugins/coreplugin/viewmanager.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "viewmanager.h"
 
 #include "coreconstants.h"
@@ -37,24 +38,23 @@
 #include "uniqueidmanager.h"
 #include "iview.h"
 
-#include <QtCore/QSettings>
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
-#include <QtGui/QDockWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QMenu>
-#include <QtGui/QStatusBar>
-#include <QtGui/QLabel>
-#include <QtGui/QComboBox>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QToolButton>
-
 #include <coreplugin/actionmanager/actionmanagerinterface.h>
 #include <coreplugin/actionmanager/icommand.h>
 #include <extensionsystem/ExtensionSystemInterfaces>
 #include <aggregation/aggregate.h>
 
+#include <QtCore/QSettings>
+#include <QtGui/QAction>
+#include <QtGui/QActionGroup>
+#include <QtGui/QComboBox>
+#include <QtGui/QDockWidget>
 #include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QMenu>
+#include <QtGui/QStackedWidget>
+#include <QtGui/QStatusBar>
+#include <QtGui/QToolButton>
+#include <QtGui/QVBoxLayout>
 
 using namespace Core;
 using namespace Core::Internal;

src/plugins/coreplugin/viewmanager.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef VIEWMANAGER_H
 #define VIEWMANAGER_H
 

src/plugins/coreplugin/viewmanagerinterface.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef VIEWMANAGERINTERFACE_H
 #define VIEWMANAGERINTERFACE_H
 

src/plugins/coreplugin/welcomemode.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "welcomemode.h"
 #include "coreconstants.h"
 #include "uniqueidmanager.h"
@@ -65,7 +66,8 @@ static QString readFile(const QString &name)
     return ts.readAll();
 }
 
-struct WelcomeModePrivate {
+struct WelcomeModePrivate
+{
     WelcomeModePrivate();
 
     QWidget *m_widget;

src/plugins/coreplugin/welcomemode.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef WELCOMEMODE_H
 #define WELCOMEMODE_H
 
@@ -44,7 +45,6 @@ class QLabel;
 QT_END_NAMESPACE
 
 namespace Core {
-
 namespace Internal {
 
 struct WelcomeModePrivate;

src/plugins/cpaster/cpasterplugin.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cpasterplugin.h"
 
 #include "ui_pasteselect.h"
@@ -64,9 +65,7 @@ using namespace TextEditor;
 Core::ICore *gCoreInstance = NULL;
 
 CodepasterPlugin::CodepasterPlugin()
-        : m_settingsPage(0)
+    : m_settingsPage(0), m_fetcher(0), m_poster(0)
-        , m_fetcher(0)
-        , m_poster(0)
 {
 }
 
@@ -125,7 +124,8 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
 
 void CodepasterPlugin::extensionsInitialized()
 {
-    m_projectExplorer = ExtensionSystem::PluginManager::instance()->getObject<ProjectExplorer::ProjectExplorerPlugin>();
+    m_projectExplorer = ExtensionSystem::PluginManager::instance()
+        ->getObject<ProjectExplorer::ProjectExplorerPlugin>();
 }
 
 void CodepasterPlugin::post()
@@ -268,18 +268,14 @@ void CustomFetcher::list(QListWidget* list)
     Fetcher::fetch(url);
 }
 
-CustomPoster::CustomPoster(const QString &host
+CustomPoster::CustomPoster(const QString &host, bool copyToClipboard, bool displayOutput)
-                           , bool copyToClipboard
+    : Poster(host), m_copy(copyToClipboard), m_output(displayOutput)
-                           , bool displayOutput)
-        : Poster(host)
-        , m_copy(copyToClipboard)
-        , m_output(displayOutput)
 {
     // cpaster calls QCoreApplication::exit which we want to avoid here
-    disconnect(this, SIGNAL(requestFinished(int,bool))
+    disconnect(this, SIGNAL(requestFinished(int,bool)),
-              ,this, SLOT(gotRequestFinished(int,bool)));
+              this, SLOT(gotRequestFinished(int,bool)));
-    connect(this, SIGNAL(requestFinished(int,bool))
+    connect(this, SIGNAL(requestFinished(int,bool)),
-                    , SLOT(customRequestFinished(int,bool)));
+                  SLOT(customRequestFinished(int,bool)));
 }
 
 void CustomPoster::customRequestFinished(int, bool error)

src/plugins/cpaster/cpasterplugin.h

@@ -30,8 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef CodepasterPlugin_H
+
-#define CodepasterPlugin_H
+#ifndef CODEPASTERPLUGIN_H
+#define CODEPASTERPLUGIN_H
 
 #include "settingspage.h"
 #include "fetcher.h"
@@ -61,8 +62,7 @@ public:
     CodepasterPlugin();
     ~CodepasterPlugin();
 
-    bool                        initialize(const QStringList &arguments
+    bool initialize(const QStringList &arguments, QString *error_message);
-                                           , QString *error_message);
     void extensionsInitialized();
 
 public slots:
@@ -79,16 +79,19 @@ private:
     CustomPoster  *m_poster;
 };
 
+
 class CustomFetcher : public Fetcher
 {
     Q_OBJECT
+
 public:
     CustomFetcher(const QString &host);
 
     int fetch(int pasteID);
-    inline bool                 hadCustomError() { return m_customError; }
+    bool hadCustomError() { return m_customError; }
 
     void list(QListWidget *);
+
 private slots:
     void customRequestFinished(int id, bool error);
 
@@ -99,16 +102,17 @@ private:
     bool m_customError;
 };
 
+
 class CustomPoster : public Poster
 {
     Q_OBJECT
 public:
-                                CustomPoster(const QString &host
+    CustomPoster(const QString &host, bool copyToClipboard = true,
-                                             , bool copyToClipboard = true
+                 bool displayOutput = true);
-                                             , bool displayOutput = true);
 
 private slots:
     void customRequestFinished(int id, bool error);
+
 private:
     bool m_copy;
     bool m_output;
@@ -116,4 +120,4 @@ private:
 
 } // namespace CodePaster
 
-#endif
+#endif // CODEPASTERPLUGIN_H

src/plugins/cpaster/settingspage.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "settingspage.h"
 
 #include <coreplugin/icore.h>

src/plugins/cpaster/settingspage.h

@@ -30,15 +30,16 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SETTINGSPAGE_H
 #define SETTINGSPAGE_H
 
-#include <QtCore/QUrl>
+#include "ui_settingspage.h"
-#include <QtGui/QWidget>
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include "ui_settingspage.h"
+#include <QtCore/QUrl>
+#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
@@ -78,4 +79,4 @@ private:
 
 } // namespace CodePaster
 
-#endif
+#endif // SETTINGSPAGE_H

src/plugins/cppeditor/cppclasswizard.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cppclasswizard.h"
 #include "cppeditorconstants.h"
 

src/plugins/cppeditor/cppclasswizard.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPCLASSWIZARD_H
 #define CPPCLASSWIZARD_H
 

src/plugins/cppeditor/cppeditor.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cppeditor.h"
 #include "cppeditorconstants.h"
 #include "cppplugin.h"

src/plugins/cppeditor/cppeditor.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPEDITOR_H
 #define CPPEDITOR_H
 

src/plugins/cppeditor/cppeditor_global.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPEDITOR_GLOBAL_H
 #define CPPEDITOR_GLOBAL_H
 

src/plugins/cppeditor/cppeditoractionhandler.cpp

@@ -48,7 +48,11 @@ CPPEditorActionHandler::~CPPEditorActionHandler()
 { }
 
 void CPPEditorActionHandler::createActions()
-{ TextEditor::TextEditorActionHandler::createActions(); }
+{
+    TextEditor::TextEditorActionHandler::createActions();
+}
 
 void CPPEditorActionHandler::updateActions(UpdateMode um)
-{ TextEditor::TextEditorActionHandler::updateActions(um); }
+{
+    TextEditor::TextEditorActionHandler::updateActions(um);
+}

src/plugins/cppeditor/cppeditoractionhandler.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPEDITORACTIONHANDLER_H
 #define CPPEDITORACTIONHANDLER_H
 

src/plugins/cppeditor/cppeditorconstants.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPPLUGIN_GLOBAL_H
 #define CPPPLUGIN_GLOBAL_H
 
@@ -53,6 +54,7 @@ const char * const C_SOURCE_MIMETYPE = "text/x-csrc";
 const char * const C_HEADER_MIMETYPE = "text/x-chdr";
 const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
 const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
+
 } // namespace Constants
 } // namespace CppEditor
 

src/plugins/cppeditor/cppeditorenums.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPPLUGIN_ENUMS_H
 #define CPPPLUGIN_ENUMS_H
 

src/plugins/cppeditor/cppfilewizard.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cppfilewizard.h"
 #include "cppeditor.h"
 #include "cppeditorconstants.h"

src/plugins/cppeditor/cppfilewizard.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPFILEWIZARD_H
 #define CPPFILEWIZARD_H
 

src/plugins/cppeditor/cpphighlighter.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cpphighlighter.h"
 
 #include <Token.h>

src/plugins/cppeditor/cpphighlighter.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPHIGHLIGHTER_H
 #define CPPHIGHLIGHTER_H
 

src/plugins/cppeditor/cppplugin.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cppplugin.h"
 #include "cppeditor.h"
 #include "cppeditorconstants.h"

src/plugins/cppeditor/cppplugin.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPPLUGIN_H
 #define CPPPLUGIN_H
 

src/plugins/cpptools/cppcodecompletion.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cppcodecompletion.h"
 #include "cppmodelmanager.h"
 

src/plugins/cpptools/cppcodecompletion.h

@@ -30,13 +30,10 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPCODECOMPLETION_H
 #define CPPCODECOMPLETION_H
 
-// Qt
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-
 // C++ front-end
 #include <ASTfwd.h>
 #include <FullySpecifiedType.h>
@@ -47,6 +44,10 @@
 // Qt Creator
 #include <texteditor/icompletioncollector.h>
 
+// Qt
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+
 namespace Core {
 class ICore;
 }

src/plugins/cpptools/cpphoverhandler.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cpphoverhandler.h"
 #include "cppmodelmanager.h"
 

src/plugins/cpptools/cpphoverhandler.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPHOVERHANDLER_H
 #define CPPHOVERHANDLER_H
 

src/plugins/cpptools/cppmodelmanager.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #define _SCL_SECURE_NO_WARNINGS 1
 #include "pp.h"
 

src/plugins/cpptools/cppmodelmanager.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPMODELMANAGER_H
 #define CPPMODELMANAGER_H
 

src/plugins/cpptools/cppmodelmanagerinterface.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPMODELMANAGERINTERFACE_H
 #define CPPMODELMANAGERINTERFACE_H
 

src/plugins/cpptools/cppquickopenfilter.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cppquickopenfilter.h"
 
 #include <Literals.h>

src/plugins/cpptools/cppquickopenfilter.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPQUICKOPENFILTER_H
 #define CPPQUICKOPENFILTER_H
 

src/plugins/cpptools/cpptools.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cpptools.h"
 #include "cppcodecompletion.h"
 #include "cpphoverhandler.h"

src/plugins/cpptools/cpptools.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPTOOLS_H
 #define CPPTOOLS_H
 

src/plugins/cpptools/cpptools_global.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPTOOLS_GLOBAL_H
 #define CPPTOOLS_GLOBAL_H
 

src/plugins/cpptools/cpptoolsconstants.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPTOOLSCONSTANTS_H
 #define CPPTOOLSCONSTANTS_H
 
@@ -43,7 +44,8 @@ const char * const C_SOURCE_MIMETYPE = "text/x-csrc";
 const char * const C_HEADER_MIMETYPE = "text/x-chdr";
 const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
 const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
-}
+
-}
+} // namespace Constants
+} // namespace CppTools
 
 #endif // CPPTOOLSCONSTANTS_H

src/plugins/cpptools/cpptoolseditorsupport.cpp

@@ -35,6 +35,7 @@
 #include "cppmodelmanager.h"
 
 #include <texteditor/itexteditor.h>
+
 #include <QTimer>
 
 using namespace CppTools::Internal;

src/plugins/cpptools/cpptoolseditorsupport.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPTOOLSEDITORSUPPORT_H
 #define CPPTOOLSEDITORSUPPORT_H
 
@@ -81,7 +82,7 @@ private:
     QFuture<void> _documentParser;
 };
 
-} // end of namespace Internal
+} // namespace Internal
-} // end of namespace CppTools
+} // namespace CppTools
 
 #endif // CPPTOOLSEDITORSUPPORT_H

src/plugins/cpptools/rpp/pp-cctype.h

@@ -72,5 +72,3 @@ inline bool pp_isspace (int __ch)
 } // namespace rpp
 
 #endif // PP_CCTYPE_H
-
-// kate: space-indent on; indent-width 2; replace-tabs on;

src/plugins/cpptools/rpp/pp-client.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PP_CLIENT_H
 #define PP_CLIENT_H
 
@@ -64,6 +65,6 @@ public:
   virtual void stopSkippingBlocks(unsigned offset) = 0;
 };
 
-} // end of namespace rpp
+} // namespace rpp
 
 #endif // PP_CLIENT_H

src/plugins/cpptools/rpp/pp-engine.cpp

@@ -51,6 +51,7 @@
 */
 
 #include "pp.h"
+
 #include <Lexer.h>
 #include <Token.h>
 #include <QtDebug>

src/plugins/cpptools/rpp/pp-engine.h

@@ -54,6 +54,7 @@
 #define PP_ENGINE_H
 
 #include "pp-client.h"
+
 #include <Token.h>
 #include <QVector>
 

src/plugins/cpptools/rpp/pp-internal.h

@@ -56,9 +56,7 @@
 #include <QByteArray>
 
 namespace rpp {
-
+namespace _PP_internal {
-    namespace _PP_internal
-    {
 
 inline bool comment_p (const char *__first, const char *__last)
 {
@@ -75,7 +73,6 @@ namespace rpp {
 }
 
 } // _PP_internal
-
 } // namespace rpp
 
 #endif // PP_INTERNAL_H

src/plugins/debugger/assert.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_QWB_ASSERT_H
 #define DEBUGGER_QWB_ASSERT_H
 
@@ -41,5 +42,5 @@
     if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED";action;}
 #endif
 
-#endif
+#endif // DEBUGGER_QWB_ASSERT_H
 

src/plugins/debugger/attachexternaldialog.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "attachexternaldialog.h"
 
 #include <QDebug>
@@ -39,6 +40,13 @@
 #include <QStandardItemModel>
 #include <QHeaderView>
 
+#ifdef Q_OS_WINDOWS
+#include <windows.h>
+#include <tlhelp32.h>
+#include <tchar.h>
+#include <stdio.h>
+#endif
+
 using namespace Debugger::Internal;
 
 AttachExternalDialog::AttachExternalDialog(QWidget *parent, const QString &pid)
@@ -70,7 +78,8 @@ static bool isProcessName(const QString &procname)
     return true;
 }
 
-struct ProcData {
+struct ProcData
+{
     QString ppid;
     QString name;
     QString state;
@@ -143,11 +152,6 @@ void AttachExternalDialog::rebuildProcessList()
 
 #ifdef Q_OS_WINDOWS
 
-#include <windows.h>
-#include <tlhelp32.h>
-#include <tchar.h>
-#include <stdio.h>
-
 //  Forward declarations:
 BOOL GetProcessList( );
 BOOL ListProcessModules( DWORD dwPID );

src/plugins/debugger/attachexternaldialog.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ATTACHEXTERNALDIALOG_H
 #define ATTACHEXTERNALDIALOG_H
 

src/plugins/debugger/attachremotedialog.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "attachremotedialog.h"
 
 #include <QDebug>

src/plugins/debugger/attachremotedialog.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ATTACHREMOTE_DIALOG_H
 #define ATTACHREMOTE_DIALOG_H
 

src/plugins/debugger/breakhandler.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "breakhandler.h"
 
 #include "assert.h"

src/plugins/debugger/breakhandler.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_BREAKHANDLER_H
 #define DEBUGGER_BREAKHANDLER_H
 

src/plugins/debugger/breakwindow.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "breakwindow.h"
 
 #include "ui_breakcondition.h"

src/plugins/debugger/breakwindow.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_BREAKWINDOW_H
 #define DEBUGGER_BREAKWINDOW_H
 

src/plugins/debugger/debuggerconstants.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGERCONSTANTS_H
 #define DEBUGGERCONSTANTS_H
 

src/plugins/debugger/debuggermanager.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_DEBUGGERMANAGER_H
 #define DEBUGGER_DEBUGGERMANAGER_H
 

src/plugins/debugger/debuggeroutputwindow.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "debuggeroutputwindow.h"
 
 #include <QtCore/QDebug>

src/plugins/debugger/debuggeroutputwindow.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_OUTPUTWINDOW_H
 #define DEBUGGER_OUTPUTWINDOW_H
 

src/plugins/debugger/debuggerplugin.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "debuggerplugin.h"
 
 #include "assert.h"

src/plugins/debugger/debuggerplugin.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGERPLUGIN_H
 #define DEBUGGERPLUGIN_H
 

src/plugins/debugger/debuggerrunner.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "debuggerrunner.h"
 
 #include "assert.h"

src/plugins/debugger/debuggerrunner.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGERRUNNER_H
 #define DEBUGGERRUNNER_H
 

src/plugins/debugger/disassemblerhandler.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "disassemblerhandler.h"
 
 #include "assert.h"

src/plugins/debugger/disassemblerhandler.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DISASSEMBLERHANDLER_H
 #define DISASSEMBLERHANDLER_H
 

src/plugins/debugger/disassemblerwindow.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "disassemblerwindow.h"
 
 #include <QAction>

src/plugins/debugger/disassemblerwindow.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_DISASSEMBLERWINDOW_H
 #define DEBUGGER_DISASSEMBLERWINDOW_H
 

src/plugins/debugger/gdbengine.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_GDBENGINE_H
 #define DEBUGGER_GDBENGINE_H
 

src/plugins/debugger/gdbmi.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "gdbmi.h"
 #include "assert.h"
 

src/plugins/debugger/gdboptionpage.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "gdboptionpage.h"
 
 #include "gdbengine.h"

src/plugins/debugger/gdboptionpage.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef GDBOPTIONPAGE_H
 #define GDBOPTIONPAGE_H
 

src/plugins/debugger/gdbtypemacros.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "gdboptionpage.h"
 #include "gdbengine.h"
 #include "imports.h"

src/plugins/debugger/idebuggerengine.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_IDEBUGGERENGINE_H
 #define DEBUGGER_IDEBUGGERENGINE_H
 

src/plugins/debugger/imports.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_IMPORTS_H
 #define DEBUGGER_IMPORTS_H
 

src/plugins/debugger/mode.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "mode.h"
 
 #include "assert.h"

src/plugins/debugger/mode.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_DEBUGMODE_H
 #define DEBUGGER_DEBUGMODE_H
 

src/plugins/debugger/moduleshandler.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "moduleshandler.h"
 
 #include "assert.h"

src/plugins/debugger/moduleshandler.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEBUGGER_MODULESHANDLER_H
 #define DEBUGGER_MODULESHANDLER_H