summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlanimation.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-06-30 23:38:45 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-06-30 23:38:45 (GMT)
commit61fcaa0e659e1bc676e0ce4124d49aaae565b26c (patch)
treee7071373a429da340e62bb7cfea0acb7029b63b4 /src/declarative/util/qmlanimation.h
parent9681d2190541c63a39b2cfe70dc3aaa161ebe703 (diff)
downloadQt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.zip
Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.gz
Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.bz2
Support compile-in-namespace for the declarative module.
Diffstat (limited to 'src/declarative/util/qmlanimation.h')
-rw-r--r--src/declarative/util/qmlanimation.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index 110c43e..12212df 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -134,8 +134,6 @@ private Q_SLOTS:
void timelineComplete();
};
-QML_DECLARE_TYPE(QmlAbstractAnimation)
-
class QmlPauseAnimationPrivate;
class QmlPauseAnimation : public QmlAbstractAnimation
{
@@ -158,7 +156,6 @@ protected:
virtual QAbstractAnimation *qtAnimation();
virtual void prepare(QmlMetaProperty &);
};
-QML_DECLARE_TYPE(QmlPauseAnimation)
class QmlRunScriptActionPrivate;
class QmlRunScriptAction : public QmlAbstractAnimation
@@ -186,7 +183,6 @@ Q_SIGNALS:
protected:
virtual QAbstractAnimation *qtAnimation();
};
-QML_DECLARE_TYPE(QmlRunScriptAction)
class QmlSetPropertyActionPrivate;
class QmlSetPropertyAction : public QmlAbstractAnimation
@@ -223,7 +219,6 @@ protected:
virtual QAbstractAnimation *qtAnimation();
virtual void prepare(QmlMetaProperty &);
};
-QML_DECLARE_TYPE(QmlSetPropertyAction)
class QmlParentChangeActionPrivate;
class QmlParentChangeAction : public QmlAbstractAnimation
@@ -244,7 +239,6 @@ protected:
virtual QAbstractAnimation *qtAnimation();
virtual void prepare(QmlMetaProperty &);
};
-QML_DECLARE_TYPE(QmlParentChangeAction)
class QmlPropertyAnimationPrivate;
class QmlPropertyAnimation : public QmlAbstractAnimation
@@ -296,7 +290,6 @@ Q_SIGNALS:
void easingChanged(const QString &);
void propertiesChanged(const QString &);
};
-QML_DECLARE_TYPE(QmlPropertyAnimation)
class QmlColorAnimation : public QmlPropertyAnimation
{
@@ -315,7 +308,6 @@ public:
QColor to() const;
void setTo(const QColor &);
};
-QML_DECLARE_TYPE(QmlColorAnimation)
class QmlNumberAnimation : public QmlPropertyAnimation
{
@@ -335,7 +327,6 @@ public:
qreal to() const;
void setTo(qreal);
};
-QML_DECLARE_TYPE(QmlNumberAnimation)
class QmlAnimationGroupPrivate;
class QmlAnimationGroup : public QmlAbstractAnimation
@@ -369,7 +360,6 @@ protected:
virtual QAbstractAnimation *qtAnimation();
virtual void prepare(QmlMetaProperty &);
};
-QML_DECLARE_TYPE(QmlSequentialAnimation)
class QmlParallelAnimation : public QmlAnimationGroup
{
@@ -387,10 +377,20 @@ protected:
virtual QAbstractAnimation *qtAnimation();
virtual void prepare(QmlMetaProperty &);
};
-QML_DECLARE_TYPE(QmlParallelAnimation)
QT_END_NAMESPACE
+QML_DECLARE_TYPE(QmlAbstractAnimation)
+QML_DECLARE_TYPE(QmlPauseAnimation)
+QML_DECLARE_TYPE(QmlRunScriptAction)
+QML_DECLARE_TYPE(QmlSetPropertyAction)
+QML_DECLARE_TYPE(QmlParentChangeAction)
+QML_DECLARE_TYPE(QmlPropertyAnimation)
+QML_DECLARE_TYPE(QmlColorAnimation)
+QML_DECLARE_TYPE(QmlNumberAnimation)
+QML_DECLARE_TYPE(QmlSequentialAnimation)
+QML_DECLARE_TYPE(QmlParallelAnimation)
+
QT_END_HEADER
#endif // QMLANIMATION_H