summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-09-27 21:03:50 +0200
committerMontel Laurent <[email protected]>2015-09-27 21:03:50 +0200
commitd9f8da3e0c9728ab08046c5158e9a55f7b5a2ca4 (patch)
treedf5fac0332d44367317a1b800a21860064ac1e31
parent93e51c6cc03049d042a85ab39d78a8f73adb1e2a (diff)
compile it in plugin only
-rw-r--r--messageviewer/src/CMakeLists.txt1
-rw-r--r--messageviewer/src/header/autotests/CMakeLists.txt2
-rw-r--r--messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt1
-rw-r--r--messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h6
-rw-r--r--messageviewer/src/header/headerstyle_util.h10
5 files changed, 8 insertions, 12 deletions
diff --git a/messageviewer/src/CMakeLists.txt b/messageviewer/src/CMakeLists.txt
index 08eaf3d..a11bbd9 100644
--- a/messageviewer/src/CMakeLists.txt
+++ b/messageviewer/src/CMakeLists.txt
@@ -134,7 +134,6 @@ set(libmessageviewer_header_SRCS
header/headerstrategy.cpp
header/headerstrategy_p.cpp
header/headerstyle.cpp
- header/briefheaderstyleplugin/briefheaderstyle.cpp
header/grantleeheaderstyleplugin/grantleeheaderstyle.cpp
header/customheaderstyleplugin/customheaderstyle.cpp
header/plainheaderstyle.cpp
diff --git a/messageviewer/src/header/autotests/CMakeLists.txt b/messageviewer/src/header/autotests/CMakeLists.txt
index 9e9eb89..3415b03 100644
--- a/messageviewer/src/header/autotests/CMakeLists.txt
+++ b/messageviewer/src/header/autotests/CMakeLists.txt
@@ -23,7 +23,7 @@ macro(add_messageviewer_header_class_unittest _source )
endmacro ()
-add_messageviewer_header_unittest( briefheaderstyleplugintest.cpp "../briefheaderstyleplugin/briefheaderstyleplugin.cpp;../briefheaderstyleplugin/briefheaderstyleinterface.cpp;../headerstyleinterface.cpp" "../briefheaderstyleplugin/messageviewer_briefheaderstyleplugin.desktop")
+add_messageviewer_header_unittest( briefheaderstyleplugintest.cpp "../briefheaderstyleplugin/briefheaderstyle.cpp;../briefheaderstyleplugin/briefheaderstyleplugin.cpp;../briefheaderstyleplugin/briefheaderstyleinterface.cpp;../headerstyleinterface.cpp" "../briefheaderstyleplugin/messageviewer_briefheaderstyleplugin.desktop")
add_messageviewer_header_unittest( allheaderstyleplugintest.cpp "../allheaderstyleplugin/allheaderstyleplugin.cpp;../allheaderstyleplugin/allheaderstyleinterface.cpp;../headerstyleinterface.cpp" "../allheaderstyleplugin/messageviewer_allheaderstyleplugin.desktop")
add_messageviewer_header_unittest( customheaderstyleplugintest.cpp "../customheaderstyleplugin/customheaderstyleplugin.cpp;../customheaderstyleplugin/customheaderstyleinterface.cpp;../headerstyleinterface.cpp" "../customheaderstyleplugin/messageviewer_customheaderstyleplugin.desktop")
diff --git a/messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt b/messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt
index adc17cf..5ff2450 100644
--- a/messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt
+++ b/messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt
@@ -1,6 +1,7 @@
set(messageviewer_briefheaderstyleplugin_SRCS
briefheaderstyleplugin.cpp
briefheaderstyleinterface.cpp
+ briefheaderstyle.cpp
)
add_library(messageviewer_briefheaderstyleplugin MODULE ${messageviewer_briefheaderstyleplugin_SRCS})
diff --git a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h b/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h
index 13b64c9..3cd419d 100644
--- a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h
+++ b/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h
@@ -35,14 +35,10 @@
#define BRIEFHEADERSTYLE_H
#include "header/headerstyle.h"
-#include "messageviewer_export.h"
namespace MessageViewer
{
-
-//TEMPORARY
-class MESSAGEVIEWER_EXPORT BriefHeaderStyle : public HeaderStyle
+class BriefHeaderStyle : public HeaderStyle
{
- friend class HeaderStyle;
public:
BriefHeaderStyle() : HeaderStyle() {}
~BriefHeaderStyle() {}
diff --git a/messageviewer/src/header/headerstyle_util.h b/messageviewer/src/header/headerstyle_util.h
index 4a9b486..c02cab5 100644
--- a/messageviewer/src/header/headerstyle_util.h
+++ b/messageviewer/src/header/headerstyle_util.h
@@ -26,7 +26,7 @@
#include "antispam/spamheaderanalyzer.h"
#include "header/headerstyle.h"
-
+#include "messageviewer_export.h"
namespace MessageViewer
{
namespace HeaderStyleUtil
@@ -36,13 +36,13 @@ namespace HeaderStyleUtil
//
QString directionOf(const QString &str);
-QString strToHtml(const QString &str, KTextToHTML::Options flags = KTextToHTML::PreserveSpaces);
+MESSAGEVIEWER_EXPORT QString strToHtml(const QString &str, KTextToHTML::Options flags = KTextToHTML::PreserveSpaces);
-QString dateString(KMime::Message *message, bool printing, bool shortDate);
+MESSAGEVIEWER_EXPORT QString dateString(KMime::Message *message, bool printing, bool shortDate);
-QString subjectString(KMime::Message *message, KTextToHTML::Options flags = KTextToHTML::PreserveSpaces);
+MESSAGEVIEWER_EXPORT QString subjectString(KMime::Message *message, KTextToHTML::Options flags = KTextToHTML::PreserveSpaces);
-QString subjectDirectionString(KMime::Message *message);
+MESSAGEVIEWER_EXPORT QString subjectDirectionString(KMime::Message *message);
QString drawSpamMeter(SpamError spamError, double percent, double confidence,
const QString &filterHeader, const QString &confidenceHeader);