aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Astals Cid <albert.astals@canonical.com>2013-06-11 16:47:57 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-12 08:58:17 +0200
commit1261b75a36fc330f182dd1c3b34a2b4a0d439a80 (patch)
treed0cc9dfc2d7834e827cdf6c5a8531d6df2f38d04
parent10a441e3b1cbebb6128caa79b8edf915d1182607 (diff)
Fix -Wpedantic warnings
Don't need these extra ; and give warnings with -Wpedantic Change-Id: I877fee2a6421b1aaa97ca3845a09d70f3b2b302b Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
-rw-r--r--src/qml/qml/qqmlxmlhttprequest.cpp2
-rw-r--r--src/qml/qml/v8/qv8contextwrapper.cpp2
-rw-r--r--src/qml/qml/v8/qv8listwrapper.cpp2
-rw-r--r--src/qml/qml/v8/qv8qobjectwrapper_p.h2
-rw-r--r--src/qml/qml/v8/qv8sequencewrapper_p_p.h2
-rw-r--r--src/qml/qml/v8/qv8typewrapper.cpp2
-rw-r--r--src/qml/qml/v8/qv8valuetypewrapper.cpp2
-rw-r--r--src/quick/items/qquickitem_p.h2
-rw-r--r--src/quick/scenegraph/util/qsgtexture_p.h2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 80f5deccdb..4fa9869564 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -330,7 +330,7 @@ public:
class QQmlDOMNodeResource : public QV8ObjectResource, public Node
{
- V8_RESOURCE_TYPE(DOMNodeType);
+ V8_RESOURCE_TYPE(DOMNodeType)
public:
QQmlDOMNodeResource(QV8Engine *e);
diff --git a/src/qml/qml/v8/qv8contextwrapper.cpp b/src/qml/qml/v8/qv8contextwrapper.cpp
index 9c37d87a48..630a3e5a7c 100644
--- a/src/qml/qml/v8/qv8contextwrapper.cpp
+++ b/src/qml/qml/v8/qv8contextwrapper.cpp
@@ -52,7 +52,7 @@ static QString internal(QLatin1String("You've stumbled onto an internal implemen
class QV8ContextResource : public QV8ObjectResource
{
- V8_RESOURCE_TYPE(ContextType);
+ V8_RESOURCE_TYPE(ContextType)
public:
QV8ContextResource(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false);
diff --git a/src/qml/qml/v8/qv8listwrapper.cpp b/src/qml/qml/v8/qv8listwrapper.cpp
index 58635c7c78..d3ce9f8fc2 100644
--- a/src/qml/qml/v8/qv8listwrapper.cpp
+++ b/src/qml/qml/v8/qv8listwrapper.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
class QV8ListResource : public QV8ObjectResource
{
- V8_RESOURCE_TYPE(ListType);
+ V8_RESOURCE_TYPE(ListType)
public:
QV8ListResource(QV8Engine *engine) : QV8ObjectResource(engine) {}
diff --git a/src/qml/qml/v8/qv8qobjectwrapper_p.h b/src/qml/qml/v8/qv8qobjectwrapper_p.h
index d89a3c518f..cbd6505846 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper_p.h
+++ b/src/qml/qml/v8/qv8qobjectwrapper_p.h
@@ -76,7 +76,7 @@ class QQmlPropertyCache;
class QV8QObjectResource : public QV8ObjectResource
{
- V8_RESOURCE_TYPE(QObjectType);
+ V8_RESOURCE_TYPE(QObjectType)
public:
QV8QObjectResource(QV8Engine *engine, QObject *object);
diff --git a/src/qml/qml/v8/qv8sequencewrapper_p_p.h b/src/qml/qml/v8/qv8sequencewrapper_p_p.h
index 41bfb4b76a..ff9df7d4a0 100644
--- a/src/qml/qml/v8/qv8sequencewrapper_p_p.h
+++ b/src/qml/qml/v8/qv8sequencewrapper_p_p.h
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
*/
class QV8SequenceResource : public QV8ObjectResource
{
- V8_RESOURCE_TYPE(SequenceType);
+ V8_RESOURCE_TYPE(SequenceType)
public:
virtual ~QV8SequenceResource() {}
diff --git a/src/qml/qml/v8/qv8typewrapper.cpp b/src/qml/qml/v8/qv8typewrapper.cpp
index e45ebacb90..820f0b3ee6 100644
--- a/src/qml/qml/v8/qv8typewrapper.cpp
+++ b/src/qml/qml/v8/qv8typewrapper.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
class QV8TypeResource : public QV8ObjectResource
{
- V8_RESOURCE_TYPE(TypeType);
+ V8_RESOURCE_TYPE(TypeType)
public:
QV8TypeResource(QV8Engine *engine);
diff --git a/src/qml/qml/v8/qv8valuetypewrapper.cpp b/src/qml/qml/v8/qv8valuetypewrapper.cpp
index 99ee938e0c..d5d977d9c4 100644
--- a/src/qml/qml/v8/qv8valuetypewrapper.cpp
+++ b/src/qml/qml/v8/qv8valuetypewrapper.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
class QV8ValueTypeResource : public QV8ObjectResource
{
- V8_RESOURCE_TYPE(ValueTypeType);
+ V8_RESOURCE_TYPE(ValueTypeType)
public:
enum ObjectType { Reference, Copy };
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 87b4e01a74..0ffc092a83 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -128,7 +128,7 @@ void QQuickContents::calcGeometry(QQuickItem *changed)
class QQuickTransformPrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QQuickTransform);
+ Q_DECLARE_PUBLIC(QQuickTransform)
public:
static QQuickTransformPrivate* get(QQuickTransform *transform) { return transform->d_func(); }
diff --git a/src/quick/scenegraph/util/qsgtexture_p.h b/src/quick/scenegraph/util/qsgtexture_p.h
index 6430a93ed8..7282d4051f 100644
--- a/src/quick/scenegraph/util/qsgtexture_p.h
+++ b/src/quick/scenegraph/util/qsgtexture_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
class QSGTexturePrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QSGTexture);
+ Q_DECLARE_PUBLIC(QSGTexture)
public:
QSGTexturePrivate();