[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra=5D_filters/libkowmf=3A_Fix_compiling_on_Wi?=
From:       Pierre Stirnweiss <pstirnweiss () googlemail ! com>
Date:       2011-05-31 19:38:52
Message-ID: 20110531193852.51FFEA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit b45a2489e5a22bee1fbcd6e2010405c6b73093eb by Pierre Stirnweiss.
Committed on 31/05/2011 at 21:37.
Pushed by pstirnweiss into branch 'master'.

Fix compiling on Windows MSVC2010
the traditional export macro thingy

M  +1    -1    filters/libkowmf/WmfAbstractBackend.h     
M  +1    -1    filters/libkowmf/WmfPainterBackend.h     
M  +1    -1    filters/libkowmf/WmfWriter.h     
M  +10   -0    filters/libkowmf/kowmf_export.h     

http://commits.kde.org/calligra/b45a2489e5a22bee1fbcd6e2010405c6b73093eb

diff --git a/filters/libkowmf/WmfAbstractBackend.h b/filters/libkowmf/WmfAbstractBackend.h
index 345fd56..21e9e44 100644
--- a/filters/libkowmf/WmfAbstractBackend.h
+++ b/filters/libkowmf/WmfAbstractBackend.h
@@ -57,7 +57,7 @@ class WmfDeviceContext;
  *
  */
 
-class KOWMF_EXPORT WmfAbstractBackend
+class LIBWMF_EXPORT WmfAbstractBackend
 {
 public:
     WmfAbstractBackend();
diff --git a/filters/libkowmf/WmfPainterBackend.h b/filters/libkowmf/WmfPainterBackend.h
index 9a23005..101feda 100644
--- a/filters/libkowmf/WmfPainterBackend.h
+++ b/filters/libkowmf/WmfPainterBackend.h
@@ -55,7 +55,7 @@ namespace Libwmf
  *
  */
 
-class KOWMF_EXPORT WmfPainterBackend : public WmfAbstractBackend
+class LIBWMF_EXPORT WmfPainterBackend : public WmfAbstractBackend
 {
 public:
     WmfPainterBackend(QPainter *painter, const QSizeF &outputSize);
diff --git a/filters/libkowmf/WmfWriter.h b/filters/libkowmf/WmfWriter.h
index 0c1ea50..d5bb764 100644
--- a/filters/libkowmf/WmfWriter.h
+++ b/filters/libkowmf/WmfWriter.h
@@ -53,7 +53,7 @@ class WmfWriterPrivate;
  *   wmf.end();
  *   </pre>
  */
-class KOWMF_EXPORT WmfWriter
+class LIBWMF_EXPORT WmfWriter
 {
 public:
     explicit WmfWriter(const QString& fileName);
diff --git a/filters/libkowmf/kowmf_export.h b/filters/libkowmf/kowmf_export.h
index 9f4ab8f..57a6018 100644
--- a/filters/libkowmf/kowmf_export.h
+++ b/filters/libkowmf/kowmf_export.h
@@ -36,6 +36,16 @@
 # endif
 #endif
 
+#ifndef LIBWMF_EXPORT
+# if defined(MAKE_LIBWMF_LIB)
+/* We are building this library */
+#  define LIBWMF_EXPORT KDE_EXPORT
+# else
+/* We are using this library */
+#  define LIBWMF_EXPORT KDE_IMPORT
+# endif
+#endif
+
 #else /* UNIX */
 
 #define KOWMF_EXPORT KDE_EXPORT


[prev in list] [next in list] [prev in thread] [next in thread]