Commit 3c3d3a04 authored by Laurent Montel's avatar Laurent Montel 😁

Fix api

parent 27ddb74e
......@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
set(MESSAGELIB_LIB_VERSION "5.2.41")
set(MESSAGELIB_LIB_VERSION "5.2.42")
set(KF5_VERSION "5.19.0")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
......
......@@ -30,11 +30,6 @@ NetworkPluginUrlInterceptor::~NetworkPluginUrlInterceptor()
}
void NetworkPluginUrlInterceptor::createActions(KActionCollection *ac)
{
Q_UNUSED(ac);
}
bool NetworkPluginUrlInterceptor::hasConfigureSupport() const
{
return false;
......@@ -45,8 +40,3 @@ MessageViewer::NetworkPluginUrlInterceptorConfigureWidget *NetworkPluginUrlInter
Q_UNUSED(parent);
return Q_NULLPTR;
}
QList<QAction *> MessageViewer::NetworkPluginUrlInterceptor::actions() const
{
return {};
}
......@@ -34,8 +34,6 @@ public:
~NetworkPluginUrlInterceptor();
virtual NetworkPluginUrlInterceptorInterface *createInterface(QObject *parent = Q_NULLPTR) = 0;
virtual void createActions(KActionCollection *ac);
virtual QList<QAction *> actions() const;
virtual bool hasConfigureSupport() const;
virtual MessageViewer::NetworkPluginUrlInterceptorConfigureWidget *createConfigureWidget(QWidget *parent = Q_NULLPTR);
};
......
......@@ -29,3 +29,13 @@ NetworkPluginUrlInterceptorInterface::~NetworkPluginUrlInterceptorInterface()
{
}
void NetworkPluginUrlInterceptorInterface::createActions(KActionCollection *ac)
{
Q_UNUSED(ac);
}
QList<QAction *> NetworkPluginUrlInterceptorInterface::actions() const
{
return {};
}
......@@ -21,6 +21,8 @@
#include <QObject>
#include "messageviewer_export.h"
class QWebEngineUrlRequestInfo;
class KActionCollection;
class QAction;
namespace MessageViewer
{
class MESSAGEVIEWER_EXPORT NetworkPluginUrlInterceptorInterface : public QObject
......@@ -30,6 +32,9 @@ public:
explicit NetworkPluginUrlInterceptorInterface(QObject *parent = Q_NULLPTR);
~NetworkPluginUrlInterceptorInterface();
virtual void createActions(KActionCollection *ac);
virtual QList<QAction *> actions() const;
virtual void interceptRequest(QWebEngineUrlRequestInfo &info) = 0;
};
}
......
......@@ -15,6 +15,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "networkpluginurlinterceptorinterface.h"
#include "networkurlinterceptormanager.h"
#include "networkurlinterceptorpluginmanager.h"
......@@ -37,7 +38,7 @@ void NetworkUrlInterceptorManagerPrivate::createInterfaces(KActionCollection *ac
{
Q_FOREACH (NetworkPluginUrlInterceptor *plugin, NetworkUrlInterceptorPluginManager::self()->pluginsList()) {
MessageViewer::NetworkPluginUrlInterceptorInterface *interface = plugin->createInterface(q);
plugin->createActions(ac);
interface->createActions(ac);
mListInterface.append(interface);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment