From 207a8d1f3b21aea6ba14e6e18c2998d88353ca5e Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 15 Nov 2006 17:45:52 +0000 Subject: [PATCH] Fix compile under windows svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=605168 --- kdeeducore/keduvocdocument.h | 2 +- kdeeducore/keduvocexpression.h | 2 +- kdeeducore/keduvocgrammar.h | 6 +++--- kdeeducore/keduvockvtmlreader.h | 2 +- kdeeducore/keduvockvtmlwriter.h | 2 +- kdeeducore/keduvocmultiplechoice.h | 2 +- kdeeducore/keduvocwqlreader.h | 2 +- kdeeducore/keduvocwqlwriter.h | 2 +- kdeeducore/keduvowqlreader.h | 2 +- kdeeducore/keduvowqlwriter.h | 2 +- kdeeducore/leitnerbox.h | 2 +- kdeeducore/leitnersystem.h | 2 +- kdeeducore/leitnersystemview.h | 2 +- kdeeducore/libkdeedu_core_export.h | 10 +++++----- kdeeducore/prefleitner.h | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h index 2f536cb..1a29446 100644 --- 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 4ab93e1..006b63e 100644 --- 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 e47ca5e..f7d167f 100644 --- 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 f16e390..0889906 100644 --- 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 66d49dd..4a47f1d 100644 --- 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 3438f68..5f169fc 100644 --- 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 6be687d..e1592aa 100644 --- 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 8aa6bf3..86d36d9 100644 --- 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 55f5ff0..f7ad04b 100644 --- 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 30abc32..2fdb993 100644 --- 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 e4319f7..1767eb7 100644 --- a/kdeeducore/leitnerbox.h +++ b/kdeeducore/leitnerbox.h @@ -33,7 +33,7 @@ * cards of this LeitnerBox * @author Martin Pfeiffer */ -class EDUCORE_EXPORT LeitnerBox +class KDEEDUCORE_EXPORT LeitnerBox { public: /** diff --git a/kdeeducore/leitnersystem.h b/kdeeducore/leitnersystem.h index dd77837..4bd7f7a 100644 --- 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 29a63f2..5c3c28c 100644 --- 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 21eccc8..a3e1508 100644 --- a/kdeeducore/libkdeedu_core_export.h +++ b/kdeeducore/libkdeedu_core_export.h @@ -25,16 +25,16 @@ #include #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 9f04378..3544188 100644 --- 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 */ -class EDUCORE_EXPORT PrefLeitner : public QDialog +class KDEEDUCORE_EXPORT PrefLeitner : public QDialog { Q_OBJECT -- 2.47.3