From b005d490b1c09a41a87903d4bbbf8b4991e48dce Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 12 Mar 2013 11:49:56 +0100
Subject: [PATCH] Fix Krazy warnings about includes/header guards in QML
 designer.

Change-Id: I9adb43b9c9f2b2c97693ebb09ebef795d0206d1c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit fdfb3cafcd8ae5a9eb8e447daaa5fe1d47d47046)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
---
 .../components/formeditor/abstractformeditortool.cpp        | 1 -
 .../qmldesigner/components/formeditor/formeditorscene.cpp   | 1 -
 .../qmldesigner/components/formeditor/formeditorview.cpp    | 2 +-
 .../components/formeditor/selectionrectangle.cpp            | 1 -
 .../qmldesigner/components/integration/designdocument.cpp   | 1 -
 .../integration/stackedutilitypanelcontroller.cpp           | 5 +++--
 .../components/integration/stackedutilitypanelcontroller.h  | 2 ++
 .../components/integration/utilitypanelcontroller.cpp       | 4 ++--
 .../qmldesigner/components/integration/xuifiledialog.cpp    | 3 +--
 .../qmldesigner/components/itemlibrary/customdraganddrop.h  | 5 +++++
 .../components/itemlibrary/itemlibrarycomponents.h          | 6 +++---
 .../qmldesigner/components/navigator/navigatorwidget.cpp    | 6 +++---
 .../qmldesigner/components/propertyeditor/basicwidgets.cpp  | 1 -
 .../components/propertyeditor/behaviordialog.cpp            | 1 -
 .../qmldesigner/components/propertyeditor/fontwidget.cpp    | 1 -
 .../components/propertyeditor/genericpropertieswidget.cpp   | 3 ++-
 .../components/propertyeditor/genericpropertieswidget.h     | 6 +++---
 .../qmldesigner/components/propertyeditor/propertyeditor.h  | 6 +++---
 .../components/propertyeditor/propertyeditorvalue.cpp       | 1 -
 .../qmldesigner/components/propertyeditor/resetwidget.cpp   | 2 +-
 .../designercore/exceptions/invalididexception.cpp          | 3 ++-
 .../designercore/filemanager/changeimportsvisitor.cpp       | 3 ++-
 .../qmldesigner/designercore/filemanager/qmlrefactoring.cpp | 3 ++-
 .../qmldesigner/designercore/include/abstractproperty.h     | 4 ++--
 src/plugins/qmldesigner/designercore/include/modelnode.h    | 6 +++---
 .../qmldesigner/designercore/include/qmlmodelnodefacade.h   | 6 +++---
 .../qmldesigner/designercore/include/qmlobjectnode.h        | 6 +++---
 src/plugins/qmldesigner/designercore/include/qmlstate.h     | 6 +++---
 src/plugins/qmldesigner/designercore/include/rewriterview.h | 1 -
 .../qmldesigner/designercore/include/variantproperty.h      | 4 ++--
 .../qmldesigner/designercore/metainfo/nodemetainfo.cpp      | 1 -
 .../designercore/metainfo/subcomponentmanager.cpp           | 3 ++-
 src/plugins/qmldesigner/designercore/model/copyhelper.cpp   | 6 +++---
 src/plugins/qmldesigner/designercore/model/import.cpp       | 4 ++--
 src/plugins/qmldesigner/designercore/model/model.cpp        | 4 ++--
 src/plugins/qmldesigner/designercore/model/modelmerger.cpp  | 1 -
 src/plugins/qmldesigner/designercore/model/modelnode.cpp    | 4 +---
 .../designercore/model/modelnodepositionrecalculator.cpp    | 3 ++-
 .../designercore/model/modelnodepositionstorage.cpp         | 2 +-
 .../qmldesigner/designercore/model/modelrewriter.cpp        | 2 +-
 .../qmldesigner/designercore/model/modeltotextmerger.cpp    | 2 +-
 src/plugins/qmldesigner/designercore/model/paster.cpp       | 3 ++-
 .../qmldesigner/designercore/model/propertybinding.cpp      | 2 +-
 .../qmldesigner/designercore/model/qmlobjectnode.cpp        | 1 -
 .../qmldesigner/designercore/model/qmltextgenerator.cpp     | 3 ++-
 .../qmldesigner/designercore/model/rewriteaction.cpp        | 3 ++-
 .../designercore/model/rewriteactioncompressor.cpp          | 3 ++-
 src/plugins/qmldesigner/designercore/model/rewriterview.cpp | 3 ++-
 .../qmldesigner/designercore/model/texttomodelmerger.cpp    | 2 +-
 src/plugins/qmldesigner/qmldesignerconstants.h              | 6 +++---
 src/plugins/qmldesigner/qmldesignerplugin.cpp               | 2 +-
 src/plugins/qmldesigner/settingspage.cpp                    | 2 +-
 52 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
index e182b5db9cf..0ed61fcf9c1 100644
--- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
@@ -29,7 +29,6 @@
 
 #include "abstractformeditortool.h"
 #include "formeditorview.h"
-#include "formeditorview.h"
 
 #include <modelnodecontextmenu.h>
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
index 4d0c919fe01..0d2fafc4e60 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
@@ -51,7 +51,6 @@
 #include "formeditornodeinstanceview.h"
 
 #include "resizehandleitem.h"
-#include <QDebug>
 
 
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index d7559a89823..699df557eb1 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -27,11 +27,11 @@
 **
 ****************************************************************************/
 
+#include "formeditorview.h"
 #include "selectiontool.h"
 #include "movetool.h"
 #include "resizetool.h"
 #include "dragtool.h"
-#include "formeditorview.h"
 #include "formeditorwidget.h"
 #include "formeditornodeinstanceview.h"
 #include "formeditoritem.h"
diff --git a/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp b/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp
index 38b8c58e217..c1857a28c1a 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp
@@ -33,7 +33,6 @@
 #include <QGraphicsScene>
 #include <QDebug>
 #include <cmath>
-#include <QGraphicsScene>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp
index a1c7db09729..0f3e84f7c74 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp
@@ -43,7 +43,6 @@
 #include <rewritingexception.h>
 #include <nodelistproperty.h>
 #include <variantproperty.h>
-#include <rewritingexception.h>
 #include <modelnodeoperations.h>
 #include <qmldesignerplugin.h>
 #include <viewmanager.h>
diff --git a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
index 6d86f466857..a6d66434a92 100644
--- a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
@@ -27,10 +27,11 @@
 **
 ****************************************************************************/
 
+#include "stackedutilitypanelcontroller.h"
+#include "designdocument.h"
+
 #include <QStackedWidget>
 
-#include "designdocument.h"
-#include "stackedutilitypanelcontroller.h"
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
index 969532fa9fc..25a27f32222 100644
--- a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
+++ b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
@@ -32,6 +32,8 @@
 
 #include "utilitypanelcontroller.h"
 
+class QStackedWidget;
+
 namespace QmlDesigner {
 
 class DesignDocument;
diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
index 3e1c43e7e9f..b898473f143 100644
--- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
@@ -27,14 +27,14 @@
 **
 ****************************************************************************/
 
+#include "utilitypanelcontroller.h"
+
 #include <QDebug>
 #include <QEvent>
 #include <QDockWidget>
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "utilitypanelcontroller.h"
-
 namespace QmlDesigner {
 
 UtilityPanelController::UtilityPanelController(QObject* parent):
diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
index 3fed00cd855..f761c9e9ffb 100644
--- a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
+++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
@@ -27,6 +27,7 @@
 **
 ****************************************************************************/
 
+#include "xuifiledialog.h"
 #include <utils/hostosinfo.h>
 
 #include <QDebug>
@@ -34,8 +35,6 @@
 #include <QObject>
 #include <QCoreApplication>
 
-#include "xuifiledialog.h"
-
 namespace QmlDesigner {
 
 void XUIFileDialog::runOpenFileDialog(const QString& path, QWidget* parent, QObject* receiver, const char* member)
diff --git a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
index b178ee218c7..6666c99ee26 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
@@ -27,6 +27,9 @@
 **
 ****************************************************************************/
 
+#ifndef CUSTOMDRAGANDDROP_H
+#define CUSTOMDRAGANDDROP_H
+
 #include <QPixmap>
 #include <QLabel>
 #include <QTimeLine>
@@ -140,3 +143,5 @@ private:
     };
 
 } //namespave QmlDesigner
+
+#endif // CUSTOMDRAGANDDROP_H
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
index dda1e02bce9..8990ddd131d 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ITEMLIBRARYTREEVIEW_H
-#define ITEMLIBRARYTREEVIEW_H
+#ifndef ITEMLIBRARYCOMPONENTS_H
+#define ITEMLIBRARYCOMPONENTS_H
 
 #include <QTreeView>
 #include <QStandardItemModel>
@@ -90,5 +90,5 @@ private:
 
 } // namespace QmlDesigner
 
-#endif // ITEMLIBRARYTREEVIEW_H
+#endif // ITEMLIBRARYCOMPONENTS_H
 
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 266e9f1b070..3f74c08aa43 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -27,14 +27,14 @@
 **
 ****************************************************************************/
 
+#include "navigatorwidget.h"
+#include "navigatorview.h"
+
 #include <QBoxLayout>
 #include <QTreeView>
 #include <QHeaderView>
 #include <model.h>
 
-#include "navigatorwidget.h"
-#include "navigatorview.h"
-
 #include <utils/fileutils.h>
 
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index 0b4e1ad60c9..8edda671603 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -41,7 +41,6 @@
 #include <QMenu>
 #include <QAction>
 #include <QListView>
-#include <QDebug>
 #include <QApplication>
 #include <QGraphicsOpacityEffect>
 #include <QStyleFactory>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
index b85e7958c23..2a8e706160c 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
@@ -33,7 +33,6 @@
 #include <nodeproperty.h>
 #include <variantproperty.h>
 #include <bindingproperty.h>
-#include <nodeproperty.h>
 
 #include <QLineEdit>
 #include <QSpinBox>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp
index d83561c38e8..e3daa1981ab 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp
@@ -34,7 +34,6 @@
 #include <QFontDialog>
 #include <QApplication>
 #include <QComboBox>
-#include <QLabel>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp
index 5f54b981cdd..d9656194167 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp
@@ -27,6 +27,8 @@
 **
 ****************************************************************************/
 
+#include "genericpropertieswidget.h"
+
 #include <QSet>
 #include <QDebug>
 #include <QWidget>
@@ -37,7 +39,6 @@
 #include "qttreepropertybrowser.h"
 #include "qtvariantproperty.h"
 
-#include "genericpropertieswidget.h"
 #include "nodemetainfo.h"
 #include "propertymetainfo.h"
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h
index add3e3b67b0..2b7de840e74 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef PropertyView_h
-#define PropertyView_h
+#ifndef GENERICPROPERTIESWIDGET_H
+#define GENERICPROPERTIESWIDGET_H
 
 #include <QTabWidget>
 
@@ -93,4 +93,4 @@ private:
 
 }
 
-#endif // PropertyView_h
+#endif // GENERICPROPERTIESWIDGET_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
index 899346e59d2..bbda3db6a56 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef QmlPropertyView_h
-#define QmlPropertyView_h
+#ifndef PROPERTYEDITOR_H
+#define PROPERTYEDITOR_H
 
 #include <qmlmodelview.h>
 #include <declarativewidgetview.h>
@@ -167,4 +167,4 @@ protected:
 };
 }
 
-#endif // QmlPropertyView_h
+#endif // PROPERTYEDITOR_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 92d9fe1b617..a4adf32240f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -36,7 +36,6 @@
 #include <model.h>
 #include <nodemetainfo.h>
 #include <metainfo.h>
-#include <nodeproperty.h>
 #include <qmlobjectnode.h>
 
 //using namespace QmlDesigner;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
index 857c3ccb97e..56f9e96017e 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 
-#include "qdeclarative.h"
 #include "resetwidget.h"
+#include "qdeclarative.h"
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QStringList>
diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp
index 9fe318cb44d..264016ffd68 100644
--- a/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp
+++ b/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp
@@ -27,9 +27,10 @@
 **
 ****************************************************************************/
 
-#include <QCoreApplication>
 #include "invalididexception.h"
 
+#include <QCoreApplication>
+
 namespace QmlDesigner {
 
 InvalidIdException::InvalidIdException(int line,
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
index 74bf4ba42a2..f7fa85301e7 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
@@ -27,10 +27,11 @@
 **
 ****************************************************************************/
 
+#include "changeimportsvisitor.h"
+
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/parser/qmljsengine_p.h>
 
-#include "changeimportsvisitor.h"
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp
index 0c35d008d9a..a5646cdd02d 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp
@@ -27,6 +27,8 @@
 **
 ****************************************************************************/
 
+#include "qmlrefactoring.h"
+
 #include <QDebug>
 
 #include "addarraymembervisitor.h"
@@ -37,7 +39,6 @@
 #include "changepropertyvisitor.h"
 #include "moveobjectvisitor.h"
 #include "moveobjectbeforeobjectvisitor.h"
-#include "qmlrefactoring.h"
 #include "removepropertyvisitor.h"
 #include "removeuiobjectmembervisitor.h"
 
diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
index b26f07e8299..36a993d538f 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ABSTRACTROPERTY_H
-#define ABSTRACTROPERTY_H
+#ifndef ABSTRACTPROPERTY_H
+#define ABSTRACTPROPERTY_H
 
 #include <QVariant>
 #include <QWeakPointer>
diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h
index a2a3ff645e0..ed322f49d92 100644
--- a/src/plugins/qmldesigner/designercore/include/modelnode.h
+++ b/src/plugins/qmldesigner/designercore/include/modelnode.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DESIGNERNODE_H
-#define DESIGNERNODE_H
+#ifndef MODELNODE_H
+#define MODELNODE_H
 
 #include "qmldesignercorelib_global.h"
 #include <QWeakPointer>
@@ -203,4 +203,4 @@ QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const ModelN
 Q_DECLARE_METATYPE(QmlDesigner::ModelNode)
 Q_DECLARE_METATYPE(QList<QmlDesigner::ModelNode>)
 
-#endif // DESIGNERNODE_H
+#endif // MODELNODE_H
diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
index 5576c291c69..6c40a452b09 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FXMODELNODEFACADE_H
-#define FXMODELNODEFACADE_H
+#ifndef QMLMODELNODEFACADE_H
+#define QMLMODELNODEFACADE_H
 
 #include <qmldesignercorelib_global.h>
 #include <modelnode.h>
@@ -58,4 +58,4 @@ private:
 
 } //QmlDesigner
 
-#endif // FXMODELNODEFACADE_H
+#endif // QMLMODELNODEFACADE_H
diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
index 694e91eb038..552b5b1fb2e 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FXOBJECTNODE_H
-#define FXOBJECTNODE_H
+#ifndef QMLOBJECTNODE_H
+#define QMLOBJECTNODE_H
 
 #include <qmldesignercorelib_global.h>
 #include "qmlmodelnodefacade.h"
@@ -111,4 +111,4 @@ QMLDESIGNERCORE_EXPORT QList<ModelNode> toModelNodeList(const QList<QmlObjectNod
 QMLDESIGNERCORE_EXPORT QList<QmlObjectNode> toQmlObjectNodeList(const QList<ModelNode> &modelNodeList);
 }// QmlDesigner
 
-#endif // FXOBJECTNODE_H
+#endif // QMLOBJECTNODE_H
diff --git a/src/plugins/qmldesigner/designercore/include/qmlstate.h b/src/plugins/qmldesigner/designercore/include/qmlstate.h
index f66087593ba..2831011c42d 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlstate.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlstate.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FXSTATE_H
-#define FXSTATE_H
+#ifndef QMLSTATE_H
+#define QMLSTATE_H
 
 #include <qmldesignercorelib_global.h>
 #include "qmlmodelnodefacade.h"
@@ -79,4 +79,4 @@ protected:
 } //QmlDesigner
 
 
-#endif // FXSTATE_H
+#endif // QMLSTATE_H
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index f79442e3b87..0c5dd8e7d44 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -38,7 +38,6 @@
 #include <QMap>
 #include <QPointer>
 #include <QWeakPointer>
-#include <QHash>
 #include <QUrl>
 
 #include <modelnode.h>
diff --git a/src/plugins/qmldesigner/designercore/include/variantproperty.h b/src/plugins/qmldesigner/designercore/include/variantproperty.h
index 72d115c4edf..f507f45214e 100644
--- a/src/plugins/qmldesigner/designercore/include/variantproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/variantproperty.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef VARIANTROPERTY_H
-#define VARIANTROPERTY_H
+#ifndef VARIANTPROPERTY_H
+#define VARIANTPROPERTY_H
 
 #include "qmldesignercorelib_global.h"
 #include "abstractproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 9d6a23e21d3..fbfc3fce8d2 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -32,7 +32,6 @@
 #include "invalidargumentexception.h"
 
 #include "metainfo.h"
-#include <model.h>
 #include <rewriterview.h>
 #include <propertyparser.h>
 
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index c82fa8f1df9..761aa1ca2fc 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -27,9 +27,10 @@
 **
 ****************************************************************************/
 
+#include "subcomponentmanager.h"
+
 #include <qmldesignerconstants.h>
 
-#include "subcomponentmanager.h"
 #include "model.h"
 #include "metainfo.h"
 #include "metainforeader.h"
diff --git a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp
index 6889527ce22..376102df472 100644
--- a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp
+++ b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp
@@ -27,12 +27,12 @@
 **
 ****************************************************************************/
 
-#include <QBuffer>
-#include <QDataStream>
-
 #include "copyhelper.h"
 #include "internalnode_p.h"
 
+#include <QBuffer>
+#include <QDataStream>
+
 namespace QmlDesigner {
 namespace Internal {
 
diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp
index c8eda553967..c49800123f9 100644
--- a/src/plugins/qmldesigner/designercore/model/import.cpp
+++ b/src/plugins/qmldesigner/designercore/model/import.cpp
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-#include <QHash>
-
 #include "import.h"
 
+#include <QHash>
+
 namespace QmlDesigner {
 
 Import Import::createLibraryImport(const QString &url, const QString &version, const QString &alias, const QStringList &importPaths)
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 3f2c6047dbb..eb32bf1b904 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -27,7 +27,8 @@
 **
 ****************************************************************************/
 
-#include <model.h>
+#include "model.h"
+#include "model_p.h"
 #include <modelnode.h>
 #include "internalnode_p.h"
 #include "invalidpropertyexception.h"
@@ -48,7 +49,6 @@
 #include "nodeinstanceview.h"
 #include "metainfo.h"
 #include "nodemetainfo.h"
-#include "model_p.h"
 #include "subcomponentmanager.h"
 #include "internalproperty.h"
 #include "internalnodelistproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
index c72a330f77c..cac03fa4b6b 100644
--- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
@@ -29,7 +29,6 @@
 
 #include "modelmerger.h"
 
-#include "modelmerger.h"
 #include "modelnode.h"
 #include "abstractview.h"
 #include "model.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index b79f4ec26a7..1266241b124 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <modelnode.h>
+#include "modelnode.h"
 #include <abstractproperty.h>
 #include <abstractview.h>
 #include <model.h>
@@ -42,8 +42,6 @@
 #include "invalidpropertyexception.h"
 #include "invalidslideindexexception.h"
 #include "model_p.h"
-#include "abstractview.h"
-#include "abstractproperty.h"
 #include "variantproperty.h"
 #include "bindingproperty.h"
 #include "nodeabstractproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp
index f70fa15ecf2..2a3591d1cf1 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp
@@ -27,9 +27,10 @@
 **
 ****************************************************************************/
 
-#include <QDebug>
 #include "modelnodepositionrecalculator.h"
 
+#include <QDebug>
+
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
 
diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
index 3dfcf5f0612..451c27dee64 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "invalidmodelnodeexception.h"
 #include "modelnodepositionstorage.h"
+#include "invalidmodelnodeexception.h"
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp b/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp
index f51239ebcf9..a4ad2ff8186 100644
--- a/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp
@@ -27,13 +27,13 @@
 **
 ****************************************************************************/
 
+#include "modelrewriter.h"
 #include <QCoreApplication>
 
 #include "copyhelper.h"
 #include "invalidmodelnodeexception.h"
 #include "invalidpropertyexception.h"
 #include "internalnode_p.h"
-#include "modelrewriter.h"
 #include "modificationgroupexception.h"
 #include "nodeproperty.h"
 #include "paster.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
index 8c97a2211e9..511ea6c44e3 100644
--- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "modelnodepositionrecalculator.h"
 #include "modeltotextmerger.h"
+#include "modelnodepositionrecalculator.h"
 #include "qmltextgenerator.h"
 #include "rewriteactioncompressor.h"
 #include "rewriterview.h"
diff --git a/src/plugins/qmldesigner/designercore/model/paster.cpp b/src/plugins/qmldesigner/designercore/model/paster.cpp
index 17c2fb47941..d2a2ee0afed 100644
--- a/src/plugins/qmldesigner/designercore/model/paster.cpp
+++ b/src/plugins/qmldesigner/designercore/model/paster.cpp
@@ -27,6 +27,8 @@
 **
 ****************************************************************************/
 
+#include "paster.h"
+
 #include <QByteArray>
 #include <QDataStream>
 #include <QSet>
@@ -34,7 +36,6 @@
 #include "changeimportsvisitor.h"
 #include "copypasteutil.h"
 #include "parsedqml.h"
-#include "paster.h"
 #include "qmlrewriter.h"
 
 using namespace QmlJS;
diff --git a/src/plugins/qmldesigner/designercore/model/propertybinding.cpp b/src/plugins/qmldesigner/designercore/model/propertybinding.cpp
index 20297527b40..1b050d06bac 100644
--- a/src/plugins/qmldesigner/designercore/model/propertybinding.cpp
+++ b/src/plugins/qmldesigner/designercore/model/propertybinding.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "invalidpropertyexception.h"
 #include "propertybinding.h"
+#include "invalidpropertyexception.h"
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index d8259a5ef23..fa7d13737d1 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -29,7 +29,6 @@
 
 #include "qmlobjectnode.h"
 #include "qmlitemnode.h"
-#include "qmlitemnode.h"
 #include "qmlstate.h"
 #include "variantproperty.h"
 #include "nodeproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
index 12fb4228447..ebd001a2922 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
@@ -27,13 +27,14 @@
 **
 ****************************************************************************/
 
+#include "qmltextgenerator.h"
+
 #include <QVariant>
 #include <QColor>
 
 #include "bindingproperty.h"
 #include "nodeproperty.h"
 #include "nodelistproperty.h"
-#include "qmltextgenerator.h"
 #include "variantproperty.h"
 #include <nodemetainfo.h>
 #include "model.h"
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
index 0bfff4195a8..91875e09797 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
@@ -27,12 +27,13 @@
 **
 ****************************************************************************/
 
+#include "rewriteaction.h"
+
 #include <QDebug>
 
 #include "nodeabstractproperty.h"
 #include "nodelistproperty.h"
 #include "nodemetainfo.h"
-#include "rewriteaction.h"
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
index 608c6b9327f..bce759a9461 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
@@ -27,13 +27,14 @@
 **
 ****************************************************************************/
 
+#include "rewriteactioncompressor.h"
+
 #include <QSet>
 
 #include "modelnode.h"
 #include "nodelistproperty.h"
 #include "nodeproperty.h"
 #include "qmltextgenerator.h"
-#include "rewriteactioncompressor.h"
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index 1b16be516b4..ffd0a116970 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -27,6 +27,8 @@
 **
 ****************************************************************************/
 
+#include "rewriterview.h"
+
 #include <filemanager/astobjecttextextractor.h>
 #include <filemanager/objectlengthcalculator.h>
 #include <filemanager/firstdefinitionfinder.h>
@@ -34,7 +36,6 @@
 
 #include <qmljs/parser/qmljsengine_p.h>
 
-#include "rewriterview.h"
 #include "rewritingexception.h"
 #include "textmodifier.h"
 #include "texttomodelmerger.h"
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index aac9de667c1..de6c4d75d8b 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -27,6 +27,7 @@
 **
 ****************************************************************************/
 
+#include "texttomodelmerger.h"
 #include "abstractproperty.h"
 #include "bindingproperty.h"
 #include "filemanager/firstdefinitionfinder.h"
@@ -37,7 +38,6 @@
 #include "nodeproperty.h"
 #include "propertyparser.h"
 #include "textmodifier.h"
-#include "texttomodelmerger.h"
 #include "rewriterview.h"
 #include "variantproperty.h"
 #include "nodemetainfo.h"
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index ef62c140736..9853772cac3 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLDESIGNERPLUGIN_CONSTANTS_H
-#define QMLDESIGNERPLUGIN_CONSTANTS_H
+#ifndef QMLDESIGNERCONSTANTS_H
+#define QMLDESIGNERCONSTANTS_H
 
 namespace QmlDesigner {
 namespace Constants {
@@ -75,4 +75,4 @@ namespace Internal {
 } // Constants
 } // QmlDesigner
 
-#endif //QMLDESIGNERPLUGIN_CONSTANTS_H
+#endif //QMLDESIGNERCONSTANTS_H
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index d7908fd28d1..55265460073 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "exception.h"
 #include "qmldesignerplugin.h"
+#include "exception.h"
 #include "qmldesignerconstants.h"
 #include "pluginmanager.h"
 #include "designmodewidget.h"
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 5158a8a96a1..0274cd7c742 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
+#include "settingspage.h"
 #include "designersettings.h"
 #include "qmldesignerconstants.h"
 #include "qmldesignerplugin.h"
-#include "settingspage.h"
 
 #include <qmljseditor/qmljseditorconstants.h>
 
-- 
GitLab