summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2015-04-20 16:48:28 +0200
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-04-20 14:56:22 +0000
commit7ff8dc3dbfe4effce66bee8b7b59284f4b2f95be (patch)
tree7ba647c045bfe63e49faccafee391b586539666a
parent1ec438cb947b8079af71d306ab7e329ec9062f8e (diff)
Remove erroneous semicolons after Q_DECLARE_* macros
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 <michael.bruning@theqtcompany.com>
-rw-r--r--src/webengine/api/qquickwebenginehistory_p.h4
-rw-r--r--src/webenginewidgets/api/qwebenginecertificateerror.h2
-rw-r--r--src/webenginewidgets/api/qwebenginehistory.h2
-rw-r--r--src/webenginewidgets/api/qwebenginepage.h4
-rw-r--r--src/webenginewidgets/api/qwebengineview.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/webengine/api/qquickwebenginehistory_p.h b/src/webengine/api/qquickwebenginehistory_p.h
index cb6aff2b..9b3eeb61 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<QQuickWebEngineHistoryListModelPrivate> d_ptr;
friend class QQuickWebEngineHistory;
@@ -98,7 +98,7 @@ public:
private:
QQuickWebEngineHistory();
- Q_DECLARE_PRIVATE(QQuickWebEngineHistory);
+ Q_DECLARE_PRIVATE(QQuickWebEngineHistory)
QScopedPointer<QQuickWebEngineHistoryPrivate> d_ptr;
};
diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.h b/src/webenginewidgets/api/qwebenginecertificateerror.h
index 4ada5560..90b23208 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<QWebEngineCertificateErrorPrivate> d_ptr;
};
diff --git a/src/webenginewidgets/api/qwebenginehistory.h b/src/webenginewidgets/api/qwebenginehistory.h
index f7f2db81..0471e28e 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<QWebEngineHistoryItemPrivate> d;
friend class QWebEngineHistory;
friend class QWebEngineHistoryPrivate;
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index f2067c6a..b4cf5229 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<QWebEnginePagePrivate> 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 747dc871..6b37dbf3 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<QWebEngineViewPrivate> d_ptr;
friend class QWebEnginePage;