Update includes to MimeTreeParser

messageviewer/src/header/headerstyle_util.cpp

@@ -16,11 +16,11 @@
 */
 
 #include "headerstyle_util.h"
-#include "messageviewer/nodehelper.h"
 #include "header/headerstyle.h"
 #include "messageviewer_debug.h"
 #include <MessageCore/StringUtil>
-#include "utils/iconnamecache.h"
+#include <MimeTreeParser/IconNameCache>
+#include <MimeTreeParser/NodeHelper>
 
 #include "MessageCore/MessageCoreSettings"
 #include "settings/messageviewersettings.h"

messageviewer/src/settings/globalsettings_messageviewer.kcfgc

@@ -6,5 +6,5 @@ Mutators=true
 Singleton=true
 ItemAccessors=true
 SetUserTexts=true
-IncludeFiles=qapplication.h,messageviewer_export.h,messageviewer/objecttreeparser.h,messageviewer_debug.h
+IncludeFiles=qapplication.h,messageviewer_export.h,MimeTreeParser/Enums,messageviewer_debug.h
 CategoryLoggingName=MESSAGEVIEWER_LOG

messageviewer/src/utils/messageviewerutil.cpp

@@ -38,7 +38,7 @@
 
 #include "messageviewer/messageviewerutil.h"
 #include "kpimtextedit/texttospeech.h"
-#include "messageviewer/nodehelper.h"
+#include <MimeTreeParser/NodeHelper>
 #include "messageviewer_debug.h"
 #include "MessageCore/MessageCoreSettings"
 #include "MessageCore/NodeHelper"

messageviewer/src/utils/messageviewerutil.h

@@ -39,7 +39,7 @@
 #define MAILVIEWERUTIL_H
 
 #include "messageviewer_export.h"
-#include "mimetype.h"
+#include <MimeTreeParser/MimeType>
 #include "kmime/kmime_content.h"
 #include <KService>
 #include <AkonadiCore/Item>

messageviewer/src/viewer/bodypartformatterfactory.cpp

@@ -36,7 +36,7 @@
 #include "urlhandlermanager.h"
 #include "messageviewer_debug.h"
 
-#include "interfaces/bodypartformatter.h"
+#include <MimeTreeParser/BodyPartFormatter>
 
 using namespace MessageViewer;
 

messageviewer/src/viewer/bodypartformatterfactory.h

@@ -36,7 +36,7 @@
 
 #include "messageviewer_export.h"
 
-#include "messageviewer/bodypartformatterbasefactory.h"
+#include <MimeTreeParser/BodyPartFormatterBaseFactory>
 
 namespace MessageViewer
 {

messageviewer/src/viewer/csshelper.h

@@ -32,7 +32,7 @@
 #ifndef __MESSAGEVIEWER_CSSHELPER_H__
 #define __MESSAGEVIEWER_CSSHELPER_H__
 
-#include "csshelperbase.h"
+#include <MimeTreeParser/CSSHelperBase>
 
 #include "messageviewer_export.h"
 

messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp

@@ -17,10 +17,10 @@
     02110-1301, USA.
 */
 
-#include "messageviewer/messageviewerutil.h"
 #include "mimetreemodel.h"
 
-#include "messageviewer/nodehelper.h"
+#include <MimeTreeParser/NodeHelper>
+#include <MimeTreeParser/MimeType>
 
 #include <kmime/kmime_content.h>
 #include <KMime/Message>

messageviewer/src/viewer/objecttreeemptysource.cpp

@@ -20,7 +20,7 @@
 #include "objecttreeemptysource.h"
 #include "viewer/viewer_p.h"
 
-#include "attachmentstrategy.h"
+#include <MimeTreeParser/AttachmentStrategy>
 #include "bodypartformatterfactorysingleton.h"
 
 namespace MessageViewer

messageviewer/src/viewer/objecttreeemptysource.h

@@ -20,7 +20,7 @@
 #ifndef MAILVIEWER_OBJECTTREEEMPTYSOURCE_H
 #define MAILVIEWER_OBJECTTREEEMPTYSOURCE_H
 
-#include "objecttreesourceif.h"
+#include <MimeTreeParser/ObjectTreeSourceIf>
 
 class QString;
 

messageviewer/src/viewer/objecttreeviewersource.h

@@ -20,7 +20,7 @@
 #ifndef MAILVIEWER_OBJECTTREEVIEWERSOURCE_H
 #define MAILVIEWER_OBJECTTREEVIEWERSOURCE_H
 
-#include "objecttreesourceif.h"
+#include <MimeTreeParser/ObjectTreeSourceIf>
 
 class QString;
 

messageviewer/src/viewer/urlhandlermanager.cpp

@@ -36,13 +36,14 @@
 #include "messageviewer_debug.h"
 #include "messageviewer/urlhandler.h"
 #include "interfaces/bodyparturlhandler.h"
-#include "partnodebodypart.h"
 #include "viewer/viewer_p.h"
 #include "viewer/webview/mailwebview.h"
-#include "messageviewer/nodehelper.h"
 #include "messageviewer/messageviewerutil.h"
 #include "stl_util.h"
 
+#include <MimeTreeParser/NodeHelper>
+#include <MimeTreeParser/PartNodeBodyPart>
+
 #include <MessageCore/StringUtil>
 #include <Libkdepim/BroadcastStatus>
 #include <Libkdepim/OpenEmailAddressJob>

messageviewer/src/viewer/viewer.h

@@ -24,7 +24,7 @@
 
 #include "messageviewer_export.h"
 #include "messageviewer/viewerplugininterface.h"
-#include "messageviewer/enums.h"
+#include <MimeTreeParser/Enums>
 
 #include <kmime/kmime_message.h>
 

messageviewer/src/viewer/viewer_p.cpp

@@ -42,7 +42,7 @@
 #include "viewerplugins/viewerplugintoolmanager.h"
 #include <KContacts/VCardConverter>
 #ifdef MESSAGEVIEWER_READER_HTML_DEBUG
-#include "htmlwriter/filehtmlwriter.h"
+#include <MimeMessagePart/FileHtmlWriter>
 #include "htmlwriter/teehtmlwriter.h"
 #endif
 #include <unistd.h> // link()
@@ -114,8 +114,8 @@
 #include "htmlwriter/webkitparthtmlwriter.h"
 #include "widgets/mailsourceviewer.h"
 #include "viewer/mimeparttree/mimetreemodel.h"
-#include "messageviewer/nodehelper.h"
-#include "viewer/objecttreeparser.h"
+#include <MimeTreeParser/NodeHelper>
+#include <MimeTreeParser/ObjectTreeParser>
 #include "viewer/urlhandlermanager.h"
 #include "messageviewer/messageviewerutil.h"
 #include "widgets/vcardviewer.h"
@@ -123,8 +123,8 @@
 #include "findbar/findbarwebview.h"
 #include "header/headerstylemenumanager.h"
 
-#include "messageviewer/bodypart.h"
-#include "interfaces/htmlwriter.h"
+#include <MimeTreeParser/BodyPart>
+#include <MimeTreeParser/HtmlWriter>
 
 #include <MessageCore/StringUtil>
 

messageviewer/src/viewer/viewer_p.h

@@ -21,7 +21,7 @@
 #ifndef MAILVIEWER_P_H
 #define MAILVIEWER_P_H
 
-#include "messageviewer/nodehelper.h"
+#include <MimeTreeParser/NodeHelper>
 #include "viewer.h" //not so nice, it is actually for the enums from MailViewer
 #include "PimCommon/ShareServiceUrlManager"
 #include "messageviewer/viewerplugininterface.h"

messageviewer/src/widgets/configurewidget.cpp

@@ -20,9 +20,9 @@
 #include "configurewidget.h"
 #include "messageviewer_debug.h"
 #include "ui_settings.h"
-#include "messageviewer/messageviewerutil.h"
+#include "utils/messageviewerutil.h"
 #include "settings/messageviewersettings.h"
-#include "messageviewer/nodehelper.h"
+#include <MimeTreeParser/NodeHelper>
 
 #include "MessageCore/MessageCoreSettings"