diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-23 23:00:51 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-23 23:00:51 (GMT) |
commit | 2a3b4ceb65fd387126affcd61bc416da834e1b95 (patch) | |
tree | cccabd9a2ba891ba5594f6730a877ac49cee4157 /src/declarative/fx/qfxitem.h | |
parent | 561ad2fa5003adcc207b52b50b6fef705e171500 (diff) | |
download | Qt-2a3b4ceb65fd387126affcd61bc416da834e1b95.zip Qt-2a3b4ceb65fd387126affcd61bc416da834e1b95.tar.gz Qt-2a3b4ceb65fd387126affcd61bc416da834e1b95.tar.bz2 |
Don't depend on qfxanchors.h.
Diffstat (limited to 'src/declarative/fx/qfxitem.h')
-rw-r--r-- | src/declarative/fx/qfxitem.h | 28 |
1 files changed, 26 insertions, 2 deletions
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 { |