Commit fdfb3caf authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

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



Change-Id: I9adb43b9c9f2b2c97693ebb09ebef795d0206d1c
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 8ae38d1a
......@@ -27,9 +27,10 @@
**
****************************************************************************/
#include <QCoreApplication>
#include "invalididexception.h"
#include <QCoreApplication>
namespace QmlDesigner {
InvalidIdException::InvalidIdException(int line,
......
......@@ -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;
......
......@@ -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"
......
......@@ -27,8 +27,8 @@
**
****************************************************************************/
#ifndef ABSTRACTROPERTY_H
#define ABSTRACTROPERTY_H
#ifndef ABSTRACTPROPERTY_H
#define ABSTRACTPROPERTY_H
#include <QVariant>
#include <QWeakPointer>
......
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -38,7 +38,6 @@
#include <QMap>
#include <QPointer>
#include <QWeakPointer>
#include <QHash>
#include <QUrl>
#include <modelnode.h>
......
......@@ -27,8 +27,8 @@
**
****************************************************************************/
#ifndef VARIANTROPERTY_H
#define VARIANTROPERTY_H
#ifndef VARIANTPROPERTY_H
#define VARIANTPROPERTY_H
#include "qmldesignercorelib_global.h"
#include "abstractproperty.h"
......
......@@ -32,7 +32,6 @@
#include "invalidargumentexception.h"
#include "metainfo.h"
#include <model.h>
#include <rewriterview.h>
#include <propertyparser.h>
......
......@@ -27,9 +27,10 @@
**
****************************************************************************/
#include "subcomponentmanager.h"
#include <qmldesignerconstants.h>
#include "subcomponentmanager.h"
#include "model.h"
#include "metainfo.h"
#include "metainforeader.h"
......
......@@ -27,12 +27,12 @@
**
****************************************************************************/
#include <QBuffer>
#include <QDataStream>
#include "copyhelper.h"
#include "internalnode_p.h"
#include <QBuffer>
#include <QDataStream>
namespace QmlDesigner {
namespace Internal {
......
......@@ -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)
......
......@@ -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"
......
......@@ -29,7 +29,6 @@
#include "modelmerger.h"
#include "modelmerger.h"
#include "modelnode.h"
#include "abstractview.h"
#include "model.h"
......
......@@ -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"
......
......@@ -27,9 +27,10 @@
**
****************************************************************************/
#include <QDebug>
#include "modelnodepositionrecalculator.h"
#include <QDebug>
using namespace QmlDesigner;
using namespace QmlDesigner::Internal;
......
......@@ -27,8 +27,8 @@
**
****************************************************************************/
#include "invalidmodelnodeexception.h"
#include "modelnodepositionstorage.h"
#include "invalidmodelnodeexception.h"
using namespace QmlDesigner;
using namespace QmlDesigner::Internal;
......
......@@ -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"
......
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