diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-09-16 10:44:23 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-16 03:48:32 +0200 |
| commit | ef5f27339f34bc8d09077c1039d8e567e7fa69bd (patch) | |
| tree | 89bd12545d1205763f00179b64d52c01e69149fd /src/declarative/items | |
| parent | f489af8534beeb233ca92a454c014f8a9db58192 (diff) | |
Fix warnings.
Change-Id: I7f066550fa2e1799f1c44b787da84c882f549b03
Reviewed-on: http://codereview.qt-project.org/5036
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/items')
| -rw-r--r-- | src/declarative/items/qsgcanvas.h | 6 | ||||
| -rw-r--r-- | src/declarative/items/qsgitem.h | 6 | ||||
| -rw-r--r-- | src/declarative/items/qsgpainteditem.h | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/declarative/items/qsgcanvas.h b/src/declarative/items/qsgcanvas.h index b396788e73..a2bb278c0a 100644 --- a/src/declarative/items/qsgcanvas.h +++ b/src/declarative/items/qsgcanvas.h @@ -85,10 +85,8 @@ public: void setRenderTarget(QOpenGLFramebufferObject *fbo); QOpenGLFramebufferObject *renderTarget() const; -signals: - void frameSwapped(); - Q_SIGNALS: + void frameSwapped(); void sceneGraphInitialized(); protected: @@ -126,7 +124,7 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QSGCanvas *); +Q_DECLARE_METATYPE(QSGCanvas *) QT_END_HEADER diff --git a/src/declarative/items/qsgitem.h b/src/declarative/items/qsgitem.h index 6653a4fe1b..e340a6a364 100644 --- a/src/declarative/items/qsgitem.h +++ b/src/declarative/items/qsgitem.h @@ -78,7 +78,7 @@ protected: QSGTransform(QSGTransformPrivate &dd, QObject *parent); private: - Q_DECLARE_PRIVATE(QSGTransform); + Q_DECLARE_PRIVATE(QSGTransform) }; class QDeclarativeV8Function; @@ -154,7 +154,7 @@ public: ItemClipsChildrenToShape = 0x01, ItemAcceptsInputMethod = 0x02, ItemIsFocusScope = 0x04, - ItemHasContents = 0x08, + ItemHasContents = 0x08 // Remember to increment the size of QSGItemPrivate::flags }; Q_DECLARE_FLAGS(Flags, Flag) @@ -167,7 +167,7 @@ public: ItemParentHasChanged, // value.item ItemOpacityHasChanged, // value.realValue ItemActiveFocusHasChanged, // value.boolValue - ItemRotationHasChanged, // value.realValue + ItemRotationHasChanged // value.realValue }; union ItemChangeData { diff --git a/src/declarative/items/qsgpainteditem.h b/src/declarative/items/qsgpainteditem.h index 244e24b18c..2d5d260b9c 100644 --- a/src/declarative/items/qsgpainteditem.h +++ b/src/declarative/items/qsgpainteditem.h @@ -108,8 +108,8 @@ protected: virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); private: - Q_DISABLE_COPY(QSGPaintedItem); - Q_DECLARE_PRIVATE(QSGPaintedItem); + Q_DISABLE_COPY(QSGPaintedItem) + Q_DECLARE_PRIVATE(QSGPaintedItem) }; QT_END_NAMESPACE |