summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-04-01 08:27:57 +0200
committerMontel Laurent <[email protected]>2016-04-01 08:27:57 +0200
commit07986cb31ef7cb755405b01d225c1f6e3ab0c61f (patch)
treecd1ee355220474bf7f70c48faa72e6b507dc2197
parenteb94dc910f53124ba7b141109bcd8d914f612ab6 (diff)
We need configurewidget info
-rw-r--r--CMakeLists.txt2
-rw-r--r--messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.cpp2
-rw-r--r--messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.h3
-rw-r--r--messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.cpp2
-rw-r--r--messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.h2
-rw-r--r--messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.cpp8
-rw-r--r--messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.h3
7 files changed, 12 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 971eb6b..2394104 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(MESSAGELIB_LIB_VERSION "5.2.48")
+set(MESSAGELIB_LIB_VERSION "5.2.49")
set(KF5_VERSION "5.19.0")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
diff --git a/messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.cpp b/messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.cpp
index 745eac8..b5b0174 100644
--- a/messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.cpp
+++ b/messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.cpp
@@ -69,7 +69,7 @@ QList<QAction *> NetworkAccessManagerWebEngine::actions() const
return actions;
}
-QList<MessageViewer::NetworkPluginUrlInterceptorConfigureWidget *> NetworkAccessManagerWebEngine::configureInterceptorList(QWidget *parent) const
+QVector<NetworkPluginUrlInterceptorConfigureWidgetSetting> NetworkAccessManagerWebEngine::configureInterceptorList(QWidget *parent) const
{
return d->mManager->configureInterceptorList(parent);
}
diff --git a/messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.h b/messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.h
index 032ef7c..42c51b9 100644
--- a/messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.h
+++ b/messageviewer/src/webengine/networkmanager/networkaccessmanagerwebengine.h
@@ -28,6 +28,7 @@ namespace MessageViewer
class NetworkPluginUrlInterceptorInterface;
class NetworkAccessManagerWebEnginePrivate;
class NetworkPluginUrlInterceptorConfigureWidget;
+class NetworkPluginUrlInterceptorConfigureWidgetSetting;
class MESSAGEVIEWER_EXPORT NetworkAccessManagerWebEngine : public QNetworkAccessManager
{
Q_OBJECT
@@ -36,7 +37,7 @@ public:
~NetworkAccessManagerWebEngine();
void addInterceptor(MessageViewer::NetworkPluginUrlInterceptorInterface *interceptor);
QList<QAction *> actions() const;
- QList<MessageViewer::NetworkPluginUrlInterceptorConfigureWidget *> configureInterceptorList(QWidget *parent = Q_NULLPTR) const;
+ QVector<MessageViewer::NetworkPluginUrlInterceptorConfigureWidgetSetting> configureInterceptorList(QWidget *parent = Q_NULLPTR) const;
private:
NetworkAccessManagerWebEnginePrivate *const d;
};
diff --git a/messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.cpp b/messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.cpp
index bcd31cb..05ed67e 100644
--- a/messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.cpp
+++ b/messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.cpp
@@ -35,7 +35,7 @@ bool NetworkPluginUrlInterceptor::hasConfigureSupport() const
return false;
}
-NetworkPluginUrlInterceptorConfigureWidget *NetworkPluginUrlInterceptor::createConfigureWidget(QWidget *parent)
+NetworkPluginUrlInterceptorConfigureWidgetSetting NetworkPluginUrlInterceptor::createConfigureWidget(QWidget *parent)
{
Q_UNUSED(parent);
return {};
diff --git a/messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.h b/messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.h
index 7b25720..fbfcc26 100644
--- a/messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.h
+++ b/messageviewer/src/webengine/urlinterceptor/networkpluginurlinterceptor.h
@@ -48,7 +48,7 @@ public:
virtual NetworkPluginUrlInterceptorInterface *createInterface(QWebEngineView *webEngine, QObject *parent = Q_NULLPTR) = 0;
virtual bool hasConfigureSupport() const;
- virtual MessageViewer::NetworkPluginUrlInterceptorConfigureWidget *createConfigureWidget(QWidget *parent = Q_NULLPTR);
+ virtual NetworkPluginUrlInterceptorConfigureWidgetSetting createConfigureWidget(QWidget *parent = Q_NULLPTR);
};
}
#endif // MAILNETWORKPLUGINURLINTERCEPTOR_H
diff --git a/messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.cpp b/messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.cpp
index 845d5f7..9da7081 100644
--- a/messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.cpp
+++ b/messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.cpp
@@ -31,7 +31,7 @@ public:
}
QList<QAction *> actions() const;
- QList<NetworkPluginUrlInterceptorConfigureWidget *> configureInterceptorList(QWidget *parent) const;
+ QVector<NetworkPluginUrlInterceptorConfigureWidgetSetting> configureInterceptorList(QWidget *parent) const;
void createInterfaces(QWebEngineView *webEngine, KActionCollection *ac);
QVector<MessageViewer::NetworkPluginUrlInterceptorInterface *> mListInterface;
QList<QAction *> mActionList;
@@ -43,9 +43,9 @@ QList<QAction *> NetworkUrlInterceptorManagerPrivate::actions() const
return mActionList;
}
-QList<NetworkPluginUrlInterceptorConfigureWidget *> NetworkUrlInterceptorManagerPrivate::configureInterceptorList(QWidget *parent) const
+QVector<NetworkPluginUrlInterceptorConfigureWidgetSetting> NetworkUrlInterceptorManagerPrivate::configureInterceptorList(QWidget *parent) const
{
- QList<NetworkPluginUrlInterceptorConfigureWidget *> lstConfigureWidget;
+ QVector<NetworkPluginUrlInterceptorConfigureWidgetSetting> lstConfigureWidget;
Q_FOREACH (NetworkPluginUrlInterceptor *plugin, NetworkUrlInterceptorPluginManager::self()->pluginsList()) {
if (plugin->hasConfigureSupport()) {
lstConfigureWidget.append(plugin->createConfigureWidget(parent));
@@ -86,7 +86,7 @@ QList<QAction *> NetworkUrlInterceptorManager::actions() const
return d->actions();
}
-QList<NetworkPluginUrlInterceptorConfigureWidget *> NetworkUrlInterceptorManager::configureInterceptorList(QWidget *parent) const
+QVector<NetworkPluginUrlInterceptorConfigureWidgetSetting> NetworkUrlInterceptorManager::configureInterceptorList(QWidget *parent) const
{
return d->configureInterceptorList(parent);
}
diff --git a/messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.h b/messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.h
index 7479919..843eb4f 100644
--- a/messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.h
+++ b/messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.h
@@ -21,6 +21,7 @@
#include <QObject>
#include <messageviewer/networkpluginurlinterceptor.h>
#include "messageviewer_export.h"
+#include <QVector>
namespace MessageViewer
{
@@ -34,7 +35,7 @@ public:
QVector<NetworkPluginUrlInterceptorInterface *> interfaceList() const;
QList<QAction *> actions() const;
- QList<MessageViewer::NetworkPluginUrlInterceptorConfigureWidget *> configureInterceptorList(QWidget *parent) const;
+ QVector<NetworkPluginUrlInterceptorConfigureWidgetSetting> configureInterceptorList(QWidget *parent) const;
private:
NetworkUrlInterceptorManagerPrivate *const d;
};