summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxpath.h
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2009-07-01 15:48:33 (GMT)
committerErik Verbruggen <erik.verbruggen@nokia.com>2009-07-01 15:48:33 (GMT)
commit04a9ce0e3392563e3843588d7083dd92ad00bd83 (patch)
tree18b05a8e1801208ed8e8d26e1ffa92e4d83bfb34 /src/declarative/fx/qfxpath.h
parenteeccaca2875b675d9fabfe5cf03941fa1fd93511 (diff)
parent1924f31db80328b7445ac37bc8fd8a0263cf166b (diff)
downloadQt-04a9ce0e3392563e3843588d7083dd92ad00bd83.zip
Qt-04a9ce0e3392563e3843588d7083dd92ad00bd83.tar.gz
Qt-04a9ce0e3392563e3843588d7083dd92ad00bd83.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxpath.h')
-rw-r--r--src/declarative/fx/qfxpath.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/declarative/fx/qfxpath.h b/src/declarative/fx/qfxpath.h
index 39b9d01..04d24c6 100644
--- a/src/declarative/fx/qfxpath.h
+++ b/src/declarative/fx/qfxpath.h
@@ -61,7 +61,6 @@ public:
Q_SIGNALS:
void changed();
};
-QML_DECLARE_TYPE(QFxPathElement)
class Q_DECLARATIVE_EXPORT QFxPathAttribute : public QFxPathElement
{
@@ -83,7 +82,6 @@ private:
QString _name;
qreal _value;
};
-QML_DECLARE_TYPE(QFxPathAttribute)
class Q_DECLARATIVE_EXPORT QFxCurve : public QFxPathElement
{
@@ -106,7 +104,6 @@ private:
qreal _x;
qreal _y;
};
-QML_DECLARE_TYPE(QFxCurve)
class Q_DECLARATIVE_EXPORT QFxPathLine : public QFxCurve
{
@@ -116,7 +113,6 @@ public:
void addToPath(QPainterPath &path);
};
-QML_DECLARE_TYPE(QFxPathLine)
class Q_DECLARATIVE_EXPORT QFxPathQuad : public QFxCurve
{
@@ -139,7 +135,6 @@ private:
qreal _controlX;
qreal _controlY;
};
-QML_DECLARE_TYPE(QFxPathQuad)
class Q_DECLARATIVE_EXPORT QFxPathCubic : public QFxCurve
{
@@ -172,7 +167,6 @@ private:
int _control2X;
int _control2Y;
};
-QML_DECLARE_TYPE(QFxPathCubic)
class Q_DECLARATIVE_EXPORT QFxPathPercent : public QFxPathElement
{
@@ -187,7 +181,6 @@ public:
private:
qreal _value;
};
-QML_DECLARE_TYPE(QFxPathPercent)
class QFxPathPrivate;
class Q_DECLARATIVE_EXPORT QFxPath : public QObject, public QmlParserStatus
@@ -249,9 +242,18 @@ private:
Q_DISABLE_COPY(QFxPath)
Q_DECLARE_PRIVATE(QFxPath)
};
-QML_DECLARE_TYPE(QFxPath)
QT_END_NAMESPACE
+QML_DECLARE_TYPE(QFxPathElement)
+QML_DECLARE_TYPE(QFxPathAttribute)
+QML_DECLARE_TYPE(QFxCurve)
+QML_DECLARE_TYPE(QFxPathLine)
+QML_DECLARE_TYPE(QFxPathQuad)
+QML_DECLARE_TYPE(QFxPathCubic)
+QML_DECLARE_TYPE(QFxPathPercent)
+QML_DECLARE_TYPE(QFxPath)
+
QT_END_HEADER
+
#endif // QFXPATH_H