From: Laurent Montel Date: Wed, 15 Nov 2006 17:52:09 +0000 (+0000) Subject: Fix compile under windows X-Git-Tag: v3.80.3~106 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=8c560ad0276ac8e3a127885eb52f26be82093404;p=libqmvoc.git Fix compile under windows svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=605169 --- diff --git a/kdeeduplot/kplotaxis.h b/kdeeduplot/kplotaxis.h index bbcffcc..1efbfe5 100644 --- 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 33f8ac2..566087e 100644 --- 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 84257fb..2e9ecd1 100644 --- 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 c6671ef..70104d9 100644 --- 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 f8127a3..41b85f9 100644 --- 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 3233a3f..d344665 100644 --- 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 c172902..7ab82ab 100644 --- a/libscience/chemicaldataobject.h +++ b/libscience/chemicaldataobject.h @@ -36,7 +36,7 @@ class ChemicalDataObjectPrivate; * * @author Carsten Niehaus */ -class EDUSCIENCE_EXPORT ChemicalDataObject +class SCIENCE_EXPORT ChemicalDataObject { public: /** @@ -238,7 +238,7 @@ class EDUSCIENCE_EXPORT ChemicalDataObject QSharedDataPointer 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 97b43ab..b44103c 100644 --- 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 3a2c2b8..928b661 100644 --- a/libscience/elementparser.h +++ b/libscience/elementparser.h @@ -24,7 +24,7 @@ class Element; /** * @author Carsten Niehaus */ -class EDUSCIENCE_EXPORT ElementSaxParser : public QXmlDefaultHandler +class SCIENCE_EXPORT ElementSaxParser : public QXmlDefaultHandler { public: /** diff --git a/libscience/isotope.h b/libscience/isotope.h index 9a51bee..c8fb72e 100644 --- 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 54c2be6..a36d985 100644 --- a/libscience/isotopeparser.h +++ b/libscience/isotopeparser.h @@ -24,7 +24,7 @@ class Isotope; /** * @author Carsten Niehaus */ -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 e2566e0..f7d77f7 100644 --- 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 2f07e3b..e81d006 100644 --- 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 d3ad291..118a4f6 100644 --- 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 e4cdd37..7689064 100644 --- 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 ca8515c..bb9cad5 100644 --- a/libscience/spectrumparser.h +++ b/libscience/spectrumparser.h @@ -27,7 +27,7 @@ class Spectrum; /** * @author Carsten Niehaus */ -class EDUSCIENCE_EXPORT SpectrumParser : public QXmlDefaultHandler +class SCIENCE_EXPORT SpectrumParser : public QXmlDefaultHandler { public: /** diff --git a/libscience/tempunit.h b/libscience/tempunit.h index ddeae9e..3f20001 100644 --- a/libscience/tempunit.h +++ b/libscience/tempunit.h @@ -34,7 +34,7 @@ * * @author Pino Toscano */ -class EDUSCIENCE_EXPORT TempUnit +class SCIENCE_EXPORT TempUnit { public: