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

List:       kde-commits
Subject:    koffice/kplato/workpackage
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2008-02-01 23:13:15
Message-ID: 1201907595.653840.1823.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 769736 by sengels:

change some stuff - renaming of libraries has to take place in the foo_export.h file as well.

 M  +1 -1      application.h  
 M  +20 -2     kplatowork_export.h  


--- trunk/koffice/kplato/workpackage/application.h #769735:769736
@@ -62,7 +62,7 @@
 
 class KPlatoWork_MainGUIClient;
 
-class KPLATOWORK_EXPORT KPlatoWork_Application : public KoApplication
+class KPLATOWORKAPP_EXPORT KPlatoWork_Application : public KoApplication
 {
     Q_OBJECT
 public:
--- trunk/koffice/kplato/workpackage/kplatowork_export.h #769735:769736
@@ -27,7 +27,7 @@
 #if defined _WIN32 || defined _WIN64
 
 #ifndef KPLATOWORK_EXPORT
-# if defined(MAKE_KPLATOWORKPRIVATE_LIB)
+# if defined(MAKE_KPLATOWORKFACTORY_LIB)
    /* We are building this library */ 
 #  define KPLATOWORK_EXPORT KDE_EXPORT
 # else
@@ -42,11 +42,29 @@
 
 #endif
 
+/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */
+#if defined _WIN32 || defined _WIN64
+
+#ifndef KPLATOWORKAPP_EXPORT
+# if defined(MAKE_KPLATOWORKAPP_LIB)
+   /* We are building this library */ 
+#  define KPLATOWORKAPP_EXPORT KDE_EXPORT
+# else
+   /* We are using this library */ 
+#  define KPLATOWORKAPP_EXPORT KDE_IMPORT
+# endif
+#endif
+
+#else /* UNIX */
+
+#define KPLATOWORK_EXPORT KDE_EXPORT
+
+#endif
 /* Now the same for KPLATOWORK_TEST_EXPORT, if compiling with unit tests enabled */
 
 #ifdef COMPILING_TESTS
 #if defined _WIN32 || defined _WIN64
-# if defined(MAKE_KPLATOWORKPRIVATE_LIB)
+# if defined(MAKE_KPLATOWORKFACTORY_LIB)
 #       define KPLATOWORK_TEST_EXPORT KDE_EXPORT
 #   else
 #       define KPLATOWORK_TEST_EXPORT KDE_IMPORT
[prev in list] [next in list] [prev in thread] [next in thread]