summaryrefslogtreecommitdiffstats
path: root/src/core/browser_context_adapter.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-04-15 14:05:08 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-04-19 23:11:09 +0000
commit7023f228b099c410081db5c697e2d69ed57558da (patch)
tree783b36e9728099e147fd248a248eaa921fd2da64 /src/core/browser_context_adapter.h
parent1e006305a7f450d6da3e700bcf0bbe70bf8c5105 (diff)
Switch BrowserContextAdapter to QSharedPointer
BrowserContextAdapter is not a form of shared data, and using QExplicitSharedDataPointer on it as always been a misuse of the class. Instead we should switch it to QSharedPointer, which also allows us to use QWeakPointer. Change-Id: I8eb489b4a12d3fdddcde55821be294814a156a9d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Diffstat (limited to 'src/core/browser_context_adapter.h')
-rw-r--r--src/core/browser_context_adapter.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/browser_context_adapter.h b/src/core/browser_context_adapter.h
index a388e9a0c..7ec83983f 100644
--- a/src/core/browser_context_adapter.h
+++ b/src/core/browser_context_adapter.h
@@ -39,10 +39,10 @@
#include "qtwebenginecoreglobal.h"
+#include <QEnableSharedFromThis>
#include <QList>
#include <QPointer>
#include <QScopedPointer>
-#include <QSharedData>
#include <QString>
#include <QVector>
@@ -60,14 +60,14 @@ class DownloadManagerDelegateQt;
class UserScriptControllerHost;
class WebEngineVisitedLinksManager;
-class QWEBENGINE_EXPORT BrowserContextAdapter : public QSharedData
+class QWEBENGINE_EXPORT BrowserContextAdapter : public QEnableSharedFromThis<BrowserContextAdapter>
{
public:
explicit BrowserContextAdapter(bool offTheRecord = false);
explicit BrowserContextAdapter(const QString &storagePrefix);
virtual ~BrowserContextAdapter();
- static BrowserContextAdapter* defaultContext();
+ static QSharedPointer<BrowserContextAdapter> defaultContext();
static QObject* globalQObjectRoot();
WebEngineVisitedLinksManager *visitedLinksManager();