Fix export + header

mimetreeparser/src/htmlwriter/filehtmlwriter.h

@@ -32,7 +32,7 @@
 #ifndef __MESSAGEVIEWER_FILEHTMLWRITER_H__
 #define __MESSAGEVIEWER_FILEHTMLWRITER_H__
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 #include "mimetreeparser/htmlwriter.h"
 
 #include <QFile>
@@ -43,7 +43,7 @@ class QString;
 namespace MessageViewer
 {
 
-class MESSAGEVIEWER_EXPORT FileHtmlWriter : public HtmlWriter
+class MIMETREEPARSER_EXPORT FileHtmlWriter : public HtmlWriter
 {
 public:
     explicit FileHtmlWriter(const QString &filename);

mimetreeparser/src/htmlwriter/queuehtmlwriter.h

@@ -20,7 +20,7 @@
 #ifndef __MESSAGEVIEWER_QUEUEHTMLWRITER_H__
 #define __MESSAGEVIEWER_QUEUEHTMLWRITER_H__
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 #include "mimetreeparser/htmlwriter.h"
 
 #include<QVector>

mimetreeparser/src/interfaces/bodypartformatter.h

@@ -34,7 +34,7 @@
 #ifndef __KMAIL_INTERFACE_BODYPARTFORMATTER_H__
 #define __KMAIL_INTERFACE_BODYPARTFORMATTER_H__
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 
 #include <QObject>
 #include <QSharedPointer>
@@ -51,7 +51,7 @@ namespace Interface
 class BodyPartURLHandler;
 class BodyPart;
 
-class MESSAGEVIEWER_EXPORT MessagePart
+class MIMETREEPARSER_EXPORT MessagePart
 {
 public:
     typedef QSharedPointer<MessagePart> Ptr;
@@ -71,7 +71,7 @@ private:
     friend class BodyPartFormatter;
 };
 
-class MESSAGEVIEWER_EXPORT BodyPartFormatter
+class MIMETREEPARSER_EXPORT BodyPartFormatter
 {
 public:
     virtual ~BodyPartFormatter() {}

mimetreeparser/src/objecttreesourceif.h

@@ -20,7 +20,7 @@
 #ifndef MAILVIEWER_OBJECTTREESOURCE_IF_H
 #define MAILVIEWER_OBJECTTREESOURCE_IF_H
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 #include "mimetreeparser/mimetype.h"
 
 #include <KMime/Message>
@@ -43,7 +43,7 @@ namespace MessageViewer
  * Interface for object tree sources.
  * @author Andras Mantia <amantia@kdab.net>
  */
-class MESSAGEVIEWER_EXPORT ObjectTreeSourceIf
+class MIMETREEPARSER_EXPORT ObjectTreeSourceIf
 {
 
 public:

mimetreeparser/src/utils/iconnamecache.h

@@ -21,7 +21,7 @@
 
 #include <QMap>
 #include <QString>
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 
 namespace MessageViewer
 {
@@ -33,7 +33,7 @@ namespace MessageViewer
  *
  * The IconNameCache caches the result of iconPath() in a map and solves the slowness.
  */
-class MESSAGEVIEWER_EXPORT IconNameCache
+class MIMETREEPARSER_EXPORT IconNameCache
 {
 public:
 

mimetreeparser/src/utils/mimetype.h

@@ -20,7 +20,7 @@
 #ifndef MESSAGEVIEWER_UTIL_MIMETYPE_H
 #define MESSAGEVIEWER_UTIL_MIMETYPE_H
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 
 #include <QString>
 class QMimeType;
@@ -49,7 +49,7 @@ enum HtmlMode {
 /**
  * Search mimetype from filename when mimetype is empty or application/octet-stream
  **/
-QMimeType MESSAGEVIEWER_EXPORT mimetype(const QString &name);
+QMimeType MIMETREEPARSER_EXPORT mimetype(const QString &name);
 
 /**
      * Finds the filename of an icon based on the given mimetype or filenames.
@@ -67,7 +67,7 @@ QMimeType MESSAGEVIEWER_EXPORT mimetype(const QString &name);
      *                              Example: "test.zip"
      * @return the full file name of the icon file
      */
-QString MESSAGEVIEWER_EXPORT fileNameForMimetype(const QString &mimeType, int iconSize,
+QString MIMETREEPARSER_EXPORT fileNameForMimetype(const QString &mimeType, int iconSize,
         const QString &fallbackFileName1 = QString(),
         const QString &fallbackFileName2 = QString());
 }

mimetreeparser/src/viewer/attachmentstrategy.h

@@ -34,7 +34,7 @@
 #ifndef __MESSAGEVIEWER_ATTACHMENTSTRATEGY_H__
 #define __MESSAGEVIEWER_ATTACHMENTSTRATEGY_H__
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 
 class QString;
 namespace KMime
@@ -45,7 +45,7 @@ class Content;
 namespace MessageViewer
 {
 
-class MESSAGEVIEWER_EXPORT AttachmentStrategy
+class MIMETREEPARSER_EXPORT AttachmentStrategy
 {
 protected:
     AttachmentStrategy();

mimetreeparser/src/viewer/bodypartformatterbasefactory.h

@@ -34,7 +34,7 @@
 #ifndef __MESSAGEVIEWER_BODYPARTFORMATTERBASEFACTORY_H__
 #define __MESSAGEVIEWER_BODYPARTFORMATTERBASEFACTORY_H__
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 
 #include <map>
 #include <QByteArray>
@@ -61,7 +61,7 @@ typedef std::map<const char *, MessageViewer::SubtypeRegistry, MessageViewer::lt
 
 class BodyPartFormatterBaseFactoryPrivate;
 
-class MESSAGEVIEWER_EXPORT BodyPartFormatterBaseFactory
+class MIMETREEPARSER_EXPORT BodyPartFormatterBaseFactory
 {
 public:
     BodyPartFormatterBaseFactory();

mimetreeparser/src/viewer/csshelperbase.h

@@ -32,7 +32,7 @@
 #ifndef MESSAGEVIEWER_CSSHELPERBASE_H
 #define MESSAGEVIEWER_CSSHELPERBASE_H
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 #include <QColor>
 #include <QFont>
 
@@ -42,7 +42,7 @@ class QPaintDevice;
 namespace MessageViewer
 {
 
-class MESSAGEVIEWER_EXPORT CSSHelperBase
+class MIMETREEPARSER_EXPORT CSSHelperBase
 {
 public:
     /** Construct a CSSHelper object and set its font and color settings to

mimetreeparser/src/viewer/nodehelper.h

@@ -19,7 +19,7 @@
 
 #ifndef _MESSAGEVIEWER_NODEHELPER_H
 #define _MESSAGEVIEWER_NODEHELPER_H
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 
 #include "mimetreeparser/partmetadata.h"
 #include "mimetreeparser/enums.h"
@@ -53,7 +53,7 @@ namespace MessageViewer
 /**
  * @author Andras Mantia <andras@kdab.net>
  */
-class MESSAGEVIEWER_EXPORT NodeHelper: public QObject
+class MIMETREEPARSER_EXPORT NodeHelper: public QObject
 {
     Q_OBJECT
 public:

mimetreeparser/src/viewer/objecttreeparser.h

@@ -34,7 +34,7 @@
 #ifndef _MESSAGEVIEWER_OBJECTTREEPARSER_H_
 #define _MESSAGEVIEWER_OBJECTTREEPARSER_H_
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 
 #include "mimetreeparser/nodehelper.h"
 #include "objecttreesourceif.h"
@@ -70,7 +70,7 @@ class MimeMessagePart;
 typedef QSharedPointer<MessagePart> MessagePartPtr;
 typedef QSharedPointer<MimeMessagePart> MimeMessagePartPtr;
 
-class MESSAGEVIEWER_EXPORT ProcessResult
+class MIMETREEPARSER_EXPORT ProcessResult
 {
 public:
     explicit ProcessResult(NodeHelper *nodeHelper, KMMsgSignatureState  inlineSignatureState  = KMMsgNotSigned,
@@ -277,7 +277,7 @@ is used to mark an attachment in the body with a yellow border when the user cli
 in the header. Finally, parseObjectTree() creates an anchor with the id 'att%1', which is used in
 the Viewer to scroll to the attachment.
 */
-class MESSAGEVIEWER_EXPORT ObjectTreeParser
+class MIMETREEPARSER_EXPORT ObjectTreeParser
 {
     class CryptoProtocolSaver;
     /**

mimetreeparser/src/viewer/partmetadata.h

@@ -16,7 +16,7 @@
 #ifndef _MESSAGEVIEWER_PARTMETADATA_H_
 #define _MESSAGEVIEWER_PARTMETADATA_H_
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 
 #include <gpgme++/verificationresult.h>
 #include <gpgme++/context.h>

mimetreeparser/src/viewer/partnodebodypart.h

@@ -34,7 +34,7 @@
 #ifndef __MESSAGEVIEWER_PARTNODEBODYPART_H_
 #define __MESSAGEVIEWER_PARTNODEBODYPART_H_
 
-#include "messageviewer_export.h"
+#include "mimetreeparser_export.h"
 #include "mimetreeparser/bodypart.h"
 
 class QTextCodec;
@@ -55,7 +55,7 @@ namespace MessageViewer
 /**
     @short an implementation of the BodyPart interface using KMime::Content's
 */
-class MESSAGEVIEWER_EXPORT PartNodeBodyPart : public Interface::BodyPart
+class MIMETREEPARSER_EXPORT PartNodeBodyPart : public Interface::BodyPart
 {
 public:
     explicit PartNodeBodyPart(ObjectTreeParser *otp, ProcessResult *result, KMime::Content *topLevelContent, KMime::Content *content,