summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-10-13 23:04:38 +0200
committerMontel Laurent <[email protected]>2015-10-13 23:05:10 +0200
commitedc188cefcf97998f710f120b48d25c24395e1f3 (patch)
tree9fa0be6c456c5a5660c8eff94df25549eb294545
parent1d195dd47b2d9241c6ce78037c98074973af63a5 (diff)
Rename files
-rw-r--r--messageviewer/src/CMakeLists.txt4
-rw-r--r--messageviewer/src/viewer/mailwebview.cpp (renamed from messageviewer/src/viewer/mailwebview_webkit.cpp)0
-rw-r--r--messageviewer/src/viewer/mailwebview.h18
3 files changed, 3 insertions, 19 deletions
diff --git a/messageviewer/src/CMakeLists.txt b/messageviewer/src/CMakeLists.txt
index 1ed2924..bf71494 100644
--- a/messageviewer/src/CMakeLists.txt
+++ b/messageviewer/src/CMakeLists.txt
@@ -47,7 +47,7 @@ if(DEBUG_SIGNATURE)
add_definitions(-DDEBUG_SIGNATURE)
endif()
- set(_mailwebview_cpp viewer/mailwebview_webkit.cpp
+set(_mailwebview_cpp viewer/mailwebview.cpp
adblock/networkaccessmanager.cpp
adblock/webpage.cpp
adblock/adblockelementhiding.cpp
@@ -67,7 +67,7 @@ endif()
adblock/adblockcreatefilterdialog.cpp
adblock/adblockblockableitemswidget.cpp
)
- set(_mailwebview_lib KF5::WebKit Qt5::WebKitWidgets)
+set(_mailwebview_lib KF5::WebKit Qt5::WebKitWidgets)
set(libmessageviewer_viewer_SRCS
viewer/attachmentstrategy.cpp
diff --git a/messageviewer/src/viewer/mailwebview_webkit.cpp b/messageviewer/src/viewer/mailwebview.cpp
index ffa1ada..ffa1ada 100644
--- a/messageviewer/src/viewer/mailwebview_webkit.cpp
+++ b/messageviewer/src/viewer/mailwebview.cpp
diff --git a/messageviewer/src/viewer/mailwebview.h b/messageviewer/src/viewer/mailwebview.h
index 67d0887..f78ef63 100644
--- a/messageviewer/src/viewer/mailwebview.h
+++ b/messageviewer/src/viewer/mailwebview.h
@@ -22,11 +22,7 @@
#include "messageviewer/messageviewersettings.h"
#include "messageviewer_export.h"
-#ifdef KDEPIM_NO_WEBKIT
-# include <QTextBrowser>
-#else
-# include <KWebView>
-#endif
+#include <KWebView>
#include <boost/function.hpp>
@@ -35,16 +31,10 @@ class KActionCollection;
namespace MessageViewer
{
-#ifndef KDEPIM_NO_WEBKIT
class ScamDetection;
-#endif
/// MailWebView extends KWebView so that it can emit the popupMenu() signal
-#ifdef KDEPIM_NO_WEBKIT
-class MESSAGEVIEWER_EXPORT MailWebView : public QTextBrowser // krazy:exclude=qclasses
-#else
class MESSAGEVIEWER_EXPORT MailWebView : public KWebView
-#endif
{
Q_OBJECT
public:
@@ -97,11 +87,9 @@ public:
bool isAShortUrl(const QUrl &url) const;
void expandUrl(const QUrl &url);
-#ifndef KDEPIM_NO_WEBKIT
void scamCheck();
void saveMainFrameScreenshotInFile(const QString &filename);
void openBlockableItemsDialog();
-#endif
public Q_SLOTS:
void slotShowDetails();
@@ -114,9 +102,7 @@ Q_SIGNALS:
void popupMenu(const QUrl &url, const QUrl &imageUrl, const QPoint &point);
void linkHovered(const QString &link, const QString &title = QString(), const QString &textContent = QString());
-#ifdef KDEPIM_NO_WEBKIT
void linkClicked(const QUrl &link);
-#endif
void messageMayBeAScam();
protected:
@@ -131,7 +117,6 @@ private Q_SLOTS:
void hideAccessKeys();
private:
-#ifndef KDEPIM_NO_WEBKIT
bool checkForAccessKey(QKeyEvent *event);
void showAccessKeys();
void makeAccessKeyLabel(const QChar &accessKey, const QWebElement &element);
@@ -146,7 +131,6 @@ private:
QHash<QString, QChar> mDuplicateLinkElements;
ScamDetection *mScamDetection;
-#endif
KActionCollection *mActionCollection;
};