summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-11 05:13:14 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-11 05:13:14 (GMT)
commitce78ecf7a67ed0011d948c1be55e67835a70d974 (patch)
tree68e4e4339dd1c5833efad7b1d3662930ee61b86d
parenteb611dcde232a694794e38af95cb0fed8edcc2a1 (diff)
Rename class as discussed with david
-rw-r--r--CMakeLists.txt2
-rw-r--r--messageviewer/src/viewer/webengine/mailwebengineview.cpp6
-rw-r--r--webengineviewer/src/CMakeLists.txt4
-rw-r--r--webengineviewer/src/networkmanager/interceptormanager.cpp (renamed from webengineviewer/src/networkmanager/networkaccessmanagerwebengine.cpp)12
-rw-r--r--webengineviewer/src/networkmanager/interceptormanager.h (renamed from webengineviewer/src/networkmanager/networkaccessmanagerwebengine.h)6
5 files changed, 15 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b45f55..a3eafff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.55")
+set(PIM_VERSION "5.3.56")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.3.40")
diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.cpp b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
index c430696..f7e0ec2 100644
--- a/messageviewer/src/viewer/webengine/mailwebengineview.cpp
+++ b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
@@ -24,7 +24,7 @@
#include "messageviewer/messageviewersettings.h"
#include "loadexternalreferencesurlinterceptor/loadexternalreferencesurlinterceptor.h"
#include "cidreferencesurlinterceptor/cidreferencesurlinterceptor.h"
-#include <WebEngineViewer/NetworkAccessManagerWebEngine>
+#include <WebEngineViewer/InterceptorManager>
#include "scamdetection/scamdetectionwebengine.h"
#include "scamdetection/scamcheckshorturl.h"
@@ -72,7 +72,7 @@ public:
WebEngineViewer::WebEngineAccessKey *mWebViewAccessKey;
MessageViewer::LoadExternalReferencesUrlInterceptor *mExternalReference;
MailWebEnginePage *mPageEngine;
- WebEngineViewer::NetworkAccessManagerWebEngine *mNetworkAccessManager;
+ WebEngineViewer::InterceptorManager *mNetworkAccessManager;
};
MailWebEngineView::MailWebEngineView(KActionCollection *ac, QWidget *parent)
@@ -89,7 +89,7 @@ MailWebEngineView::MailWebEngineView(KActionCollection *ac, QWidget *parent)
connect(d->mWebViewAccessKey, &WebEngineViewer::WebEngineAccessKey::openUrl, this, &MailWebEngineView::openUrl);
connect(this, &MailWebEngineView::loadFinished, this, &MailWebEngineView::slotLoadFinished);
- d->mNetworkAccessManager = new WebEngineViewer::NetworkAccessManagerWebEngine(this, ac, this);
+ d->mNetworkAccessManager = new WebEngineViewer::InterceptorManager(this, ac, this);
d->mExternalReference = new MessageViewer::LoadExternalReferencesUrlInterceptor(this);
d->mNetworkAccessManager->addInterceptor(d->mExternalReference);
MessageViewer::CidReferencesUrlInterceptor *cidReference = new MessageViewer::CidReferencesUrlInterceptor(this);
diff --git a/webengineviewer/src/CMakeLists.txt b/webengineviewer/src/CMakeLists.txt
index a59c9c5..ccb5f81 100644
--- a/webengineviewer/src/CMakeLists.txt
+++ b/webengineviewer/src/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
configure_file(../config-webengineviewer.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/../config-webengineviewer.h )
set(libwebengineviewer_webengine_SRCS
- networkmanager/networkaccessmanagerwebengine.cpp
+ networkmanager/interceptormanager.cpp
webhittestresult.cpp
webhittest.cpp
webenginepage.cpp
@@ -128,7 +128,7 @@ ecm_generate_headers(WebEngineViewer_Camelcasewebengine_urlinterceptor_HEADERS
)
ecm_generate_headers(WebEngineViewer_Camelcasewebengine_manager_HEADERS
HEADER_NAMES
- NetworkAccessManagerWebEngine
+ InterceptorManager
REQUIRED_HEADERS WebEngineViewer_webengine_manager_HEADERS
PREFIX WebEngineViewer
RELATIVE networkmanager
diff --git a/webengineviewer/src/networkmanager/networkaccessmanagerwebengine.cpp b/webengineviewer/src/networkmanager/interceptormanager.cpp
index 37ac11e..861314c 100644
--- a/webengineviewer/src/networkmanager/networkaccessmanagerwebengine.cpp
+++ b/webengineviewer/src/networkmanager/interceptormanager.cpp
@@ -16,7 +16,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#include "networkaccessmanagerwebengine.h"
+#include "interceptormanager.h"
#include "urlinterceptor/networkurlinterceptormanager.h"
#include "urlinterceptor/networkurlinterceptor.h"
#include <QWebEngineProfile>
@@ -38,7 +38,7 @@ public:
WebEngineViewer::NetworkUrlInterceptor *mNetworkUrlInterceptor;
};
-NetworkAccessManagerWebEngine::NetworkAccessManagerWebEngine(QWebEngineView *webEngine, KActionCollection *ac, QObject *parent)
+InterceptorManager::InterceptorManager(QWebEngineView *webEngine, KActionCollection *ac, QObject *parent)
: QObject(parent),
d(new NetworkAccessManagerWebEnginePrivate)
{
@@ -52,17 +52,17 @@ NetworkAccessManagerWebEngine::NetworkAccessManagerWebEngine(QWebEngineView *web
webEngine->page()->profile()->setRequestInterceptor(d->mNetworkUrlInterceptor);
}
-NetworkAccessManagerWebEngine::~NetworkAccessManagerWebEngine()
+InterceptorManager::~InterceptorManager()
{
delete d;
}
-void NetworkAccessManagerWebEngine::addInterceptor(WebEngineViewer::NetworkPluginUrlInterceptorInterface *interceptor)
+void InterceptorManager::addInterceptor(WebEngineViewer::NetworkPluginUrlInterceptorInterface *interceptor)
{
d->mNetworkUrlInterceptor->addInterceptor(interceptor);
}
-QList<QAction *> NetworkAccessManagerWebEngine::interceptorUrlActions(const WebEngineViewer::WebHitTestResult &result) const
+QList<QAction *> InterceptorManager::interceptorUrlActions(const WebEngineViewer::WebHitTestResult &result) const
{
QList<QAction *> actions;
Q_FOREACH (WebEngineViewer::NetworkPluginUrlInterceptorInterface *interface, d->mManager->interfaceList()) {
@@ -71,7 +71,7 @@ QList<QAction *> NetworkAccessManagerWebEngine::interceptorUrlActions(const WebE
return actions;
}
-QVector<NetworkPluginUrlInterceptorConfigureWidgetSetting> NetworkAccessManagerWebEngine::configureInterceptorList(QWidget *parent) const
+QVector<NetworkPluginUrlInterceptorConfigureWidgetSetting> InterceptorManager::configureInterceptorList(QWidget *parent) const
{
return d->mManager->configureInterceptorList(parent);
}
diff --git a/webengineviewer/src/networkmanager/networkaccessmanagerwebengine.h b/webengineviewer/src/networkmanager/interceptormanager.h
index 50df29e..ad93667 100644
--- a/webengineviewer/src/networkmanager/networkaccessmanagerwebengine.h
+++ b/webengineviewer/src/networkmanager/interceptormanager.h
@@ -32,12 +32,12 @@ class WebHitTestResult;
class NetworkPluginUrlInterceptorInterface;
class NetworkAccessManagerWebEnginePrivate;
class NetworkPluginUrlInterceptorConfigureWidget;
-class WEBENGINEVIEWER_EXPORT NetworkAccessManagerWebEngine : public QObject
+class WEBENGINEVIEWER_EXPORT InterceptorManager : public QObject
{
Q_OBJECT
public:
- explicit NetworkAccessManagerWebEngine(QWebEngineView *webEngine, KActionCollection *ac, QObject *parent = Q_NULLPTR);
- ~NetworkAccessManagerWebEngine();
+ explicit InterceptorManager(QWebEngineView *webEngine, KActionCollection *ac, QObject *parent = Q_NULLPTR);
+ ~InterceptorManager();
void addInterceptor(WebEngineViewer::NetworkPluginUrlInterceptorInterface *interceptor);
QList<QAction *> interceptorUrlActions(const WebEngineViewer::WebHitTestResult &result) const;
QVector<WebEngineViewer::NetworkPluginUrlInterceptorConfigureWidgetSetting> configureInterceptorList(QWidget *parent = Q_NULLPTR) const;