From 78996eb7ff4ad49a5b703f2e92469eef9226364c Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sat, 2 Apr 2016 13:18:52 +0200 Subject: [PATCH] forward QList --- messageviewer/src/viewer/viewer.cpp | 9 ++++++++- messageviewer/src/viewer/viewer.h | 8 ++++++++ messageviewer/src/viewer/viewer_p.cpp | 7 +++++++ messageviewer/src/viewer/viewer_p.h | 4 +++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/messageviewer/src/viewer/viewer.cpp b/messageviewer/src/viewer/viewer.cpp index c78be5ea..8c573b9d 100644 --- a/messageviewer/src/viewer/viewer.cpp +++ b/messageviewer/src/viewer/viewer.cpp @@ -25,7 +25,6 @@ //#define KMAIL_READER_HTML_DEBUG 1 #include "viewer.h" -#include "config-messageviewer.h" #include "viewer_p.h" #include "widgets/configurewidget.h" #include "csshelper.h" @@ -685,5 +684,13 @@ QList Viewer::viewerPluginActionList(ViewerPluginInterface::SpecificF return d->viewerPluginActionList(features); } +#ifdef MESSAGEVIEWER_USE_QTWEBENGINE +QList Viewer::interceptorUrlActions(const MessageViewer::WebHitTestResult &result) const +{ + Q_D(const Viewer); + return d->interceptorUrlActions(result); +} +#endif + } diff --git a/messageviewer/src/viewer/viewer.h b/messageviewer/src/viewer/viewer.h index 1e276688..aadd2f56 100644 --- a/messageviewer/src/viewer/viewer.h +++ b/messageviewer/src/viewer/viewer.h @@ -23,6 +23,7 @@ #define MESSAGEVIEWER_H #include "messageviewer_export.h" +#include "config-messageviewer.h" #include "messageviewer/viewerplugininterface.h" #include @@ -53,6 +54,10 @@ class QResizeEvent; namespace MessageViewer { +#ifdef MESSAGEVIEWER_USE_QTWEBENGINE +class WebHitTestResult; +#endif + class HeaderStylePlugin; class CSSHelper; class ViewerPrivate; @@ -330,6 +335,9 @@ public: void showOpenAttachmentFolderWidget(const QUrl &url); QList viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features); +#ifdef MESSAGEVIEWER_USE_QTWEBENGINE + QList interceptorUrlActions(const MessageViewer::WebHitTestResult &result) const; +#endif Q_SIGNALS: void moveMessageToTrash(); diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp index fd4aa300..996bacb4 100644 --- a/messageviewer/src/viewer/viewer_p.cpp +++ b/messageviewer/src/viewer/viewer_p.cpp @@ -3125,3 +3125,10 @@ void ViewerPrivate::slotServiceUrlSelected(PimCommon::ShareServiceUrlManager::Se const QUrl url = mShareServiceManager->generateServiceUrl(mClickedUrl.toString(), QString(), serviceType); mShareServiceManager->openUrl(url); } + +#ifdef MESSAGEVIEWER_USE_QTWEBENGINE +QList ViewerPrivate::interceptorUrlActions(const MessageViewer::WebHitTestResult &result) const +{ + return mViewer->interceptorUrlActions(result); +} +#endif diff --git a/messageviewer/src/viewer/viewer_p.h b/messageviewer/src/viewer/viewer_p.h index e5b8d44b..44e7eac6 100644 --- a/messageviewer/src/viewer/viewer_p.h +++ b/messageviewer/src/viewer/viewer_p.h @@ -438,6 +438,9 @@ public: void setPluginName(const QString &pluginName); QList viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features); +#ifdef MESSAGEVIEWER_USE_QTWEBENGINE + QList interceptorUrlActions(const MessageViewer::WebHitTestResult &result) const; +#endif private Q_SLOTS: void slotActivatePlugin(MessageViewer::ViewerPluginInterface *interface); @@ -586,7 +589,6 @@ Q_SIGNALS: void changeDisplayMail(Viewer::DisplayFormatMessage, bool); void moveMessageToTrash(); void executeMailAction(MessageViewer::Viewer::MailAction type); - private: QString attachmentInjectionHtml(); QString recipientsQuickListLinkHtml(bool, const QString &); -- GitLab