From 7ff8dc3dbfe4effce66bee8b7b59284f4b2f95be Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Mon, 20 Apr 2015 16:48:28 +0200 Subject: Remove erroneous semicolons after Q_DECLARE_* macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of these declarations had habitual semicolons at the end, which would fail when compiling with -Werror,-Wextra-semi. Change-Id: I8dd73462fc1c10b0bb746fbfc3281d9cce36e5fc Reviewed-by: Michael BrĂ¼ning --- src/webengine/api/qquickwebenginehistory_p.h | 4 ++-- src/webenginewidgets/api/qwebenginecertificateerror.h | 2 +- src/webenginewidgets/api/qwebenginehistory.h | 2 +- src/webenginewidgets/api/qwebenginepage.h | 4 ++-- src/webenginewidgets/api/qwebengineview.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/webengine/api/qquickwebenginehistory_p.h b/src/webengine/api/qquickwebenginehistory_p.h index cb6aff2bc..9b3eeb617 100644 --- a/src/webengine/api/qquickwebenginehistory_p.h +++ b/src/webengine/api/qquickwebenginehistory_p.h @@ -67,7 +67,7 @@ public: private: QQuickWebEngineHistoryListModel(); - Q_DECLARE_PRIVATE(QQuickWebEngineHistoryListModel); + Q_DECLARE_PRIVATE(QQuickWebEngineHistoryListModel) QScopedPointer d_ptr; friend class QQuickWebEngineHistory; @@ -98,7 +98,7 @@ public: private: QQuickWebEngineHistory(); - Q_DECLARE_PRIVATE(QQuickWebEngineHistory); + Q_DECLARE_PRIVATE(QQuickWebEngineHistory) QScopedPointer d_ptr; }; diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.h b/src/webenginewidgets/api/qwebenginecertificateerror.h index 4ada5560d..90b23208c 100644 --- a/src/webenginewidgets/api/qwebenginecertificateerror.h +++ b/src/webenginewidgets/api/qwebenginecertificateerror.h @@ -75,7 +75,7 @@ public: private: Q_DISABLE_COPY(QWebEngineCertificateError) - Q_DECLARE_PRIVATE(QWebEngineCertificateError); + Q_DECLARE_PRIVATE(QWebEngineCertificateError) QScopedPointer d_ptr; }; diff --git a/src/webenginewidgets/api/qwebenginehistory.h b/src/webenginewidgets/api/qwebenginehistory.h index f7f2db81e..0471e28e6 100644 --- a/src/webenginewidgets/api/qwebenginehistory.h +++ b/src/webenginewidgets/api/qwebenginehistory.h @@ -67,7 +67,7 @@ public: bool isValid() const; private: QWebEngineHistoryItem(QWebEngineHistoryItemPrivate *priv); - Q_DECLARE_PRIVATE_D(d.data(), QWebEngineHistoryItem); + Q_DECLARE_PRIVATE_D(d.data(), QWebEngineHistoryItem) QExplicitlySharedDataPointer d; friend class QWebEngineHistory; friend class QWebEngineHistoryPrivate; diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index f2067c6aa..b4cf52298 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -125,7 +125,7 @@ public: FindBackward = 1, FindCaseSensitively = 2, }; - Q_DECLARE_FLAGS(FindFlags, FindFlag); + Q_DECLARE_FLAGS(FindFlags, FindFlag) enum WebWindowType { WebBrowserWindow, @@ -271,7 +271,7 @@ protected: virtual bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame); private: - Q_DECLARE_PRIVATE(QWebEnginePage); + Q_DECLARE_PRIVATE(QWebEnginePage) QScopedPointer d_ptr; #ifndef QT_NO_ACTION Q_PRIVATE_SLOT(d_func(), void _q_webActionTriggered(bool checked)) diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index 747dc8717..6b37dbf39 100644 --- a/src/webenginewidgets/api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h @@ -120,7 +120,7 @@ protected: virtual bool event(QEvent*) Q_DECL_OVERRIDE; private: - Q_DECLARE_PRIVATE(QWebEngineView); + Q_DECLARE_PRIVATE(QWebEngineView) QScopedPointer d_ptr; friend class QWebEnginePage; -- cgit v1.2.3