diff options
113 files changed, 237 insertions, 237 deletions
diff --git a/src/declarative/extra/qfxintegermodel.h b/src/declarative/extra/qfxintegermodel.h index 2f5c756..a715949 100644 --- a/src/declarative/extra/qfxintegermodel.h +++ b/src/declarative/extra/qfxintegermodel.h @@ -77,7 +77,7 @@ private: QFxIntegerModelPrivate *d; }; -QML_DECLARE_TYPE(QFxIntegerModel); +QML_DECLARE_TYPE(QFxIntegerModel) QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlnumberformatter.h b/src/declarative/extra/qmlnumberformatter.h index cdd6b58..e4efc03 100644 --- a/src/declarative/extra/qmlnumberformatter.h +++ b/src/declarative/extra/qmlnumberformatter.h @@ -83,7 +83,7 @@ private: Q_DECLARE_PRIVATE(QmlNumberFormatter) }; -QML_DECLARE_TYPE(QmlNumberFormatter); +QML_DECLARE_TYPE(QmlNumberFormatter) QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlsqlconnection.h b/src/declarative/extra/qmlsqlconnection.h index 0fff1b0..dd0e5b5 100644 --- a/src/declarative/extra/qmlsqlconnection.h +++ b/src/declarative/extra/qmlsqlconnection.h @@ -108,7 +108,7 @@ private: Q_DECLARE_PRIVATE(QmlSqlConnection) }; -QML_DECLARE_TYPE(QmlSqlConnection); +QML_DECLARE_TYPE(QmlSqlConnection) QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlsqlquery.h b/src/declarative/extra/qmlsqlquery.h index 3fff127..5f750ee 100644 --- a/src/declarative/extra/qmlsqlquery.h +++ b/src/declarative/extra/qmlsqlquery.h @@ -82,7 +82,7 @@ private: Q_DECLARE_PRIVATE(QmlSqlBind) }; -QML_DECLARE_TYPE(QmlSqlBind); +QML_DECLARE_TYPE(QmlSqlBind) class QSqlQuery; class QmlSqlQueryPrivate; @@ -134,7 +134,7 @@ private: Q_DECLARE_PRIVATE(QmlSqlQuery) }; -QML_DECLARE_TYPE(QmlSqlQuery); +QML_DECLARE_TYPE(QmlSqlQuery) QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h index cf2f5f4..052a0c2 100644 --- a/src/declarative/extra/qmlxmllistmodel.h +++ b/src/declarative/extra/qmlxmllistmodel.h @@ -82,7 +82,7 @@ private: bool m_isList; bool m_isCData; }; -QML_DECLARE_TYPE(XmlListModelRole); +QML_DECLARE_TYPE(XmlListModelRole) class QmlXmlListModelPrivate; class Q_DECLARATIVE_EXPORT QmlXmlListModel : public QListModelInterface, public QmlParserStatus @@ -141,7 +141,7 @@ private: Q_DISABLE_COPY(QmlXmlListModel) }; -QML_DECLARE_TYPE(QmlXmlListModel); +QML_DECLARE_TYPE(QmlXmlListModel) QT_END_NAMESPACE diff --git a/src/declarative/extra/qnumberformat.h b/src/declarative/extra/qnumberformat.h index 75224ec..aa1e447 100644 --- a/src/declarative/extra/qnumberformat.h +++ b/src/declarative/extra/qnumberformat.h @@ -163,7 +163,7 @@ private: QString _text; }; -QML_DECLARE_TYPE(QNumberFormat); +QML_DECLARE_TYPE(QNumberFormat) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index 681a9fa..bd5520a 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxAnchors,Anchors); +QML_DEFINE_TYPE(QFxAnchors,Anchors) //TODO: should we cache relationships, so we don't have to check each time (parent-child or sibling)? //TODO: baseline support diff --git a/src/declarative/fx/qfxanchors.h b/src/declarative/fx/qfxanchors.h index 3f142c4..8c3fe89 100644 --- a/src/declarative/fx/qfxanchors.h +++ b/src/declarative/fx/qfxanchors.h @@ -78,7 +78,7 @@ public: AnchorLine anchorLine; }; -Q_DECLARE_METATYPE(QFxAnchorLine); +Q_DECLARE_METATYPE(QFxAnchorLine) class QFxAnchorsPrivate; class Q_DECLARATIVE_EXPORT QFxAnchors : public QObject @@ -188,7 +188,7 @@ private: Q_DECLARE_PRIVATE(QFxAnchors) }; -QML_DECLARE_TYPE(QFxAnchors); +QML_DECLARE_TYPE(QFxAnchors) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxanimatedimageitem.cpp b/src/declarative/fx/qfxanimatedimageitem.cpp index 7a1cb7f..029206b 100644 --- a/src/declarative/fx/qfxanimatedimageitem.cpp +++ b/src/declarative/fx/qfxanimatedimageitem.cpp @@ -77,7 +77,7 @@ Item { \endqml \endtable */ -QML_DEFINE_TYPE(QFxAnimatedImageItem, AnimatedImage); +QML_DEFINE_TYPE(QFxAnimatedImageItem, AnimatedImage) QFxAnimatedImageItem::QFxAnimatedImageItem(QFxItem *parent) : QFxImage(*(new QFxAnimatedImageItemPrivate), parent) diff --git a/src/declarative/fx/qfxanimatedimageitem.h b/src/declarative/fx/qfxanimatedimageitem.h index a332c8b..a0d14c4 100644 --- a/src/declarative/fx/qfxanimatedimageitem.h +++ b/src/declarative/fx/qfxanimatedimageitem.h @@ -91,7 +91,7 @@ private: Q_DECLARE_PRIVATE(QFxAnimatedImageItem) }; -QML_DECLARE_TYPE(QFxAnimatedImageItem); +QML_DECLARE_TYPE(QFxAnimatedImageItem) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxblendedimage.cpp b/src/declarative/fx/qfxblendedimage.cpp index 79b8e41..73eb3c4 100644 --- a/src/declarative/fx/qfxblendedimage.cpp +++ b/src/declarative/fx/qfxblendedimage.cpp @@ -292,6 +292,6 @@ void QFxBlendedImage::paintGLContents(GLPainter &p) } #endif -QML_DEFINE_TYPE(QFxBlendedImage,BlendedImage); +QML_DEFINE_TYPE(QFxBlendedImage,BlendedImage) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxblendedimage.h b/src/declarative/fx/qfxblendedimage.h index 2fdf15b..4e6204d 100644 --- a/src/declarative/fx/qfxblendedimage.h +++ b/src/declarative/fx/qfxblendedimage.h @@ -102,7 +102,7 @@ private: QFxPixmap primPix; QFxPixmap secPix; }; -QML_DECLARE_TYPE(QFxBlendedImage); +QML_DECLARE_TYPE(QFxBlendedImage) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxblurfilter.cpp b/src/declarative/fx/qfxblurfilter.cpp index baa2253..84799ec 100644 --- a/src/declarative/fx/qfxblurfilter.cpp +++ b/src/declarative/fx/qfxblurfilter.cpp @@ -463,5 +463,5 @@ void QFxBlurFilter::filterGL(QSimpleCanvasItem::GLPainter &p) } -QML_DEFINE_TYPE(QFxBlurFilter,Blur); +QML_DEFINE_TYPE(QFxBlurFilter,Blur) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxblurfilter.h b/src/declarative/fx/qfxblurfilter.h index 576debf..90285de 100644 --- a/src/declarative/fx/qfxblurfilter.h +++ b/src/declarative/fx/qfxblurfilter.h @@ -73,7 +73,7 @@ protected: private: QFxBlurFilterPrivate *d; }; -QML_DECLARE_TYPE(QFxBlurFilter); +QML_DECLARE_TYPE(QFxBlurFilter) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp index 472b98b..d3f7061 100644 --- a/src/declarative/fx/qfxcomponentinstance.cpp +++ b/src/declarative/fx/qfxcomponentinstance.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxComponentInstance,ComponentInstance); +QML_DEFINE_TYPE(QFxComponentInstance,ComponentInstance) /*! \internal diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h index 9f84043..4b8c142 100644 --- a/src/declarative/fx/qfxcomponentinstance.h +++ b/src/declarative/fx/qfxcomponentinstance.h @@ -80,7 +80,7 @@ protected: private: Q_DECLARE_PRIVATE(QFxComponentInstance) }; -QML_DECLARE_TYPE(QFxComponentInstance); +QML_DECLARE_TYPE(QFxComponentInstance) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxcontentwrapper.cpp b/src/declarative/fx/qfxcontentwrapper.cpp index d493990..482442b 100644 --- a/src/declarative/fx/qfxcontentwrapper.cpp +++ b/src/declarative/fx/qfxcontentwrapper.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxContentWrapper,ContentWrapper); +QML_DEFINE_TYPE(QFxContentWrapper,ContentWrapper) /*! \qmlclass ContentWrapper QFxContentWrapper @@ -129,7 +129,7 @@ QFxItem *QFxContentWrapper::findContent(QList<QSimpleCanvasItem *> &nodes) return findContent(nodes); } -QML_DEFINE_TYPE(QFxContent,Content); +QML_DEFINE_TYPE(QFxContent,Content) /*! \qmlclass Content QFxContent diff --git a/src/declarative/fx/qfxcontentwrapper.h b/src/declarative/fx/qfxcontentwrapper.h index 0b7253e..d8fe0b8 100644 --- a/src/declarative/fx/qfxcontentwrapper.h +++ b/src/declarative/fx/qfxcontentwrapper.h @@ -73,7 +73,7 @@ protected: private: Q_DECLARE_PRIVATE(QFxContentWrapper) }; -QML_DECLARE_TYPE(QFxContentWrapper); +QML_DECLARE_TYPE(QFxContentWrapper) class Q_DECLARATIVE_EXPORT QFxContent : public QFxItem { @@ -81,7 +81,7 @@ class Q_DECLARATIVE_EXPORT QFxContent : public QFxItem public: QFxContent(QFxItem *parent=0) : QFxItem(parent) {} }; -QML_DECLARE_TYPE(QFxContent); +QML_DECLARE_TYPE(QFxContent) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxevents.cpp b/src/declarative/fx/qfxevents.cpp index 195d1e5..94c2d2e 100644 --- a/src/declarative/fx/qfxevents.cpp +++ b/src/declarative/fx/qfxevents.cpp @@ -176,7 +176,7 @@ MouseRegion { \endqml */ -QML_DEFINE_NOCREATE_TYPE(QFxKeyEvent); -QML_DEFINE_NOCREATE_TYPE(QFxMouseEvent); +QML_DEFINE_NOCREATE_TYPE(QFxKeyEvent) +QML_DEFINE_NOCREATE_TYPE(QFxMouseEvent) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxevents_p.h b/src/declarative/fx/qfxevents_p.h index bcd9f2d..2eb29af 100644 --- a/src/declarative/fx/qfxevents_p.h +++ b/src/declarative/fx/qfxevents_p.h @@ -78,7 +78,7 @@ private: QKeyEvent event; }; -QML_DECLARE_TYPE(QFxKeyEvent); +QML_DECLARE_TYPE(QFxKeyEvent) class QFxMouseEvent : public QObject { @@ -120,7 +120,7 @@ private: bool _accepted; }; -QML_DECLARE_TYPE(QFxMouseEvent); +QML_DECLARE_TYPE(QFxMouseEvent) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 4248ebb..bc4a5fc 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -228,7 +228,7 @@ void QFxFlickablePrivate::updateBeginningEnd() static const int FlickThreshold = 5; -QML_DEFINE_TYPE(QFxFlickable,Flickable); +QML_DEFINE_TYPE(QFxFlickable,Flickable) /*! \qmlclass Flickable diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h index 3857017..dcbc6bb 100644 --- a/src/declarative/fx/qfxflickable.h +++ b/src/declarative/fx/qfxflickable.h @@ -186,7 +186,7 @@ private: Q_DISABLE_COPY(QFxFlickable) Q_DECLARE_PRIVATE(QFxFlickable) }; -QML_DECLARE_TYPE(QFxFlickable); +QML_DECLARE_TYPE(QFxFlickable) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxflickable_p.h b/src/declarative/fx/qfxflickable_p.h index ebd0327..a3b1500 100644 --- a/src/declarative/fx/qfxflickable_p.h +++ b/src/declarative/fx/qfxflickable_p.h @@ -162,7 +162,7 @@ public: void data_insert(int, QObject *); QObject *data_at(int) const; void data_clear(); - QML_DECLARE_LIST_PROXY(QFxFlickablePrivate, QObject *, data); + QML_DECLARE_LIST_PROXY(QFxFlickablePrivate, QObject *, data) }; QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp index edcc7cb..4c02e74 100644 --- a/src/declarative/fx/qfxflipable.cpp +++ b/src/declarative/fx/qfxflipable.cpp @@ -44,7 +44,7 @@ #include "qfxtransform.h" #include <QtDeclarative/qmlinfo.h> -QML_DEFINE_TYPE(QFxFlipable,Flipable); +QML_DEFINE_TYPE(QFxFlipable,Flipable) class QFxFlipablePrivate : public QFxItemPrivate { diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h index 62b62a5..be9e755 100644 --- a/src/declarative/fx/qfxflipable.h +++ b/src/declarative/fx/qfxflipable.h @@ -97,7 +97,7 @@ private: Q_DISABLE_COPY(QFxFlipable) Q_DECLARE_PRIVATE(QFxFlipable) }; -QML_DECLARE_TYPE(QFxFlipable); +QML_DECLARE_TYPE(QFxFlipable) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxfocuspanel.cpp b/src/declarative/fx/qfxfocuspanel.cpp index 5d62e66..6da8564 100644 --- a/src/declarative/fx/qfxfocuspanel.cpp +++ b/src/declarative/fx/qfxfocuspanel.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxFocusPanel,FocusPanel); +QML_DEFINE_TYPE(QFxFocusPanel,FocusPanel) /*! \qmlclass FocusPanel diff --git a/src/declarative/fx/qfxfocuspanel.h b/src/declarative/fx/qfxfocuspanel.h index cec12a1..60f9118 100644 --- a/src/declarative/fx/qfxfocuspanel.h +++ b/src/declarative/fx/qfxfocuspanel.h @@ -72,7 +72,7 @@ private: Q_DISABLE_COPY(QFxFocusPanel) }; -QML_DECLARE_TYPE(QFxFocusPanel); +QML_DECLARE_TYPE(QFxFocusPanel) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxfocusrealm.cpp b/src/declarative/fx/qfxfocusrealm.cpp index 07849fa..9270bb2 100644 --- a/src/declarative/fx/qfxfocusrealm.cpp +++ b/src/declarative/fx/qfxfocusrealm.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxFocusRealm,FocusRealm); +QML_DEFINE_TYPE(QFxFocusRealm,FocusRealm) /*! \qmlclass FocusRealm diff --git a/src/declarative/fx/qfxfocusrealm.h b/src/declarative/fx/qfxfocusrealm.h index fdf1525..d2aadce 100644 --- a/src/declarative/fx/qfxfocusrealm.h +++ b/src/declarative/fx/qfxfocusrealm.h @@ -58,7 +58,7 @@ public: virtual ~QFxFocusRealm(); }; -QML_DECLARE_TYPE(QFxFocusRealm); +QML_DECLARE_TYPE(QFxFocusRealm) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index db54aea..dde8fcf 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -1421,7 +1421,7 @@ QObject *QFxGridView::qmlAttachedProperties(QObject *obj) return QFxGridViewAttached::properties(obj); } -QML_DEFINE_TYPE(QFxGridView,GridView); +QML_DEFINE_TYPE(QFxGridView,GridView) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h index 99c7cff..73f3046 100644 --- a/src/declarative/fx/qfxgridview.h +++ b/src/declarative/fx/qfxgridview.h @@ -139,7 +139,7 @@ private: void refill(); }; -QML_DECLARE_TYPE(QFxGridView); +QML_DECLARE_TYPE(QFxGridView) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxhighlightfilter.cpp b/src/declarative/fx/qfxhighlightfilter.cpp index a22ad98..9807e21 100644 --- a/src/declarative/fx/qfxhighlightfilter.cpp +++ b/src/declarative/fx/qfxhighlightfilter.cpp @@ -314,6 +314,6 @@ void QFxHighlightFilter::filterGL(QSimpleCanvasItem::GLPainter &p) #endif } -QML_DEFINE_TYPE(QFxHighlightFilter,Highlight); +QML_DEFINE_TYPE(QFxHighlightFilter,Highlight) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxhighlightfilter.h b/src/declarative/fx/qfxhighlightfilter.h index 92a3dc7..19e95ac 100644 --- a/src/declarative/fx/qfxhighlightfilter.h +++ b/src/declarative/fx/qfxhighlightfilter.h @@ -89,7 +89,7 @@ protected: private: QFxHighlightFilterPrivate *d; }; -QML_DECLARE_TYPE(QFxHighlightFilter); +QML_DECLARE_TYPE(QFxHighlightFilter) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp index 064580e..6226e45 100644 --- a/src/declarative/fx/qfximage.cpp +++ b/src/declarative/fx/qfximage.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxImage,Image); +QML_DEFINE_TYPE(QFxImage,Image) /*! \qmlclass Image QFxImage diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h index 1436551..4d5f134 100644 --- a/src/declarative/fx/qfximage.h +++ b/src/declarative/fx/qfximage.h @@ -120,7 +120,7 @@ private: Q_DECLARE_PRIVATE(QFxImage) void setGridScaledImage(const QFxGridScaledImage& sci); }; -QML_DECLARE_TYPE(QFxImage); +QML_DECLARE_TYPE(QFxImage) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 3e29f13..7129757 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -71,9 +71,9 @@ QT_BEGIN_NAMESPACE #define INT_MAX 2147483647 #endif -QML_DEFINE_NOCREATE_TYPE(QFxContents); -QML_DEFINE_TYPE(QFxItem,Item); -QML_DEFINE_NOCREATE_TYPE(QSimpleCanvasFilter); +QML_DEFINE_NOCREATE_TYPE(QFxContents) +QML_DEFINE_TYPE(QFxItem,Item) +QML_DEFINE_NOCREATE_TYPE(QSimpleCanvasFilter) /*! \group group_animation diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index 0b4f897..778c10f 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -87,8 +87,8 @@ private: int _height; int _width; }; -QML_DECLARE_TYPE(QFxContents); -Q_DECLARE_OPERATORS_FOR_FLAGS(QFxAnchors::UsedAnchors); +QML_DECLARE_TYPE(QFxContents) +Q_DECLARE_OPERATORS_FOR_FLAGS(QFxAnchors::UsedAnchors) class QmlState; class QmlTransition; @@ -267,9 +267,9 @@ private: Q_DISABLE_COPY(QFxItem) Q_DECLARE_PRIVATE(QFxItem) }; -QML_DECLARE_TYPE(QFxItem); +QML_DECLARE_TYPE(QFxItem) -QML_DECLARE_TYPE(QSimpleCanvasFilter); +QML_DECLARE_TYPE(QSimpleCanvasFilter) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h index b5f9554..a54f523 100644 --- a/src/declarative/fx/qfxitem_p.h +++ b/src/declarative/fx/qfxitem_p.h @@ -100,7 +100,7 @@ public: void data_insert(int, QObject *); QObject *data_at(int) const; void data_clear(); - QML_DECLARE_LIST_PROXY(QFxItemPrivate, QObject *, data); + QML_DECLARE_LIST_PROXY(QFxItemPrivate, QObject *, data) // resources property void resources_removeAt(int); @@ -109,7 +109,7 @@ public: void resources_insert(int, QObject *); QObject *resources_at(int) const; void resources_clear(); - QML_DECLARE_LIST_PROXY(QFxItemPrivate, QObject *, resources); + QML_DECLARE_LIST_PROXY(QFxItemPrivate, QObject *, resources) // children property void children_removeAt(int); @@ -118,7 +118,7 @@ public: void children_insert(int, QFxItem *); QFxItem *children_at(int) const; void children_clear(); - QML_DECLARE_LIST_PROXY(QFxItemPrivate, QFxItem *, children); + QML_DECLARE_LIST_PROXY(QFxItemPrivate, QFxItem *, children) QList<QFxTransform *> _transform; QFxAnchors *anchors() { diff --git a/src/declarative/fx/qfxkeyactions.cpp b/src/declarative/fx/qfxkeyactions.cpp index a07f047..5a1fd7d 100644 --- a/src/declarative/fx/qfxkeyactions.cpp +++ b/src/declarative/fx/qfxkeyactions.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxKeyActions,KeyActions); +QML_DEFINE_TYPE(QFxKeyActions,KeyActions) class QFxKeyActionsPrivate { diff --git a/src/declarative/fx/qfxkeyactions.h b/src/declarative/fx/qfxkeyactions.h index a5aec2e..cea992a 100644 --- a/src/declarative/fx/qfxkeyactions.h +++ b/src/declarative/fx/qfxkeyactions.h @@ -310,7 +310,7 @@ private: QFxKeyActionsPrivate *d; }; -QML_DECLARE_TYPE(QFxKeyActions); +QML_DECLARE_TYPE(QFxKeyActions) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxkeyproxy.cpp b/src/declarative/fx/qfxkeyproxy.cpp index 848b2d9..e80f2c7 100644 --- a/src/declarative/fx/qfxkeyproxy.cpp +++ b/src/declarative/fx/qfxkeyproxy.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxKeyProxy,KeyProxy); +QML_DEFINE_TYPE(QFxKeyProxy,KeyProxy) /*! \qmlclass KeyProxy diff --git a/src/declarative/fx/qfxkeyproxy.h b/src/declarative/fx/qfxkeyproxy.h index 6cf0c0d..38cff7a 100644 --- a/src/declarative/fx/qfxkeyproxy.h +++ b/src/declarative/fx/qfxkeyproxy.h @@ -69,7 +69,7 @@ private: QFxKeyProxyPrivate *d; }; -QML_DECLARE_TYPE(QFxKeyProxy); +QML_DECLARE_TYPE(QFxKeyProxy) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp index 53b367a..a975778 100644 --- a/src/declarative/fx/qfxlayouts.cpp +++ b/src/declarative/fx/qfxlayouts.cpp @@ -450,7 +450,7 @@ void QFxBaseLayout::applyRemove(const QList<QPair<QString, QVariant> >& changes, applyTransition(changes,target, remove()); } -QML_DEFINE_TYPE(QFxVerticalLayout, VerticalLayout); +QML_DEFINE_TYPE(QFxVerticalLayout, VerticalLayout) /*! \qmlclass VerticalLayout \brief The VerticalLayout item arranges its children in a vertical layout. @@ -651,7 +651,7 @@ void QFxVerticalLayout::doLayout() setMovingItem(0); } -QML_DEFINE_TYPE(QFxHorizontalLayout,HorizontalLayout); +QML_DEFINE_TYPE(QFxHorizontalLayout,HorizontalLayout) /*! \qmlclass HorizontalLayout \brief The HorizontalLayout item arranges its children in a horizontal layout. @@ -815,7 +815,7 @@ void QFxHorizontalLayout::doLayout() setWidth(hoffset); } -QML_DEFINE_TYPE(QFxGridLayout,GridLayout); +QML_DEFINE_TYPE(QFxGridLayout,GridLayout) /*! \qmlclass GridLayout QFxGridLayout diff --git a/src/declarative/fx/qfxlayouts.h b/src/declarative/fx/qfxlayouts.h index 35e41d8..b119d6f 100644 --- a/src/declarative/fx/qfxlayouts.h +++ b/src/declarative/fx/qfxlayouts.h @@ -128,7 +128,7 @@ protected Q_SLOTS: private: Q_DISABLE_COPY(QFxVerticalLayout) }; -QML_DECLARE_TYPE(QFxVerticalLayout); +QML_DECLARE_TYPE(QFxVerticalLayout) class Q_DECLARATIVE_EXPORT QFxHorizontalLayout: public QFxBaseLayout { @@ -140,7 +140,7 @@ protected Q_SLOTS: private: Q_DISABLE_COPY(QFxHorizontalLayout) }; -QML_DECLARE_TYPE(QFxHorizontalLayout); +QML_DECLARE_TYPE(QFxHorizontalLayout) class Q_DECLARATIVE_EXPORT QFxGridLayout : public QFxBaseLayout { @@ -163,7 +163,7 @@ private: int _columns; Q_DISABLE_COPY(QFxGridLayout) }; -QML_DECLARE_TYPE(QFxGridLayout); +QML_DECLARE_TYPE(QFxGridLayout) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp index 247f64b..432c6ac 100644 --- a/src/declarative/fx/qfxlistview.cpp +++ b/src/declarative/fx/qfxlistview.cpp @@ -1643,7 +1643,7 @@ QObject *QFxListView::qmlAttachedProperties(QObject *obj) return QFxListViewAttached::properties(obj); } -QML_DEFINE_TYPE(QFxListView,ListView); +QML_DEFINE_TYPE(QFxListView,ListView) QT_END_NAMESPACE #include "qfxlistview.moc" diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h index 87a851b..4aa9810 100644 --- a/src/declarative/fx/qfxlistview.h +++ b/src/declarative/fx/qfxlistview.h @@ -145,7 +145,7 @@ private Q_SLOTS: void destroyingItem(QFxItem *item); }; -QML_DECLARE_TYPE(QFxListView); +QML_DECLARE_TYPE(QFxListView) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp index a60ddc4..6eb358b 100644 --- a/src/declarative/fx/qfxmouseregion.cpp +++ b/src/declarative/fx/qfxmouseregion.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE static const int DragThreshold = 5; static const int PressAndHoldDelay = 800; -QML_DEFINE_TYPE(QFxDrag,Drag); +QML_DEFINE_TYPE(QFxDrag,Drag) QFxDrag::QFxDrag(QObject *parent) : QObject(parent), _target(0), _xmin(0), _xmax(0), _ymin(0), _ymax(0) { @@ -249,7 +249,7 @@ void QFxDrag::setYmax(int m) position of the release of the click, and whether the click wasHeld. */ -QML_DEFINE_TYPE(QFxMouseRegion,MouseRegion); +QML_DEFINE_TYPE(QFxMouseRegion,MouseRegion) /*! \internal diff --git a/src/declarative/fx/qfxmouseregion.h b/src/declarative/fx/qfxmouseregion.h index 1d1ec93..d7db1dc 100644 --- a/src/declarative/fx/qfxmouseregion.h +++ b/src/declarative/fx/qfxmouseregion.h @@ -86,7 +86,7 @@ private: int _ymax; Q_DISABLE_COPY(QFxDrag) }; -QML_DECLARE_TYPE(QFxDrag); +QML_DECLARE_TYPE(QFxDrag) class QFxMouseEvent; class QFxMouseRegionPrivate; @@ -154,7 +154,7 @@ private: Q_DISABLE_COPY(QFxMouseRegion) Q_DECLARE_PRIVATE(QFxMouseRegion) }; -QML_DECLARE_TYPE(QFxMouseRegion); +QML_DECLARE_TYPE(QFxMouseRegion) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qfxpainteditem.h index 6cd21e6..997c324 100644 --- a/src/declarative/fx/qfxpainteditem.h +++ b/src/declarative/fx/qfxpainteditem.h @@ -88,7 +88,7 @@ private: Q_DISABLE_COPY(QFxPaintedItem) Q_DECLARE_PRIVATE(QFxPaintedItem) }; -QML_DECLARE_TYPE(QFxPaintedItem); +QML_DECLARE_TYPE(QFxPaintedItem) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp index 67c1208..e9f38b0 100644 --- a/src/declarative/fx/qfxparticles.cpp +++ b/src/declarative/fx/qfxparticles.cpp @@ -105,7 +105,7 @@ public: //--------------------------------------------------------------------------- -QML_DEFINE_TYPE(QFxParticleMotion,ParticleMotion); +QML_DEFINE_TYPE(QFxParticleMotion,ParticleMotion) /*! \class QFxParticleMotion @@ -165,7 +165,7 @@ void QFxParticleMotion::destroy(QFxParticle &particle) \brief The QFxParticleMotionLinear class moves the particles linearly. */ -QML_DEFINE_TYPE(QFxParticleMotionLinear,ParticleMotionLinear); +QML_DEFINE_TYPE(QFxParticleMotionLinear,ParticleMotionLinear) void QFxParticleMotionLinear::advance(QFxParticle &p, int interval) { @@ -187,7 +187,7 @@ void QFxParticleMotionLinear::advance(QFxParticle &p, int interval) \brief The QFxParticleMotionGravity class moves the particles towards a point. */ -QML_DEFINE_TYPE(QFxParticleMotionGravity,ParticleMotionGravity); +QML_DEFINE_TYPE(QFxParticleMotionGravity,ParticleMotionGravity) /*! \qmlproperty int ParticleMotionGravity::xattractor @@ -289,7 +289,7 @@ Rect { This property holds how quickly the paricles will move from side to side. */ -QML_DEFINE_TYPE(QFxParticleMotionWander,ParticleMotionWander); +QML_DEFINE_TYPE(QFxParticleMotionWander,ParticleMotionWander) void QFxParticleMotionWander::advance(QFxParticle &p, int interval) { @@ -546,7 +546,7 @@ void QFxParticlesPrivate::updateOpacity(QFxParticle &p, int age) } } -QML_DEFINE_TYPE(QFxParticles,Particles); +QML_DEFINE_TYPE(QFxParticles,Particles) /*! \qmlclass Particles diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h index 31a00fb..9f0d04c 100644 --- a/src/declarative/fx/qfxparticles.h +++ b/src/declarative/fx/qfxparticles.h @@ -66,7 +66,7 @@ public: virtual void created(QFxParticle &); virtual void destroy(QFxParticle &); }; -QML_DECLARE_TYPE(QFxParticleMotion); +QML_DECLARE_TYPE(QFxParticleMotion) class Q_DECLARATIVE_EXPORT QFxParticleMotionLinear : public QFxParticleMotion { @@ -77,7 +77,7 @@ public: virtual void advance(QFxParticle &, int interval); }; -QML_DECLARE_TYPE(QFxParticleMotionLinear); +QML_DECLARE_TYPE(QFxParticleMotionLinear) class Q_DECLARATIVE_EXPORT QFxParticleMotionGravity : public QFxParticleMotion { @@ -106,7 +106,7 @@ private: int _yAttr; qreal _accel; }; -QML_DECLARE_TYPE(QFxParticleMotionGravity); +QML_DECLARE_TYPE(QFxParticleMotionGravity) class Q_DECLARATIVE_EXPORT QFxParticleMotionWander : public QFxParticleMotion { @@ -146,7 +146,7 @@ private: qreal _yvariance; qreal _pace; }; -QML_DECLARE_TYPE(QFxParticleMotionWander); +QML_DECLARE_TYPE(QFxParticleMotionWander) class QFxParticlesPrivate; class Q_DECLARATIVE_EXPORT QFxParticles : public QFxItem @@ -231,7 +231,7 @@ private: Q_DISABLE_COPY(QFxParticles) Q_DECLARE_PRIVATE(QFxParticles) }; -QML_DECLARE_TYPE(QFxParticles); +QML_DECLARE_TYPE(QFxParticles) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxpath.cpp b/src/declarative/fx/qfxpath.cpp index 5bbdf64..5deaaa5 100644 --- a/src/declarative/fx/qfxpath.cpp +++ b/src/declarative/fx/qfxpath.cpp @@ -46,14 +46,14 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxPath,Path); -QML_DEFINE_NOCREATE_TYPE(QFxPathElement); -QML_DEFINE_NOCREATE_TYPE(QFxCurve); -QML_DEFINE_TYPE(QFxPathAttribute,PathAttribute); -QML_DEFINE_TYPE(QFxPathPercent,PathPercent); -QML_DEFINE_TYPE(QFxPathLine,PathLine); -QML_DEFINE_TYPE(QFxPathQuad,PathQuad); -QML_DEFINE_TYPE(QFxPathCubic,PathCubic); +QML_DEFINE_TYPE(QFxPath,Path) +QML_DEFINE_NOCREATE_TYPE(QFxPathElement) +QML_DEFINE_NOCREATE_TYPE(QFxCurve) +QML_DEFINE_TYPE(QFxPathAttribute,PathAttribute) +QML_DEFINE_TYPE(QFxPathPercent,PathPercent) +QML_DEFINE_TYPE(QFxPathLine,PathLine) +QML_DEFINE_TYPE(QFxPathQuad,PathQuad) +QML_DEFINE_TYPE(QFxPathCubic,PathCubic) /*! \qmlclass PathElement diff --git a/src/declarative/fx/qfxpath.h b/src/declarative/fx/qfxpath.h index 10cf252..5c17fcb 100644 --- a/src/declarative/fx/qfxpath.h +++ b/src/declarative/fx/qfxpath.h @@ -61,7 +61,7 @@ public: Q_SIGNALS: void changed(); }; -QML_DECLARE_TYPE(QFxPathElement); +QML_DECLARE_TYPE(QFxPathElement) class Q_DECLARATIVE_EXPORT QFxPathAttribute : public QFxPathElement { @@ -83,7 +83,7 @@ private: QString _name; qreal _value; }; -QML_DECLARE_TYPE(QFxPathAttribute); +QML_DECLARE_TYPE(QFxPathAttribute) class Q_DECLARATIVE_EXPORT QFxCurve : public QFxPathElement { @@ -106,7 +106,7 @@ private: qreal _x; qreal _y; }; -QML_DECLARE_TYPE(QFxCurve); +QML_DECLARE_TYPE(QFxCurve) class Q_DECLARATIVE_EXPORT QFxPathLine : public QFxCurve { @@ -116,7 +116,7 @@ public: void addToPath(QPainterPath &path); }; -QML_DECLARE_TYPE(QFxPathLine); +QML_DECLARE_TYPE(QFxPathLine) class Q_DECLARATIVE_EXPORT QFxPathQuad : public QFxCurve { @@ -139,7 +139,7 @@ private: qreal _controlX; qreal _controlY; }; -QML_DECLARE_TYPE(QFxPathQuad); +QML_DECLARE_TYPE(QFxPathQuad) class Q_DECLARATIVE_EXPORT QFxPathCubic : public QFxCurve { @@ -172,7 +172,7 @@ private: int _control2X; int _control2Y; }; -QML_DECLARE_TYPE(QFxPathCubic); +QML_DECLARE_TYPE(QFxPathCubic) class Q_DECLARATIVE_EXPORT QFxPathPercent : public QFxPathElement { @@ -187,7 +187,7 @@ public: private: qreal _value; }; -QML_DECLARE_TYPE(QFxPathPercent); +QML_DECLARE_TYPE(QFxPathPercent) class QFxPathPrivate; class Q_DECLARATIVE_EXPORT QFxPath : public QObject, public QmlParserStatus @@ -249,7 +249,7 @@ private: Q_DISABLE_COPY(QFxPath) Q_DECLARE_PRIVATE(QFxPath) }; -QML_DECLARE_TYPE(QFxPath); +QML_DECLARE_TYPE(QFxPath) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp index 3f2e77a..625d778 100644 --- a/src/declarative/fx/qfxpathview.cpp +++ b/src/declarative/fx/qfxpathview.cpp @@ -55,7 +55,7 @@ static const int FlickThreshold = 5; QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxPathView,PathView); +QML_DEFINE_TYPE(QFxPathView,PathView) class QFxPathViewAttached : public QObject { diff --git a/src/declarative/fx/qfxpathview.h b/src/declarative/fx/qfxpathview.h index 33db566..cbdafa8 100644 --- a/src/declarative/fx/qfxpathview.h +++ b/src/declarative/fx/qfxpathview.h @@ -127,7 +127,7 @@ private: Q_DISABLE_COPY(QFxPathView) Q_DECLARE_PRIVATE(QFxPathView) }; -QML_DECLARE_TYPE(QFxPathView); +QML_DECLARE_TYPE(QFxPathView) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp index f81f9b3..90170da 100644 --- a/src/declarative/fx/qfxrect.cpp +++ b/src/declarative/fx/qfxrect.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxPen,Pen); +QML_DEFINE_TYPE(QFxPen,Pen) /*! \internal @@ -118,7 +118,7 @@ void QFxPen::setWidth(int w) -QML_DEFINE_TYPE(QFxRect,Rect); +QML_DEFINE_TYPE(QFxRect,Rect) /*! \qmlclass Rect QFxRect diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h index 420ec44..209a8ef 100644 --- a/src/declarative/fx/qfxrect.h +++ b/src/declarative/fx/qfxrect.h @@ -77,7 +77,7 @@ private: QColor _color; bool _valid; }; -QML_DECLARE_TYPE(QFxPen); +QML_DECLARE_TYPE(QFxPen) class QFxRectPrivate; class Q_DECLARATIVE_EXPORT QFxRect : public QFxItem @@ -131,7 +131,7 @@ private: Q_DISABLE_COPY(QFxRect) Q_DECLARE_PRIVATE(QFxRect) }; -QML_DECLARE_TYPE(QFxRect); +QML_DECLARE_TYPE(QFxRect) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxreflectionfilter.cpp b/src/declarative/fx/qfxreflectionfilter.cpp index 0bc01a7..2e57aa7 100644 --- a/src/declarative/fx/qfxreflectionfilter.cpp +++ b/src/declarative/fx/qfxreflectionfilter.cpp @@ -348,5 +348,5 @@ QRectF QFxReflectionFilter::itemBoundingRect(const QRectF &r) const return rv; } -QML_DEFINE_TYPE(QFxReflectionFilter,Reflection); +QML_DEFINE_TYPE(QFxReflectionFilter,Reflection) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxreflectionfilter.h b/src/declarative/fx/qfxreflectionfilter.h index 383e12f..6e56b5e 100644 --- a/src/declarative/fx/qfxreflectionfilter.h +++ b/src/declarative/fx/qfxreflectionfilter.h @@ -87,7 +87,7 @@ private: Q_DISABLE_COPY(QFxReflectionFilter) QFxReflectionFilterPrivate *d; }; -QML_DECLARE_TYPE(QFxReflectionFilter); +QML_DECLARE_TYPE(QFxReflectionFilter) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp index 23b4e01..0211ebb 100644 --- a/src/declarative/fx/qfxrepeater.cpp +++ b/src/declarative/fx/qfxrepeater.cpp @@ -71,7 +71,7 @@ QFxItem *QFxRepeaterPrivate::addItem(QmlContext *ctxt, QFxItem *lastItem) return item; } -QML_DEFINE_TYPE(QFxRepeater,Repeater); +QML_DEFINE_TYPE(QFxRepeater,Repeater) /*! \qmlclass Repeater diff --git a/src/declarative/fx/qfxrepeater.h b/src/declarative/fx/qfxrepeater.h index 362242b..c1b194a 100644 --- a/src/declarative/fx/qfxrepeater.h +++ b/src/declarative/fx/qfxrepeater.h @@ -80,7 +80,7 @@ private: Q_DISABLE_COPY(QFxRepeater) Q_DECLARE_PRIVATE(QFxRepeater) }; -QML_DECLARE_TYPE(QFxRepeater); +QML_DECLARE_TYPE(QFxRepeater) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxscalegrid.h b/src/declarative/fx/qfxscalegrid.h index d0f735f..2a20de7 100644 --- a/src/declarative/fx/qfxscalegrid.h +++ b/src/declarative/fx/qfxscalegrid.h @@ -111,7 +111,7 @@ private: int _b; QString _pix; }; -QML_DECLARE_TYPE(QFxScaleGrid); +QML_DECLARE_TYPE(QFxScaleGrid) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxshadowfilter.cpp b/src/declarative/fx/qfxshadowfilter.cpp index 83c1b47..10c332c 100644 --- a/src/declarative/fx/qfxshadowfilter.cpp +++ b/src/declarative/fx/qfxshadowfilter.cpp @@ -209,6 +209,6 @@ void QFxShadowFilter::filterGL(QSimpleCanvasItem::GLPainter &p) #endif } -QML_DEFINE_TYPE(QFxShadowFilter,Shadow); +QML_DEFINE_TYPE(QFxShadowFilter,Shadow) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxshadowfilter.h b/src/declarative/fx/qfxshadowfilter.h index fc54e01..67d165a 100644 --- a/src/declarative/fx/qfxshadowfilter.h +++ b/src/declarative/fx/qfxshadowfilter.h @@ -77,7 +77,7 @@ protected: private: QFxShadowFilterPrivate *d; }; -QML_DECLARE_TYPE(QFxShadowFilter); +QML_DECLARE_TYPE(QFxShadowFilter) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index 315b451..94a1712 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxText,Text); +QML_DEFINE_TYPE(QFxText,Text) /*! \qmlclass Text QFxText diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h index ee9082b..158aece 100644 --- a/src/declarative/fx/qfxtext.h +++ b/src/declarative/fx/qfxtext.h @@ -144,7 +144,7 @@ private: Q_DISABLE_COPY(QFxText) Q_DECLARE_PRIVATE(QFxText) }; -QML_DECLARE_TYPE(QFxText); +QML_DECLARE_TYPE(QFxText) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index f59e0ae..fc73ecd 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxTextEdit, TextEdit); +QML_DEFINE_TYPE(QFxTextEdit, TextEdit) /*! \qmlclass TextEdit diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h index 1456cd8..37bc327 100644 --- a/src/declarative/fx/qfxtextedit.h +++ b/src/declarative/fx/qfxtextedit.h @@ -198,7 +198,7 @@ private: Q_DISABLE_COPY(QFxTextEdit) Q_DECLARE_PRIVATE(QFxTextEdit) }; -QML_DECLARE_TYPE(QFxTextEdit); +QML_DECLARE_TYPE(QFxTextEdit) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp index d99af27..a4c5d22 100644 --- a/src/declarative/fx/qfxtransform.cpp +++ b/src/declarative/fx/qfxtransform.cpp @@ -99,7 +99,7 @@ void QFxTransform::update() \endqml */ -QML_DEFINE_TYPE(QFxAxis, Axis); +QML_DEFINE_TYPE(QFxAxis, Axis) QFxAxis::QFxAxis(QObject *parent) : QObject(parent), _startX(0), _startY(0), _endX(0), _endY(0), _endZ(0) @@ -286,7 +286,7 @@ void QFxRotation::update() QFxTransform::update(); } -QML_DEFINE_TYPE(QFxRotation, Rotation); +QML_DEFINE_TYPE(QFxRotation, Rotation) /*! \qmlclass Rotation3D @@ -298,7 +298,7 @@ QML_DEFINE_TYPE(QFxRotation, Rotation); \image axisrotation.png */ -QML_DEFINE_TYPE(QFxRotation3D,Rotation3D); +QML_DEFINE_TYPE(QFxRotation3D,Rotation3D) QFxRotation3D::QFxRotation3D(QObject *parent) : QFxTransform(parent), _angle(0), _dirty(true) @@ -448,7 +448,7 @@ Image { \endqml */ -QML_DEFINE_TYPE(QFxTranslation3D,Translation3D); +QML_DEFINE_TYPE(QFxTranslation3D,Translation3D) QFxTranslation3D::QFxTranslation3D(QObject *parent) : QFxTransform(parent), _distance(0), _dirty(true) @@ -568,7 +568,7 @@ void QFxTranslation3D::update() OpenGL. When running under software rasterization it has no effect. */ -QML_DEFINE_TYPE(QFxPerspective,Perspective); +QML_DEFINE_TYPE(QFxPerspective,Perspective) QFxPerspective::QFxPerspective(QObject *parent) : QFxTransform(parent) @@ -683,7 +683,7 @@ QMatrix4x4 QFxPerspective::transform() const \image squish.png */ -QML_DEFINE_TYPE(QFxSquish,Squish); +QML_DEFINE_TYPE(QFxSquish,Squish) QFxSquish::QFxSquish(QObject *parent) : QFxTransform(parent) diff --git a/src/declarative/fx/qfxtransform.h b/src/declarative/fx/qfxtransform.h index 31374df..7be8adc 100644 --- a/src/declarative/fx/qfxtransform.h +++ b/src/declarative/fx/qfxtransform.h @@ -67,7 +67,7 @@ public: virtual bool isIdentity() const; virtual QSimpleCanvas::Matrix transform() const; }; -QML_DECLARE_TYPE(QFxTransform); +QML_DECLARE_TYPE(QFxTransform) class Q_DECLARATIVE_EXPORT QFxAxis : public QObject { @@ -107,7 +107,7 @@ private: qreal _endY; qreal _endZ; }; -QML_DECLARE_TYPE(QFxAxis); +QML_DECLARE_TYPE(QFxAxis) class Q_DECLARATIVE_EXPORT QFxRotation : public QFxTransform { @@ -145,7 +145,7 @@ private: mutable bool _dirty; mutable QSimpleCanvas::Matrix _transform; }; -QML_DECLARE_TYPE(QFxRotation); +QML_DECLARE_TYPE(QFxRotation) class Q_DECLARATIVE_EXPORT QFxRotation3D : public QFxTransform { @@ -174,7 +174,7 @@ private: mutable bool _dirty; mutable QSimpleCanvas::Matrix _transform; }; -QML_DECLARE_TYPE(QFxRotation3D); +QML_DECLARE_TYPE(QFxRotation3D) class Q_DECLARATIVE_EXPORT QFxTranslation3D : public QFxTransform { @@ -203,7 +203,7 @@ private: mutable bool _dirty; mutable QSimpleCanvas::Matrix _transform; }; -QML_DECLARE_TYPE(QFxTranslation3D); +QML_DECLARE_TYPE(QFxTranslation3D) class Q_DECLARATIVE_EXPORT QFxPerspective : public QFxTransform { @@ -244,7 +244,7 @@ private: qreal _angle; qreal _aspect; }; -QML_DECLARE_TYPE(QFxPerspective); +QML_DECLARE_TYPE(QFxPerspective) class Q_DECLARATIVE_EXPORT QFxSquish : public QFxTransform { @@ -310,7 +310,7 @@ private: QSizeF s; QPointF p1, p2, p3, p4; }; -QML_DECLARE_TYPE(QFxSquish); +QML_DECLARE_TYPE(QFxSquish) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp index 039998a..cac5d59 100644 --- a/src/declarative/fx/qfxvisualitemmodel.cpp +++ b/src/declarative/fx/qfxvisualitemmodel.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -QML_DECLARE_TYPE(QListModelInterface); +QML_DECLARE_TYPE(QListModelInterface) class QFxVisualItemModelParts; class QFxVisualItemModelData; @@ -765,7 +765,7 @@ void QFxVisualItemModel::_q_destroyingPackage(QmlPackage *package) emit destroyingItem(qobject_cast<QFxItem*>(package->part(d->m_part))); } -QML_DEFINE_TYPE(QFxVisualItemModel,VisualModel); +QML_DEFINE_TYPE(QFxVisualItemModel,VisualModel) QT_END_NAMESPACE #include "qfxvisualitemmodel.moc" diff --git a/src/declarative/fx/qfxvisualitemmodel.h b/src/declarative/fx/qfxvisualitemmodel.h index 622065c..968cc2e 100644 --- a/src/declarative/fx/qfxvisualitemmodel.h +++ b/src/declarative/fx/qfxvisualitemmodel.h @@ -123,7 +123,7 @@ private Q_SLOTS: private: Q_DISABLE_COPY(QFxVisualItemModel) }; -QML_DECLARE_TYPE(QFxVisualItemModel); +QML_DECLARE_TYPE(QFxVisualItemModel) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index 7998711..4c35cae 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -71,7 +71,7 @@ #include <private/qfxpainteditem_p.h> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxWebView,WebView); +QML_DEFINE_TYPE(QFxWebView,WebView) static const int MAX_DOUBLECLICK_TIME=500; // XXX need better gesture system diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h index 6a3dad5..28ef6c3 100644 --- a/src/declarative/fx/qfxwebview.h +++ b/src/declarative/fx/qfxwebview.h @@ -207,7 +207,7 @@ private: Q_DISABLE_COPY(QFxWebView) Q_DECLARE_PRIVATE(QFxWebView) }; -QML_DECLARE_TYPE(QFxWebView); +QML_DECLARE_TYPE(QFxWebView) QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxwidgetcontainer.cpp b/src/declarative/fx/qfxwidgetcontainer.cpp index fccdad1..421c2f7 100644 --- a/src/declarative/fx/qfxwidgetcontainer.cpp +++ b/src/declarative/fx/qfxwidgetcontainer.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \brief The QFxWidgetContainer class allows you to add QGraphicsWidgets into Fluid UI applications. */ -QML_DEFINE_TYPE(QFxWidgetContainer, WidgetContainer); +QML_DEFINE_TYPE(QFxWidgetContainer, WidgetContainer) QFxWidgetContainer::QFxWidgetContainer(QFxItem *parent) : QFxItem(parent), _graphicsWidget(0) diff --git a/src/declarative/fx/qfxwidgetcontainer.h b/src/declarative/fx/qfxwidgetcontainer.h index 3b1f016..cc36010 100644 --- a/src/declarative/fx/qfxwidgetcontainer.h +++ b/src/declarative/fx/qfxwidgetcontainer.h @@ -72,7 +72,7 @@ protected: private: QGraphicsWidget *_graphicsWidget; }; -QML_DECLARE_TYPE(QFxWidgetContainer); +QML_DECLARE_TYPE(QFxWidgetContainer) QT_END_NAMESPACE diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index b435e94..370bb58 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -59,13 +59,13 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) #define QML_DECLARE_TYPE(TYPE) \ - Q_DECLARE_METATYPE(TYPE *); \ - Q_DECLARE_METATYPE(QList<TYPE *> *); \ - Q_DECLARE_METATYPE(QmlList<TYPE *> *); + Q_DECLARE_METATYPE(TYPE *) \ + Q_DECLARE_METATYPE(QList<TYPE *> *) \ + Q_DECLARE_METATYPE(QmlList<TYPE *> *) #define QML_DECLARE_TYPE_HASMETATYPE(TYPE) \ - Q_DECLARE_METATYPE(QList<TYPE *> *); \ - Q_DECLARE_METATYPE(QmlList<TYPE *> *); + Q_DECLARE_METATYPE(QList<TYPE *> *) \ + Q_DECLARE_METATYPE(QmlList<TYPE *> *) #define QML_DECLARE_INTERFACE(INTERFACE) \ QML_DECLARE_TYPE(INTERFACE) @@ -109,8 +109,8 @@ QObject *qmlAttachedPropertiesObject(const QObject *obj) return qmlAttachedPropertiesObjectById(idx, obj); } -QML_DECLARE_TYPE(QObject); -Q_DECLARE_METATYPE(QVariant); +QML_DECLARE_TYPE(QObject) +Q_DECLARE_METATYPE(QVariant) QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlbindablevalue.h b/src/declarative/qml/qmlbindablevalue.h index 7831177..e50c154 100644 --- a/src/declarative/qml/qmlbindablevalue.h +++ b/src/declarative/qml/qmlbindablevalue.h @@ -85,7 +85,7 @@ protected: private: Q_DECLARE_PRIVATE(QmlBindableValue) }; -QML_DECLARE_TYPE(QmlBindableValue); +QML_DECLARE_TYPE(QmlBindableValue) QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h index 90f7467..3369de3 100644 --- a/src/declarative/qml/qmlcomponent.h +++ b/src/declarative/qml/qmlcomponent.h @@ -101,7 +101,7 @@ private: friend class QmlVME; friend struct QmlCompositeTypeData; }; -QML_DECLARE_TYPE(QmlComponent); +QML_DECLARE_TYPE(QmlComponent) QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlpropertyvaluesource.h b/src/declarative/qml/qmlpropertyvaluesource.h index 736b25f..9cef150 100644 --- a/src/declarative/qml/qmlpropertyvaluesource.h +++ b/src/declarative/qml/qmlpropertyvaluesource.h @@ -69,7 +69,7 @@ protected: private: Q_DISABLE_COPY(QmlPropertyValueSource) }; -QML_DECLARE_TYPE(QmlPropertyValueSource); +QML_DECLARE_TYPE(QmlPropertyValueSource) #endif // QMLPROPERTYVALUESOURCE_H diff --git a/src/declarative/util/qfxperf.h b/src/declarative/util/qfxperf.h index 3430658..23de8b5 100644 --- a/src/declarative/util/qfxperf.h +++ b/src/declarative/util/qfxperf.h @@ -50,33 +50,33 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) Q_DECLARE_PERFORMANCE_LOG(QFxPerf) { - Q_DECLARE_PERFORMANCE_METRIC(QmlParsing); - Q_DECLARE_PERFORMANCE_METRIC(Compile); - Q_DECLARE_PERFORMANCE_METRIC(CompileRun); - Q_DECLARE_PERFORMANCE_METRIC(CreateComponent); - Q_DECLARE_PERFORMANCE_METRIC(BindInit); - Q_DECLARE_PERFORMANCE_METRIC(BindCompile); - Q_DECLARE_PERFORMANCE_METRIC(BindValue); - Q_DECLARE_PERFORMANCE_METRIC(BindValueSSE); - Q_DECLARE_PERFORMANCE_METRIC(BindValueQt); - Q_DECLARE_PERFORMANCE_METRIC(ContextQuery); - Q_DECLARE_PERFORMANCE_METRIC(ContextProperty); - Q_DECLARE_PERFORMANCE_METRIC(ObjectQuery); - Q_DECLARE_PERFORMANCE_METRIC(ObjectProperty); - Q_DECLARE_PERFORMANCE_METRIC(ObjectSetProperty); - Q_DECLARE_PERFORMANCE_METRIC(BindableValueUpdate); - Q_DECLARE_PERFORMANCE_METRIC(PixmapLoad); - Q_DECLARE_PERFORMANCE_METRIC(MetaProperty); - Q_DECLARE_PERFORMANCE_METRIC(PathCache); - Q_DECLARE_PERFORMANCE_METRIC(CreateParticle); - Q_DECLARE_PERFORMANCE_METRIC(FontDatabase); - Q_DECLARE_PERFORMANCE_METRIC(ItemComponentComplete); - Q_DECLARE_PERFORMANCE_METRIC(ImageComponentComplete); - Q_DECLARE_PERFORMANCE_METRIC(ComponentInstanceComponentComplete); - Q_DECLARE_PERFORMANCE_METRIC(BaseLayoutComponentComplete); - Q_DECLARE_PERFORMANCE_METRIC(TextComponentComplete); - Q_DECLARE_PERFORMANCE_METRIC(QFxText_setText); - Q_DECLARE_PERFORMANCE_METRIC(AddScript); + Q_DECLARE_PERFORMANCE_METRIC(QmlParsing) + Q_DECLARE_PERFORMANCE_METRIC(Compile) + Q_DECLARE_PERFORMANCE_METRIC(CompileRun) + Q_DECLARE_PERFORMANCE_METRIC(CreateComponent) + Q_DECLARE_PERFORMANCE_METRIC(BindInit) + Q_DECLARE_PERFORMANCE_METRIC(BindCompile) + Q_DECLARE_PERFORMANCE_METRIC(BindValue) + Q_DECLARE_PERFORMANCE_METRIC(BindValueSSE) + Q_DECLARE_PERFORMANCE_METRIC(BindValueQt) + Q_DECLARE_PERFORMANCE_METRIC(ContextQuery) + Q_DECLARE_PERFORMANCE_METRIC(ContextProperty) + Q_DECLARE_PERFORMANCE_METRIC(ObjectQuery) + Q_DECLARE_PERFORMANCE_METRIC(ObjectProperty) + Q_DECLARE_PERFORMANCE_METRIC(ObjectSetProperty) + Q_DECLARE_PERFORMANCE_METRIC(BindableValueUpdate) + Q_DECLARE_PERFORMANCE_METRIC(PixmapLoad) + Q_DECLARE_PERFORMANCE_METRIC(MetaProperty) + Q_DECLARE_PERFORMANCE_METRIC(PathCache) + Q_DECLARE_PERFORMANCE_METRIC(CreateParticle) + Q_DECLARE_PERFORMANCE_METRIC(FontDatabase) + Q_DECLARE_PERFORMANCE_METRIC(ItemComponentComplete) + Q_DECLARE_PERFORMANCE_METRIC(ImageComponentComplete) + Q_DECLARE_PERFORMANCE_METRIC(ComponentInstanceComponentComplete) + Q_DECLARE_PERFORMANCE_METRIC(BaseLayoutComponentComplete) + Q_DECLARE_PERFORMANCE_METRIC(TextComponentComplete) + Q_DECLARE_PERFORMANCE_METRIC(QFxText_setText) + Q_DECLARE_PERFORMANCE_METRIC(AddScript) } #endif // _QFXPERF_H_ diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 24bcac98..d4aea81 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -137,7 +137,7 @@ QEasingCurve stringToCurve(const QString &curve) return easingCurve; } -QML_DEFINE_NOCREATE_TYPE(QmlAbstractAnimation); +QML_DEFINE_NOCREATE_TYPE(QmlAbstractAnimation) /*! \qmlclass Animation @@ -554,7 +554,7 @@ void QmlAbstractAnimation::timelineComplete() \l{xmlPauseAnimation} {<PauseAnimation>}. */ -QML_DEFINE_TYPE(QmlPauseAnimation,PauseAnimation); +QML_DEFINE_TYPE(QmlPauseAnimation,PauseAnimation) QmlPauseAnimation::QmlPauseAnimation(QObject *parent) : QmlAbstractAnimation(*(new QmlPauseAnimationPrivate), parent) { @@ -924,7 +924,7 @@ void QmlColorAnimationPrivate::valueChanged(qreal v) property.write(newColor); } } -QML_DEFINE_TYPE(QmlColorAnimation,ColorAnimation); +QML_DEFINE_TYPE(QmlColorAnimation,ColorAnimation) /*! \qmlclass RunScriptAction QmlRunScriptAction @@ -1018,7 +1018,7 @@ QAbstractAnimation *QmlRunScriptAction::qtAnimation() return d->rsa; } -QML_DEFINE_TYPE(QmlRunScriptAction, RunScriptAction); +QML_DEFINE_TYPE(QmlRunScriptAction, RunScriptAction) /*! \qmlclass SetPropertyAction QmlSetPropertyAction @@ -1215,7 +1215,7 @@ void QmlSetPropertyAction::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlSetPropertyAction,SetPropertyAction); +QML_DEFINE_TYPE(QmlSetPropertyAction,SetPropertyAction) /*! \qmlclass ParentChangeAction QmlParentChangeAction @@ -1325,7 +1325,7 @@ void QmlParentChangeAction::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlParentChangeAction,ParentChangeAction); +QML_DEFINE_TYPE(QmlParentChangeAction,ParentChangeAction) /*! \qmlclass NumericAnimation QmlNumericAnimation @@ -1707,7 +1707,7 @@ void QmlNumericAnimation::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlNumericAnimation,NumericAnimation); +QML_DEFINE_TYPE(QmlNumericAnimation,NumericAnimation) QmlAnimationGroup::QmlAnimationGroup(QObject *parent) : QmlAbstractAnimation(*(new QmlAnimationGroupPrivate), parent) @@ -1799,7 +1799,7 @@ void QmlSequentialAnimation::transition(QmlStateActions &actions, //d->ag->setDirection(direction == Backward ? QAbstractAnimation::Backward : QAbstractAnimation::Forward); } -QML_DEFINE_TYPE(QmlSequentialAnimation,SequentialAnimation); +QML_DEFINE_TYPE(QmlSequentialAnimation,SequentialAnimation) /*! \qmlclass ParallelAnimation QmlParallelAnimation @@ -1875,7 +1875,7 @@ void QmlParallelAnimation::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlParallelAnimation,ParallelAnimation); +QML_DEFINE_TYPE(QmlParallelAnimation,ParallelAnimation) QVariant QmlVariantAnimationPrivate::interpolateVariant(const QVariant &from, const QVariant &to, qreal progress) { @@ -2262,6 +2262,6 @@ void QmlVariantAnimation::transition(QmlStateActions &actions, } //XXX whats the best name for this? (just Animation?) -QML_DEFINE_TYPE(QmlVariantAnimation,VariantAnimation); +QML_DEFINE_TYPE(QmlVariantAnimation,VariantAnimation) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h index 8bd53e2..74cf1b4 100644 --- a/src/declarative/util/qmlanimation.h +++ b/src/declarative/util/qmlanimation.h @@ -124,7 +124,7 @@ private Q_SLOTS: void timelineComplete(); }; -QML_DECLARE_TYPE(QmlAbstractAnimation); +QML_DECLARE_TYPE(QmlAbstractAnimation) class QmlPauseAnimationPrivate; class QmlPauseAnimation : public QmlAbstractAnimation @@ -148,7 +148,7 @@ protected: virtual QAbstractAnimation *qtAnimation(); virtual void prepare(QmlMetaProperty &); }; -QML_DECLARE_TYPE(QmlPauseAnimation); +QML_DECLARE_TYPE(QmlPauseAnimation) class QmlColorAnimationPrivate; class QmlColorAnimation : public QmlAbstractAnimation @@ -195,7 +195,7 @@ Q_SIGNALS: void toChanged(const QColor &); void easingChanged(const QString &); }; -QML_DECLARE_TYPE(QmlColorAnimation); +QML_DECLARE_TYPE(QmlColorAnimation) class QmlRunScriptActionPrivate; class QmlRunScriptAction : public QmlAbstractAnimation @@ -223,7 +223,7 @@ Q_SIGNALS: protected: virtual QAbstractAnimation *qtAnimation(); }; -QML_DECLARE_TYPE(QmlRunScriptAction); +QML_DECLARE_TYPE(QmlRunScriptAction) class QmlSetPropertyActionPrivate; class QmlSetPropertyAction : public QmlAbstractAnimation @@ -260,7 +260,7 @@ protected: virtual QAbstractAnimation *qtAnimation(); virtual void prepare(QmlMetaProperty &); }; -QML_DECLARE_TYPE(QmlSetPropertyAction); +QML_DECLARE_TYPE(QmlSetPropertyAction) class QmlParentChangeActionPrivate; class QmlParentChangeAction : public QmlAbstractAnimation @@ -281,7 +281,7 @@ protected: virtual QAbstractAnimation *qtAnimation(); virtual void prepare(QmlMetaProperty &); }; -QML_DECLARE_TYPE(QmlParentChangeAction); +QML_DECLARE_TYPE(QmlParentChangeAction) class QmlNumericAnimationPrivate; class QmlNumericAnimation : public QmlAbstractAnimation @@ -333,7 +333,7 @@ Q_SIGNALS: void easingChanged(const QString &); void propertiesChanged(const QString &); }; -QML_DECLARE_TYPE(QmlNumericAnimation); +QML_DECLARE_TYPE(QmlNumericAnimation) #if 0 class QmlDiscreteAnimation : public QmlAbstractAnimation @@ -374,7 +374,7 @@ protected: virtual QAbstractAnimation *qtAnimation(); virtual void prepare(QmlMetaProperty &); }; -QML_DECLARE_TYPE(QmlSequentialAnimation); +QML_DECLARE_TYPE(QmlSequentialAnimation) class QmlParallelAnimation : public QmlAnimationGroup { @@ -392,7 +392,7 @@ protected: virtual QAbstractAnimation *qtAnimation(); virtual void prepare(QmlMetaProperty &); }; -QML_DECLARE_TYPE(QmlParallelAnimation); +QML_DECLARE_TYPE(QmlParallelAnimation) class QmlVariantAnimationPrivate; class QmlVariantAnimation : public QmlAbstractAnimation @@ -444,7 +444,7 @@ Q_SIGNALS: void easingChanged(const QString &); void propertiesChanged(const QString &); }; -QML_DECLARE_TYPE(QmlVariantAnimation); +QML_DECLARE_TYPE(QmlVariantAnimation) #endif // QMLANIMATION_H diff --git a/src/declarative/util/qmlbehaviour.cpp b/src/declarative/util/qmlbehaviour.cpp index 354c7e3..077f666 100644 --- a/src/declarative/util/qmlbehaviour.cpp +++ b/src/declarative/util/qmlbehaviour.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QmlBehaviour,Behaviour); +QML_DEFINE_TYPE(QmlBehaviour,Behaviour) class QmlBehaviourData : public QObject diff --git a/src/declarative/util/qmlbehaviour.h b/src/declarative/util/qmlbehaviour.h index 7a54d63..584b96d 100644 --- a/src/declarative/util/qmlbehaviour.h +++ b/src/declarative/util/qmlbehaviour.h @@ -86,7 +86,7 @@ protected: private Q_SLOTS: void propertyValueChanged(); }; -QML_DECLARE_TYPE(QmlBehaviour); +QML_DECLARE_TYPE(QmlBehaviour) #endif // QMLBEHAVIOUR_H diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index 59bfd75..b45d07d 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -63,7 +63,7 @@ public: QmlNullableValue<QVariant> value; }; -QML_DEFINE_TYPE(QmlBind,Bind); +QML_DEFINE_TYPE(QmlBind,Bind) /*! \qmlclass Bind QmlBind \brief The Bind element allows arbitrary property bindings to be created. diff --git a/src/declarative/util/qmlbind.h b/src/declarative/util/qmlbind.h index 5576957..9d4ae8d 100644 --- a/src/declarative/util/qmlbind.h +++ b/src/declarative/util/qmlbind.h @@ -81,7 +81,7 @@ public: private: void eval(); }; -QML_DECLARE_TYPE(QmlBind); +QML_DECLARE_TYPE(QmlBind) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp index 8f6c908..6c7b158 100644 --- a/src/declarative/util/qmlconnection.cpp +++ b/src/declarative/util/qmlconnection.cpp @@ -294,6 +294,6 @@ void QmlConnection::setSignal(const QString& sig) connectIfValid(); } -QML_DEFINE_TYPE(QmlConnection,Connection); +QML_DEFINE_TYPE(QmlConnection,Connection) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlconnection.h b/src/declarative/util/qmlconnection.h index c943092..c776dac 100644 --- a/src/declarative/util/qmlconnection.h +++ b/src/declarative/util/qmlconnection.h @@ -81,7 +81,7 @@ private: void connectIfValid(); void componentComplete(); }; -QML_DECLARE_TYPE(QmlConnection); +QML_DECLARE_TYPE(QmlConnection) #endif diff --git a/src/declarative/util/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp index 94b87ee..ad0e473 100644 --- a/src/declarative/util/qmldatetimeformatter.cpp +++ b/src/declarative/util/qmldatetimeformatter.cpp @@ -364,5 +364,5 @@ void QmlDateTimeFormatter::classComplete() d->updateText(); } -QML_DEFINE_TYPE(QmlDateTimeFormatter, DateTimeFormatter); +QML_DEFINE_TYPE(QmlDateTimeFormatter, DateTimeFormatter) QT_END_NAMESPACE diff --git a/src/declarative/util/qmldatetimeformatter.h b/src/declarative/util/qmldatetimeformatter.h index 3421f8c..5d11dab 100644 --- a/src/declarative/util/qmldatetimeformatter.h +++ b/src/declarative/util/qmldatetimeformatter.h @@ -107,7 +107,7 @@ private: Q_DECLARE_PRIVATE(QmlDateTimeFormatter) }; -QML_DECLARE_TYPE(QmlDateTimeFormatter); +QML_DECLARE_TYPE(QmlDateTimeFormatter) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp index 8e5ae69..d1ecac4 100644 --- a/src/declarative/util/qmlfollow.cpp +++ b/src/declarative/util/qmlfollow.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QmlFollow,Follow); +QML_DEFINE_TYPE(QmlFollow,Follow) class QmlFollowPrivate : public QObjectPrivate { diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h index fa0bff8..1c7275d 100644 --- a/src/declarative/util/qmlfollow.h +++ b/src/declarative/util/qmlfollow.h @@ -92,7 +92,7 @@ Q_SIGNALS: void valueChanged(qreal); }; -QML_DECLARE_TYPE(QmlFollow); +QML_DECLARE_TYPE(QmlFollow) #endif // QFXFOLLOW_H diff --git a/src/declarative/util/qmlfont.cpp b/src/declarative/util/qmlfont.cpp index 9f3225a..c537a83 100644 --- a/src/declarative/util/qmlfont.cpp +++ b/src/declarative/util/qmlfont.cpp @@ -51,7 +51,7 @@ public: QFont font; }; -QML_DEFINE_TYPE(QmlFont,Font); +QML_DEFINE_TYPE(QmlFont,Font) /*! \internal diff --git a/src/declarative/util/qmlfont.h b/src/declarative/util/qmlfont.h index 3a21c34..1fee6cb 100644 --- a/src/declarative/util/qmlfont.h +++ b/src/declarative/util/qmlfont.h @@ -83,7 +83,7 @@ public: Q_SIGNALS: void updated(); }; -QML_DECLARE_TYPE(QmlFont); +QML_DECLARE_TYPE(QmlFont) QT_END_NAMESPACE diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index 80eb9c3..5dc3fda 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -519,16 +519,16 @@ void ListModelParser::setCustomData(QObject *obj, const QByteArray &d) } } -QML_DECLARE_TYPE(ListModel); -QML_DEFINE_CUSTOM_TYPE(ListModel, ListModel, ListModelParser); +QML_DECLARE_TYPE(ListModel) +QML_DEFINE_CUSTOM_TYPE(ListModel, ListModel, ListModelParser) // ### FIXME class ListElement : public QObject { Q_OBJECT }; -QML_DECLARE_TYPE(ListElement); -QML_DEFINE_TYPE(ListElement,ListElement); +QML_DECLARE_TYPE(ListElement) +QML_DEFINE_TYPE(ListElement,ListElement) static void dump(ModelNode *node, int ind) { diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp index 107bcdb..e527c1f 100644 --- a/src/declarative/util/qmlpackage.cpp +++ b/src/declarative/util/qmlpackage.cpp @@ -147,7 +147,7 @@ QmlPackageAttached *QmlPackage::qmlAttachedProperties(QObject *o) return new QmlPackageAttached(o); } -QML_DEFINE_TYPE(QmlPackage, Package); +QML_DEFINE_TYPE(QmlPackage, Package) QT_END_NAMESPACE #include "qmlpackage.moc" diff --git a/src/declarative/util/qmlpackage.h b/src/declarative/util/qmlpackage.h index f4167fd..763ba6a 100644 --- a/src/declarative/util/qmlpackage.h +++ b/src/declarative/util/qmlpackage.h @@ -77,7 +77,7 @@ public: static QmlPackageAttached *qmlAttachedProperties(QObject *); }; -QML_DECLARE_TYPE(QmlPackage); +QML_DECLARE_TYPE(QmlPackage) #endif // QMLPACKAGE_H diff --git a/src/declarative/util/qmlscript.cpp b/src/declarative/util/qmlscript.cpp index d6d610a..45370e2 100644 --- a/src/declarative/util/qmlscript.cpp +++ b/src/declarative/util/qmlscript.cpp @@ -101,7 +101,7 @@ public: avoided. */ -QML_DEFINE_TYPE(QmlScript,Script); +QML_DEFINE_TYPE(QmlScript,Script) QmlScript::QmlScript(QObject *parent) : QObject(*(new QmlScriptPrivate), parent) { } diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h index b739fd7..35a935b 100644 --- a/src/declarative/util/qmlscript.h +++ b/src/declarative/util/qmlscript.h @@ -73,7 +73,7 @@ public: private Q_SLOTS: void replyFinished(); }; -QML_DECLARE_TYPE(QmlScript); +QML_DECLARE_TYPE(QmlScript) QT_END_NAMESPACE QT_END_HEADER diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp index c986864..cb97ed9 100644 --- a/src/declarative/util/qmlsetproperties.cpp +++ b/src/declarative/util/qmlsetproperties.cpp @@ -357,6 +357,6 @@ QmlSetProperties::ActionList QmlSetProperties::actions() return list; } -QML_DEFINE_CUSTOM_TYPE(QmlSetProperties,SetProperties,QmlSetPropertiesParser); +QML_DEFINE_CUSTOM_TYPE(QmlSetProperties,SetProperties,QmlSetPropertiesParser) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlsetproperties.h b/src/declarative/util/qmlsetproperties.h index 24ad99a..6dc5993 100644 --- a/src/declarative/util/qmlsetproperties.h +++ b/src/declarative/util/qmlsetproperties.h @@ -71,7 +71,7 @@ public: virtual ActionList actions(); }; -QML_DECLARE_TYPE(QmlSetProperties); +QML_DECLARE_TYPE(QmlSetProperties) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 6261003..abe8301 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -104,7 +104,7 @@ QmlStateOperation::QmlStateOperation(QObjectPrivate &dd, QObject *parent) \sa {states-transitions}{States and Transitions} */ -QML_DEFINE_TYPE(QmlState,State); +QML_DEFINE_TYPE(QmlState,State) QmlState::QmlState(QObject *parent) : QObject(*(new QmlStatePrivate), parent) { @@ -463,7 +463,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever d->applyBindings(); //### merge into above foreach? } -QML_DEFINE_TYPE(QmlStateOperation,StateOperation); +QML_DEFINE_TYPE(QmlStateOperation,StateOperation) QmlStateOperation::ActionList QmlStateOperation::actions() { return ActionList(); diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h index aa8871f..39a9f19 100644 --- a/src/declarative/util/qmlstate.h +++ b/src/declarative/util/qmlstate.h @@ -116,7 +116,7 @@ public: protected: QmlStateOperation(QObjectPrivate &dd, QObject *parent = 0); }; -QML_DECLARE_TYPE(QmlStateOperation); +QML_DECLARE_TYPE(QmlStateOperation) typedef QmlStateOperation::ActionList QmlStateActions; @@ -166,7 +166,7 @@ private: Q_DISABLE_COPY(QmlState) friend class QmlTransitionPrivate; }; -QML_DECLARE_TYPE(QmlState); +QML_DECLARE_TYPE(QmlState) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index cabef63..57ccd37 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG); -QML_DEFINE_TYPE(QmlStateGroup,StateGroup); +QML_DEFINE_TYPE(QmlStateGroup,StateGroup) class QmlStateGroupPrivate : public QObjectPrivate { diff --git a/src/declarative/util/qmlstategroup.h b/src/declarative/util/qmlstategroup.h index cca1015..ac9b8c3 100644 --- a/src/declarative/util/qmlstategroup.h +++ b/src/declarative/util/qmlstategroup.h @@ -85,7 +85,7 @@ private: friend class QmlState; void updateAutoState(); }; -QML_DECLARE_TYPE(QmlStateGroup); +QML_DECLARE_TYPE(QmlStateGroup) #endif // QMLSTATEGROUP_H diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index 01f9cdd..02b54f8 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -64,7 +64,7 @@ public: \brief The ParentChange element allows you to reparent an object in a state. */ -QML_DEFINE_TYPE(QmlParentChange,ParentChange); +QML_DEFINE_TYPE(QmlParentChange,ParentChange) QmlParentChange::QmlParentChange(QObject *parent) : QmlStateOperation(*(new QmlParentChangePrivate), parent) { @@ -147,7 +147,7 @@ public: \qmlclass RunScript QmlRunScript \brief The RunScript element allows you to run a script in a state. */ -QML_DEFINE_TYPE(QmlRunScript,RunScript); +QML_DEFINE_TYPE(QmlRunScript,RunScript) QmlRunScript::QmlRunScript(QObject *parent) : QmlStateOperation(*(new QmlRunScriptPrivate), parent) { @@ -268,7 +268,7 @@ public: QString binding; }; -QML_DEFINE_TYPE(QmlSetProperty,SetProperty); +QML_DEFINE_TYPE(QmlSetProperty,SetProperty) QmlSetProperty::QmlSetProperty(QObject *parent) : QmlStateOperation(*(new QmlSetPropertyPrivate), parent) diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h index 720c639..ef36ab2 100644 --- a/src/declarative/util/qmlstateoperations.h +++ b/src/declarative/util/qmlstateoperations.h @@ -70,7 +70,7 @@ public: virtual ActionList actions(); }; -QML_DECLARE_TYPE(QmlParentChange); +QML_DECLARE_TYPE(QmlParentChange) class QmlRunScriptPrivate; class Q_DECLARATIVE_EXPORT QmlRunScript : public QmlStateOperation, public ActionEvent @@ -95,7 +95,7 @@ public: virtual void execute(); }; -QML_DECLARE_TYPE(QmlRunScript); +QML_DECLARE_TYPE(QmlRunScript) class QmlSetPropertyPrivate; class Q_DECLARATIVE_EXPORT QmlSetProperty : public QmlStateOperation @@ -123,7 +123,7 @@ public: virtual ActionList actions(); }; -QML_DECLARE_TYPE(QmlSetProperty); +QML_DECLARE_TYPE(QmlSetProperty) QT_END_NAMESPACE diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp index 26ed8b1..5931075 100644 --- a/src/declarative/util/qmltransition.cpp +++ b/src/declarative/util/qmltransition.cpp @@ -135,7 +135,7 @@ void ParallelAnimationWrapper::updateState(QAbstractAnimation::State oldState, Q } -QML_DEFINE_TYPE(QmlTransition,Transition); +QML_DEFINE_TYPE(QmlTransition,Transition) QmlTransition::QmlTransition(QObject *parent) : QObject(*(new QmlTransitionPrivate), parent) { diff --git a/src/declarative/util/qmltransition.h b/src/declarative/util/qmltransition.h index 646746e..4462b4c 100644 --- a/src/declarative/util/qmltransition.h +++ b/src/declarative/util/qmltransition.h @@ -88,7 +88,7 @@ public: void setReversed(bool r); void stop(); }; -QML_DECLARE_TYPE(QmlTransition); +QML_DECLARE_TYPE(QmlTransition) QT_END_NAMESPACE diff --git a/src/declarative/widgets/graphicslayouts.cpp b/src/declarative/widgets/graphicslayouts.cpp index d6c4ac2..21acbcd 100644 --- a/src/declarative/widgets/graphicslayouts.cpp +++ b/src/declarative/widgets/graphicslayouts.cpp @@ -89,7 +89,7 @@ private: Qt::Alignment _alignment; }; -QML_DEFINE_TYPE(QGraphicsLinearLayoutStretchItemObject,QGraphicsLinearLayoutStretchItem); +QML_DEFINE_TYPE(QGraphicsLinearLayoutStretchItemObject,QGraphicsLinearLayoutStretchItem) QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent) : QObject(parent) @@ -103,7 +103,7 @@ QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, cons return QSizeF(); } -QML_DEFINE_TYPE(QGraphicsLinearLayoutObject,QGraphicsLinearLayout); +QML_DEFINE_TYPE(QGraphicsLinearLayoutObject,QGraphicsLinearLayout) QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent) : QObject(parent), _children(this) @@ -246,7 +246,7 @@ private: Qt::Alignment _alignment; }; -QML_DEFINE_TYPE(QGraphicsGridLayoutObject,QGraphicsGridLayout); +QML_DEFINE_TYPE(QGraphicsGridLayoutObject,QGraphicsGridLayout) QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent) diff --git a/src/declarative/widgets/graphicslayouts.h b/src/declarative/widgets/graphicslayouts.h index e9930f1..303f749 100644 --- a/src/declarative/widgets/graphicslayouts.h +++ b/src/declarative/widgets/graphicslayouts.h @@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -QML_DECLARE_INTERFACE(QGraphicsLayoutItem); -QML_DECLARE_INTERFACE(QGraphicsLayout); +QML_DECLARE_INTERFACE(QGraphicsLayoutItem) +QML_DECLARE_INTERFACE(QGraphicsLayout) class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem { @@ -64,7 +64,7 @@ public: virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const; }; -QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject); +QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject) //TODO: // -content margins @@ -120,7 +120,7 @@ private: ChildList _children; }; -QML_DECLARE_TYPE(QGraphicsLinearLayoutObject); +QML_DECLARE_TYPE(QGraphicsLinearLayoutObject) //TODO: // -content margins @@ -181,7 +181,7 @@ private: ChildList _children; }; -QML_DECLARE_TYPE(QGraphicsGridLayoutObject); +QML_DECLARE_TYPE(QGraphicsGridLayoutObject) #endif // GRAPHICSLAYOUTS_H diff --git a/src/declarative/widgets/graphicswidgets.h b/src/declarative/widgets/graphicswidgets.h index cec15b6..e29f1d6 100644 --- a/src/declarative/widgets/graphicswidgets.h +++ b/src/declarative/widgets/graphicswidgets.h @@ -50,10 +50,10 @@ QT_BEGIN_NAMESPACE -QML_DECLARE_TYPE(QGraphicsView); -QML_DECLARE_TYPE_HASMETATYPE(QGraphicsScene); -QML_DECLARE_TYPE(QGraphicsWidget); -QML_DECLARE_INTERFACE_HASMETATYPE(QGraphicsItem); +QML_DECLARE_TYPE(QGraphicsView) +QML_DECLARE_TYPE_HASMETATYPE(QGraphicsScene) +QML_DECLARE_TYPE(QGraphicsWidget) +QML_DECLARE_INTERFACE_HASMETATYPE(QGraphicsItem) QT_END_NAMESPACE |