Update internal dependencies

mimetreeparser/src/htmlwriter/filehtmlwriter.h

@@ -33,7 +33,7 @@
 #define __MESSAGEVIEWER_FILEHTMLWRITER_H__
 
 #include "messageviewer_export.h"
-#include "messageviewer/htmlwriter.h"
+#include "mimetreeparser/htmlwriter.h"
 
 #include <QFile>
 #include <QTextStream>

mimetreeparser/src/htmlwriter/queuehtmlwriter.h

@@ -21,7 +21,7 @@
 #define __MESSAGEVIEWER_QUEUEHTMLWRITER_H__
 
 #include "messageviewer_export.h"
-#include "messageviewer/htmlwriter.h"
+#include "mimetreeparser/htmlwriter.h"
 
 #include<QVector>
 #include<QVariant>

mimetreeparser/src/interfaces/bodypartformatter.h

@@ -39,7 +39,7 @@
 #include <QObject>
 #include <QSharedPointer>
 
-#include <messageviewer/objecttreeparser.h>
+#include "mimetreeparser/objecttreeparser.h"
 
 namespace MessageViewer
 {

mimetreeparser/src/objecttreesourceif.h

@@ -21,7 +21,7 @@
 #define MAILVIEWER_OBJECTTREESOURCE_IF_H
 
 #include "messageviewer_export.h"
-#include "messageviewer/mimetype.h"
+#include "mimetreeparser/mimetype.h"
 
 #include <KMime/Message>
 

mimetreeparser/src/viewer/attachmentstrategy.cpp

@@ -33,7 +33,7 @@
 
 #include "attachmentstrategy.h"
 
-#include "messageviewer/nodehelper.h"
+#include "nodehelper.h"
 
 #include <kmime/kmime_content.h>
 

mimetreeparser/src/viewer/messagepart.h

@@ -22,7 +22,7 @@
 
 #include "partmetadata.h"
 #include "nodehelper.h"
-#include "messageviewer/bodypartformatter.h"
+#include "mimetreeparser/bodypartformatter.h"
 #include <KMime/Message>
 
 #include <Libkleo/CryptoBackend>

mimetreeparser/src/viewer/nodehelper.cpp

@@ -22,7 +22,7 @@
 #include "utils/iconnamecache.h"
 #include "partmetadata.h"
 #include "interfaces/bodypart.h"
-#include "messageviewer/mimetype.h"
+#include "utils/mimetype.h"
 #include "PimCommon/AttachmentTemporaryFilesDirs"
 
 #include <MessageCore/NodeHelper>

mimetreeparser/src/viewer/nodehelper.h

@@ -21,8 +21,8 @@
 #define _MESSAGEVIEWER_NODEHELPER_H
 #include "messageviewer_export.h"
 
-#include "messageviewer/partmetadata.h"
-#include "messageviewer/enums.h"
+#include "mimetreeparser/partmetadata.h"
+#include "mimetreeparser/enums.h"
 
 #include <KMime/Message>
 

mimetreeparser/src/viewer/objecttreeparser.cpp

@@ -50,9 +50,9 @@
 #include "bodypartformatterbasefactory.h"
 #include "viewer/partnodebodypart.h"
 #include "interfaces/bodypartformatter.h"
-#include "messageviewer/mimetype.h"
+#include "utils/mimetype.h"
 #include "job/kleojobexecutor.h"
-#include "messageviewer/nodehelper.h"
+#include "nodehelper.h"
 #include "utils/iconnamecache.h"
 #include "messageviewer_debug.h"
 #include "converthtmltoplaintext.h"

mimetreeparser/src/viewer/objecttreeparser.h

@@ -36,14 +36,12 @@
 
 #include "messageviewer_export.h"
 
-#include "messageviewer/nodehelper.h"
+#include "mimetreeparser/nodehelper.h"
 #include "objecttreesourceif.h"
 
 #include <Libkleo/CryptoBackend>
 #include <gpgme++/verificationresult.h>
 
-#include "objecttreeemptysource.h"
-
 class QString;
 
 namespace KMime

mimetreeparser/src/viewer/partnodebodypart.cpp

@@ -32,8 +32,8 @@
 */
 
 #include "partnodebodypart.h"
-#include "messageviewer/nodehelper.h"
-#include "messageviewer/objecttreeparser.h"
+#include "nodehelper.h"
+#include "objecttreeparser.h"
 #include "messageviewer_debug.h"
 #include <kmime/kmime_content.h>