Commit b005d490 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by Thomas Hartmann
Browse files

Fix Krazy warnings about includes/header guards in QML designer.



Change-Id: I9adb43b9c9f2b2c97693ebb09ebef795d0206d1c
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit fdfb3caf

)
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent 7acb8573
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "abstractformeditortool.h" #include "abstractformeditortool.h"
#include "formeditorview.h" #include "formeditorview.h"
#include "formeditorview.h"
#include <modelnodecontextmenu.h> #include <modelnodecontextmenu.h>
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include "formeditornodeinstanceview.h" #include "formeditornodeinstanceview.h"
#include "resizehandleitem.h" #include "resizehandleitem.h"
#include <QDebug>
......
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include "formeditorview.h"
#include "selectiontool.h" #include "selectiontool.h"
#include "movetool.h" #include "movetool.h"
#include "resizetool.h" #include "resizetool.h"
#include "dragtool.h" #include "dragtool.h"
#include "formeditorview.h"
#include "formeditorwidget.h" #include "formeditorwidget.h"
#include "formeditornodeinstanceview.h" #include "formeditornodeinstanceview.h"
#include "formeditoritem.h" #include "formeditoritem.h"
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QDebug> #include <QDebug>
#include <cmath> #include <cmath>
#include <QGraphicsScene>
namespace QmlDesigner { namespace QmlDesigner {
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <rewritingexception.h> #include <rewritingexception.h>
#include <nodelistproperty.h> #include <nodelistproperty.h>
#include <variantproperty.h> #include <variantproperty.h>
#include <rewritingexception.h>
#include <modelnodeoperations.h> #include <modelnodeoperations.h>
#include <qmldesignerplugin.h> #include <qmldesignerplugin.h>
#include <viewmanager.h> #include <viewmanager.h>
......
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include "stackedutilitypanelcontroller.h"
#include "designdocument.h"
#include <QStackedWidget> #include <QStackedWidget>
#include "designdocument.h"
#include "stackedutilitypanelcontroller.h"
namespace QmlDesigner { namespace QmlDesigner {
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
#include "utilitypanelcontroller.h" #include "utilitypanelcontroller.h"
class QStackedWidget;
namespace QmlDesigner { namespace QmlDesigner {
class DesignDocument; class DesignDocument;
......
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
** **
****************************************************************************/ ****************************************************************************/
#include "utilitypanelcontroller.h"
#include <QDebug> #include <QDebug>
#include <QEvent> #include <QEvent>
#include <QDockWidget> #include <QDockWidget>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include "utilitypanelcontroller.h"
namespace QmlDesigner { namespace QmlDesigner {
UtilityPanelController::UtilityPanelController(QObject* parent): UtilityPanelController::UtilityPanelController(QObject* parent):
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include "xuifiledialog.h"
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <QDebug> #include <QDebug>
...@@ -34,8 +35,6 @@ ...@@ -34,8 +35,6 @@
#include <QObject> #include <QObject>
#include <QCoreApplication> #include <QCoreApplication>
#include "xuifiledialog.h"
namespace QmlDesigner { namespace QmlDesigner {
void XUIFileDialog::runOpenFileDialog(const QString& path, QWidget* parent, QObject* receiver, const char* member) void XUIFileDialog::runOpenFileDialog(const QString& path, QWidget* parent, QObject* receiver, const char* member)
......
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef CUSTOMDRAGANDDROP_H
#define CUSTOMDRAGANDDROP_H
#include <QPixmap> #include <QPixmap>
#include <QLabel> #include <QLabel>
#include <QTimeLine> #include <QTimeLine>
...@@ -140,3 +143,5 @@ private: ...@@ -140,3 +143,5 @@ private:
}; };
} //namespave QmlDesigner } //namespave QmlDesigner
#endif // CUSTOMDRAGANDDROP_H
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef ITEMLIBRARYTREEVIEW_H #ifndef ITEMLIBRARYCOMPONENTS_H
#define ITEMLIBRARYTREEVIEW_H #define ITEMLIBRARYCOMPONENTS_H
#include <QTreeView> #include <QTreeView>
#include <QStandardItemModel> #include <QStandardItemModel>
...@@ -90,5 +90,5 @@ private: ...@@ -90,5 +90,5 @@ private:
} // namespace QmlDesigner } // namespace QmlDesigner
#endif // ITEMLIBRARYTREEVIEW_H #endif // ITEMLIBRARYCOMPONENTS_H
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
** **
****************************************************************************/ ****************************************************************************/
#include "navigatorwidget.h"
#include "navigatorview.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QTreeView> #include <QTreeView>
#include <QHeaderView> #include <QHeaderView>
#include <model.h> #include <model.h>
#include "navigatorwidget.h"
#include "navigatorview.h"
#include <utils/fileutils.h> #include <utils/fileutils.h>
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include <QMenu> #include <QMenu>
#include <QAction> #include <QAction>
#include <QListView> #include <QListView>
#include <QDebug>
#include <QApplication> #include <QApplication>
#include <QGraphicsOpacityEffect> #include <QGraphicsOpacityEffect>
#include <QStyleFactory> #include <QStyleFactory>
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <nodeproperty.h> #include <nodeproperty.h>
#include <variantproperty.h> #include <variantproperty.h>
#include <bindingproperty.h> #include <bindingproperty.h>
#include <nodeproperty.h>
#include <QLineEdit> #include <QLineEdit>
#include <QSpinBox> #include <QSpinBox>
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <QFontDialog> #include <QFontDialog>
#include <QApplication> #include <QApplication>
#include <QComboBox> #include <QComboBox>
#include <QLabel>
namespace QmlDesigner { namespace QmlDesigner {
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include "genericpropertieswidget.h"
#include <QSet> #include <QSet>
#include <QDebug> #include <QDebug>
#include <QWidget> #include <QWidget>
...@@ -37,7 +39,6 @@ ...@@ -37,7 +39,6 @@
#include "qttreepropertybrowser.h" #include "qttreepropertybrowser.h"
#include "qtvariantproperty.h" #include "qtvariantproperty.h"
#include "genericpropertieswidget.h"
#include "nodemetainfo.h" #include "nodemetainfo.h"
#include "propertymetainfo.h" #include "propertymetainfo.h"
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef PropertyView_h #ifndef GENERICPROPERTIESWIDGET_H
#define PropertyView_h #define GENERICPROPERTIESWIDGET_H
#include <QTabWidget> #include <QTabWidget>
...@@ -93,4 +93,4 @@ private: ...@@ -93,4 +93,4 @@ private:
} }
#endif // PropertyView_h #endif // GENERICPROPERTIESWIDGET_H
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef QmlPropertyView_h #ifndef PROPERTYEDITOR_H
#define QmlPropertyView_h #define PROPERTYEDITOR_H
#include <qmlmodelview.h> #include <qmlmodelview.h>
#include <declarativewidgetview.h> #include <declarativewidgetview.h>
...@@ -167,4 +167,4 @@ protected: ...@@ -167,4 +167,4 @@ protected:
}; };
} }
#endif // QmlPropertyView_h #endif // PROPERTYEDITOR_H
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <model.h> #include <model.h>
#include <nodemetainfo.h> #include <nodemetainfo.h>
#include <metainfo.h> #include <metainfo.h>
#include <nodeproperty.h>
#include <qmlobjectnode.h> #include <qmlobjectnode.h>
//using namespace QmlDesigner; //using namespace QmlDesigner;
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
****************************************************************************/ ****************************************************************************/
#include "qdeclarative.h"
#include "resetwidget.h" #include "resetwidget.h"
#include "qdeclarative.h"
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QStringList> #include <QStringList>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment