Update includes to MimeTreeParser

CMakeLists.txt

@@ -74,7 +74,7 @@ set(KDEPIMLIBS_LIB_VERSION "5.2.40")
 set(GRAVATAR_LIB_VERSION "5.2.40")
 set(INCIDENCEEDITOR_LIB_VERSION "5.2.40")
 set(KTNEF_LIB_VERSION "5.2.40")
-set(MESSAGELIB_LIB_VERSION "5.2.40")
+set(MESSAGELIB_LIB_VERSION "5.2.41")
 find_package(KF5MailCommon ${MAILCOMMN_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageViewer ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)

examples/apps/mailreader/mailreaderview.cpp

@@ -5,8 +5,8 @@
  */
 #include "mailreaderview.h"
 #include "settings.h"
-#include "messageviewer/viewer.h"
-#include "messageviewer/attachmentstrategy.h"
+#include <MessageViewer/Viewer>
+#include <MimeTreeParser/AttachmentStrategy>
 #include <messageviewersettings.h>
 #include <KXmlGuiWindow>
 #include <KConfigDialog>

plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp

@@ -22,9 +22,9 @@
 
 #include "testobjecttreesource.h"
 
-#include <MessageViewer/ObjectTreeParser>
-#include <MessageViewer/CSSHelperBase>
-#include <MessageViewer/FileHtmlWriter>
+#include <MimeTreeParser/ObjectTreeParser>
+#include <MimeTreeParser/CSSHelperBase>
+#include <MimeTreeParser/FileHtmlWriter>
 
 #include <KMime/Message>
 #include <QTest>
@@ -120,4 +120,4 @@ void RenderTest::testRender()
     QCOMPARE(proc.exitCode(), 0);
 }
 
-QTEST_MAIN(RenderTest)
\ No newline at end of file
+QTEST_MAIN(RenderTest)

plugins/messageviewer/bodypartformatter/autotests/testobjecttreesource.h

@@ -22,8 +22,8 @@
 #define MESSAGECORE_TESTS_UTIL_H
 
 #include <MessageViewer/ObjectTreeEmptySource>
-#include <MessageViewer/CSSHelperBase>
-#include <MessageViewer/AttachmentStrategy>
+#include <MimeTreeParser/CSSHelperBase>
+#include <MimeTreeParser/AttachmentStrategy>
 
 class TestObjectTreeSource : public MessageViewer::EmptySource
 {

plugins/messageviewer/bodypartformatter/ms-tnef/application_ms-tnef.cpp

@@ -27,13 +27,13 @@
     your version.
 */
 
-#include <messageviewer/bodypartformatter.h>
-#include <messageviewer/bodypart.h>
-#include <messageviewer/bodyparturlhandler.h>
-#include <messageviewer/htmlwriter.h>
-#include <messageviewer/nodehelper.h>
 #include <MessageCore/StringUtil>
+#include <MessageViewer/BodyPartURLHandler>
 #include <MessageViewer/MessageViewerUtil>
+#include <MimeTreeParser/BodyPartFormatter>
+#include <MimeTreeParser/BodyPart>
+#include <MimeTreeParser/HtmlWriter>
+#include <MimeTreeParser/NodeHelper>
 
 #include <KCalCore/Event>
 #include <KCalCore/Incidence>

plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp

@@ -30,15 +30,16 @@
   you do not wish to do so, delete this exception statement from
   your version.
 */
-#include "messageviewer/bodypartformatter.h"
-#include "messageviewer/bodyparturlhandler.h"
-#include "messageviewer/bodypart.h"
-#include <messageviewer/nodehelper.h>
+
 #include "updatecontactjob.h"
 #include "vcardmemento.h"
 
+#include <MessageViewer/BodyPartURLHandler>
+#include <MimeTreeParser/BodyPartFormatter>
+#include <MimeTreeParser/BodyPart>
+#include <MimeTreeParser/NodeHelper>
+#include <MimeTreeParser/HtmlWriter>
 using MessageViewer::Interface::BodyPart;
-#include <messageviewer/htmlwriter.h>
 
 #include <Libkdepim/AddContactJob>
 

plugins/messageviewer/bodypartformatter/vcard/vcardmemento.h

@@ -18,9 +18,9 @@
 #ifndef VCARDMEMENTO_H
 #define VCARDMEMENTO_H
 
-#include <messageviewer/bodypart.h>
+#include <MessageViewer/Viewer>
 
-#include <messageviewer/viewer.h>
+#include <MimeTreeParser/BodyPart>
 
 #include <QObject>
 #include <QMap>

plugins/messageviewer/bodypartformatter/xdiff/text_xdiff.cpp

@@ -29,10 +29,10 @@
     your version.
 */
 
-#include <messageviewer/bodypartformatter.h>
-#include <messageviewer/bodypart.h>
-#include <messageviewer/bodyparturlhandler.h>
-#include <messageviewer/htmlwriter.h>
+#include <MessageViewer/BodyPartURLHandler>
+#include <MimeTreeParser/BodyPartFormatter>
+#include <MimeTreeParser/BodyPart>
+#include <MimeTreeParser/HtmlWriter>
 
 #include <kstringhandler.h>
 #include <kmessagebox.h>

plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp

@@ -23,7 +23,7 @@
 #include "messageviewer/headerstrategy.h"
 #include <KTextToHTML>
 #include "messageviewer/messageviewersettings.h"
-#include "messageviewer/nodehelper.h"
+#include <MimeTreeParser/NodeHelper>
 
 #include <MessageCore/StringUtil>