From 2ce9eebf27d73296ff23e2f936b68f22f96ac38d Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@theqtcompany.com>
Date: Tue, 25 Aug 2015 13:16:27 +0200
Subject: [PATCH] Consistenly use Q_DISABLE_COPY in public API
Improves error messages for people trying to copy ...
Change-Id: If95e33058ebff46ab39164ba6226b3396b6aef15
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
src/core/api/qwebenginecookiestoreclient.h | 2 +-
src/core/api/qwebengineurlrequestinterceptor.h | 1 +
src/webenginewidgets/api/qwebenginepage.h | 1 +
src/webenginewidgets/api/qwebengineprofile.h | 1 +
src/webenginewidgets/api/qwebengineview.h | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/core/api/qwebenginecookiestoreclient.h b/src/core/api/qwebenginecookiestoreclient.h
index 929584c86..5dae3bf59 100644
--- a/src/core/api/qwebenginecookiestoreclient.h
+++ b/src/core/api/qwebenginecookiestoreclient.h
@@ -80,7 +80,7 @@ Q_SIGNALS:
private:
friend class QtWebEngineCore::CookieMonsterDelegateQt;
-
+ Q_DISABLE_COPY(QWebEngineCookieStoreClient)
Q_DECLARE_PRIVATE(QWebEngineCookieStoreClient)
QScopedPointer<QWebEngineCookieStoreClientPrivate> d_ptr;
};
diff --git a/src/core/api/qwebengineurlrequestinterceptor.h b/src/core/api/qwebengineurlrequestinterceptor.h
index 3eac74bb6..72f3452d0 100644
--- a/src/core/api/qwebengineurlrequestinterceptor.h
+++ b/src/core/api/qwebengineurlrequestinterceptor.h
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
class QWEBENGINE_EXPORT QWebEngineUrlRequestInterceptor : public QObject
{
Q_OBJECT
+ Q_DISABLE_COPY(QWebEngineUrlRequestInterceptor)
public:
explicit QWebEngineUrlRequestInterceptor(QObject *p = 0)
: QObject (p)
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 471fd7290..422a4a8ad 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -260,6 +260,7 @@ protected:
virtual bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame);
private:
+ Q_DISABLE_COPY(QWebEnginePage)
Q_DECLARE_PRIVATE(QWebEnginePage)
QScopedPointer<QWebEnginePagePrivate> d_ptr;
#ifndef QT_NO_ACTION
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h
index 06e11eeca..c617fe361 100644
--- a/src/webenginewidgets/api/qwebengineprofile.h
+++ b/src/webenginewidgets/api/qwebengineprofile.h
@@ -115,6 +115,7 @@ Q_SIGNALS:
void downloadRequested(QWebEngineDownloadItem *download);
private:
+ Q_DISABLE_COPY(QWebEngineProfile)
Q_DECLARE_PRIVATE(QWebEngineProfile)
QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = 0);
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index 6b37dbf39..0d8f9fc17 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -120,6 +120,7 @@ protected:
virtual bool event(QEvent*) Q_DECL_OVERRIDE;
private:
+ Q_DISABLE_COPY(QWebEngineView)
Q_DECLARE_PRIVATE(QWebEngineView)
QScopedPointer<QWebEngineViewPrivate> d_ptr;
--
GitLab