diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-07-24 00:06:42 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-07-24 00:06:42 (GMT) |
| commit | 8ba5e3b86984fce9fd3999d643cad6a732653940 (patch) | |
| tree | d6cd1e14f0e5121d82f6d4202616f197913147a4 /src/declarative/fx/qfxanchors.h | |
| parent | 8a67aa7d4397bf0fb2d24724c0d3588136f3c93e (diff) | |
| parent | f2a0676485522b58e38b74b76d039611d6baa965 (diff) | |
| download | Qt-8ba5e3b86984fce9fd3999d643cad6a732653940.zip Qt-8ba5e3b86984fce9fd3999d643cad6a732653940.tar.gz Qt-8ba5e3b86984fce9fd3999d643cad6a732653940.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxanchors.h')
| -rw-r--r-- | src/declarative/fx/qfxanchors.h | 27 |
1 files changed, 2 insertions, 25 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 |