Fix compile under windows

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

diff --git a/kdeeduplot/kplotaxis.h b/kdeeduplot/kplotaxis.h
index bbcffccea2654f7db0be4cf02c5ce7c6cd848344..1efbfe533a375a9004768d694a2d64a8977e58c2 100644 (file)
--- a/kdeeduplot/kplotaxis.h
+++ b/kdeeduplot/kplotaxis.h
@@ -31,7 +31,7 @@
  * @author Andreas Nicolai
  * @version 1.0
  */
-class EDUPLOT_EXPORT KPlotAxis {
+class KDEEDUPLOT_EXPORT KPlotAxis {
 public:
 
        /**

diff --git a/kdeeduplot/kplotobject.h b/kdeeduplot/kplotobject.h
index 33f8ac2466b0102791fc7e04e0b5acc4cc9d43b0..566087e53dee186bca66ebc7a36da58fa2096c7d 100644 (file)
--- a/kdeeduplot/kplotobject.h
+++ b/kdeeduplot/kplotobject.h
@@ -39,7 +39,7 @@ class KPlotWidget;
  * bar-widths are omitted, then the widths will be set automatically, 
  * based on the halfway-mark between adjacent points.
  */
-class EDUPLOT_EXPORT KPlotPoint {
+class KDEEDUPLOT_EXPORT KPlotPoint {
  public:
        /** 
         *Default constructor.
@@ -136,7 +136,7 @@ class EDUPLOT_EXPORT KPlotPoint {
  * @author Jason Harris
  * @version 1.1
  */
-class EDUPLOT_EXPORT KPlotObject{
+class KDEEDUPLOT_EXPORT KPlotObject{
 public:
        /**
         * @enum PlotType

diff --git a/kdeeduplot/kplotwidget.h b/kdeeduplot/kplotwidget.h
index 84257fb2055dddd58a2ddc145504c229cfb5d4cc..2e9ecd1d1fd87d3f7a32446fbb4383b0b5aeca8c 100644 (file)
--- a/kdeeduplot/kplotwidget.h
+++ b/kdeeduplot/kplotwidget.h
@@ -73,7 +73,7 @@ class KPlotPoint;
  *@author Jason Harris
  *@version 1.1
  */
-class EDUPLOT_EXPORT KPlotWidget : public QFrame {
+class KDEEDUPLOT_EXPORT KPlotWidget : public QFrame {
        Q_OBJECT
        Q_PROPERTY(int leftPadding READ leftPadding)
        Q_PROPERTY(int rightPadding READ rightPadding)

diff --git a/kdeeduplot/libkdeedu_plot_export.h b/kdeeduplot/libkdeedu_plot_export.h
index c6671ef7a7f7b68ab17bd023a116b7b80e045404..70104d9fa157c65abdb216b3d226918a3f274ced 100644 (file)
--- a/kdeeduplot/libkdeedu_plot_export.h
+++ b/kdeeduplot/libkdeedu_plot_export.h
@@ -26,17 +26,17 @@
 
 #if defined Q_OS_WIN
 
-#ifndef EDUPLOT_EXPORT
-# ifdef MAKE_EDUPLOT_LIB
-#  define EDUPLOT_EXPORT KDE_EXPORT
+#ifndef KDEEDUPLOT_EXPORT
+# ifdef MAKE_KDEEDUPLOT_LIB
+#  define KDEEDUPLOT_EXPORT KDE_EXPORT
 # else
-#  define EDUPLOT_EXPORT KDE_IMPORT
+#  define KDEEDUPLOT_EXPORT KDE_IMPORT
 # endif
 #endif
 
 #else
 /* export statements for unix */
-#define EDUPLOT_EXPORT KDE_EXPORT
+#define KDEEDUPLOT_EXPORT KDE_EXPORT
 #endif
 
 #endif

diff --git a/kdeeduui/kdeeduglossary.h b/kdeeduui/kdeeduglossary.h
index f8127a3e899b7587acf9d03e065ee15678e1b8e8..41b85f9a44bb6b4dff376621cb655527dde90eb8 100644 (file)
--- a/kdeeduui/kdeeduglossary.h
+++ b/kdeeduui/kdeeduglossary.h
@@ -36,7 +36,7 @@ class GlossaryItem;
  * This class stores all items to be displayed. It also
  * has access-methods to the items
  */
-class EDUUI_EXPORT Glossary
+class KDEEDUUI_EXPORT Glossary
 {
        public:
                /**
@@ -177,7 +177,7 @@ class EDUUI_EXPORT Glossary
  * a number of pictures or references associated to it.
  * These are stored as QStringLists.
  */
-class EDUUI_EXPORT GlossaryItem
+class KDEEDUUI_EXPORT GlossaryItem
 {
        public:
                GlossaryItem(){};
@@ -242,7 +242,7 @@ class EDUUI_EXPORT GlossaryItem
  * @author Pino Toscano
  * @author Carsten Niehaus
  */
-class EDUUI_EXPORT GlossaryDialog : public KDialog
+class KDEEDUUI_EXPORT GlossaryDialog : public KDialog
 {
        Q_OBJECT
 

diff --git a/kdeeduui/libkdeedu_ui_export.h b/kdeeduui/libkdeedu_ui_export.h
index 3233a3fca693141269022ff5810681c095041302..d3446658077940f91c3f1ede5fc5202c61ad9e4d 100644 (file)
--- a/kdeeduui/libkdeedu_ui_export.h
+++ b/kdeeduui/libkdeedu_ui_export.h
@@ -26,17 +26,17 @@
 
 #if defined Q_OS_WIN
 
-#ifndef EDUUI_EXPORT
-# ifdef MAKE_EDUUI_LIB
-#  define EDUUI_EXPORT KDE_EXPORT
+#ifndef KDEEDUUI_EXPORT
+# ifdef MAKE_KDEEDUUI_LIB
+#  define KDEEDUUI_EXPORT KDE_EXPORT
 # else
-#  define EDUUI_EXPORT KDE_IMPORT
+#  define KDEEDUUI_EXPORT KDE_IMPORT
 # endif
 #endif
 
 #else /* UNIX */
 /* export statements for unix */
-#define EDUUI_EXPORT KDE_EXPORT
+#define KDEEDUUI_EXPORT KDE_EXPORT
 #endif
 
 #endif

diff --git a/libscience/chemicaldataobject.h b/libscience/chemicaldataobject.h
index c1729026fb4ab64dca34ce37bc943d2764a5f358..7ab82ab108bcce7424021079dd46889974171411 100644 (file)
--- a/libscience/chemicaldataobject.h
+++ b/libscience/chemicaldataobject.h
@@ -36,7 +36,7 @@ class ChemicalDataObjectPrivate;
  *
  * @author Carsten Niehaus <cniehaus@kde.org>
  */
-class EDUSCIENCE_EXPORT ChemicalDataObject
+class SCIENCE_EXPORT ChemicalDataObject
 {
        public:
                /**
@@ -238,7 +238,7 @@ class EDUSCIENCE_EXPORT ChemicalDataObject
     QSharedDataPointer<ChemicalDataObjectPrivate> d;
 };
 
-class EDUSCIENCE_EXPORT ChemicalDataObjectPrivate : public QSharedData
+class SCIENCE_EXPORT ChemicalDataObjectPrivate : public QSharedData
 {
     public:
         ChemicalDataObjectPrivate();

diff --git a/libscience/element.h b/libscience/element.h
index 97b43ab7a3eba37c6f9564d13318107ba3e7c238..b44103c728b7118e1f8a1404e88168f8d80b2607 100644 (file)
--- a/libscience/element.h
+++ b/libscience/element.h
@@ -38,7 +38,7 @@ class Isotope;
  * @short This class is the represention of a chemical element
  * @author Carsten Niehaus
 */
-class EDUSCIENCE_EXPORT Element
+class SCIENCE_EXPORT Element
 {
        public:
                Element();

diff --git a/libscience/elementparser.h b/libscience/elementparser.h
index 3a2c2b8b89b7897bcc95f4fcab553270153a70a0..928b66141c5e49229fe9bc942b468f7044ad96bb 100644 (file)
--- a/libscience/elementparser.h
+++ b/libscience/elementparser.h
@@ -24,7 +24,7 @@ class Element;
 /**
  * @author Carsten Niehaus <cniehaus@kde.org>
  */
-class EDUSCIENCE_EXPORT ElementSaxParser : public QXmlDefaultHandler
+class SCIENCE_EXPORT ElementSaxParser : public QXmlDefaultHandler
 {
        public:
                /**

diff --git a/libscience/isotope.h b/libscience/isotope.h
index 9a51bee2d3810f9d72fecdc6f6d649ad9212e795..c8fb72eae1169071df80ea1d3c9172d3edc9f6cc 100644 (file)
--- a/libscience/isotope.h
+++ b/libscience/isotope.h
@@ -30,7 +30,7 @@
  *
  * This class represents an Isotope with all its properties
  */
-class EDUSCIENCE_EXPORT Isotope
+class SCIENCE_EXPORT Isotope
 {
        public:
                /**

diff --git a/libscience/isotopeparser.h b/libscience/isotopeparser.h
index 54c2be612133105d1e2628a2d8b6c6fe46673eb4..a36d98545c898fbf068afb12fc0985d6eb489f26 100644 (file)
--- a/libscience/isotopeparser.h
+++ b/libscience/isotopeparser.h
@@ -24,7 +24,7 @@ class Isotope;
 /**
  * @author Carsten Niehaus <cniehaus@kde.org>
  */
-class EDUSCIENCE_EXPORT IsotopeParser : public QXmlDefaultHandler
+class SCIENCE_EXPORT IsotopeParser : public QXmlDefaultHandler
 {
        public:
                /**

diff --git a/libscience/libkdeedu_science_export.h b/libscience/libkdeedu_science_export.h
index e2566e0e28334afec82b5f1c03485d88fe71b07f..f7d77f72a95b4254a7dc14cb1122d9bf3724c7e9 100644 (file)
--- a/libscience/libkdeedu_science_export.h
+++ b/libscience/libkdeedu_science_export.h
@@ -26,17 +26,17 @@
 
 #if defined Q_OS_WIN
 
-#ifndef EDUSCIENCE_EXPORT
-# ifdef MAKE_EDUSCIENCE_LIB
-#  define EDUSCIENCE_EXPORT KDE_EXPORT
+#ifndef SCIENCE_EXPORT
+# ifdef MAKE_SCIENCE_LIB
+#  define SCIENCE_EXPORT KDE_EXPORT
 # else
-#  define EDUSCIENCE_EXPORT KDE_IMPORT
+#  define SCIENCE_EXPORT KDE_IMPORT
 # endif
 #endif
 
 #else
 /* export statements for unix */
-#define EDUSCIENCE_EXPORT KDE_EXPORT
+#define SCIENCE_EXPORT KDE_EXPORT
 #endif
 
 #endif

diff --git a/libscience/moleculeparser.h b/libscience/moleculeparser.h
index 2f07e3bca314c275f27d4021bcf54dfe5bd41869..e81d006ba2203230b6ca6ec43017b8cf23b6a6b6 100644 (file)
--- a/libscience/moleculeparser.h
+++ b/libscience/moleculeparser.h
@@ -27,7 +27,7 @@
  * @class ElementCount
  * @author Inge Wallin
  */
-class EDUSCIENCE_EXPORT ElementCount 
+class SCIENCE_EXPORT ElementCount 
 {
        public:
                /**
@@ -88,7 +88,7 @@ class EDUSCIENCE_EXPORT ElementCount
  * @class ElementCountMap
  * @author Inge Wallin
  */
-class EDUSCIENCE_EXPORT ElementCountMap 
+class SCIENCE_EXPORT ElementCountMap 
 {
        public:
                /**
@@ -166,7 +166,7 @@ class EDUSCIENCE_EXPORT ElementCountMap
  *
  * @author Inge Wallin
  */
-class EDUSCIENCE_EXPORT MoleculeParser : public Parser {
+class SCIENCE_EXPORT MoleculeParser : public Parser {
 
 public:
        /**

diff --git a/libscience/parser.h b/libscience/parser.h
index d3ad291f14292c5c2b1079a16f43817d751bfc68..118a4f6cac933f4553f9dfc59c38481ac19bd82e 100644 (file)
--- a/libscience/parser.h
+++ b/libscience/parser.h
@@ -26,7 +26,7 @@
  *
  * @author Inge Wallin
  */
-class EDUSCIENCE_EXPORT Parser {
+class SCIENCE_EXPORT Parser {
 public:
        /**
         * Constructor

diff --git a/libscience/spectrum.h b/libscience/spectrum.h
index e4cdd372fab49de8781819ab19a6418e6496e459..7689064564a3ae5135e00d8aa3bdcacbe757a92d 100644 (file)
--- a/libscience/spectrum.h
+++ b/libscience/spectrum.h
@@ -32,7 +32,7 @@ class Element;
  *
  * This class represents an spectrum with all its properties
  */
-class EDUSCIENCE_EXPORT Spectrum
+class SCIENCE_EXPORT Spectrum
 {
        public:
                /**

diff --git a/libscience/spectrumparser.h b/libscience/spectrumparser.h
index ca8515c9a34501c6b59f37c24b29c7b0d7aec03f..bb9cad52761ef667f6d09c292f7f8bdb2ecd3007 100644 (file)
--- a/libscience/spectrumparser.h
+++ b/libscience/spectrumparser.h
@@ -27,7 +27,7 @@ class Spectrum;
 /**
  * @author Carsten Niehaus <cniehaus@kde.org>
  */
-class EDUSCIENCE_EXPORT SpectrumParser : public QXmlDefaultHandler
+class SCIENCE_EXPORT SpectrumParser : public QXmlDefaultHandler
 {
        public:
                /**

diff --git a/libscience/tempunit.h b/libscience/tempunit.h
index ddeae9e14cc23d301a9f3dfaa446e96127509e79..3f200016f1b2ad1ab60b08b1c31933b1f517f824 100644 (file)
--- a/libscience/tempunit.h
+++ b/libscience/tempunit.h
@@ -34,7 +34,7 @@
  *
  * @author Pino Toscano
  */
-class EDUSCIENCE_EXPORT TempUnit
+class SCIENCE_EXPORT TempUnit
 {
        public: