Don't depend on qfxanchors.h.

3 files changed, 29 insertions, 27 deletions

diff --git a/src/declarative/fx/qfxanchors.h b/src/declarative/fx/qfxanchors.h
index dcd5d79..c11080c 100644
--- a/src/declarative/fx/qfxanchors.h
+++ b/src/declarative/fx/qfxanchors.h
@@ -45,6 +45,7 @@
 #include <QtCore/QObject>
 #include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
+#include <QtDeclarative/qfxitem.h>
 
 QT_BEGIN_HEADER
 
@@ -52,31 +53,6 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QFxItem;
-class QFxAnchorLine
-{
-public:
-    QFxAnchorLine() : item(0), anchorLine(Invalid)
-    {
-    }
-
-    enum AnchorLine {
-        Invalid = 0x0,
-        Left = 0x01,
-        Right = 0x02,
-        Top = 0x04,
-        Bottom = 0x08,
-        HCenter = 0x10,
-        VCenter = 0x20,
-        Baseline = 0x40,
-        Horizontal_Mask = Left | Right | HCenter,
-        Vertical_Mask = Top | Bottom | VCenter | Baseline
-    };
-
-    QFxItem *item;
-    AnchorLine anchorLine;
-};
-
 class QFxAnchorsPrivate;
 class Q_DECLARATIVE_EXPORT QFxAnchors : public QObject
 {
@@ -184,6 +160,7 @@ private:
     Q_DISABLE_COPY(QFxAnchors)
     Q_DECLARE_PRIVATE(QFxAnchors)
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(QFxAnchors::UsedAnchors)
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index e3f371e..a75bdcd 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -45,7 +45,6 @@
 #include <QtCore/QObject>
 #include <QtScript/qscriptvalue.h>
 #include <QtCore/QList>
-#include <QtDeclarative/qfxanchors.h>
 #include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlcomponent.h>
@@ -58,6 +57,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class QFxItem;
 class Q_DECLARATIVE_EXPORT QFxContents : public QObject
 {
     Q_OBJECT
@@ -85,12 +85,36 @@ private:
     qreal m_height;
     qreal m_width;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(QFxAnchors::UsedAnchors)
+
+class QFxAnchorLine
+{
+public:
+    QFxAnchorLine() : item(0), anchorLine(Invalid)
+    {
+    }
+
+    enum AnchorLine {
+        Invalid = 0x0,
+        Left = 0x01,
+        Right = 0x02,
+        Top = 0x04,
+        Bottom = 0x08,
+        HCenter = 0x10,
+        VCenter = 0x20,
+        Baseline = 0x40,
+        Horizontal_Mask = Left | Right | HCenter,
+        Vertical_Mask = Top | Bottom | VCenter | Baseline
+    };
+
+    QFxItem *item;
+    AnchorLine anchorLine;
+};
 
 class QmlState;
 class QmlTransition;
 class QFxTransform;
 class QFxKeyEvent;
+class QFxAnchors;
 class QFxItemPrivate;
 class Q_DECLARATIVE_EXPORT QFxItem : public QGraphicsObject, public QmlParserStatus
 {
diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h
index 029b8b0..bb3a97a 100644
--- a/src/declarative/fx/qfxitem_p.h
+++ b/src/declarative/fx/qfxitem_p.h
@@ -55,6 +55,7 @@
 
 #include <QtDeclarative/qfxitem.h>
 #include <QtDeclarative/qmlstate.h>
+#include <QtDeclarative/qfxanchors.h>
 #include <private/qmlnullablevalue_p.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlcontext.h>