From dd3163be45f68c9807d834d010e6d5b7f550e2b5 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 22 Mar 2017 10:44:47 +0100
Subject: [PATCH] Rename WebCoreVisitedLinksManager to VisitedLinksManagerQt
Rename to follow our standard naming. This class was one of our oldest
and probably predates our standard naming convention.
Change-Id: I32dfbad9611b789ad13114d9692b07045806f7c0
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
src/core/browser_context_adapter.cpp | 6 +++---
src/core/browser_context_adapter.h | 6 +++---
src/core/core_generator.pro | 4 ++--
..._manager.cpp => visited_links_manager_qt.cpp} | 16 ++++++++--------
...inks_manager.h => visited_links_manager_qt.h} | 12 ++++++------
src/core/web_contents_delegate_qt.cpp | 2 +-
src/webengine/api/qquickwebengineview.cpp | 1 -
src/webenginewidgets/api/qwebengineprofile.cpp | 2 +-
8 files changed, 24 insertions(+), 25 deletions(-)
rename src/core/{web_engine_visited_links_manager.cpp => visited_links_manager_qt.cpp} (88%)
rename src/core/{web_engine_visited_links_manager.h => visited_links_manager_qt.h} (90%)
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index 863731ff4..1bb90aff6 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -47,8 +47,8 @@
#include "download_manager_delegate_qt.h"
#include "permission_manager_qt.h"
#include "type_conversion.h"
+#include "visited_links_manager_qt.h"
#include "web_engine_context.h"
-#include "web_engine_visited_links_manager.h"
#include "url_request_context_getter_qt.h"
#include "renderer_host/user_resource_controller_host.h"
@@ -134,7 +134,7 @@ BrowserContextQt *BrowserContextAdapter::browserContext()
return m_browserContext.data();
}
-WebEngineVisitedLinksManager *BrowserContextAdapter::visitedLinksManager()
+VisitedLinksManagerQt *BrowserContextAdapter::visitedLinksManager()
{
if (!m_visitedLinksManager)
resetVisitedLinksManager();
@@ -526,7 +526,7 @@ bool BrowserContextAdapter::isSpellCheckEnabled() const
void BrowserContextAdapter::resetVisitedLinksManager()
{
- m_visitedLinksManager.reset(new WebEngineVisitedLinksManager(this));
+ m_visitedLinksManager.reset(new VisitedLinksManagerQt(this));
}
} // namespace QtWebEngineCore
diff --git a/src/core/browser_context_adapter.h b/src/core/browser_context_adapter.h
index 39b9db61c..f6ebfd51c 100644
--- a/src/core/browser_context_adapter.h
+++ b/src/core/browser_context_adapter.h
@@ -61,7 +61,7 @@ class BrowserContextAdapterClient;
class BrowserContextQt;
class DownloadManagerDelegateQt;
class UserResourceControllerHost;
-class WebEngineVisitedLinksManager;
+class VisitedLinksManagerQt;
class QWEBENGINE_EXPORT BrowserContextAdapter : public QEnableSharedFromThis<BrowserContextAdapter>
{
@@ -73,7 +73,7 @@ public:
static QSharedPointer<BrowserContextAdapter> defaultContext();
static QObject* globalQObjectRoot();
- WebEngineVisitedLinksManager *visitedLinksManager();
+ VisitedLinksManagerQt *visitedLinksManager();
DownloadManagerDelegateQt *downloadManagerDelegate();
QWebEngineCookieStore *cookieStore();
@@ -180,7 +180,7 @@ private:
QString m_name;
bool m_offTheRecord;
QScopedPointer<BrowserContextQt> m_browserContext;
- QScopedPointer<WebEngineVisitedLinksManager> m_visitedLinksManager;
+ QScopedPointer<VisitedLinksManagerQt> m_visitedLinksManager;
QScopedPointer<DownloadManagerDelegateQt> m_downloadManagerDelegate;
QScopedPointer<UserResourceControllerHost> m_userResourceController;
QScopedPointer<QWebEngineCookieStore> m_cookieStore;
diff --git a/src/core/core_generator.pro b/src/core/core_generator.pro
index 6f427757c..82c9b8125 100644
--- a/src/core/core_generator.pro
+++ b/src/core/core_generator.pro
@@ -101,6 +101,7 @@ SOURCES = \
url_request_custom_job_delegate.cpp \
url_request_qrc_job_qt.cpp \
user_script.cpp \
+ visited_links_manager_qt.cpp \
web_contents_adapter.cpp \
web_contents_delegate_qt.cpp \
web_contents_view_qt.cpp \
@@ -108,7 +109,6 @@ SOURCES = \
web_engine_error.cpp \
web_engine_library_info.cpp \
web_engine_settings.cpp \
- web_engine_visited_links_manager.cpp \
web_event_factory.cpp
HEADERS = \
@@ -176,6 +176,7 @@ HEADERS = \
url_request_custom_job_delegate.h \
url_request_qrc_job_qt.h \
user_script.h \
+ visited_links_manager_qt.h \
web_contents_adapter.h \
web_contents_adapter_client.h \
web_contents_adapter_p.h \
@@ -185,7 +186,6 @@ HEADERS = \
web_engine_error.h \
web_engine_library_info.h \
web_engine_settings.h \
- web_engine_visited_links_manager.h \
web_event_factory.h
diff --git a/src/core/web_engine_visited_links_manager.cpp b/src/core/visited_links_manager_qt.cpp
similarity index 88%
rename from src/core/web_engine_visited_links_manager.cpp
rename to src/core/visited_links_manager_qt.cpp
index 689c130e6..5e9a89338 100644
--- a/src/core/web_engine_visited_links_manager.cpp
+++ b/src/core/visited_links_manager_qt.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -37,7 +37,7 @@
**
****************************************************************************/
-#include "web_engine_visited_links_manager.h"
+#include "visited_links_manager_qt.h"
#include "browser_context_adapter.h"
#include "browser_context_qt.h"
@@ -75,18 +75,18 @@ public:
void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) { enumerator->OnComplete(true); }
};
-void WebEngineVisitedLinksManager::deleteAllVisitedLinkData()
+void VisitedLinksManagerQt::deleteAllVisitedLinkData()
{
m_visitedLinkMaster->DeleteAllURLs();
}
-void WebEngineVisitedLinksManager::deleteVisitedLinkDataForUrls(const QList<QUrl> &urlsToDelete)
+void VisitedLinksManagerQt::deleteVisitedLinkDataForUrls(const QList<QUrl> &urlsToDelete)
{
BasicUrlIterator iterator(urlsToDelete);
m_visitedLinkMaster->DeleteURLs(&iterator);
}
-bool WebEngineVisitedLinksManager::containsUrl(const QUrl &url) const
+bool VisitedLinksManagerQt::containsUrl(const QUrl &url) const
{
return m_visitedLinkMaster->IsVisited(toGurl(url));
}
@@ -106,7 +106,7 @@ static void ensureDirectoryExists(const base::FilePath &path)
errorstr.c_str());
}
-WebEngineVisitedLinksManager::WebEngineVisitedLinksManager(BrowserContextAdapter *adapter)
+VisitedLinksManagerQt::VisitedLinksManagerQt(BrowserContextAdapter *adapter)
: m_delegate(new VisitedLinkDelegateQt)
{
Q_ASSERT(adapter && adapter->browserContext());
@@ -117,11 +117,11 @@ WebEngineVisitedLinksManager::WebEngineVisitedLinksManager(BrowserContextAdapter
m_visitedLinkMaster->Init();
}
-WebEngineVisitedLinksManager::~WebEngineVisitedLinksManager()
+VisitedLinksManagerQt::~VisitedLinksManagerQt()
{
}
-void WebEngineVisitedLinksManager::addUrl(const GURL &urlToAdd)
+void VisitedLinksManagerQt::addUrl(const GURL &urlToAdd)
{
Q_ASSERT(m_visitedLinkMaster);
m_visitedLinkMaster->AddURL(urlToAdd);
diff --git a/src/core/web_engine_visited_links_manager.h b/src/core/visited_links_manager_qt.h
similarity index 90%
rename from src/core/web_engine_visited_links_manager.h
rename to src/core/visited_links_manager_qt.h
index eab2b9610..30265e033 100644
--- a/src/core/web_engine_visited_links_manager.h
+++ b/src/core/visited_links_manager_qt.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -37,8 +37,8 @@
**
****************************************************************************/
-#ifndef WEB_ENGINE_VISITED_LINKS_MANAGER_H
-#define WEB_ENGINE_VISITED_LINKS_MANAGER_H
+#ifndef VISITED_LINKS_MANAGER_QT_H
+#define VISITED_LINKS_MANAGER_QT_H
#include "qtwebenginecoreglobal.h"
#include <QList>
@@ -59,11 +59,11 @@ namespace QtWebEngineCore {
class BrowserContextAdapter;
class VisitedLinkDelegateQt;
-class QWEBENGINE_EXPORT WebEngineVisitedLinksManager {
+class QWEBENGINE_EXPORT VisitedLinksManagerQt {
public:
- virtual~WebEngineVisitedLinksManager();
- WebEngineVisitedLinksManager(BrowserContextAdapter*);
+ virtual~VisitedLinksManagerQt();
+ VisitedLinksManagerQt(BrowserContextAdapter*);
void deleteAllVisitedLinkData();
void deleteVisitedLinkDataForUrls(const QList<QUrl> &);
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index fb32ea813..cda234d6d 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -53,11 +53,11 @@
#include "network_delegate_qt.h"
#include "render_widget_host_view_qt.h"
#include "type_conversion.h"
+#include "visited_links_manager_qt.h"
#include "web_contents_adapter_client.h"
#include "web_contents_adapter_p.h"
#include "web_engine_context.h"
#include "web_engine_settings.h"
-#include "web_engine_visited_links_manager.h"
#include "components/web_cache/browser/web_cache_manager.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 60fb5d0a5..6383f3468 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -68,7 +68,6 @@
#include "web_contents_adapter.h"
#include "web_engine_error.h"
#include "web_engine_settings.h"
-#include "web_engine_visited_links_manager.h"
#include <QClipboard>
#include <QGuiApplication>
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index 886a7207e..abed066d3 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -49,7 +49,7 @@
#include "browser_context_adapter.h"
#include <qtwebenginecoreglobal.h>
-#include "web_engine_visited_links_manager.h"
+#include "visited_links_manager_qt.h"
#include "web_engine_settings.h"
QT_BEGIN_NAMESPACE
--
GitLab