diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2013-06-07 15:20:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-07 16:08:43 +0200 |
| commit | 3f6cad782e7751c34226cc1bda874951109ca228 (patch) | |
| tree | a3e6ee9616286dacb3b9d7559c691c2f95f1ef15 | |
| parent | b1ee75d377fc9517d67047c8fe6929c49cc4bd01 (diff) | |
Fix -Wpedantic warnings
Don't need these extra ; and give warnings with -Wpedantic
Change-Id: I877fee2a6421b151697ca3845a09d70f3b2b302b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| -rw-r--r-- | src/qml/qml/qqmlcustomparser_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlglobal_p.h | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlscript_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/v8/qscriptisolate_p.h | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlcustomparser_p.h b/src/qml/qml/qqmlcustomparser_p.h index 7a3fd47b46..3eaf99191d 100644 --- a/src/qml/qml/qqmlcustomparser_p.h +++ b/src/qml/qml/qqmlcustomparser_p.h @@ -149,7 +149,7 @@ private: Flags m_flags; friend class QQmlCompiler; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlCustomParser::Flags); +Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlCustomParser::Flags) #if 0 #define QML_REGISTER_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, CUSTOMTYPE) \ diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h index 19139ce920..114c076c60 100644 --- a/src/qml/qml/qqmlglobal_p.h +++ b/src/qml/qml/qqmlglobal_p.h @@ -344,8 +344,8 @@ protected: QQmlApplication(QQmlApplicationPrivate &dd, QObject* parent=0); private: - Q_DISABLE_COPY(QQmlApplication); - Q_DECLARE_PRIVATE(QQmlApplication); + Q_DISABLE_COPY(QQmlApplication) + Q_DECLARE_PRIVATE(QQmlApplication) }; class QQmlApplicationPrivate : public QObjectPrivate diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index 63b8b79fd2..e9fc584a53 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -213,7 +213,7 @@ private: friend class QQmlPropertyCache; quint32 flags; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlPropertyRawData::Flags); +Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlPropertyRawData::Flags) class QQmlPropertyData : public QQmlPropertyRawData { diff --git a/src/qml/qml/qqmlscript_p.h b/src/qml/qml/qqmlscript_p.h index 54e7a67b65..250c71d6ac 100644 --- a/src/qml/qml/qqmlscript_p.h +++ b/src/qml/qml/qqmlscript_p.h @@ -512,7 +512,7 @@ public: } -Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlScript::Object::ScriptBlock::Pragmas); +Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlScript::Object::ScriptBlock::Pragmas) QT_END_NAMESPACE diff --git a/src/qml/qml/v8/qscriptisolate_p.h b/src/qml/qml/v8/qscriptisolate_p.h index d6326bf915..da35069e33 100644 --- a/src/qml/qml/v8/qscriptisolate_p.h +++ b/src/qml/qml/v8/qscriptisolate_p.h @@ -78,7 +78,7 @@ public: } private: - Q_DISABLE_COPY(QScriptIsolate); + Q_DISABLE_COPY(QScriptIsolate) const QV8Engine *m_engine; const OperationMode m_mode; }; diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index c71da3c330..87b4e01a74 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -894,7 +894,7 @@ QSGNode *QQuickItemPrivate::childContainerNode() return groupNode; } -Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickItemPrivate::ChangeTypes); +Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickItemPrivate::ChangeTypes) QT_END_NAMESPACE |