Fix compile under windows

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=605168

diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h
index 2f536cbf97bc2ca7de52282f009ab535167eb401..1a29446447a50f0aa3c8e2189ca6f03f23d2c2f3 100644 (file)
--- a/kdeeducore/keduvocdocument.h
+++ b/kdeeducore/keduvocdocument.h
@@ -252,7 +252,7 @@ class LeitnerSystem;
  * This class contains the expressions of your vocabulary
  * as well as other information about the vocabulary
  */
-class EDUCORE_EXPORT KEduVocDocument : public QObject
+class KDEEDUCORE_EXPORT KEduVocDocument : public QObject
 {
   Q_OBJECT
   friend class KEduVocKvtmlWriter;

diff --git a/kdeeducore/keduvocexpression.h b/kdeeducore/keduvocexpression.h
index 4ab93e1590ea781c2294131ae3bed645cb301954..006b63ea4d5cef1e5df5070529335bca0efd1f17 100644 (file)
--- a/kdeeducore/keduvocexpression.h
+++ b/kdeeducore/keduvocexpression.h
@@ -64,7 +64,7 @@ typedef unsigned short count_t;
   translations
   */
 
-class EDUCORE_EXPORT KEduVocExpression
+class KDEEDUCORE_EXPORT KEduVocExpression
 {
 public:
 

diff --git a/kdeeducore/keduvocgrammar.h b/kdeeducore/keduvocgrammar.h
index e47ca5e040ac375cdb317702076774d777479a7a..f7d167f29205b095c633cf6f995253634e788f78 100644 (file)
--- a/kdeeducore/keduvocgrammar.h
+++ b/kdeeducore/keduvocgrammar.h
@@ -54,7 +54,7 @@
  * It contains all available articles of the language as QString
  */
 
-class EDUCORE_EXPORT KEduVocArticle
+class KDEEDUCORE_EXPORT KEduVocArticle
 {
 
 public:
@@ -109,7 +109,7 @@ protected:
 };
 
 
-class EDUCORE_EXPORT KEduVocComparison
+class KDEEDUCORE_EXPORT KEduVocComparison
 {
 
 public:
@@ -163,7 +163,7 @@ protected:
 /**
  * The conjugation of a verb
  */
-class EDUCORE_EXPORT KEduVocConjugation
+class KDEEDUCORE_EXPORT KEduVocConjugation
 {
 
 public:

diff --git a/kdeeducore/keduvockvtmlreader.h b/kdeeducore/keduvockvtmlreader.h
index f16e3902f30e355ac4b2d39b622016554db4f6e9..0889906c185b6f69c996f42840f9d5246a51ee27 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.h
+++ b/kdeeducore/keduvockvtmlreader.h
@@ -71,7 +71,7 @@ class KEduVocDocument;
 /**
 @author Eric Pignet
 */
-class EDUCORE_EXPORT  KEduVocKvtmlReader : public QObject
+class KDEEDUCORE_EXPORT  KEduVocKvtmlReader : public QObject
 {
 public:
        KEduVocKvtmlReader(QFile *file);

diff --git a/kdeeducore/keduvockvtmlwriter.h b/kdeeducore/keduvockvtmlwriter.h
index 66d49dd14fa8df1ecabacff06e461bbfd59a79ab..4a47f1db0cab52381234aa1c46dd45159c021ff1 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.h
+++ b/kdeeducore/keduvockvtmlwriter.h
@@ -67,7 +67,7 @@ class KEduVocDocument;
 /**
 @author Eric Pignet
 */
-class EDUCORE_EXPORT KEduVocKvtmlWriter
+class KDEEDUCORE_EXPORT KEduVocKvtmlWriter
 {
 public:
   KEduVocKvtmlWriter(QFile *file);

diff --git a/kdeeducore/keduvocmultiplechoice.h b/kdeeducore/keduvocmultiplechoice.h
index 3438f68b64264613cef9097273ac0ce4e3923f4d..5f169fc3d33c269689d6a77bcee96d5cc1dc1c9d 100644 (file)
--- a/kdeeducore/keduvocmultiplechoice.h
+++ b/kdeeducore/keduvocmultiplechoice.h
@@ -33,7 +33,7 @@
 
 #define MAX_MULTIPLE_CHOICE  5  // select one out of x
 
-class EDUCORE_EXPORT KEduVocMultipleChoice
+class KDEEDUCORE_EXPORT KEduVocMultipleChoice
 {
 
 public:

diff --git a/kdeeducore/keduvocwqlreader.h b/kdeeducore/keduvocwqlreader.h
index 6be687d1167a4b078a38e460529e5d781faf9975..e1592aaa2a91fab21c0b5f36f179e26342ebaff2 100644 (file)
--- a/kdeeducore/keduvocwqlreader.h
+++ b/kdeeducore/keduvocwqlreader.h
@@ -26,7 +26,7 @@
 
 class KEduVocDocument;
 
-class EDUCORE_EXPORT KEduVocWqlReader : public QObject
+class KDEEDUCORE_EXPORT KEduVocWqlReader : public QObject
 {
 public:
        KEduVocWqlReader(QFile *file);

diff --git a/kdeeducore/keduvocwqlwriter.h b/kdeeducore/keduvocwqlwriter.h
index 8aa6bf334a4fc3cea3b37642efa70b84c6ee82e3..86d36d934ce32f1f94134e7cdfa760a489e095d5 100644 (file)
--- a/kdeeducore/keduvocwqlwriter.h
+++ b/kdeeducore/keduvocwqlwriter.h
@@ -26,7 +26,7 @@
 
 class KEduVocDocument;
 
-class EDUCORE_EXPORT KEduVocWqlWriter
+class KDEEDUCORE_EXPORT KEduVocWqlWriter
 {
 public:
   KEduVocWqlWriter(QFile *file);

diff --git a/kdeeducore/keduvowqlreader.h b/kdeeducore/keduvowqlreader.h
index 55f5ff081b0295ff2a6c125d9d7107080a18fd2c..f7ad04b808fcc374e892ea954593196c0c3dc7fa 100644 (file)
--- a/kdeeducore/keduvowqlreader.h
+++ b/kdeeducore/keduvowqlreader.h
@@ -26,7 +26,7 @@
 
 class KEduVocDocument;
 
-class EDUCORE_EXPORT KEduVocWqlReader : public QObject
+class KDEEDUCORE_EXPORT KEduVocWqlReader : public QObject
 {
 public:
        KEduVocWqlReader(QFile *file);

diff --git a/kdeeducore/keduvowqlwriter.h b/kdeeducore/keduvowqlwriter.h
index 30abc32fddf904393c5f930951cf6f5535b1b090..2fdb9930386db17dc2b132084675a4ababcd8e2e 100644 (file)
--- a/kdeeducore/keduvowqlwriter.h
+++ b/kdeeducore/keduvowqlwriter.h
@@ -26,7 +26,7 @@
 
 class KEduVocDocument;
 
-class EDUCORE_EXPORT KEduVocWqlWriter
+class KDEEDUCORE_EXPORT KEduVocWqlWriter
 {
 public:
   KEduVocWqlWriter(QFile *file);

diff --git a/kdeeducore/leitnerbox.h b/kdeeducore/leitnerbox.h
index e4319f79fd487278f65647c5a0f138bbaedfb307..1767eb73a3aa67b37f88e10832d58a1a2efb89a2 100644 (file)
--- a/kdeeducore/leitnerbox.h
+++ b/kdeeducore/leitnerbox.h
@@ -33,7 +33,7 @@
  * cards of this LeitnerBox
  * @author Martin Pfeiffer <hubipete@gmx.net>
  */
-class EDUCORE_EXPORT LeitnerBox
+class KDEEDUCORE_EXPORT LeitnerBox
 {
 public:
        /**

diff --git a/kdeeducore/leitnersystem.h b/kdeeducore/leitnersystem.h
index dd778379254fdf73de992f1e62c5d536ce9e0657..4bd7f7a371be2543a626ff0d1de5526b135eb20e 100644 (file)
--- a/kdeeducore/leitnersystem.h
+++ b/kdeeducore/leitnersystem.h
@@ -24,7 +24,7 @@
 @author Martin Pfeiffer
 */
 
-class EDUCORE_EXPORT LeitnerSystem
+class KDEEDUCORE_EXPORT LeitnerSystem
 {
 public:
        /**Constructor without arguments*/

diff --git a/kdeeducore/leitnersystemview.h b/kdeeducore/leitnersystemview.h
index 29a63f2a2e7ee7b9b0d50976393111ff0235c004..5c3c28cc1a630c72efe2051d10212ab256e2fe69 100644 (file)
--- a/kdeeducore/leitnersystemview.h
+++ b/kdeeducore/leitnersystemview.h
@@ -28,7 +28,7 @@ class LeitnerSystem;
  * @author Martin Pfeiffer
  */
 
-class EDUCORE_EXPORT LeitnerSystemView : public QWidget
+class KDEEDUCORE_EXPORT LeitnerSystemView : public QWidget
 {
        Q_OBJECT
                

diff --git a/kdeeducore/libkdeedu_core_export.h b/kdeeducore/libkdeedu_core_export.h
index 21eccc86c25379af1ac66ce1f1136d41dfa5b224..a3e15086a5ece742edb5b0ce42f3479f5c408914 100644 (file)
--- a/kdeeducore/libkdeedu_core_export.h
+++ b/kdeeducore/libkdeedu_core_export.h
@@ -25,16 +25,16 @@
 #include <kdemacros.h>
 
 #if defined Q_OS_WIN
-#ifndef EDUCORE_EXPORT
-# ifdef MAKE_EDUCORE_LIB
-#  define EDUCORE_EXPORT KDE_EXPORT
+#ifndef KDEEDUCORE_EXPORT
+# ifdef MAKE_KDEEDUCORE_LIB
+#  define KDEEDUCORE_EXPORT KDE_EXPORT
 # else
-#  define EDUCORE_EXPORT KDE_IMPORT
+#  define KDEEDUCORE_EXPORT KDE_IMPORT
 # endif
 #endif
 
 #else /* UNIX */
-#define EDUCORE_EXPORT KDE_EXPORT
+#define KDEEDUCORE_EXPORT KDE_EXPORT
 #endif
 
 #endif

diff --git a/kdeeducore/prefleitner.h b/kdeeducore/prefleitner.h
index 9f043781cdd8ec5e4e215f473d8503d312b7a221..354418806402d8c4192f04ab27723fc80abf2240 100644 (file)
--- a/kdeeducore/prefleitner.h
+++ b/kdeeducore/prefleitner.h
@@ -37,7 +37,7 @@ namespace Ui
  * This class is a dialog for configuring a LeitnerSystem
  * @author Martin Pfeiffer <hubipete@gmx.net>
  */
-class EDUCORE_EXPORT PrefLeitner : public QDialog
+class KDEEDUCORE_EXPORT PrefLeitner : public QDialog
 {
        Q_OBJECT