diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp
index c3110f77d06f1cebd4e09bc8836637828bd27f31..3c17b25583303c6d48db3602f30ee6f70571f688 100644
--- a/src/plugins/coreplugin/rightpane.cpp
+++ b/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>
diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h
index 89e717cbb2f1b9c272c8b5cb88b72e89782be1ef..c542c85f4c3baffe2031ec11674f949617aacdec 100644
--- a/src/plugins/coreplugin/rightpane.h
+++ b/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
diff --git a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h b/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h
index 02e04bc64874bcfb90fe0368186583966bca9103..aa4ab9a4f53d2100bcfdabd9fbd7f52e60a46b89 100644
--- a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h
+++ b/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
diff --git a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
index 91a43659021bb55030359c09b3a602bd6b9e229a..28c3c658e66f3ed4dab51a8148b99bb875c51c5f 100644
--- a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
+++ b/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
diff --git a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
index 7cf7bb86d6fd4ec33249f695b454ef3f07677e72..4efa9cc8a6c49a5e8c54cf8f398516b3c1231d5e 100644
--- a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
+++ b/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)
@@ -259,4 +265,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif //QWORKBENCH_WRAPPER_H
+#endif // QWORKBENCH_WRAPPER_H
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
index f768daccbe898cb86f74ae31669411e273dd95de..5613bd6781a0553aeb24406445dd824fdf0d1109 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+++ b/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
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.h b/src/plugins/coreplugin/scriptmanager/scriptmanager.h
index 0944ede127d82b9109def7035cac0d6ecf12c83c..06ef0ed3d629c2d93211b24a6a5ee7b8a15267bc 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.h
+++ b/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 {
@@ -68,4 +69,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif //SCRIPTMANAGER_H
+#endif // SCRIPTMANAGER_H
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h b/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h
index a5c7a53f7cb6a7569737fb5574de37b27e546af0..22ed62af2bd9c6b160f348e01c77fe77bfc36660 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h
+++ b/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
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index d88ae74f65f4f3567ff60fe4c5953f0c8ac31e49..0ef66fc809422b1ae62ae6c6fbffb91dff730c26 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/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>
diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h
index 33876309fc7f1d83ab4612693a4dbf73ad4e4e88..566342fa4e73807a5ee870654de1d18ffebb8f51 100644
--- a/src/plugins/coreplugin/sidebar.h
+++ b/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
diff --git a/src/plugins/coreplugin/styleanimator.cpp b/src/plugins/coreplugin/styleanimator.cpp
index b23600e3971a013227088f72e15d2abeeba3dae9..e69c48200d0a1c62d968a773e90e7d6c1cb743a0 100644
--- a/src/plugins/coreplugin/styleanimator.cpp
+++ b/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)
diff --git a/src/plugins/coreplugin/styleanimator.h b/src/plugins/coreplugin/styleanimator.h
index 594df3eceaa33fb6d562bf18e58b6d2666704076..24e137dfbe131843ec41369fe919a0b208312c0f 100644
--- a/src/plugins/coreplugin/styleanimator.h
+++ b/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
diff --git a/src/plugins/coreplugin/stylehelper.cpp b/src/plugins/coreplugin/stylehelper.cpp
index d2eed7a0148f9574e194a1d335ae2e945e74fd9b..23769937bf37281048d9be37ea1f166517cdf7cf 100644
--- a/src/plugins/coreplugin/stylehelper.cpp
+++ b/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;
}
diff --git a/src/plugins/coreplugin/stylehelper.h b/src/plugins/coreplugin/stylehelper.h
index d57f14df7813c515012a10677f820802abdab2b3..2a3cf3f54b4524360f3bc6bfe7d1ae6d0dba4409 100644
--- a/src/plugins/coreplugin/stylehelper.h
+++ b/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; }
diff --git a/src/plugins/coreplugin/tabpositionindicator.cpp b/src/plugins/coreplugin/tabpositionindicator.cpp
index 5dcc02bbbdb2df7dedd2df88a0e07c1ac5fb9e43..2a4a267adbcddd46b55631f700c76a47b2d5a52a 100644
--- a/src/plugins/coreplugin/tabpositionindicator.cpp
+++ b/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)
diff --git a/src/plugins/coreplugin/tabpositionindicator.h b/src/plugins/coreplugin/tabpositionindicator.h
index ac4e87525f5881eef5fdca2000701bc74433f917..14342483052464e99968e535c3f77015d4a2be5d 100644
--- a/src/plugins/coreplugin/tabpositionindicator.h
+++ b/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);
@@ -54,4 +56,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif //TABPOSITIONINDICATOR_H
+#endif // TABPOSITIONINDICATOR_H
diff --git a/src/plugins/coreplugin/uniqueidmanager.cpp b/src/plugins/coreplugin/uniqueidmanager.cpp
index 2a8e42742e0d25bf39cd9fc66c403e3b87b89ce3..6199180c7fc62ec044580e45ed0f85efef8b088d 100644
--- a/src/plugins/coreplugin/uniqueidmanager.cpp
+++ b/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"
diff --git a/src/plugins/coreplugin/uniqueidmanager.h b/src/plugins/coreplugin/uniqueidmanager.h
index 9a42088c9f1f6652d2c9f321672ab75b2581ad01..e740ab8fe6d9ae2a365ecf59a2eda71d9bdf00d8 100644
--- a/src/plugins/coreplugin/uniqueidmanager.h
+++ b/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
diff --git a/src/plugins/coreplugin/variablemanager.cpp b/src/plugins/coreplugin/variablemanager.cpp
index 2432ab37f62641fb32b0f744a02275c3c80dfcb7..44263e044a0bd74366b8573488f1224750885b07 100644
--- a/src/plugins/coreplugin/variablemanager.cpp
+++ b/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;
diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h
index d5e7a6d8157a2004e70ae88fd8fcdb725f42961b..a148551d9fd10804ffff6fdfde01cb6904e4e39c 100644
--- a/src/plugins/coreplugin/variablemanager.h
+++ b/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
diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp
index fb88d44e4e04bfbb7337c6fe2304ba278fd9dca5..a0e1cc19c0ad2663899efcf53a566deeeba574da 100644
--- a/src/plugins/coreplugin/vcsmanager.cpp
+++ b/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
diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h
index 8cbac49011804efe979df8ef39945b1117fb84ad..92e4f35d1540a2a2282b1fb361ae35ea231a75ef 100644
--- a/src/plugins/coreplugin/vcsmanager.h
+++ b/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 {
diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp
index 5fc8fd1ab13f1074cad06eb5589c175a8993058a..d2ad590ef693edaf3c0f1f1079db42e4e89c836a 100644
--- a/src/plugins/coreplugin/versiondialog.cpp
+++ b/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):
- QDialog(parent)
+VersionDialog::VersionDialog(QWidget *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)
diff --git a/src/plugins/coreplugin/versiondialog.h b/src/plugins/coreplugin/versiondialog.h
index 5019390032809092468e128ef92bf6a7d05df374..d53adab9ab6eb093311d32f1f6ad35551bd56f68 100644
--- a/src/plugins/coreplugin/versiondialog.h
+++ b/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
diff --git a/src/plugins/coreplugin/viewmanager.cpp b/src/plugins/coreplugin/viewmanager.cpp
index d985a46bab67a0e9e42cd9313971e3468d71ffac..71ee11329945ebc9312dbbe238a2bb6145fac31f 100644
--- a/src/plugins/coreplugin/viewmanager.cpp
+++ b/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 <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/QVBoxLayout>
-#include <QtGui/QMenu>
-#include <QtGui/QStatusBar>
+#include <QtGui/QHBoxLayout>
#include <QtGui/QLabel>
-#include <QtGui/QComboBox>
+#include <QtGui/QMenu>
#include <QtGui/QStackedWidget>
+#include <QtGui/QStatusBar>
#include <QtGui/QToolButton>
-
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
-#include <coreplugin/actionmanager/icommand.h>
-#include <extensionsystem/ExtensionSystemInterfaces>
-#include <aggregation/aggregate.h>
-
-#include <QtGui/QHBoxLayout>
+#include <QtGui/QVBoxLayout>
using namespace Core;
using namespace Core::Internal;
diff --git a/src/plugins/coreplugin/viewmanager.h b/src/plugins/coreplugin/viewmanager.h
index 96adcad18af6451080f6c4f07e9f0cb27d8a09ff..2405b576661a608bd2fcf3c95ed3a25732a1d351 100644
--- a/src/plugins/coreplugin/viewmanager.h
+++ b/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
@@ -83,4 +84,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif //VIEWMANAGER_H
+#endif // VIEWMANAGER_H
diff --git a/src/plugins/coreplugin/viewmanagerinterface.h b/src/plugins/coreplugin/viewmanagerinterface.h
index 6a86a730bb7e5a69bf5c66e4f2c8dd9a869aaa61..ddff06984afee771bc6cd1fbb96ec07e8bb56133 100644
--- a/src/plugins/coreplugin/viewmanagerinterface.h
+++ b/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
@@ -59,6 +60,6 @@ public:
virtual IView * view(const QString & id) = 0;
};
-} //namespace Core
+} // namespace Core
-#endif //VIEWMANAGERINTERFACE_H
+#endif // VIEWMANAGERINTERFACE_H
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index 8ea880fcb47317e8f4b31378b6b2db49151dc392..e90a4db6bb37d7a461b84a394cb5189b6809457c 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/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;
diff --git a/src/plugins/coreplugin/welcomemode.h b/src/plugins/coreplugin/welcomemode.h
index df99f37d5df8f70bd26598bd73e3e68a41170077..f69b8226a72adacb14e9b54834ccfd58b6c9d936 100644
--- a/src/plugins/coreplugin/welcomemode.h
+++ b/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;
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index ac7fc7624bd165060468b317b5101e179ad38ce7..2a4808891815c537759404da3bed26ad8bc49044 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/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_fetcher(0)
- , m_poster(0)
+ : m_settingsPage(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
- , bool copyToClipboard
- , bool displayOutput)
- : Poster(host)
- , m_copy(copyToClipboard)
- , m_output(displayOutput)
+CustomPoster::CustomPoster(const QString &host, bool copyToClipboard, 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))
- ,this, SLOT(gotRequestFinished(int,bool)));
- connect(this, SIGNAL(requestFinished(int,bool))
- , SLOT(customRequestFinished(int,bool)));
+ disconnect(this, SIGNAL(requestFinished(int,bool)),
+ this, SLOT(gotRequestFinished(int,bool)));
+ connect(this, SIGNAL(requestFinished(int,bool)),
+ SLOT(customRequestFinished(int,bool)));
}
void CustomPoster::customRequestFinished(int, bool error)
diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h
index f758352d181c840edf495297939adb09accb120e..3231fe48d91263a164839810e33a70902526b8e2 100644
--- a/src/plugins/cpaster/cpasterplugin.h
+++ b/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"
@@ -58,62 +59,65 @@ class CodepasterPlugin : public ExtensionSystem::IPlugin
Q_OBJECT
public:
- CodepasterPlugin();
- ~CodepasterPlugin();
+ CodepasterPlugin();
+ ~CodepasterPlugin();
- bool initialize(const QStringList &arguments
- , QString *error_message);
- void extensionsInitialized();
+ bool initialize(const QStringList &arguments, QString *error_message);
+ void extensionsInitialized();
public slots:
- void post();
- void fetch();
+ void post();
+ void fetch();
private:
- QAction *m_postAction;
- QAction *m_fetchAction;
+ QAction *m_postAction;
+ QAction *m_fetchAction;
ProjectExplorer::ProjectExplorerPlugin *m_projectExplorer;
- SettingsPage *m_settingsPage;
- CustomFetcher *m_fetcher;
- CustomPoster *m_poster;
+ SettingsPage *m_settingsPage;
+ CustomFetcher *m_fetcher;
+ CustomPoster *m_poster;
};
+
class CustomFetcher : public Fetcher
{
Q_OBJECT
+
public:
- CustomFetcher(const QString &host);
+ CustomFetcher(const QString &host);
- int fetch(int pasteID);
- inline bool hadCustomError() { return m_customError; }
+ int fetch(int pasteID);
+ bool hadCustomError() { return m_customError; }
+
+ void list(QListWidget *);
- void list(QListWidget*);
private slots:
- void customRequestFinished(int id, bool error);
+ void customRequestFinished(int id, bool error);
private:
- QString m_host;
- QListWidget *m_listWidget;
- int m_id;
- bool m_customError;
+ QString m_host;
+ QListWidget *m_listWidget;
+ int m_id;
+ bool m_customError;
};
+
class CustomPoster : public Poster
{
Q_OBJECT
public:
- CustomPoster(const QString &host
- , bool copyToClipboard = true
- , bool displayOutput = true);
+ CustomPoster(const QString &host, bool copyToClipboard = true,
+ bool displayOutput = true);
private slots:
- void customRequestFinished(int id, bool error);
+ void customRequestFinished(int id, bool error);
+
private:
- bool m_copy;
- bool m_output;
+ bool m_copy;
+ bool m_output;
};
} // namespace CodePaster
-#endif
+#endif // CODEPASTERPLUGIN_H
diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp
index ce3994504e4481c82b0661b5b725884f1ec80bef..cc4d9117259ee078b3a34cf4d57afb6407566b1a 100644
--- a/src/plugins/cpaster/settingspage.cpp
+++ b/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>
diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h
index 947bf4c7d9d97689238d932f6f7404bd8bc2668e..9830b97ccaa47cb894ea66c0f8d8f2c53fa4d121 100644
--- a/src/plugins/cpaster/settingspage.h
+++ b/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 <QtGui/QWidget>
+#include "ui_settingspage.h"
#include <coreplugin/dialogs/ioptionspage.h>
-#include "ui_settingspage.h"
+#include <QtCore/QUrl>
+#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class QSettings;
@@ -51,31 +52,31 @@ class SettingsPage : public Core::IOptionsPage
Q_OBJECT
public:
- SettingsPage();
+ SettingsPage();
- QString name() const;
- QString category() const;
- QString trCategory() const;
+ QString name() const;
+ QString category() const;
+ QString trCategory() const;
- QWidget* createPage(QWidget *parent);
- void finished(bool accepted);
+ QWidget *createPage(QWidget *parent);
+ void finished(bool accepted);
- QString username() const;
- QUrl serverUrl() const;
+ QString username() const;
+ QUrl serverUrl() const;
- bool copyToClipBoard() const;
- bool displayOutput() const;
+ bool copyToClipBoard() const;
+ bool displayOutput() const;
private:
- Ui_SettingsPage m_ui;
- QSettings *m_settings;
+ Ui_SettingsPage m_ui;
+ QSettings *m_settings;
- QString m_username;
- QUrl m_server;
- bool m_copy;
- bool m_output;
+ QString m_username;
+ QUrl m_server;
+ bool m_copy;
+ bool m_output;
};
-} //namespace CodePaster
+} // namespace CodePaster
-#endif
+#endif // SETTINGSPAGE_H
diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp
index 47ec495510c372997c651e9744930aef69a94d1c..6730f5b9ed9c388184b1d6040bb55cfe433b0bda 100644
--- a/src/plugins/cppeditor/cppclasswizard.cpp
+++ b/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"
diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h
index 2e498829c87eb8720d0a524665e6fc7ea173b7fb..b0850d692898a49f9d0c0fffcc09b8b8fbfe85d2 100644
--- a/src/plugins/cppeditor/cppclasswizard.h
+++ b/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
@@ -45,9 +46,9 @@ class QComboBox;
QT_END_NAMESPACE
namespace Core {
- namespace Utils {
- class NewClassWidget;
- }
+namespace Utils {
+ class NewClassWidget;
+}
}
namespace CppEditor {
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 4f37d489e2f869dc78f2cd957451e05c864f72df..254e9341de66b16c24f814dfadeecd1ec0a7170d 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/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"
@@ -138,7 +139,7 @@ QualifiedNameId *qualifiedNameIdForSymbol(Symbol *s, const LookupContext &contex
}
CPPEditorEditable::CPPEditorEditable(CPPEditor *editor)
- :BaseTextEditorEditable(editor)
+ : BaseTextEditorEditable(editor)
{
Core::ICore *core = CppPlugin::core();
m_context << core->uniqueIDManager()->uniqueIdentifier(CppEditor::Constants::C_CPPEDITOR);
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 55794345be1e3a61a253772153abe4216086e0f0..e6c6d1aa8633cd807179308b2761685119a0a247 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/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
diff --git a/src/plugins/cppeditor/cppeditor_global.h b/src/plugins/cppeditor/cppeditor_global.h
index daff348df9d43cb3dcbab4a6db1766cb737bd153..68adb513b6f7ddf3aba704d0456d50173e1d8f06 100644
--- a/src/plugins/cppeditor/cppeditor_global.h
+++ b/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
diff --git a/src/plugins/cppeditor/cppeditoractionhandler.cpp b/src/plugins/cppeditor/cppeditoractionhandler.cpp
index a570970404ba022fe4cb45a2d9b3797d576b297e..f68a1cd1c01b5701b6346b9c21e32d15cf23fec2 100644
--- a/src/plugins/cppeditor/cppeditoractionhandler.cpp
+++ b/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);
+}
diff --git a/src/plugins/cppeditor/cppeditoractionhandler.h b/src/plugins/cppeditor/cppeditoractionhandler.h
index b194bcc2b0c50b8c1409c2498f651a1027e9dc78..a3514fa60be8c3bf4d10110fb1a21c758144d5b5 100644
--- a/src/plugins/cppeditor/cppeditoractionhandler.h
+++ b/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
diff --git a/src/plugins/cppeditor/cppeditorconstants.h b/src/plugins/cppeditor/cppeditorconstants.h
index 5a8f015a482d68b0935afda74c1f7368291d1001..a89d69f5b54b3d66346c82358d543379815090b7 100644
--- a/src/plugins/cppeditor/cppeditorconstants.h
+++ b/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
diff --git a/src/plugins/cppeditor/cppeditorenums.h b/src/plugins/cppeditor/cppeditorenums.h
index 5ab65f4dc8cb6261f37a4150b5945fb0340a8b76..f8e3dbe78151e8eb1ec1f1332684e939c4c1b708 100644
--- a/src/plugins/cppeditor/cppeditorenums.h
+++ b/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
diff --git a/src/plugins/cppeditor/cppfilewizard.cpp b/src/plugins/cppeditor/cppfilewizard.cpp
index be179944440f85b229f457687a4e53349fceacb9..d5f834b91f2d35df57e861b929e90122fb1384b1 100644
--- a/src/plugins/cppeditor/cppfilewizard.cpp
+++ b/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"
diff --git a/src/plugins/cppeditor/cppfilewizard.h b/src/plugins/cppeditor/cppfilewizard.h
index 7a9cd8bcc75ba44eb3c130f66f4fe8aeef984941..1e2e0b3324ed905ff96c91702887aefc71a9735a 100644
--- a/src/plugins/cppeditor/cppfilewizard.h
+++ b/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
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index d3baca0c5fdc9f7928d1c39486385c9225a3addd..a16af7f851f05bbfe4e3b51ce358a9755eb54b18 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/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>
diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h
index 80b03f1c7166ab7839aafa29d72627d25b9c3796..6ffffbb2f557447d93391a32058c974aacdf6f14 100644
--- a/src/plugins/cppeditor/cpphighlighter.h
+++ b/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
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index a03188a52aa957d87c1e2d48516819c40a36e425..ac4a74b051819467bf5f5804497381a0c672b53c 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/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"
diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h
index 72447856f77b4fe7536e755e0237d6c9e7d51fd9..91ccafcdb28613d84c4928776f480f9bb323b5a8 100644
--- a/src/plugins/cppeditor/cppplugin.h
+++ b/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
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index a56330083dca63d03dc4b0792ecc676dd1b6c9d5..7568d2c8877f0d06f0037d4db93bfc2327efa14c 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/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"
diff --git a/src/plugins/cpptools/cppcodecompletion.h b/src/plugins/cpptools/cppcodecompletion.h
index 58e0d148a97b9375f077fd90ef29938c23f67750..02170482486453a719aa61f4ac7ce9ec146c6bd8 100644
--- a/src/plugins/cpptools/cppcodecompletion.h
+++ b/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;
}
diff --git a/src/plugins/cpptools/cpphoverhandler.cpp b/src/plugins/cpptools/cpphoverhandler.cpp
index 4f6196e9e2c3e0220b8bbcd0f746440f212588d8..37b63bda9c23f4adf11670e34062efaded814a18 100644
--- a/src/plugins/cpptools/cpphoverhandler.cpp
+++ b/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"
diff --git a/src/plugins/cpptools/cpphoverhandler.h b/src/plugins/cpptools/cpphoverhandler.h
index 813305148a16a6fe5270c94e2f40137f553178ef..9aaa17cb0f88e1e47c04ebca1a96114f53f6917b 100644
--- a/src/plugins/cpptools/cpphoverhandler.h
+++ b/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
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 7d83ff2c343af5f42fcc82c6908833d91edac0d8..1708e62de35b26c5aae7bf7c25d4f5129505278b 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/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"
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index dd915efb75b9dc117f8c3c62d2bd7ec37c060f59..187187cc5d313586293cd3fdb0e7d5186dc30c01 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/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
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h
index bb1429ac7c1f17c7477be2437dae2a80292c37bc..11be08a4b0e20c4a2b5fd572d15db6dfb1b91dd0 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.h
+++ b/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
diff --git a/src/plugins/cpptools/cppquickopenfilter.cpp b/src/plugins/cpptools/cppquickopenfilter.cpp
index 679c8d422bc363c58de6e04ee1a7461aca5e1ef4..9470ec46039a57c77e3d1499b71c3e457f01c190 100644
--- a/src/plugins/cpptools/cppquickopenfilter.cpp
+++ b/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>
diff --git a/src/plugins/cpptools/cppquickopenfilter.h b/src/plugins/cpptools/cppquickopenfilter.h
index ac3fc0bf2054fe4abbe6a802cda0f6b040b8821b..bf6696a02af24ed690d286177e6ed9746e206112 100644
--- a/src/plugins/cpptools/cppquickopenfilter.h
+++ b/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
diff --git a/src/plugins/cpptools/cpptools.cpp b/src/plugins/cpptools/cpptools.cpp
index ed22bc3d98edc1b9bf9f9e392c6111c10461e564..423ddf3016d0d4a967dffd0d4a7e236163aa9793 100644
--- a/src/plugins/cpptools/cpptools.cpp
+++ b/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"
diff --git a/src/plugins/cpptools/cpptools.h b/src/plugins/cpptools/cpptools.h
index 2a3fd002579140f3577d21c5d1c9852be0d4e1ce..a64bfcf9dcdd4da661b55146e92c5095705aafff 100644
--- a/src/plugins/cpptools/cpptools.h
+++ b/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
diff --git a/src/plugins/cpptools/cpptools_global.h b/src/plugins/cpptools/cpptools_global.h
index 959e9ace346b18ea1548f4fb92c0fdeb4b39bc38..bbb7b0c764bdc71ef3cd127d3a109747db980ffe 100644
--- a/src/plugins/cpptools/cpptools_global.h
+++ b/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
diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h
index d1d80d0a7c94190f82a3fd9235e3840bb437c650..0eadabbd4a6474aab7f0b833be984ace072704b9 100644
--- a/src/plugins/cpptools/cpptoolsconstants.h
+++ b/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";
-}
-}
-#endif //CPPTOOLSCONSTANTS_H
+} // namespace Constants
+} // namespace CppTools
+
+#endif // CPPTOOLSCONSTANTS_H
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp
index c638b51324f374c587a2257a194e3d2f518c3e4c..fbca4c1a07530b1f0e60be8c480dba9ab61b503a 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.cpp
+++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp
@@ -35,6 +35,7 @@
#include "cppmodelmanager.h"
#include <texteditor/itexteditor.h>
+
#include <QTimer>
using namespace CppTools::Internal;
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h
index fd0d67941b9d26a7670af9d6341ddd176760f67f..6cfb7dc20100512d8a9d9577607963e53fe2573c 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.h
+++ b/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
-} // end of namespace CppTools
+} // namespace Internal
+} // namespace CppTools
#endif // CPPTOOLSEDITORSUPPORT_H
diff --git a/src/plugins/cpptools/rpp/pp-cctype.h b/src/plugins/cpptools/rpp/pp-cctype.h
index ac643a5d41411ee72efa75bbf81215a15d21fb0a..62b44f0bf4c4bae72080f836c0074a7e4fe56620 100644
--- a/src/plugins/cpptools/rpp/pp-cctype.h
+++ b/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;
diff --git a/src/plugins/cpptools/rpp/pp-client.h b/src/plugins/cpptools/rpp/pp-client.h
index 1d158135002b208670b915319cdb8907bac87862..073fc44c3627ad3643e18eef4be96c2e565a8f40 100644
--- a/src/plugins/cpptools/rpp/pp-client.h
+++ b/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
diff --git a/src/plugins/cpptools/rpp/pp-engine.cpp b/src/plugins/cpptools/rpp/pp-engine.cpp
index a3f4ec6ed3d5d6a21cf503bcee87f3d03fdfad91..5128b4ce37d4c1a2550c2a06c517a7af2b95adaa 100644
--- a/src/plugins/cpptools/rpp/pp-engine.cpp
+++ b/src/plugins/cpptools/rpp/pp-engine.cpp
@@ -51,6 +51,7 @@
*/
#include "pp.h"
+
#include <Lexer.h>
#include <Token.h>
#include <QtDebug>
diff --git a/src/plugins/cpptools/rpp/pp-engine.h b/src/plugins/cpptools/rpp/pp-engine.h
index 5f822c43786b1b52950643c99348c5243c2b2b37..13135f6a3102f45fab3fdbb5901c83fb1d75afc0 100644
--- a/src/plugins/cpptools/rpp/pp-engine.h
+++ b/src/plugins/cpptools/rpp/pp-engine.h
@@ -54,6 +54,7 @@
#define PP_ENGINE_H
#include "pp-client.h"
+
#include <Token.h>
#include <QVector>
diff --git a/src/plugins/cpptools/rpp/pp-internal.h b/src/plugins/cpptools/rpp/pp-internal.h
index 45a2a218da3b08855a5822c9f2268d471f251bfd..13bc7c17e84499f304976e46d94a7730605233b4 100644
--- a/src/plugins/cpptools/rpp/pp-internal.h
+++ b/src/plugins/cpptools/rpp/pp-internal.h
@@ -56,26 +56,23 @@
#include <QByteArray>
namespace rpp {
+namespace _PP_internal {
- namespace _PP_internal
- {
+inline bool comment_p (const char *__first, const char *__last)
+{
+ if (__first == __last)
+ return false;
- inline bool comment_p (const char *__first, const char *__last)
- {
- if (__first == __last)
- return false;
+ if (*__first != '/')
+ return false;
- if (*__first != '/')
- return false;
+ if (++__first == __last)
+ return false;
- if (++__first == __last)
- return false;
-
- return (*__first == '/' || *__first == '*');
- }
-
- } // _PP_internal
+ return (*__first == '/' || *__first == '*');
+}
+} // _PP_internal
} // namespace rpp
#endif // PP_INTERNAL_H
diff --git a/src/plugins/cpptools/rpp/pp-macro-expander.cpp b/src/plugins/cpptools/rpp/pp-macro-expander.cpp
index 1fee24e3fb4c68d03b0cbd111d731586d8953bc7..0b224d8eea96c387d7796cbfdd6b0bf346f7e55d 100644
--- a/src/plugins/cpptools/rpp/pp-macro-expander.cpp
+++ b/src/plugins/cpptools/rpp/pp-macro-expander.cpp
@@ -38,11 +38,11 @@
using namespace rpp;
MacroExpander::MacroExpander (Environment &env, pp_frame *frame)
- : env (env), frame (frame),
- lines (0), generated_lines (0)
+ : env(env), frame(frame),
+ lines(0), generated_lines(0)
{ }
-const QByteArray *MacroExpander::resolve_formal (const QByteArray &__name)
+const QByteArray *MacroExpander::resolve_formal(const QByteArray &__name)
{
if (! (frame && frame->expanding_macro))
return 0;
diff --git a/src/plugins/debugger/assert.h b/src/plugins/debugger/assert.h
index 99ba81e8cf234bb5fe6a96428185489b6042b524..014bb3b25d382bf787490e9e99c8578cb09fa203 100644
--- a/src/plugins/debugger/assert.h
+++ b/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
diff --git a/src/plugins/debugger/attachexternaldialog.cpp b/src/plugins/debugger/attachexternaldialog.cpp
index 55825a9be4d6e86f903cd7d806b4194629b279bd..1a376b3373ffce4854ddcaa1481a4fcc12e38d53 100644
--- a/src/plugins/debugger/attachexternaldialog.cpp
+++ b/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 );
diff --git a/src/plugins/debugger/attachexternaldialog.h b/src/plugins/debugger/attachexternaldialog.h
index 50954049772dae298d98329819391b0b9c795f9d..b64691ef803d46ffae79a84cbd0af92cedb000db 100644
--- a/src/plugins/debugger/attachexternaldialog.h
+++ b/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
diff --git a/src/plugins/debugger/attachremotedialog.cpp b/src/plugins/debugger/attachremotedialog.cpp
index 18d6193c74089a33eb9d773dbdde910f12378f18..65b02f37f100978739f13b5d999ede99a2b5caea 100644
--- a/src/plugins/debugger/attachremotedialog.cpp
+++ b/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>
diff --git a/src/plugins/debugger/attachremotedialog.h b/src/plugins/debugger/attachremotedialog.h
index 86deec71a89509634ce51cf77ec98b97450a249d..00177c89f244d7700131cd7d8872deec55636e03 100644
--- a/src/plugins/debugger/attachremotedialog.h
+++ b/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
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 105f7fb6b27f05d2138c31aa0b6de3faa038be56..8199d4ab518ddc3a1884cb009c5d688b6096ba55 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/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"
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index a915e89add4b0713d796065173c8107fad5e3d7c..4581e3a4de97552328dfda23835a41124214ec54 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/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
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index 18b27be90e1c0ef6739cf5dbf31672393956f3de..d393a3b21cfa7011a5cdc96f61ca454887548063 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/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"
diff --git a/src/plugins/debugger/breakwindow.h b/src/plugins/debugger/breakwindow.h
index aacf322fdd49854281ddc64dba45ea54fec93790..8b45c8f121ca25455e6242d6372f0308375e89e5 100644
--- a/src/plugins/debugger/breakwindow.h
+++ b/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
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 66b4ce994a03bfdf5456090e984812b60871692a..a94fff8b59b7f8cadadf7afe4b47b0f6655c0d6b 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/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
diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index 3de119e120c4acb610fca3c9cd37ac8c9f62f44b..fd1e7cf5cbaab2f0f7f12314c6d28876bf29db0b 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/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
diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp
index 66272fef060ac83d1399155493719a6481eca34e..7dc293cf35a0462bffa36d7f270bb9c4317d8120 100644
--- a/src/plugins/debugger/debuggeroutputwindow.cpp
+++ b/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>
diff --git a/src/plugins/debugger/debuggeroutputwindow.h b/src/plugins/debugger/debuggeroutputwindow.h
index 6b5e16776fda5d932449b41a492d6f8baec04f58..0b2fd53fd5b7b9f5fec2de0adf1f467e52fb83a9 100644
--- a/src/plugins/debugger/debuggeroutputwindow.h
+++ b/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
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f5d52d20c652fc9cde7a6a118ccf78fa46494b84..b11472a5243db7bf7ca0ed202a8e8789ffa0b066 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/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"
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index da5e1cddb828f00aaddbd80ceae65aa6b94beb0b..7dfcae1ffe7f3006a69a644130ba86b807be3174 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/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
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index ee492486753d31a5ceba152a6a581ed52a006d61..c161c9bad9881f49f5bbe555b27a0f3afe0c734d 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/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"
diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h
index 56bb1cada4d922cb08d4247a7b219ddf14bdef66..8b9c6ce2b1ac2e1fba3a60e8cdf6f480fa1380c8 100644
--- a/src/plugins/debugger/debuggerrunner.h
+++ b/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
diff --git a/src/plugins/debugger/disassemblerhandler.cpp b/src/plugins/debugger/disassemblerhandler.cpp
index cb910d4ae104bbe35804f85c44b32ca574c08c6f..2ab255b29ae3f5da7fea46adf31db4d38848140e 100644
--- a/src/plugins/debugger/disassemblerhandler.cpp
+++ b/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"
diff --git a/src/plugins/debugger/disassemblerhandler.h b/src/plugins/debugger/disassemblerhandler.h
index b15060cdaf9207224423a40b83791899b35127ef..f5f6e1c4408100fe880f1a277f7bce9d74438d1c 100644
--- a/src/plugins/debugger/disassemblerhandler.h
+++ b/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
diff --git a/src/plugins/debugger/disassemblerwindow.cpp b/src/plugins/debugger/disassemblerwindow.cpp
index 9b4e18c241035ff83e5936ab1fa25e82986295bd..2a3dc7a99a2792506b8806b58efe3a6e300a77b5 100644
--- a/src/plugins/debugger/disassemblerwindow.cpp
+++ b/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>
diff --git a/src/plugins/debugger/disassemblerwindow.h b/src/plugins/debugger/disassemblerwindow.h
index a39c120943716d58c11eaee9b871b82760802500..7e2e91fc8484b88fa516f92913f5c10b58848100 100644
--- a/src/plugins/debugger/disassemblerwindow.h
+++ b/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
diff --git a/src/plugins/debugger/gdbengine.h b/src/plugins/debugger/gdbengine.h
index 7d328a5a255d7e0bf44d6f164c40825f34b7773e..45eafcdb92c6172f62fa634f4fb450b79e87f29c 100644
--- a/src/plugins/debugger/gdbengine.h
+++ b/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
diff --git a/src/plugins/debugger/gdbmi.cpp b/src/plugins/debugger/gdbmi.cpp
index 9c0324cc20307bb62ed4cdc0b3af7c7c27287fed..ff976eff798978694e9acf0db461b19ecd4f12de 100644
--- a/src/plugins/debugger/gdbmi.cpp
+++ b/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"
diff --git a/src/plugins/debugger/gdboptionpage.cpp b/src/plugins/debugger/gdboptionpage.cpp
index 07a74b27f8e08fc361e6ee15a6f59e7526004c0f..e05b811889abf12094d267a823b45f70716a9ed9 100644
--- a/src/plugins/debugger/gdboptionpage.cpp
+++ b/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"
diff --git a/src/plugins/debugger/gdboptionpage.h b/src/plugins/debugger/gdboptionpage.h
index b618c8191ae3c1d797b306517ed4bb962f6d3bc2..1d71024bac1b7ef923b9ce577041c0b0266055b8 100644
--- a/src/plugins/debugger/gdboptionpage.h
+++ b/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
diff --git a/src/plugins/debugger/gdbtypemacros.cpp b/src/plugins/debugger/gdbtypemacros.cpp
index 338265d9bd76596b4817fa768390e589bc69f1b9..a445a336324a302c73cf39670db33cb6d2ad3749 100644
--- a/src/plugins/debugger/gdbtypemacros.cpp
+++ b/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"
diff --git a/src/plugins/debugger/idebuggerengine.h b/src/plugins/debugger/idebuggerengine.h
index 800a0dce49aa7f9e2005c9588d9ad06c92a8bac8..22ed3ca184583aedf5c729c806d969d8000f5444 100644
--- a/src/plugins/debugger/idebuggerengine.h
+++ b/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
diff --git a/src/plugins/debugger/imports.h b/src/plugins/debugger/imports.h
index ce3e8fb206b54c77368fb3231a692a5289b6c352..f780f31300e34a5c67d493bd835b25c81a075706 100644
--- a/src/plugins/debugger/imports.h
+++ b/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
diff --git a/src/plugins/debugger/mode.cpp b/src/plugins/debugger/mode.cpp
index ed880bdaa4847d1253dd23fa906a5da99e3783ef..3eef7dc8329a78626ed628197defb93f1b037694 100644
--- a/src/plugins/debugger/mode.cpp
+++ b/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"
diff --git a/src/plugins/debugger/mode.h b/src/plugins/debugger/mode.h
index 2e5824e4171aa097a9ef6038f54a65b1d756b489..8aa2c69bbfe6b5de75b5c913bf8f92a3451d2994 100644
--- a/src/plugins/debugger/mode.h
+++ b/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
diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp
index 27431c05a4d8c213059b5f8be313a235d3fc6aa4..80d9060f7b94c8968bcd205d71eee7f6055ab480 100644
--- a/src/plugins/debugger/moduleshandler.cpp
+++ b/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"
diff --git a/src/plugins/debugger/moduleshandler.h b/src/plugins/debugger/moduleshandler.h
index 0d34e6817fa2b2d49f72031b4399eb309e46750b..efd8aa9a491c027e23883ad266f1be088ad91c5a 100644
--- a/src/plugins/debugger/moduleshandler.h
+++ b/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
diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp
index 61512879a214627cfffc4d394b389a087a5a32b0..3ae127a03492db4fa80d8c2849aeb7639c6b39bf 100644
--- a/src/plugins/debugger/moduleswindow.cpp
+++ b/src/plugins/debugger/moduleswindow.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "moduleswindow.h"
#include "moduleshandler.h" // for model roles
diff --git a/src/plugins/debugger/moduleswindow.h b/src/plugins/debugger/moduleswindow.h
index 732fb79f717b67ace05d05df57fff7bda1490a03..1d9309c0bbb94e33957d5c0cfeaa736c84578ced 100644
--- a/src/plugins/debugger/moduleswindow.h
+++ b/src/plugins/debugger/moduleswindow.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_MODULESWINDOW_H
#define DEBUGGER_MODULESWINDOW_H
diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp
index ebae02199a4af08334a8af7d5ed2205035abf6e5..c227de81ce5c24013afe61458fc63d5a08190e08 100644
--- a/src/plugins/debugger/procinterrupt.cpp
+++ b/src/plugins/debugger/procinterrupt.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "procinterrupt.h"
#ifdef Q_OS_WIN
diff --git a/src/plugins/debugger/procinterrupt.h b/src/plugins/debugger/procinterrupt.h
index 846661de6984fa4da36225149d25e916e59517d0..960b6e00218e3a8b4475a7f4ce7d309674268a27 100644
--- a/src/plugins/debugger/procinterrupt.h
+++ b/src/plugins/debugger/procinterrupt.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_PROCINTERRUPT_H
#define DEBUGGER_PROCINTERRUPT_H
diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index dc1da8913edf9707cd1ca320b83bd13313e93a3f..09beeb006f478e3f80539e86e70b3822e84d1d9a 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "registerhandler.h"
#include "assert.h"
@@ -45,7 +46,6 @@ using namespace Debugger::Internal;
using namespace Debugger::Constants;
-
//////////////////////////////////////////////////////////////////
//
// RegisterHandler
diff --git a/src/plugins/debugger/registerhandler.h b/src/plugins/debugger/registerhandler.h
index 88e9471713aab911d0d93371045163a480beb13d..b80a9122a9c07d1bc4c7a4ea07a39267815d4346 100644
--- a/src/plugins/debugger/registerhandler.h
+++ b/src/plugins/debugger/registerhandler.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_REGISTERHANDLER_H
#define DEBUGGER_REGISTERHANDLER_H
diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp
index 750309ad0649db8a062edd3f7f4e8acc45ff8129..0a9aac613e9fb87ec0a3275b537637caa80be9d9 100644
--- a/src/plugins/debugger/registerwindow.cpp
+++ b/src/plugins/debugger/registerwindow.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "registerwindow.h"
#include "debuggerconstants.h"
diff --git a/src/plugins/debugger/registerwindow.h b/src/plugins/debugger/registerwindow.h
index b94d2356aa621f2cfd81f9d88a4ff1d2e094ea07..00629b207728f6b6fd29c618786b0ffed13371dc 100644
--- a/src/plugins/debugger/registerwindow.h
+++ b/src/plugins/debugger/registerwindow.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_REGISTERWINDOW_H
#define DEBUGGER_REGISTERWINDOW_H
diff --git a/src/plugins/debugger/scriptengine.h b/src/plugins/debugger/scriptengine.h
index 472a2091c49168d143531c5c403e3887bb8efc5e..1c160a1ea3f0ecd9a7659e0c7ab61b5be2f098cd 100644
--- a/src/plugins/debugger/scriptengine.h
+++ b/src/plugins/debugger/scriptengine.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_SCRIPTENGINE_H
#define DEBUGGER_SCRIPTENGINE_H
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index 06dada9bcdd47ec462cec01f6facbd0d91e75829..d2a468b07c6e3bedeb83db8a1adc07d047f7c36f 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "stackhandler.h"
#include "assert.h"
diff --git a/src/plugins/debugger/stackhandler.h b/src/plugins/debugger/stackhandler.h
index e78cc3f4c3cd67586e6995401027227cbb47b1c7..16d77583af48339f4fc7ef1daf7682933ac08e0b 100644
--- a/src/plugins/debugger/stackhandler.h
+++ b/src/plugins/debugger/stackhandler.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_STACKHANDLER_H
#define DEBUGGER_STACKHANDLER_H
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index 5778243b326a94ed90c2f81b1f2d983d567685ba..a079b54c134f9cf7a9dfe036b6b6c2af60740999 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "stackwindow.h"
#include "assert.h"
diff --git a/src/plugins/debugger/stackwindow.h b/src/plugins/debugger/stackwindow.h
index 39689d1cc6c27f17afb08da15a328276ff1d21a9..f1dffcf7b7a3310bf0906f28b504a2e33c89a517 100644
--- a/src/plugins/debugger/stackwindow.h
+++ b/src/plugins/debugger/stackwindow.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_STACKWINDOW_H
#define DEBUGGER_STACKWINDOW_H
diff --git a/src/plugins/debugger/startexternaldialog.cpp b/src/plugins/debugger/startexternaldialog.cpp
index 2d1b3de02be9a3758ae6e343f44c4813032eed57..785757b7667f42bc5ffb8fef92c6e47fe12cbdb4 100644
--- a/src/plugins/debugger/startexternaldialog.cpp
+++ b/src/plugins/debugger/startexternaldialog.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "startexternaldialog.h"
#include <QtGui/QFileDialog>
diff --git a/src/plugins/debugger/startexternaldialog.h b/src/plugins/debugger/startexternaldialog.h
index 3bb64c8c5c21ee6354df8375289d569240619e27..b71a5147765fceb9b543d463866bf9e606b8e733 100644
--- a/src/plugins/debugger/startexternaldialog.h
+++ b/src/plugins/debugger/startexternaldialog.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_STARTEXTERNALDIALOG_H
#define DEBUGGER_STARTEXTERNALDIALOG_H
diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp
index e3088a848bc5b93035a7c38c18e6f401f2ea101b..354f1cba3e0a827e9747386884afe36065bc60d1 100644
--- a/src/plugins/debugger/threadswindow.cpp
+++ b/src/plugins/debugger/threadswindow.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "threadswindow.h"
#include "assert.h"
diff --git a/src/plugins/debugger/threadswindow.h b/src/plugins/debugger/threadswindow.h
index 686424bab6827835cae46304ba5f82b996c4bb57..7d4f6c59b0eca51f164d986ad642fb0288972c01 100644
--- a/src/plugins/debugger/threadswindow.h
+++ b/src/plugins/debugger/threadswindow.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_THREADWINDOW_H
#define DEBUGGER_THREADWINDOW_H
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 1fb6b9c33829b1c2439c7f37932413a32007e1a6..3d99a84ad34edf93ba96a3a4a1f7f0d489d8f8d8 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "watchhandler.h"
#if USE_MODEL_TEST
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 4a876bae087ef9b5bea07af656c50c654b31f0c3..3841d55d30019ce1ab7cc5a75e7b3ca9d492b10b 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_WATCHHANDLER_H
#define DEBUGGER_WATCHHANDLER_H
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 7f5d61995f14fdfc81584c193cee92b6b4a86020..78366198955d6379c7e7130b1501d9aef0122488 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "watchwindow.h"
#include <QtCore/QDebug>
diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h
index 0704ea92f1e2402cf41c26871fc422006fc0459d..9781f79fdb7b7099a36c36bf75daf675bf3ef073 100644
--- a/src/plugins/debugger/watchwindow.h
+++ b/src/plugins/debugger/watchwindow.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DEBUGGER_WATCHWINDOW_H
#define DEBUGGER_WATCHWINDOW_H
diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp
index cb240ea0b5750606d39ffe8e2312ba7aec0cdf65..d1ce92854734b8a9067f5d0ee0f64011c99259e5 100644
--- a/src/plugins/designer/cpp/formclasswizard.cpp
+++ b/src/plugins/designer/cpp/formclasswizard.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formclasswizard.h"
#include "formclasswizarddialog.h"
#include "designerconstants.h"
diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h
index 73460918f6e04276cdeeb17d2b7bc3e9f39368f5..749ab86137a83750c2f499bf481802689ee27b4c 100644
--- a/src/plugins/designer/cpp/formclasswizard.h
+++ b/src/plugins/designer/cpp/formclasswizard.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMCLASSWIZARD_H
#define FORMCLASSWIZARD_H
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index 15bbd8d5374d48dfe290896e7c9be7634df15cc4..345309d45c3fc1913a5b324a5201eda6fe5a3fed 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formclasswizarddialog.h"
#include "formtemplatewizardpage.h"
#include "formclasswizardpage.h"
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h
index 1e914ae86017bef1c92e5e05e2ddc1879804bdf4..cdb1f60d17047b00fe83f9c88df1900bb95d83ba 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.h
+++ b/src/plugins/designer/cpp/formclasswizarddialog.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMCLASSWIZARDDIALOG_H
#define FORMCLASSWIZARDDIALOG_H
diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp
index 1f946aa311344c3ef9e05304c3ab5c2c84ba4366..d076753374b666ef632c4a97a1f2394857993bae 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.cpp
+++ b/src/plugins/designer/cpp/formclasswizardpage.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formclasswizardpage.h"
#include "ui_formclasswizardpage.h"
#include "formclasswizardparameters.h"
diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h
index 59e8e808e99a5283dcb5c14404e6e3fda45c871f..c0b53040c6fe3fe82d340866e4ad396587e78fe2 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.h
+++ b/src/plugins/designer/cpp/formclasswizardpage.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMCLASSWIZARDPAGE_H
#define FORMCLASSWIZARDPAGE_H
diff --git a/src/plugins/designer/cpp/formclasswizardparameters.cpp b/src/plugins/designer/cpp/formclasswizardparameters.cpp
index b33dbab6fcafbaedc5474319ce4a827048c8047a..7dd0056186a2dfc9440dfc835671b69970dbb2c5 100644
--- a/src/plugins/designer/cpp/formclasswizardparameters.cpp
+++ b/src/plugins/designer/cpp/formclasswizardparameters.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formclasswizardparameters.h"
#include "formtemplatewizardpage.h"
diff --git a/src/plugins/designer/cpp/formclasswizardparameters.h b/src/plugins/designer/cpp/formclasswizardparameters.h
index 32bea7603ebdae8e9dd1e9abcad1efe8ba06e241..d72b8c5c2cccbafc2012315b01c2c49ec555b906 100644
--- a/src/plugins/designer/cpp/formclasswizardparameters.h
+++ b/src/plugins/designer/cpp/formclasswizardparameters.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMCLASSWIZARDPARAMETERS_H
#define FORMCLASSWIZARDPARAMETERS_H
diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index 85c877efcfa91926ebdbc10f12dcb2edc2f0329d..2a30a8ea4fdae6ea9ae136e50375deb1cfb2f7cb 100644
--- a/src/plugins/designer/designerconstants.h
+++ b/src/plugins/designer/designerconstants.h
@@ -30,36 +30,44 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DESIGNERPLUGIN_CONSTANTS_H
#define DESIGNERPLUGIN_CONSTANTS_H
namespace Designer {
- namespace Constants {
- // context
- const char * const C_FORMEDITOR = "Formeditor";
- const char * const T_FORMEDITOR = "Formeditor.Toolbar";
- const char * const M_FORMEDITOR = "Formeditor.Menu";
- const char * const M_FORMEDITOR_PREVIEW = "Formeditor.Menu.Preview";
- const char * const C_FORMWINDOW = "Formwindow";
- // Wizard type
- const char * const FORM_FILE_TYPE = "Qt4FormFiles";
- const char * const FORM_MIMETYPE = "application/x-designer";
+namespace Constants {
+
+// context
+const char * const C_FORMEDITOR = "Formeditor";
+const char * const T_FORMEDITOR = "Formeditor.Toolbar";
+const char * const M_FORMEDITOR = "Formeditor.Menu";
+const char * const M_FORMEDITOR_PREVIEW = "Formeditor.Menu.Preview";
+const char * const C_FORMWINDOW = "Formwindow";
+
+// Wizard type
+const char * const FORM_FILE_TYPE = "Qt4FormFiles";
+const char * const FORM_MIMETYPE = "application/x-designer";
+
+enum DesignerSubWindows
+{
+ WidgetBoxSubWindow,
+ ObjectInspectorSubWindow,
+ PropertyEditorSubWindow,
+ SignalSlotEditorSubWindow,
+ ActionEditorSubWindow,
+ DesignerSubWindowCount
+};
- enum DesignerSubWindows {
- WidgetBoxSubWindow,
- ObjectInspectorSubWindow,
- PropertyEditorSubWindow,
- SignalSlotEditorSubWindow,
- ActionEditorSubWindow,
- DesignerSubWindowCount };
+enum EditModes
+{
+ EditModeWidgetEditor,
+ EditModeSignalsSlotEditor,
+ EditModeBuddyEditor,
+ EditModeTabOrderEditor,
+ NumEditModes
+};
- enum EditModes {
- EditModeWidgetEditor,
- EditModeSignalsSlotEditor,
- EditModeBuddyEditor,
- EditModeTabOrderEditor,
- NumEditModes };
- }
-}
+} // Constants
+} // Designer
#endif //DESIGNERPLUGIN_CONSTANTS_H
diff --git a/src/plugins/designer/editorwidget.cpp b/src/plugins/designer/editorwidget.cpp
index be941e9dc097949d38dd1432a763b54edc00ef67..1a60dbb171540e33b7c1c7f64a9057cc8efb2b73 100644
--- a/src/plugins/designer/editorwidget.cpp
+++ b/src/plugins/designer/editorwidget.cpp
@@ -31,14 +31,14 @@
**
***************************************************************************/
-
#include "editorwidget.h"
#include "formeditorw.h"
+#include <coreplugin/minisplitter.h>
+
#include <QtCore/QEvent>
#include <QtGui/QVBoxLayout>
#include <QtGui/QTabWidget>
-#include <coreplugin/minisplitter.h>
using namespace Designer::Constants;
@@ -49,222 +49,223 @@ enum { wantSignalSlotEditor = 0 };
namespace Designer {
namespace Internal {
- SharedSubWindow::SharedSubWindow(QWidget *shared, QWidget *parent) :
- QWidget(parent),
- m_shared(shared),
- m_layout(new QVBoxLayout)
- {
- Q_ASSERT(m_shared);
- m_layout->setContentsMargins(0, 0, 0, 0);
- setLayout(m_layout);
- }
+SharedSubWindow::SharedSubWindow(QWidget *shared, QWidget *parent) :
+ QWidget(parent),
+ m_shared(shared),
+ m_layout(new QVBoxLayout)
+{
+ Q_ASSERT(m_shared);
+ m_layout->setContentsMargins(0, 0, 0, 0);
+ setLayout(m_layout);
+}
- void SharedSubWindow::activate()
- {
- // Take the widget off the other parent
- Q_ASSERT(m_shared);
- QWidget *currentParent = m_shared->parentWidget();
- if (currentParent == this)
- return;
+void SharedSubWindow::activate()
+{
+ // Take the widget off the other parent
+ Q_ASSERT(m_shared);
+ QWidget *currentParent = m_shared->parentWidget();
+ if (currentParent == this)
+ return;
- if (currentParent) {
- QVBoxLayout *lt = qobject_cast<QVBoxLayout *>(currentParent->layout());
- Q_ASSERT(lt);
- m_shared->setParent(0);
- delete lt->takeAt(0);
- }
- m_layout->addWidget(m_shared);
- m_layout->invalidate();
+ if (currentParent) {
+ QVBoxLayout *lt = qobject_cast<QVBoxLayout *>(currentParent->layout());
+ Q_ASSERT(lt);
+ m_shared->setParent(0);
+ delete lt->takeAt(0);
}
+ m_layout->addWidget(m_shared);
+ m_layout->invalidate();
+}
- SharedSubWindow::~SharedSubWindow()
- {
- // Do not destroy the shared sub window if we currently own it
- if (m_layout->count()) {
- m_shared->setParent(0);
- delete m_layout->takeAt(0);
- }
+SharedSubWindow::~SharedSubWindow()
+{
+ // Do not destroy the shared sub window if we currently own it
+ if (m_layout->count()) {
+ m_shared->setParent(0);
+ delete m_layout->takeAt(0);
}
+}
- // ---------- Global EditorState
- Q_GLOBAL_STATIC(EditorWidgetState, editorWidgetState)
+// ---------- Global EditorState
+Q_GLOBAL_STATIC(EditorWidgetState, editorWidgetState)
- enum { Version = 1 };
- // Simple conversion of an int list to QVariantList, size as leading element
- static void intToVariantList(const QList<int> &il, QVariantList& vl)
- {
- const int size = il.size();
- vl.push_back(size);
- if (size != 0) {
- const QList<int>::const_iterator cend = il.constEnd();
- for (QList<int>::const_iterator it = il.constBegin(); it != cend; ++it)
- vl.push_back(QVariant(*it));
- }
- }
- // Simple conversion of a QVariantList portion saved by the above function to int list
- bool variantListToIntList(const QVariantList& vl, int &index, QList<int> &list)
- {
- list.clear();
- if (index >= vl.size())
- return false;
- const int size = vl.at(index++).toInt();
- const int end = index + size;
- if (end > vl.size())
- return false;
- if (size != 0) {
- for ( ; index < end; index++)
- list.push_back(vl.at(index).toInt());
- }
- return true;
+enum { Version = 1 };
+// Simple conversion of an int list to QVariantList, size as leading element
+static void intToVariantList(const QList<int> &il, QVariantList& vl)
+{
+ const int size = il.size();
+ vl.push_back(size);
+ if (size != 0) {
+ const QList<int>::const_iterator cend = il.constEnd();
+ for (QList<int>::const_iterator it = il.constBegin(); it != cend; ++it)
+ vl.push_back(QVariant(*it));
}
-
- // ------------------ EditorWidgetState
- QVariant EditorWidgetState::toVariant() const
- {
- QVariantList rc;
- rc.push_back(Version);
- intToVariantList(horizontalSizes, rc);
- intToVariantList(centerVerticalSizes, rc);
- intToVariantList(rightVerticalSizes, rc);
- return QVariant(rc);
- }
-
- bool EditorWidgetState::fromVariant(const QVariant &v)
- {
- // Restore state. The weird thing is that QSettings might return
- // a QStringList although it was saved as QVariantList<int>.
- if (v.type() != QVariant::List && v.type() != QVariant::StringList)
- return false;
- const QVariantList vl = v.toList();
- if (vl.empty())
- return false;
- int index = 0;
- const QVariant &versionV = vl.at(index++);
- if (versionV.type() != QVariant::Int && versionV.type() != QVariant::String)
- return false;
- if (versionV.toInt() > Version)
- return false;
- return variantListToIntList(vl, index, horizontalSizes) &&
- variantListToIntList(vl, index, centerVerticalSizes) &&
- variantListToIntList(vl, index, rightVerticalSizes);
+}
+// Simple conversion of a QVariantList portion saved by the above function to int list
+bool variantListToIntList(const QVariantList& vl, int &index, QList<int> &list)
+{
+ list.clear();
+ if (index >= vl.size())
+ return false;
+ const int size = vl.at(index++).toInt();
+ const int end = index + size;
+ if (end > vl.size())
+ return false;
+ if (size != 0) {
+ for ( ; index < end; index++)
+ list.push_back(vl.at(index).toInt());
}
+ return true;
+}
- // ---------- EditorWidget
- EditorWidget::EditorWidget(QWidget *formWindow) :
- Core::MiniSplitter(Qt::Horizontal),
- m_centerVertSplitter(new Core::MiniSplitter(Qt::Vertical)),
- m_bottomTab(0),
- m_rightVertSplitter(new Core::MiniSplitter(Qt::Vertical))
- {
- // Get shared sub windows from Form Editor
- FormEditorW *few = FormEditorW::instance();
- QWidget * const*subs = few->designerSubWindows();
- // Create shared sub windows except SignalSlotEditor
- qFill(m_designerSubWindows, m_designerSubWindows + DesignerSubWindowCount, static_cast<SharedSubWindow*>(0));
- for (int i=0; i < DesignerSubWindowCount; i++)
- if (wantSignalSlotEditor || i != SignalSlotEditorSubWindow)
- m_designerSubWindows[i] = new SharedSubWindow(subs[i]);
- // Create splitter
- addWidget(m_designerSubWindows[WidgetBoxSubWindow]);
+// ------------------ EditorWidgetState
+QVariant EditorWidgetState::toVariant() const
+{
+ QVariantList rc;
+ rc.push_back(Version);
+ intToVariantList(horizontalSizes, rc);
+ intToVariantList(centerVerticalSizes, rc);
+ intToVariantList(rightVerticalSizes, rc);
+ return QVariant(rc);
+}
- // center
- m_centerVertSplitter->addWidget(formWindow);
+bool EditorWidgetState::fromVariant(const QVariant &v)
+{
+ // Restore state. The weird thing is that QSettings might return
+ // a QStringList although it was saved as QVariantList<int>.
+ if (v.type() != QVariant::List && v.type() != QVariant::StringList)
+ return false;
+ const QVariantList vl = v.toList();
+ if (vl.empty())
+ return false;
+ int index = 0;
+ const QVariant &versionV = vl.at(index++);
+ if (versionV.type() != QVariant::Int && versionV.type() != QVariant::String)
+ return false;
+ if (versionV.toInt() > Version)
+ return false;
+ return variantListToIntList(vl, index, horizontalSizes) &&
+ variantListToIntList(vl, index, centerVerticalSizes) &&
+ variantListToIntList(vl, index, rightVerticalSizes);
+}
- if (wantSignalSlotEditor) {
- m_bottomTab = new QTabWidget;
- m_bottomTab->setTabPosition(QTabWidget::South);
- m_bottomTab->addTab(m_designerSubWindows[ActionEditorSubWindow], tr("Action editor"));
- m_bottomTab->addTab(m_designerSubWindows[SignalSlotEditorSubWindow], tr("Signals and slots editor"));
- m_centerVertSplitter->addWidget(m_bottomTab);
- } else {
- m_centerVertSplitter->addWidget(m_designerSubWindows[ActionEditorSubWindow]);
- }
+// ---------- EditorWidget
+EditorWidget::EditorWidget(QWidget *formWindow) :
+ Core::MiniSplitter(Qt::Horizontal),
+ m_centerVertSplitter(new Core::MiniSplitter(Qt::Vertical)),
+ m_bottomTab(0),
+ m_rightVertSplitter(new Core::MiniSplitter(Qt::Vertical))
+{
+ // Get shared sub windows from Form Editor
+ FormEditorW *few = FormEditorW::instance();
+ QWidget * const*subs = few->designerSubWindows();
+ // Create shared sub windows except SignalSlotEditor
+ qFill(m_designerSubWindows, m_designerSubWindows + DesignerSubWindowCount, static_cast<SharedSubWindow*>(0));
+ for (int i=0; i < DesignerSubWindowCount; i++)
+ if (wantSignalSlotEditor || i != SignalSlotEditorSubWindow)
+ m_designerSubWindows[i] = new SharedSubWindow(subs[i]);
+ // Create splitter
+ addWidget(m_designerSubWindows[WidgetBoxSubWindow]);
- addWidget(m_centerVertSplitter);
+ // center
+ m_centerVertSplitter->addWidget(formWindow);
- m_rightVertSplitter->addWidget(m_designerSubWindows[ObjectInspectorSubWindow]);
- m_rightVertSplitter->addWidget(m_designerSubWindows[PropertyEditorSubWindow]);
- addWidget(m_rightVertSplitter);
+ if (wantSignalSlotEditor) {
+ m_bottomTab = new QTabWidget;
+ m_bottomTab->setTabPosition(QTabWidget::South);
+ m_bottomTab->addTab(m_designerSubWindows[ActionEditorSubWindow], tr("Action editor"));
+ m_bottomTab->addTab(m_designerSubWindows[SignalSlotEditorSubWindow], tr("Signals and slots editor"));
+ m_centerVertSplitter->addWidget(m_bottomTab);
+ } else {
+ m_centerVertSplitter->addWidget(m_designerSubWindows[ActionEditorSubWindow]);
}
- void EditorWidget::setInitialSizes()
- {
- QList<int> sizes;
- // center vertical. Either the tab containing signal slot editor/
- // action editor or the action editor itself
- const QWidget *bottomWidget = m_bottomTab;
- if (!bottomWidget)
- bottomWidget = m_designerSubWindows[ActionEditorSubWindow];
- const int tabHeight = bottomWidget->sizeHint().height();
- sizes.push_back(height() - handleWidth() - tabHeight);
- sizes.push_back( tabHeight);
- m_centerVertSplitter->setSizes(sizes);
- // right vert
- sizes.clear();
- sizes.push_back(height() /2 - (handleWidth() / 2));
- sizes.push_back(height() / 2 - (handleWidth() / 2));
- m_rightVertSplitter->setSizes(sizes);
- // horiz sizes
- sizes.clear();
- const int wboxWidth = m_designerSubWindows[WidgetBoxSubWindow]->sizeHint().width();
- const int vSplitterWidth = m_rightVertSplitter->sizeHint().width();
- sizes.push_back(wboxWidth);
- sizes.push_back(width() - 2 * handleWidth() - wboxWidth - vSplitterWidth);
- sizes.push_back(vSplitterWidth);
- setSizes(sizes);
- }
+ addWidget(m_centerVertSplitter);
- void EditorWidget::activate()
- {
- for (int i=0; i < DesignerSubWindowCount; i++)
- if (SharedSubWindow *sw = m_designerSubWindows[i]) // Signal slot might be deactivated
- sw->activate();
- if (!restore(*editorWidgetState()))
- setInitialSizes();
- }
+ m_rightVertSplitter->addWidget(m_designerSubWindows[ObjectInspectorSubWindow]);
+ m_rightVertSplitter->addWidget(m_designerSubWindows[PropertyEditorSubWindow]);
+ addWidget(m_rightVertSplitter);
+}
- bool EditorWidget::event(QEvent * e)
- {
- if (e->type() == QEvent::Hide)
- *editorWidgetState() = save();
- return QSplitter::event(e);
- }
+void EditorWidget::setInitialSizes()
+{
+ QList<int> sizes;
+ // center vertical. Either the tab containing signal slot editor/
+ // action editor or the action editor itself
+ const QWidget *bottomWidget = m_bottomTab;
+ if (!bottomWidget)
+ bottomWidget = m_designerSubWindows[ActionEditorSubWindow];
+ const int tabHeight = bottomWidget->sizeHint().height();
+ sizes.push_back(height() - handleWidth() - tabHeight);
+ sizes.push_back( tabHeight);
+ m_centerVertSplitter->setSizes(sizes);
+ // right vert
+ sizes.clear();
+ sizes.push_back(height() /2 - (handleWidth() / 2));
+ sizes.push_back(height() / 2 - (handleWidth() / 2));
+ m_rightVertSplitter->setSizes(sizes);
+ // horiz sizes
+ sizes.clear();
+ const int wboxWidth = m_designerSubWindows[WidgetBoxSubWindow]->sizeHint().width();
+ const int vSplitterWidth = m_rightVertSplitter->sizeHint().width();
+ sizes.push_back(wboxWidth);
+ sizes.push_back(width() - 2 * handleWidth() - wboxWidth - vSplitterWidth);
+ sizes.push_back(vSplitterWidth);
+ setSizes(sizes);
+}
- EditorWidgetState EditorWidget::save() const
- {
- EditorWidgetState rc;
- rc.horizontalSizes = sizes();
- rc.centerVerticalSizes = m_centerVertSplitter->sizes();
- rc.rightVerticalSizes = m_rightVertSplitter->sizes();
- return rc;
- }
+void EditorWidget::activate()
+{
+ for (int i=0; i < DesignerSubWindowCount; i++)
+ if (SharedSubWindow *sw = m_designerSubWindows[i]) // Signal slot might be deactivated
+ sw->activate();
+ if (!restore(*editorWidgetState()))
+ setInitialSizes();
+}
- bool EditorWidget::restore(const EditorWidgetState &s)
- {
- if (s.horizontalSizes.size() != count() ||
- s.centerVerticalSizes.size() != m_centerVertSplitter->count() ||
- s.rightVerticalSizes.size() != m_rightVertSplitter->count())
- return false;
- m_centerVertSplitter->setSizes(s.centerVerticalSizes);
- m_rightVertSplitter->setSizes(s.rightVerticalSizes);
- setSizes(s.horizontalSizes);
- return true;
- }
+bool EditorWidget::event(QEvent * e)
+{
+ if (e->type() == QEvent::Hide)
+ *editorWidgetState() = save();
+ return QSplitter::event(e);
+}
- void EditorWidget::toolChanged(int i)
- {
- if (m_bottomTab)
- m_bottomTab->setCurrentIndex(i == EditModeSignalsSlotEditor ? SignalSlotEditorTab : ActionEditorTab);
- }
+EditorWidgetState EditorWidget::save() const
+{
+ EditorWidgetState rc;
+ rc.horizontalSizes = sizes();
+ rc.centerVerticalSizes = m_centerVertSplitter->sizes();
+ rc.rightVerticalSizes = m_rightVertSplitter->sizes();
+ return rc;
+}
- EditorWidgetState EditorWidget::state()
- {
- return *editorWidgetState();
- }
+bool EditorWidget::restore(const EditorWidgetState &s)
+{
+ if (s.horizontalSizes.size() != count() ||
+ s.centerVerticalSizes.size() != m_centerVertSplitter->count() ||
+ s.rightVerticalSizes.size() != m_rightVertSplitter->count())
+ return false;
+ m_centerVertSplitter->setSizes(s.centerVerticalSizes);
+ m_rightVertSplitter->setSizes(s.rightVerticalSizes);
+ setSizes(s.horizontalSizes);
+ return true;
+}
- void EditorWidget::setState(const EditorWidgetState& st)
- {
- *editorWidgetState() = st;
- }
+void EditorWidget::toolChanged(int i)
+{
+ if (m_bottomTab)
+ m_bottomTab->setCurrentIndex(i == EditModeSignalsSlotEditor ? SignalSlotEditorTab : ActionEditorTab);
}
+
+EditorWidgetState EditorWidget::state()
+{
+ return *editorWidgetState();
+}
+
+void EditorWidget::setState(const EditorWidgetState& st)
+{
+ *editorWidgetState() = st;
}
+
+} // namespace Internal
+} // namespace Designer
diff --git a/src/plugins/designer/editorwidget.h b/src/plugins/designer/editorwidget.h
index 4e0c78d9746ea4e2eb9cef9db7904f8ce1a99733..a687f714c50fd0c1bf5a670c9b25c2ec4393f56e 100644
--- a/src/plugins/designer/editorwidget.h
+++ b/src/plugins/designer/editorwidget.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DESIGNER_EDITORWIDGET_H
#define DESIGNER_EDITORWIDGET_H
@@ -50,69 +51,73 @@ QT_END_NAMESPACE
namespace Designer {
namespace Internal {
- /* A widget that shares its embedded sub window with others. For example,
- * the designer editors need to share the widget box, etc. */
- class SharedSubWindow : public QWidget {
- Q_OBJECT
- Q_DISABLE_COPY(SharedSubWindow)
-
- public:
- SharedSubWindow(QWidget *shared, QWidget *parent = 0);
- virtual ~SharedSubWindow();
-
- public slots:
- // Takes the shared widget off the current parent and adds it to its
- // layout
- void activate();
-
- private:
- QPointer <QWidget> m_shared;
- QVBoxLayout *m_layout;
- };
-
- /** State of the editor window (splitter sizes)
- * Shared as a global struct between the instances and stored
- * in QSettings. */
- struct EditorWidgetState {
- QVariant toVariant() const; // API to conveniently store in QSettings
- bool fromVariant(const QVariant &v);
-
- QList<int> horizontalSizes;
- QList<int> centerVerticalSizes;
- QList<int> rightVerticalSizes;
- };
-
- /* Form editor splitter used as editor window. Contains the shared designer
- * windows. */
- class EditorWidget : public Core::MiniSplitter {
- Q_OBJECT
- Q_DISABLE_COPY(EditorWidget)
- public:
- explicit EditorWidget(QWidget *formWindow);
-
- virtual bool event(QEvent * e);
-
- EditorWidgetState save() const;
- bool restore(const EditorWidgetState &s);
-
- // Get/Set the shared splitter state of all editors of that type for
- // settings
- static EditorWidgetState state();
- static void setState(const EditorWidgetState&st);
-
- public slots:
- void activate();
- void toolChanged(int);
-
- private:
- void setInitialSizes();
-
- SharedSubWindow* m_designerSubWindows[Designer::Constants::DesignerSubWindowCount];
- QSplitter *m_centerVertSplitter;
- QTabWidget *m_bottomTab;
- QSplitter *m_rightVertSplitter;
- };
-}
-}
-
-#endif
+/* A widget that shares its embedded sub window with others. For example,
+ * the designer editors need to share the widget box, etc. */
+class SharedSubWindow : public QWidget
+{
+ Q_OBJECT
+ Q_DISABLE_COPY(SharedSubWindow)
+
+public:
+ SharedSubWindow(QWidget *shared, QWidget *parent = 0);
+ virtual ~SharedSubWindow();
+
+public slots:
+ // Takes the shared widget off the current parent and adds it to its
+ // layout
+ void activate();
+
+private:
+ QPointer <QWidget> m_shared;
+ QVBoxLayout *m_layout;
+};
+
+/** State of the editor window (splitter sizes)
+ * Shared as a global struct between the instances and stored
+ * in QSettings. */
+struct EditorWidgetState
+{
+ QVariant toVariant() const; // API to conveniently store in QSettings
+ bool fromVariant(const QVariant &v);
+
+ QList<int> horizontalSizes;
+ QList<int> centerVerticalSizes;
+ QList<int> rightVerticalSizes;
+};
+
+/* Form editor splitter used as editor window. Contains the shared designer
+ * windows. */
+class EditorWidget : public Core::MiniSplitter
+{
+ Q_OBJECT
+ Q_DISABLE_COPY(EditorWidget)
+public:
+ explicit EditorWidget(QWidget *formWindow);
+
+ virtual bool event(QEvent * e);
+
+ EditorWidgetState save() const;
+ bool restore(const EditorWidgetState &s);
+
+ // Get/Set the shared splitter state of all editors of that type for
+ // settings
+ static EditorWidgetState state();
+ static void setState(const EditorWidgetState&st);
+
+public slots:
+ void activate();
+ void toolChanged(int);
+
+private:
+ void setInitialSizes();
+
+ SharedSubWindow* m_designerSubWindows[Designer::Constants::DesignerSubWindowCount];
+ QSplitter *m_centerVertSplitter;
+ QTabWidget *m_bottomTab;
+ QSplitter *m_rightVertSplitter;
+};
+
+} // namespace Internal
+} // namespace Designer
+
+#endif // DESIGNER_EDITORWIDGET_H
diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp
index aa0e7cf186f5c5d2038a9b08fbe633f75dbb7d4e..4c69966fdf422d755dd817fd8b20dabc1dced5fc 100644
--- a/src/plugins/designer/formeditorfactory.cpp
+++ b/src/plugins/designer/formeditorfactory.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formeditorfactory.h"
#include "formeditorw.h"
#include "formwindoweditor.h"
diff --git a/src/plugins/designer/formeditorfactory.h b/src/plugins/designer/formeditorfactory.h
index a4c6d247fab594ece0385ccf8be85a80a83a2b08..ae565f70c37bb2e6487f5dc9632106e49dcfead8 100644
--- a/src/plugins/designer/formeditorfactory.h
+++ b/src/plugins/designer/formeditorfactory.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMEDITORFACTORY_H
#define FORMEDITORFACTORY_H
@@ -69,5 +70,4 @@ private:
} // namespace Internal
} // namespace Designer
-#endif
-
+#endif // FORMEDITORFACTORY_H
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index 92dbd8480556cd9522db1bea545ac3affd56508f..0c3dbb4d6e559d96686f9af206f92a777d442abd 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formeditorplugin.h"
#include "formeditorfactory.h"
#include "formeditorw.h"
diff --git a/src/plugins/designer/formeditorplugin.h b/src/plugins/designer/formeditorplugin.h
index 105bd740bb751516e2fd7ddcd150bda50ab15126..9967cf3984ca50c8bb35410cf5d9543f84cdea6f 100644
--- a/src/plugins/designer/formeditorplugin.h
+++ b/src/plugins/designer/formeditorplugin.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMEDITORPLUGIN_H
#define FORMEDITORPLUGIN_H
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 5526b3a01f7b03b504878246fd44ab249538ca83..c156dec1b7f5416cf3a94cde812613e0f08465a4 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formeditorw.h"
#include "formwindoweditor.h"
#include "designerconstants.h"
diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h
index a5477bffe04a003b391e625fa5f4bf24802bfcfc..5eb0348bc82c5a35b9771626566c98b29a37c9b2 100644
--- a/src/plugins/designer/formeditorw.h
+++ b/src/plugins/designer/formeditorw.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMEDITORW_H
#define FORMEDITORW_H
diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp
index 77e008af0923e35e72698bb313836247790b170d..1d5738179611c6f5d03b172b9cd6af2320697142 100644
--- a/src/plugins/designer/formtemplatewizardpage.cpp
+++ b/src/plugins/designer/formtemplatewizardpage.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formtemplatewizardpage.h"
#include "formeditorw.h"
@@ -325,6 +326,7 @@ QString FormTemplateWizardPagePage::changeUiClassName(const QString &uiXml, cons
const QString rc = domUi.toString();
return rc;
}
-#endif
+#endif // USE_XSLT
+
} // namespace Internal
} // namespace Designer
diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h
index ed35aa5c3205c14dae57833c162615be11925989..93bd4bcf42fcbae6e4df2e4bb62dd2604cc93558 100644
--- a/src/plugins/designer/formtemplatewizardpage.h
+++ b/src/plugins/designer/formtemplatewizardpage.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMWIZARDPAGE_H
#define FORMWIZARDPAGE_H
@@ -76,4 +77,4 @@ private:
} // namespace Internal
} // namespace Designer
-#endif //FORMTEMPLATEWIZARDPAGE_H
+#endif // FORMTEMPLATEWIZARDPAGE_H
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index ab4223d5317b7d72f77396e2d478775672c9ea55..86c69dd51a5518d329ae52381b7dd3f0fe3793e3 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "designerconstants.h"
#include "editorwidget.h"
#include "formeditorw.h"
@@ -65,7 +66,8 @@ using ProjectExplorer::FileNode;
enum { debugFormWindowEditor = 0 };
-class QrcFilesVisitor : public NodesVisitor {
+class QrcFilesVisitor : public NodesVisitor
+{
public:
QStringList qrcFiles() const;
diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h
index 6a1dc26725ca42b97aa0c9a7f2c8315da6bddf6e..dbeaeae2fd15b99b5111f32333b25fc4c5f690e9 100644
--- a/src/plugins/designer/formwindoweditor.h
+++ b/src/plugins/designer/formwindoweditor.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMWINDOWEDITOR_H
#define FORMWINDOWEDITOR_H
@@ -125,4 +126,4 @@ private:
} // namespace Internal
} // namespace Designer
-#endif //FORMWINDOWEDITOR_H
+#endif // FORMWINDOWEDITOR_H
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index 0fcf9b5a1834bd2265ae1ba621ab18e635841c94..c7681848ae0fc19e5fe478fd573b50ff7b596ce3 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formwindowfile.h"
#include "designerconstants.h"
diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h
index b008d061da44fef8d2b8dddcc57b8f0c4d2d8c1b..8425d56e05617ce8768e96c04a46b45032a26518 100644
--- a/src/plugins/designer/formwindowfile.h
+++ b/src/plugins/designer/formwindowfile.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMWINDOWFILE_H
#define FORMWINDOWFILE_H
@@ -102,4 +103,4 @@ private:
} // namespace Internal
} // namespace Designer
-#endif //FORMWINDOWFILE_H
+#endif // FORMWINDOWFILE_H
diff --git a/src/plugins/designer/formwindowhost.cpp b/src/plugins/designer/formwindowhost.cpp
index f80d3a8a9de147e49945ca13632ace9a8c4c4db0..5cbc5c882d793a789e606a133404d0caa7db3ec2 100644
--- a/src/plugins/designer/formwindowhost.cpp
+++ b/src/plugins/designer/formwindowhost.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formwindowhost.h"
#include "formeditorw.h"
diff --git a/src/plugins/designer/formwindowhost.h b/src/plugins/designer/formwindowhost.h
index 2201d2f642bc98f172774f0184026b9615955b9b..8f0bc17aa613333f35aa01e98b71cf6e14f79b12 100644
--- a/src/plugins/designer/formwindowhost.h
+++ b/src/plugins/designer/formwindowhost.h
@@ -30,10 +30,10 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMWINDOWHOST_H
#define FORMWINDOWHOST_H
-
#include "widgethost.h"
class QDesignerFormWindowInterface;
@@ -58,4 +58,4 @@ private slots:
} // namespace Internal
} // namespace Designer
-#endif //FORMWINDOWHOST_H
+#endif // FORMWINDOWHOST_H
diff --git a/src/plugins/designer/formwizard.cpp b/src/plugins/designer/formwizard.cpp
index 427e8a0c034840294a2466163fee37b0f1c935fc..0aa877f05b99498be38e064ef04a5e0d104a0b56 100644
--- a/src/plugins/designer/formwizard.cpp
+++ b/src/plugins/designer/formwizard.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formwizard.h"
#include "formwizarddialog.h"
#include "formwindoweditor.h"
diff --git a/src/plugins/designer/formwizard.h b/src/plugins/designer/formwizard.h
index d2d82a858cbfab3e03c9b3377ab3de1ec2b2b891..7eb53a629f143bac5cefa1c8112e57a0a8b210aa 100644
--- a/src/plugins/designer/formwizard.h
+++ b/src/plugins/designer/formwizard.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMWIZARD_H
#define FORMWIZARD_H
diff --git a/src/plugins/designer/formwizarddialog.cpp b/src/plugins/designer/formwizarddialog.cpp
index d48be36118b86cebdd8446bd193126c69c2f1a20..e813d737480e518d7c2ac45a1f90cc9047e5a51b 100644
--- a/src/plugins/designer/formwizarddialog.cpp
+++ b/src/plugins/designer/formwizarddialog.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formwizarddialog.h"
#include "formtemplatewizardpage.h"
#include "formeditorw.h"
@@ -123,5 +124,6 @@ void FormFileWizardDialog::slotCurrentIdChanged(int id)
}
}
}
+
} // namespace Internal
} // namespace Designer
diff --git a/src/plugins/designer/formwizarddialog.h b/src/plugins/designer/formwizarddialog.h
index 98cff5e8eb0250a53710850eef1e275cd8e5558e..b537947618c11e7cb169c0fc9840a98d3da76bf2 100644
--- a/src/plugins/designer/formwizarddialog.h
+++ b/src/plugins/designer/formwizarddialog.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FORMWIZARDDIALOG_H
#define FORMWIZARDDIALOG_H
@@ -101,4 +102,4 @@ private:
} // namespace Internal
} // namespace Designer
-#endif //FORMWIZARDDIALOG_H
+#endif // FORMWIZARDDIALOG_H
diff --git a/src/plugins/designer/settingsmanager.cpp b/src/plugins/designer/settingsmanager.cpp
index a911d139cb77e9f6b396bf514ed8b3c765b94044..1f2305de1471418e57d9994e8bf0141bac5c0c29 100644
--- a/src/plugins/designer/settingsmanager.cpp
+++ b/src/plugins/designer/settingsmanager.cpp
@@ -30,7 +30,9 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
-#include <settingsmanager.h>
+
+#include "settingsmanager.h"
+
#include <QtCore/QDebug>
using namespace Designer::Internal;
diff --git a/src/plugins/designer/settingsmanager.h b/src/plugins/designer/settingsmanager.h
index d580d90eeee85895a7c3611979e7ae731f4bc9de..795a61ddfa56a22f7ee38a870a09a3118b15e187 100644
--- a/src/plugins/designer/settingsmanager.h
+++ b/src/plugins/designer/settingsmanager.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SETTINGSMANAGER_H
#define SETTINGSMANAGER_H
@@ -61,4 +62,4 @@ private:
} // namespace Internal
} // namespace Designer
-#endif //SETTINGSMANAGER_H
+#endif // SETTINGSMANAGER_H
diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp
index c2fddc2202a7a363124082535a0c2ddd5bb48e3a..269c6a1169f478632bfa0e215e35a5040f16d8bf 100644
--- a/src/plugins/designer/settingspage.cpp
+++ b/src/plugins/designer/settingspage.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "settingspage.h"
#include <extensionsystem/pluginmanager.h>
diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h
index 9970826878bebb66928ffe57e6fb2f93a8035f84..f794afa634b183bae437a2caedd79c0ecf661e6d 100644
--- a/src/plugins/designer/settingspage.h
+++ b/src/plugins/designer/settingspage.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef DESIGNER_SETTINGSPAGE_H
#define DESIGNER_SETTINGSPAGE_H
@@ -64,7 +65,7 @@ private:
QDesignerOptionsPageInterface *m_designerPage;
};
-} //namespace Internal
-} //namespace QuickOpen
+} // namespace Internal
+} // namespace QuickOpen
#endif // DESIGNER_SETTINGSPAGE_H
diff --git a/src/plugins/designer/workbenchintegration.cpp b/src/plugins/designer/workbenchintegration.cpp
index 6db411e0b26ae0dc4a74bc25498ea7d60d35a4e6..4e49218a5c4107d762eb1bdb9df8a132fc29735e 100644
--- a/src/plugins/designer/workbenchintegration.cpp
+++ b/src/plugins/designer/workbenchintegration.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "formeditorplugin.h"
#include "workbenchintegration.h"
#include "formeditorw.h"
diff --git a/src/plugins/designer/workbenchintegration.h b/src/plugins/designer/workbenchintegration.h
index ce6f5f431bc2b773f2370d9019ad22ba4e0187df..c13e27620e3a6e5e9041952aa69e01638adc211b 100644
--- a/src/plugins/designer/workbenchintegration.h
+++ b/src/plugins/designer/workbenchintegration.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef WORKBENCHINTEGRATION_H
#define WORKBENCHINTEGRATION_H
diff --git a/src/plugins/find/basetextfind.cpp b/src/plugins/find/basetextfind.cpp
index 0819d893ec67bcb159d7e59e253398620b4a3f19..63740d36527380a654cd3ea5027c6d19e66a0528 100644
--- a/src/plugins/find/basetextfind.cpp
+++ b/src/plugins/find/basetextfind.cpp
@@ -30,7 +30,9 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "basetextfind.h"
+
#include <QtGui/QTextBlock>
using namespace Find;
diff --git a/src/plugins/find/basetextfind.h b/src/plugins/find/basetextfind.h
index e3d3bc97bc58d8afffd544739b88329fcff219ef..ed8435981cc03eaa270256bc2cbd304c7c8dad11 100644
--- a/src/plugins/find/basetextfind.h
+++ b/src/plugins/find/basetextfind.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BASETEXTFIND_H
#define BASETEXTFIND_H
diff --git a/src/plugins/find/currentdocumentfind.cpp b/src/plugins/find/currentdocumentfind.cpp
index bf60c1078d5a405f755e1b19bacc829ec0139759..091c307d3d0a7af46cba3ec14e150e35e767c435 100644
--- a/src/plugins/find/currentdocumentfind.cpp
+++ b/src/plugins/find/currentdocumentfind.cpp
@@ -30,7 +30,9 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "currentdocumentfind.h"
+
#include <aggregation/aggregate.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/modemanager.h>
diff --git a/src/plugins/find/currentdocumentfind.h b/src/plugins/find/currentdocumentfind.h
index 99c4a83c30c434d18cd91009d9dbe86b3a3646e5..815182e88c64c464ad5c3b744a54f830b9f8e386 100644
--- a/src/plugins/find/currentdocumentfind.h
+++ b/src/plugins/find/currentdocumentfind.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef CURRENTDOCUMENTFIND_H
#define CURRENTDOCUMENTFIND_H
diff --git a/src/plugins/find/find_global.h b/src/plugins/find/find_global.h
index b390577994d5f844cf8f8445222b0cedfd809566..800b7cccce659adf6b800c7805aabc8da3c043f2 100644
--- a/src/plugins/find/find_global.h
+++ b/src/plugins/find/find_global.h
@@ -30,19 +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 FIND_GLOBAL_H
#define FIND_GLOBAL_H
diff --git a/src/plugins/find/findplugin.h b/src/plugins/find/findplugin.h
index 5c99198473420d7c5ef10862402580563ba4bee1..538797f516e1b655f37ab89ea7ee5052020d426f 100644
--- a/src/plugins/find/findplugin.h
+++ b/src/plugins/find/findplugin.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FINDPLUGIN_H
#define FINDPLUGIN_H
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index 88e25afc4c1d4473375d3b354d6e3ce2227b1b8c..6a28c4d93c6b92e228172934dcdd473b90ae8d97 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "findtoolbar.h"
#include "findplugin.h"
#include "textfindconstants.h"
diff --git a/src/plugins/find/findtoolbar.h b/src/plugins/find/findtoolbar.h
index ddf556aeea724dcb226f5e1ecfc8a230f747d0fc..790a1e03002ed920ae3b4d5a9f21659e4760afcd 100644
--- a/src/plugins/find/findtoolbar.h
+++ b/src/plugins/find/findtoolbar.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FINDTOOLBAR_H
#define FINDTOOLBAR_H
diff --git a/src/plugins/find/findtoolwindow.cpp b/src/plugins/find/findtoolwindow.cpp
index ba9ea2b54fea8202dbfe790337d2941174886bc2..6b1ac69debe834483d91645951f105cf604b6c33 100644
--- a/src/plugins/find/findtoolwindow.cpp
+++ b/src/plugins/find/findtoolwindow.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "findtoolwindow.h"
#include "findplugin.h"
diff --git a/src/plugins/find/findtoolwindow.h b/src/plugins/find/findtoolwindow.h
index 2a8576a7fdc893f57f2c721048ae956ba02e8b84..71d3200b3c788a6d25e91d31b6d518e73498532d 100644
--- a/src/plugins/find/findtoolwindow.h
+++ b/src/plugins/find/findtoolwindow.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FINDTOOLWINDOW_H
#define FINDTOOLWINDOW_H
diff --git a/src/plugins/find/ifindfilter.h b/src/plugins/find/ifindfilter.h
index fe88ce9e2d752769ebaf2291f9b3a27c8fde8779..057b56acd4416cff63e58202e2976de0f87aab04 100644
--- a/src/plugins/find/ifindfilter.h
+++ b/src/plugins/find/ifindfilter.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IFINDFILTER_H
#define IFINDFILTER_H
diff --git a/src/plugins/find/ifindsupport.h b/src/plugins/find/ifindsupport.h
index a5dfc36e5f720724ebb72bc198dd0ad4071f635b..6bf5ede776a59fdb7b2817b14632ac50b1b8464e 100644
--- a/src/plugins/find/ifindsupport.h
+++ b/src/plugins/find/ifindsupport.h
@@ -30,10 +30,12 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IFINDSUPPORT_H
#define IFINDSUPPORT_H
#include "find_global.h"
+
#include <QtGui/QTextDocument>
namespace Find {
@@ -69,7 +71,7 @@ signals:
};
-inline void IFindSupport::highlightAll(const QString &, QTextDocument::FindFlags){}
+inline void IFindSupport::highlightAll(const QString &, QTextDocument::FindFlags) {}
} // namespace Find
diff --git a/src/plugins/find/searchresulttreeitemdelegate.cpp b/src/plugins/find/searchresulttreeitemdelegate.cpp
index 52b3bc63ff3ab28ac648eabcb540c098725383a1..6be35f71b8ebd2c488374d9fdaf1ecfeb6b52d87 100644
--- a/src/plugins/find/searchresulttreeitemdelegate.cpp
+++ b/src/plugins/find/searchresulttreeitemdelegate.cpp
@@ -30,32 +30,30 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "searchresulttreeitemdelegate.h"
#include "searchresulttreeitemroles.h"
-#include <math.h>
-
#include <QModelIndex>
#include <QTextDocument>
#include <QPainter>
#include <QAbstractTextDocumentLayout>
#include <QApplication>
+#include <math.h>
+
using namespace Find::Internal;
SearchResultTreeItemDelegate::SearchResultTreeItemDelegate(QObject *parent)
-: QItemDelegate(parent)
+ : QItemDelegate(parent)
{
}
void SearchResultTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
- if (index.model()->data(index, ItemDataRoles::TypeRole).toString().compare("file") == 0)
- {
+ if (index.model()->data(index, ItemDataRoles::TypeRole).toString().compare("file") == 0) {
QItemDelegate::paint(painter, option, index);
- }
- else
- {
+ } else {
painter->save();
QStyleOptionViewItemV3 opt = setOptions(index, option);
diff --git a/src/plugins/find/searchresulttreeitemdelegate.h b/src/plugins/find/searchresulttreeitemdelegate.h
index 7b5237b3c75142e653b29be63056624c60180ab3..a79db17383acce9083dad340ce977c95ff9b88e5 100644
--- a/src/plugins/find/searchresulttreeitemdelegate.h
+++ b/src/plugins/find/searchresulttreeitemdelegate.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SEARCHRESULTTREEITEMDELEGATE_H
#define SEARCHRESULTTREEITEMDELEGATE_H
@@ -51,7 +52,7 @@ private:
static const int m_minimumLineNumberDigits = 6;
};
-} //Internal
-} //Find
+} // namespace Internal
+} // namespace Find
-#endif
+#endif // SEARCHRESULTTREEITEMDELEGATE_H
diff --git a/src/plugins/find/searchresulttreeitemroles.h b/src/plugins/find/searchresulttreeitemroles.h
index 569f5ad5c62d5691b081fda7f04a670f1c807e47..a1998cdeaa1d374e7fead2d12d3e5997010ee0c0 100644
--- a/src/plugins/find/searchresulttreeitemroles.h
+++ b/src/plugins/find/searchresulttreeitemroles.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SEARCHRESULTTREEITEMROLES_H
#define SEARCHRESULTTREEITEMROLES_H
@@ -50,8 +51,8 @@ enum roles
RowOfItem // The ?-th child of its parent is this this item
};
-} //Internal
-} //Find
-} //itemDataRoles
+} // namespace Internal
+} // namespace Find
+} // namespace itemDataRoles
-#endif
+#endif // SEARCHRESULTTREEITEMROLES_H
diff --git a/src/plugins/find/searchresulttreeitems.cpp b/src/plugins/find/searchresulttreeitems.cpp
index 897aad176224468867cf68888d034671ef46e266..a0983500058b331b1b0b8bb43069bae5486649cc 100644
--- a/src/plugins/find/searchresulttreeitems.cpp
+++ b/src/plugins/find/searchresulttreeitems.cpp
@@ -30,13 +30,13 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "searchresulttreeitems.h"
using namespace Find::Internal;
SearchResultTreeItem::SearchResultTreeItem(SearchResultTreeItem::itemType type, const SearchResultTreeItem *parent)
-: m_type(type)
-, m_parent(parent)
+ : m_type(type), m_parent(parent)
{
}
@@ -118,8 +118,7 @@ int SearchResultTextRow::searchTermLength() const
}
SearchResultFile::SearchResultFile(const QString &fileName, const SearchResultTreeItem *parent)
-: SearchResultTreeItem(resultFile, parent)
-, m_fileName(fileName)
+ : SearchResultTreeItem(resultFile, parent), m_fileName(fileName)
{
}
diff --git a/src/plugins/find/searchresulttreeitems.h b/src/plugins/find/searchresulttreeitems.h
index 3fc9eccaf2c632e920e4f8f5c7906d0a2171b0e6..0dd6b88676b3663240995457e6eb12e79528b8cb 100644
--- a/src/plugins/find/searchresulttreeitems.h
+++ b/src/plugins/find/searchresulttreeitems.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SEARCHRESULTTREEITEMS_H
#define SEARCHRESULTTREEITEMS_H
@@ -55,13 +56,13 @@ public:
SearchResultTreeItem(itemType type = root, const SearchResultTreeItem *parent = NULL);
virtual ~SearchResultTreeItem();
- itemType getItemType(void) const;
- const SearchResultTreeItem *getParent(void) const;
+ itemType getItemType() const;
+ const SearchResultTreeItem *getParent() const;
const SearchResultTreeItem *getChild(int index) const;
void appendChild(SearchResultTreeItem *child);
- int getChildrenCount(void) const;
- int getRowOfItem(void) const;
- void clearChildren(void);
+ int getChildrenCount() const;
+ int getRowOfItem() const;
+ void clearChildren();
private:
itemType m_type;
@@ -92,7 +93,7 @@ class SearchResultFile: public SearchResultTreeItem
{
public:
SearchResultFile(const QString &fileName, const SearchResultTreeItem *parent);
- QString getFileName(void) const;
+ QString getFileName() const;
void appendResultLine(int index, int lineNumber, const QString &rowText, int searchTermStart,
int searchTermLength);
@@ -100,7 +101,7 @@ private:
QString m_fileName;
};
-} //Internal
-} //Find
+} // namespace Internal
+} // namespace Find
-#endif
+#endif // SEARCHRESULTTREEITEMS_H
diff --git a/src/plugins/find/searchresulttreemodel.cpp b/src/plugins/find/searchresulttreemodel.cpp
index bf77243bca8277f89d70465abffbf95452fd5d56..f99e9d8e4554ef410eef756228b6ad51d674250b 100644
--- a/src/plugins/find/searchresulttreemodel.cpp
+++ b/src/plugins/find/searchresulttreemodel.cpp
@@ -30,17 +30,18 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "searchresulttreemodel.h"
#include "searchresulttreeitems.h"
#include "searchresulttreeitemroles.h"
+
#include <QtGui/QFont>
#include <QtGui/QColor>
using namespace Find::Internal;
SearchResultTreeModel::SearchResultTreeModel(QObject *parent)
-: QAbstractItemModel(parent)
-, m_lastAppendedResultFile(NULL)
+ : QAbstractItemModel(parent), m_lastAppendedResultFile(0)
{
m_rootItem = new SearchResultTreeItem();
}
diff --git a/src/plugins/find/searchresulttreemodel.h b/src/plugins/find/searchresulttreemodel.h
index 76c77b2585337d0018d5c01b9de2c379f4d9b6f0..5a1518d9f026420ccfb49995be7d1790bb3ae741 100644
--- a/src/plugins/find/searchresulttreemodel.h
+++ b/src/plugins/find/searchresulttreemodel.h
@@ -30,19 +30,20 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SEARCHRESULTTREEMODEL_H
#define SEARCHRESULTTREEMODEL_H
#include <QtCore/QAbstractItemModel>
-namespace Find{
+namespace Find {
namespace Internal {
class SearchResultTreeItem;
class SearchResultTextRow;
class SearchResultFile;
-class SearchResultTreeModel: public QAbstractItemModel
+class SearchResultTreeModel : public QAbstractItemModel
{
Q_OBJECT
@@ -81,7 +82,7 @@ private:
SearchResultFile *m_lastAppendedResultFile;
};
-} //Internal
-} //Find
+} // namespace Internal
+} // namespace Find
-#endif
+#endif // SEARCHRESULTTREEMODEL_H
diff --git a/src/plugins/find/searchresulttreeview.cpp b/src/plugins/find/searchresulttreeview.cpp
index 4e7c78937e090055a720e0da571bf0372431fe70..6cd0f41c1fcfbf7672464273069c8509c38d3ff3 100644
--- a/src/plugins/find/searchresulttreeview.cpp
+++ b/src/plugins/find/searchresulttreeview.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "searchresulttreeview.h"
#include "searchresulttreeitemroles.h"
#include "searchresulttreemodel.h"
@@ -40,8 +41,7 @@
using namespace Find::Internal;
SearchResultTreeView::SearchResultTreeView(QWidget *parent)
-: QTreeView(parent)
-, m_autoExpandResults(false)
+ : QTreeView(parent), m_autoExpandResults(false)
{
m_model = new SearchResultTreeModel(this);
setModel(m_model);
@@ -71,7 +71,7 @@ void SearchResultTreeView::appendResultLine(int index, const QString &fileName,
int rowsAfter = m_model->rowCount();
if (m_autoExpandResults && (rowsAfter > rowsBefore))
- setExpanded(model()->index(model()->rowCount()-1, 0), true);
+ setExpanded(model()->index(model()->rowCount() - 1, 0), true);
}
void SearchResultTreeView::emitJumpToSearchResult(const QModelIndex &index)
diff --git a/src/plugins/find/searchresulttreeview.h b/src/plugins/find/searchresulttreeview.h
index b1af27b1007eec75fcdb9847cc238174c198936b..578e57d9e4f847985096cc32fc329bd6dbc0cb3f 100644
--- a/src/plugins/find/searchresulttreeview.h
+++ b/src/plugins/find/searchresulttreeview.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SEARCHRESULTTREEVIEW_H
#define SEARCHRESULTTREEVIEW_H
@@ -41,7 +42,7 @@ namespace Internal {
class SearchResultTreeModel;
-class SearchResultTreeView: public QTreeView
+class SearchResultTreeView : public QTreeView
{
Q_OBJECT
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp
index 3ce2d263651248061f565a701dc28ef4226c9efe..d9b040f80f6e93e600121c785600fa9795c3fa07 100644
--- a/src/plugins/find/searchresultwindow.cpp
+++ b/src/plugins/find/searchresultwindow.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "searchresultwindow.h"
#include "searchresulttreemodel.h"
@@ -45,7 +46,7 @@ using namespace Find::Internal;
static const QString SETTINGSKEYSECTIONNAME("SearchResults");
static const QString SETTINGSKEYEXPANDRESULTS("ExpandResults");
-SearchResultWindow::SearchResultWindow(Core::ICore *core):
+SearchResultWindow::SearchResultWindow(Core::ICore *core) :
m_core(core),
m_widget(new QStackedWidget())
{
diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h
index 150f20354a3525cb7bee4bf98b492831a0651ea0..7d616b1b1153565825f76496c4886efdb84d510f 100644
--- a/src/plugins/find/searchresultwindow.h
+++ b/src/plugins/find/searchresultwindow.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SEARCHRESULTWINDOW_H
#define SEARCHRESULTWINDOW_H
@@ -91,8 +92,8 @@ private slots:
int searchTermStart, int searchTermLength);
private:
- void readSettings(void);
- void writeSettings(void);
+ void readSettings();
+ void writeSettings();
Internal::SearchResultTreeView *m_searchResultTreeView;
QListWidget *m_noMatchesFoundDisplay;
diff --git a/src/plugins/find/textfindconstants.h b/src/plugins/find/textfindconstants.h
index 1ebb8c60cf87d248e7030954d8880a9a1f4cdbf2..86d74b7b3d58bae40b0f09bb3bc76ba608e501e7 100644
--- a/src/plugins/find/textfindconstants.h
+++ b/src/plugins/find/textfindconstants.h
@@ -30,28 +30,31 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef TEXTFINDCONSTANTS_H
#define TEXTFINDCONSTANTS_H
- namespace Find {
- namespace Constants {
- const char * const M_FIND = "Find.FindMenu";
- const char * const G_FIND_FILTERS = "Find.FindMenu.Filters";
- const char * const G_FIND_FLAGS = "Find.FindMenu.Flags";
- const char * const G_FIND_ACTIONS = "Find.FindMenu.Actions";
+namespace Find {
+namespace Constants {
+
+const char * const M_FIND = "Find.FindMenu";
+const char * const G_FIND_FILTERS = "Find.FindMenu.Filters";
+const char * const G_FIND_FLAGS = "Find.FindMenu.Flags";
+const char * const G_FIND_ACTIONS = "Find.FindMenu.Actions";
+
+const char * const FIND = "Find.FindReplace";
+const char * const FIND_IN_DOCUMENT = "Find.FindInCurrentDocument";
+const char * const FIND_NEXT = "Find.FindNext";
+const char * const FIND_PREVIOUS = "Find.FindPrevious";
+const char * const FIND_ALL = "Find.FindAll";
+const char * const REPLACE_NEXT = "Find.ReplaceNext";
+const char * const REPLACE_PREVIOUS = "Find.ReplacePrevious";
+const char * const REPLACE_ALL = "Find.ReplaceAll";
+const char * const CASE_SENSITIVE = "Find.CaseSensitive";
+const char * const WHOLE_WORDS = "Find.WholeWords";
+const char * const TASK_SEARCH = "Find.Task.Search";
- const char * const FIND = "Find.FindReplace";
- const char * const FIND_IN_DOCUMENT = "Find.FindInCurrentDocument";
- const char * const FIND_NEXT = "Find.FindNext";
- const char * const FIND_PREVIOUS = "Find.FindPrevious";
- const char * const FIND_ALL = "Find.FindAll";
- const char * const REPLACE_NEXT = "Find.ReplaceNext";
- const char * const REPLACE_PREVIOUS = "Find.ReplacePrevious";
- const char * const REPLACE_ALL = "Find.ReplaceAll";
- const char * const CASE_SENSITIVE = "Find.CaseSensitive";
- const char * const WHOLE_WORDS = "Find.WholeWords";
- const char * const TASK_SEARCH = "Find.Task.Search";
- }
- } //Find
+} // namespace Constants
+} // namespace Find
-#endif //TEXTFINDCONSTANTS_H
+#endif // TEXTFINDCONSTANTS_H
diff --git a/src/plugins/git/annotationhighlighter.cpp b/src/plugins/git/annotationhighlighter.cpp
index a1436b93ef883ef88a12173afffa4f3ae29c9da6..9c85deff13c6a4a942aac900e8a017a1afab722b 100644
--- a/src/plugins/git/annotationhighlighter.cpp
+++ b/src/plugins/git/annotationhighlighter.cpp
@@ -30,7 +30,9 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "annotationhighlighter.h"
+
#include <QtCore/QDebug>
namespace Git {
@@ -49,5 +51,5 @@ QString GitAnnotationHighlighter::changeNumber(const QString &block) const
return pos > 1 ? block.left(pos) : QString();
}
-}
-}
+} // namespace Internal
+} // namespace Git
diff --git a/src/plugins/git/annotationhighlighter.h b/src/plugins/git/annotationhighlighter.h
index f1cfed9db6273a81b89d57fc7d66f14425adc324..ebc8f199f967a235dbb28f5a327ba2e9acaf0883 100644
--- a/src/plugins/git/annotationhighlighter.h
+++ b/src/plugins/git/annotationhighlighter.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef ANNOTATIONHIGHLIGHTER_H
#define ANNOTATIONHIGHLIGHTER_H
@@ -52,7 +53,7 @@ private:
const QChar m_blank;
};
-} //namespace Git
-} //namespace Internal
+} // namespace Internal
+} // namespace Git
-#endif
+#endif // ANNOTATIONHIGHLIGHTER_H
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 94b55cebd4c2f6cc1aaf03c493568932b077e77e..70004dbadfa7bb5e39320eb99ca5b0646d84b447 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "changeselectiondialog.h"
#include <QtGui/QFileDialog>
diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h
index ee47f7a828b2a203dc7c9a3a950dbe8171253c69..7ccb439a8a675b35c226e85124db597e10597e9a 100644
--- a/src/plugins/git/changeselectiondialog.h
+++ b/src/plugins/git/changeselectiondialog.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef CHANGESELECTIONDIALOG_H
#define CHANGESELECTIONDIALOG_H
@@ -40,7 +41,7 @@
namespace Git {
namespace Internal {
- class GitPlugin;
+class GitPlugin;
class ChangeSelectionDialog : public QDialog
{
@@ -57,7 +58,7 @@ private:
};
-} //namespace Internal
-} //namespace Git
+} // namespace Internal
+} // namespace Git
#endif // CHANGESELECTIONDIALOG_H
diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp
index b1d01313772a8c85b8798d3b51145d35c3a6b8f1..60e2173a660ab315b406c5c79313d256a934f107 100644
--- a/src/plugins/git/commitdata.cpp
+++ b/src/plugins/git/commitdata.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "commitdata.h"
#include <QtCore/QDebug>
@@ -92,5 +93,5 @@ QDebug operator<<(QDebug d, const CommitData &data)
return d;
}
-}
-}
+} // namespace Internal
+} // namespace Git
diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h
index 1a6d4c04f20a46d02b960725816c94381de806fa..9cd5a83eb16c3e01fec0950c6ef3675354c440bb 100644
--- a/src/plugins/git/commitdata.h
+++ b/src/plugins/git/commitdata.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef COMMITDATA_H
#define COMMITDATA_H
@@ -42,40 +43,43 @@ QT_END_NAMESPACE
namespace Git {
namespace Internal {
- // Read-only
- struct GitSubmitEditorPanelInfo {
- void clear();
- QString repository;
- QString description;
- QString branch;
- };
+// Read-only
+struct GitSubmitEditorPanelInfo
+{
+ void clear();
+ QString repository;
+ QString description;
+ QString branch;
+};
- QDebug operator<<(QDebug d, const GitSubmitEditorPanelInfo &);
+QDebug operator<<(QDebug d, const GitSubmitEditorPanelInfo &);
- struct GitSubmitEditorPanelData {
- void clear();
- // Format as "John Doe <jdoe@foobar.com>"
- QString authorString() const;
+struct GitSubmitEditorPanelData
+{
+ void clear();
+ // Format as "John Doe <jdoe@foobar.com>"
+ QString authorString() const;
- QString author;
- QString email;
- };
+ QString author;
+ QString email;
+};
- QDebug operator<<(QDebug d, const GitSubmitEditorPanelData &);
+QDebug operator<<(QDebug d, const GitSubmitEditorPanelData &);
- struct CommitData {
- void clear();
- GitSubmitEditorPanelInfo panelInfo;
- GitSubmitEditorPanelData panelData;
- QStringList commitFiles;
- QStringList notUpdatedFiles;
- QStringList untrackedFiles;
- };
+struct CommitData
+{
+ void clear();
+ GitSubmitEditorPanelInfo panelInfo;
+ GitSubmitEditorPanelData panelData;
+ QStringList commitFiles;
+ QStringList notUpdatedFiles;
+ QStringList untrackedFiles;
+};
- QDebug operator<<(QDebug d, const CommitData &);
+QDebug operator<<(QDebug d, const CommitData &);
-}
-}
+} // namespace Internal
+} // namespace Git
-#endif
+#endif // COMMITDATA_H
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 41f576e3573da2c183986b5253cf9501bf5009a4..d021881dbb064fb1398926b59a3a9e6930c5992f 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "gitclient.h"
#include "gitplugin.h"
#include "gitconstants.h"
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 872a89334ef8c4a779fe47bbb5d4d7e11f25cf89..944041afa3d4a7698ed2dd9ec0c17405f402c6e7 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef GITCLIENT_H
#define GITCLIENT_H
@@ -64,62 +65,53 @@ struct GitSubmitEditorPanelData;
class GitClient : public Core::IVersionControl
{
Q_OBJECT
+
public:
- explicit GitClient(GitPlugin *plugin, Core::ICore *core);
- ~GitClient();
- bool vcsOpen(const QString &fileName);
- bool vcsAdd(const QString&) {return false;}
- bool vcsDelete(const QString&) {return false;}
- bool managesDirectory(const QString&) const {return false;}
- QString findTopLevelForDirectory(const QString&) const {return QString();}
-
- static QString findRepositoryForFile(const QString &fileName);
- static QString findRepositoryForDirectory(const QString &dir);
-
- void diff(const QString &workingDirectory,
- const QString &fileName);
- void diff(const QString &workingDirectory,
- const QStringList &fileNames);
-
- void status(const QString &workingDirectory);
- void log(const QString &workingDirectory
- , const QString &fileName);
- void blame(const QString &workingDirectory
- , const QString &fileName);
- void showCommit(const QString &workingDirectory
- , const QString &commit);
- void checkout(const QString &workingDirectory
- , const QString &file);
- void hardReset(const QString &workingDirectory
- , const QString &commit);
- void addFile(const QString &workingDirectory
- , const QString &fileName);
- bool synchronousAdd(const QString &workingDirectory,
- const QStringList &files);
- void pull(const QString &workingDirectory);
- void push(const QString &workingDirectory);
-
- QString readConfig(const QString &workingDirectory
- , const QStringList &configVar);
-
- QString readConfigValue(const QString &workingDirectory,
- const QString &configVar);
-
- bool getCommitData(const QString &workingDirectory,
- QString *commitTemplate,
- CommitData *d,
- QString *errorMessage);
-
- bool addAndCommit(const QString &workingDirectory,
- const GitSubmitEditorPanelData &data,
- const QString &messageFile,
- const QStringList &files);
+ GitClient(GitPlugin *plugin, Core::ICore *core);
+ ~GitClient();
+
+ bool vcsOpen(const QString &fileName);
+ bool vcsAdd(const QString &) { return false; }
+ bool vcsDelete(const QString &) { return false; }
+ bool managesDirectory(const QString &) const { return false; }
+ QString findTopLevelForDirectory(const QString &) const { return QString(); }
+
+ static QString findRepositoryForFile(const QString &fileName);
+ static QString findRepositoryForDirectory(const QString &dir);
+
+ void diff(const QString &workingDirectory, const QString &fileName);
+ void diff(const QString &workingDirectory, const QStringList &fileNames);
+
+ void status(const QString &workingDirectory);
+ void log(const QString &workingDirectory, const QString &fileName);
+ void blame(const QString &workingDirectory, const QString &fileName);
+ void showCommit(const QString &workingDirectory, const QString &commit);
+ void checkout(const QString &workingDirectory, const QString &file);
+ void hardReset(const QString &workingDirectory, const QString &commit);
+ void addFile(const QString &workingDirectory, const QString &fileName);
+ bool synchronousAdd(const QString &workingDirectory, const QStringList &files);
+ void pull(const QString &workingDirectory);
+ void push(const QString &workingDirectory);
+
+ QString readConfig(const QString &workingDirectory, const QStringList &configVar);
+
+ QString readConfigValue(const QString &workingDirectory, const QString &configVar);
+
+ bool getCommitData(const QString &workingDirectory,
+ QString *commitTemplate,
+ CommitData *d,
+ QString *errorMessage);
+
+ bool addAndCommit(const QString &workingDirectory,
+ const GitSubmitEditorPanelData &data,
+ const QString &messageFile,
+ const QStringList &files);
public slots:
void show(const QString &source, const QString &id);
private:
- VCSBase::VCSBaseEditor *createVCSEditor(const QString &kind,
+ VCSBase::VCSBaseEditor *createVCSEditor(const QString &kind,
QString title,
const QString &source,
bool setSourceCodec,
@@ -127,20 +119,20 @@ private:
const QString &dynamicPropertyValue) const;
- void executeGit(const QString &workingDirectory
- , const QStringList &arguments
- , GitOutputWindow *outputWindow
- , VCSBase::VCSBaseEditor* editor = 0
- , bool outputToWindow = false);
+ void executeGit(const QString &workingDirectory,
+ const QStringList &arguments,
+ GitOutputWindow *outputWindow,
+ VCSBase::VCSBaseEditor* editor = 0,
+ bool outputToWindow = false);
- bool synchronousGit(const QString &workingDirectory
- , const QStringList &arguments
- , QByteArray* outputText = 0
- , QByteArray* errorText = 0);
+ bool synchronousGit(const QString &workingDirectory,
+ const QStringList &arguments,
+ QByteArray* outputText = 0,
+ QByteArray* errorText = 0);
- const QString m_msgWait;
- GitPlugin *m_plugin;
- Core::ICore *m_core;
+ const QString m_msgWait;
+ GitPlugin *m_plugin;
+ Core::ICore *m_core;
};
class GitCommand : public QObject
@@ -149,12 +141,12 @@ class GitCommand : public QObject
public:
GitCommand();
~GitCommand();
- void execute(const QStringList &arguments
- , const QString &workingDirectory
- , const ProjectExplorer::Environment &environment);
- void run(const QStringList &arguments
- , const QString &workingDirectory
- , const ProjectExplorer::Environment &environment);
+ void execute(const QStringList &arguments,
+ const QString &workingDirectory,
+ const ProjectExplorer::Environment &environment);
+ void run(const QStringList &arguments,
+ const QString &workingDirectory,
+ const ProjectExplorer::Environment &environment);
Q_SIGNALS:
void outputData(const QByteArray&);
@@ -162,7 +154,7 @@ Q_SIGNALS:
void errorText(const QString&);
};
- }
-}
+} // namespace Internal
+} // namespace Git
#endif // GITCLIENT_H
diff --git a/src/plugins/git/gitconstants.h b/src/plugins/git/gitconstants.h
index af5e5f15b2ac159644976b5bea3e9bbda712b529..935310f68ea4a712e405b1c786d81dfdcb28c9d2 100644
--- a/src/plugins/git/gitconstants.h
+++ b/src/plugins/git/gitconstants.h
@@ -30,29 +30,32 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef GIT_CONSTANTS_H
#define GIT_CONSTANTS_H
namespace Git {
- namespace Constants {
- const char * const GIT_COMMAND_LOG_EDITOR_KIND = "Git Command Log Editor";
- const char * const GIT_LOG_EDITOR_KIND = "Git File Log Editor";
- const char * const GIT_BLAME_EDITOR_KIND = "Git Annotation Editor";
- const char * const GIT_DIFF_EDITOR_KIND = "Git Diff Editor";
-
- const char * const C_GITSUBMITEDITOR = "Git Submit Editor";
- const char * const GITSUBMITEDITOR_KIND = "Git Submit Editor";
- const char * const SUBMIT_CURRENT = "Nokia.Git.SubmitCurrentLog";
- const char * const DIFF_SELECTED = "Nokia.Git.DiffSelectedFilesInLog";
- const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.git.submit";
-
- // TODO: For the moment, trust p4 is loaded...
- const char * const ICON_SUBMIT = ":/trolltech.perforce/images/submit.png";
- const char * const ICON_DIFF = ":/trolltech.perforce/images/diff.png";
-
- const char * const DIFF_FILE_INDICATOR = "--- ";
- enum { debug = 0 };
- }
-}
+namespace Constants {
+
+const char * const GIT_COMMAND_LOG_EDITOR_KIND = "Git Command Log Editor";
+const char * const GIT_LOG_EDITOR_KIND = "Git File Log Editor";
+const char * const GIT_BLAME_EDITOR_KIND = "Git Annotation Editor";
+const char * const GIT_DIFF_EDITOR_KIND = "Git Diff Editor";
+
+const char * const C_GITSUBMITEDITOR = "Git Submit Editor";
+const char * const GITSUBMITEDITOR_KIND = "Git Submit Editor";
+const char * const SUBMIT_CURRENT = "Nokia.Git.SubmitCurrentLog";
+const char * const DIFF_SELECTED = "Nokia.Git.DiffSelectedFilesInLog";
+const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.git.submit";
+
+// TODO: For the moment, trust p4 is loaded...
+const char * const ICON_SUBMIT = ":/trolltech.perforce/images/submit.png";
+const char * const ICON_DIFF = ":/trolltech.perforce/images/diff.png";
+
+const char * const DIFF_FILE_INDICATOR = "--- ";
+enum { debug = 0 };
+
+} // namespace Constants
+} // namespace Git
#endif // GIT_CONSTANTS_H
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index b6f43c43468437f6b71eb6eaf16507ec23436df9..733a6abc0d5bfb84a5b6eb2700d75487da9a66aa 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "giteditor.h"
#include "annotationhighlighter.h"
#include "gitconstants.h"
@@ -141,5 +142,5 @@ QString GitEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) cons
return QString();
}
-}
-}
+} // namespace Internal
+} // namespace Git
diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h
index 6b848ed02cb4a65293eb955aa9319a57b4c6e02f..1ef4b34c024c10bd8f07320150e99d0bc573c997 100644
--- a/src/plugins/git/giteditor.h
+++ b/src/plugins/git/giteditor.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef GITEDITOR_H
#define GITEDITOR_H
diff --git a/src/plugins/git/gitoutputwindow.cpp b/src/plugins/git/gitoutputwindow.cpp
index a32064a8fc60cb784982fa66bfa0ce6b63eab21a..a321449b1e22614c5367d0138e0502ede392a5f8 100644
--- a/src/plugins/git/gitoutputwindow.cpp
+++ b/src/plugins/git/gitoutputwindow.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "gitoutputwindow.h"
#include <QtCore/QTextCodec>
diff --git a/src/plugins/git/gitoutputwindow.h b/src/plugins/git/gitoutputwindow.h
index 6097d2115ecc1f11041efe21b67564e58315731a..af5a5027bbad8c89141121b75d86532591a96e65 100644
--- a/src/plugins/git/gitoutputwindow.h
+++ b/src/plugins/git/gitoutputwindow.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef GITOUTPUTWINDOW_H
#define GITOUTPUTWINDOW_H
@@ -42,7 +43,6 @@
namespace Git {
namespace Internal {
-
class GitOutputWindow : public Core::IOutputPane
{
Q_OBJECT
@@ -52,7 +52,7 @@ public:
~GitOutputWindow();
QWidget *outputWidget(QWidget *parent);
- QList<QWidget*> toolBarWidgets(void) const { return QList<QWidget *>(); }
+ QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
QString name() const;
int priorityInStatusBar() const;
@@ -76,4 +76,4 @@ private:
} // namespace Internal
} // namespace Git
-#endif
+#endif // GITOUTPUTWINDOW_H
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 52391482321366fd4ff2a5fe130f860f9482d5e5..3b6342db8ee5afb39296ee5939811b8c61d6cc58 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "gitplugin.h"
#include "gitclient.h"
#include "giteditor.h"
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index f39ebaf0595ab4efb04c6ec2280edf049c0a0896..7becc05e7dc5cd8c879f193a65c99925e0df4bfb 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef GITPLUGIN_H
#define GITPLUGIN_H
@@ -160,4 +161,4 @@ private:
} // namespace Git
} // namespace Internal
-#endif
+#endif // GITPLUGIN_H
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index 01e75ed56f162c89a6abab95c07640150fb0672d..4f0e201d666a85c9f03c6f4c5484552645eafb8c 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "gitsubmiteditor.h"
#include "gitsubmiteditorwidget.h"
#include "gitconstants.h"
@@ -88,5 +89,6 @@ QString GitSubmitEditor::fileFromChangeLine(const QString &line)
rc.remove(0, 1);
return rc;
}
-}
-}
+
+} // namespace Internal
+} // namespace Git
diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h
index ff5d7c94d3959c3c6140905aa242d6f6c2ef7202..e0554758a29b8179182e369d6fd3fd7993cbf082 100644
--- a/src/plugins/git/gitsubmiteditor.h
+++ b/src/plugins/git/gitsubmiteditor.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef GITSUBMITEDITOR_H
#define GITSUBMITEDITOR_H
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index e5271333ddf6fee5372cbef5b26d6c7951b2ade7..99400952f1815bbe6bd7e96ea51e606524511e69 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "gitsubmiteditorwidget.h"
#include "commitdata.h"
@@ -65,5 +66,5 @@ void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
m_gitSubmitPanelUi.emailLineEdit->setText(data.email);
}
-}
-}
+} // namespace Internal
+} // namespace Git
diff --git a/src/plugins/git/gitsubmiteditorwidget.h b/src/plugins/git/gitsubmiteditorwidget.h
index 7e52f70cce974bd07c717e8b6672f1a595042733..06a96cb534754a80b4662b416d9870c1e2ba0b5a 100644
--- a/src/plugins/git/gitsubmiteditorwidget.h
+++ b/src/plugins/git/gitsubmiteditorwidget.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef GITSUBMITEDITORWIDGET_H
#define GITSUBMITEDITORWIDGET_H
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index f4aa641c23fe889063a72389c46da3e56c7c06dc..7b0c37284aa1793bd82b7ff74ca58c8715164e4f 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/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>
diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h
index 6871a2478e194ed7fe0ea1047d0a0bfbff3e812b..95147cf6552e1a1ae50bf0e75218dd3bf678da51 100644
--- a/src/plugins/git/settingspage.h
+++ b/src/plugins/git/settingspage.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SETTINGSPAGE_H
#define SETTINGSPAGE_H
@@ -76,7 +77,7 @@ private:
int m_logCount;
};
-} //namespace Internal
-} //namespace Git
+} // namespace Internal
+} // namespace Git
-#endif
+#endif // SETTINGSPAGE_H
diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp
index 299c069338fe20070038caab28b20188ddc8396e..9b1c9ea2f3d325336e3c9ca8d8e977d824003afe 100644
--- a/src/plugins/helloworld/helloworldplugin.cpp
+++ b/src/plugins/helloworld/helloworldplugin.cpp
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "helloworldplugin.h"
#include "helloworldwindow.h"
diff --git a/src/plugins/helloworld/helloworldplugin.h b/src/plugins/helloworld/helloworldplugin.h
index cd18f77f9cc9e768c19acfa89265a1e02746efb3..877087ec6091ac9eb4ed1c0b91097f661c73528d 100644
--- a/src/plugins/helloworld/helloworldplugin.h
+++ b/src/plugins/helloworld/helloworldplugin.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef HELLOWORLDPLUGIN_H
#define HELLOWORLDPLUGIN_H
@@ -62,4 +63,4 @@ private:
} // namespace Internal
} // namespace HelloWorld
-#endif //HELLOWORLDPLUGIN_H
+#endif // HELLOWORLDPLUGIN_H
diff --git a/src/plugins/helloworld/helloworldwindow.cpp b/src/plugins/helloworld/helloworldwindow.cpp
index 2c06587c3103722432078def66ec13cf91f42b00..03fb45c8bffb5b8b4f15e1d022fbf4d38de2dc2f 100644
--- a/src/plugins/helloworld/helloworldwindow.cpp
+++ b/src/plugins/helloworld/helloworldwindow.cpp
@@ -30,15 +30,16 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
-#include <QtGui/QTextEdit>
-#include <QtGui/QVBoxLayout>
#include "helloworldwindow.h"
+#include <QtGui/QTextEdit>
+#include <QtGui/QVBoxLayout>
+
using namespace HelloWorld::Internal;
HelloWorldWindow::HelloWorldWindow(QWidget *parent)
- :QWidget(parent)
+ : QWidget(parent)
{
QBoxLayout *layout = new QVBoxLayout(this);
layout->addWidget(new QTextEdit("Focus me to activate my context!"));
diff --git a/src/plugins/helloworld/helloworldwindow.h b/src/plugins/helloworld/helloworldwindow.h
index d0e1f885bd77b62e9f63e7163df04dd29f75698f..9c38a5d0c353d2119de8f91078150104360c3498 100644
--- a/src/plugins/helloworld/helloworldwindow.h
+++ b/src/plugins/helloworld/helloworldwindow.h
@@ -30,6 +30,7 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef HELLOWORLDWINDOW_H
#define HELLOWORLDWINDOW_H
diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h
index b3d1a0d26abf102ca35a32785ca0d79cca85240a..0ca15ce5c591dca2b683e8899d7e1f508ea73d7e 100644
--- a/src/plugins/help/centralwidget.h
+++ b/src/plugins/help/centralwidget.h
@@ -59,11 +59,9 @@ QT_END_NAMESPACE
namespace Help {
namespace Internal {
-
class PrintHelper;
-
-}
-}
+} // namespace Internal
+} // namespace Help
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/help/contentstoolwindow.cpp b/src/plugins/help/contentstoolwindow.cpp
index 2331e4ecc71435360755cef2335477a61d601ad9..ccd540bfef76b4041a6fa18ac4927ca70d6b51d5 100644
--- a/src/plugins/help/contentstoolwindow.cpp
+++ b/src/plugins/help/contentstoolwindow.cpp
@@ -30,14 +30,15 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
+#include "contentstoolwindow.h"
+#include "helpengine.h"
+
#include <QtCore/QDebug>
#include <QtCore/QStack>
#include <QtGui/QFocusEvent>
#include <QtGui/QKeyEvent>
-#include "contentstoolwindow.h"
-#include "helpengine.h"
-
using namespace Help::Internal;
ContentsToolWidget::ContentsToolWidget()
diff --git a/src/plugins/help/contentstoolwindow.h b/src/plugins/help/contentstoolwindow.h
index a7dd5f5d80331c8c52cdb6c49b47dffa3256d56c..4c13827523ff990616e8aaf74e92f6a548567733 100644
--- a/src/plugins/help/contentstoolwindow.h
+++ b/src/plugins/help/contentstoolwindow.h
@@ -30,13 +30,14 @@
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef CONTENTSTOOLWINDOW_H
#define CONTENTSTOOLWINDOW_H
-#include <QtGui/QTreeWidget>
-
#include <coreplugin/iview.h>
+#include <QtGui/QTreeWidget>
+
namespace Help {
namespace Internal {
@@ -96,7 +97,7 @@ private:
ContentsToolWidget *m_widget;
};
-} //namespace Internal
-} //namespace Help
+} // namespace Internal
+} // namespace Help
-#endif
+#endif // CONTENTSTOOLWINDOW_H