cleanup includes

messagecomposer/autotests/testhtmlwriter.h

@@ -21,7 +21,7 @@
 #ifndef TEST_HTML_WRITER_H
 #define TEST_HTML_WRITER_H
 
-#include <messageviewer/htmlwriter.h>
+#include <MimeTreeParser/HtmlWriter>
 
 // Objecttreeparser needs a valid html writer othewise it doesn't parse
 // inline messages, so give it one to chew on.

messageviewer/autotests/util.h

@@ -16,7 +16,7 @@
   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
   02110-1301, USA.
 */
-#include "interfaces/htmlwriter.h"
+#include <MimeTreeParser/HtmlWriter>
 #include "viewer/csshelper.h"
 
 #include <KMime/Message>

messageviewer/src/htmlwriter/teehtmlwriter.h

@@ -32,7 +32,7 @@
 #ifndef __MESSAGEVIEWER_TEEHTMLWRITER_H__
 #define __MESSAGEVIEWER_TEEHTMLWRITER_H__
 
-#include "interfaces/htmlwriter.h"
+#include <MimeTreeParser/HtmlWriter>
 
 #include <QList>
 

messageviewer/src/htmlwriter/webengineparthtmlwriter.h

@@ -17,7 +17,7 @@
 #ifndef WEBENGINEPARTHTMLWRITER_H
 #define WEBENGINEPARTHTMLWRITER_H
 
-#include "messageviewer/htmlwriter.h"
+#include <MimeTreeParser/HtmlWriter>
 #include <QObject>
 
 #include <QString>

messageviewer/src/htmlwriter/webkitparthtmlwriter.h

@@ -33,7 +33,7 @@
 #ifndef MESSAGEVIEWER_WEBKITPARTHTMLWRITER_H
 #define MESSAGEVIEWER_WEBKITPARTHTMLWRITER_H
 
-#include "messageviewer/htmlwriter.h"
+#include <MimeTreeParser/HtmlWriter>
 #include <QObject>
 
 #include <QString>

mimetreeparser/src/viewer/messagepart.cpp

@@ -23,6 +23,8 @@
 #include "converthtmltoplaintext.h"
 #include "csshelperbase.h"
 #include "cryptohelper.h"
+#include "interfaces/htmlwriter.h"
+#include "job/kleojobexecutor.h"
 #include "utils/iconnamecache.h"
 
 #include <MessageCore/StringUtil>
@@ -30,9 +32,8 @@
 #include <libkleo/importjob.h>
 #include <libkleo/cryptobackendfactory.h>
 
-#include <interfaces/htmlwriter.h>
-#include <job/kleojobexecutor.h>
 #include <KMime/Content>
+
 #include <gpgme++/key.h>
 #include <gpgme.h>