From 922232e8feb3294895bfd99a4c286e863d0d28ec Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 8 May 2006 16:55:15 +0000 Subject: [PATCH] Create a real system to handle the visibility stuff of modern compilers. It's necessary also to avoid visibility troubles on win32. Every module has its own kdeedu_xxx_export.h, and defines the right xxx_EXPORT macro to use in its classes. CCMAIL: kde-edu@kde.org svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=538718 --- extdate/extdatepicker.h | 3 ++- extdate/extdatetime.h | 23 ++++++++++++----------- extdate/extdatetimeedit.h | 6 ++++-- extdate/extdatewidget.h | 4 +++- extdate/kdeedu_extdate_export.h | 30 ++++++++++++++++++++++++++++++ kdeeducore/kdeedu_core_export.h | 30 ++++++++++++++++++++++++++++++ kdeeducore/keduvocdocument.h | 5 +++-- kdeeducore/keduvocexpression.h | 5 +++-- kdeeducore/keduvocgrammar.h | 8 +++++--- kdeeducore/keduvockvtmlreader.h | 4 +++- kdeeducore/keduvockvtmlwriter.h | 4 +++- kdeeducore/keduvocmultiplechoice.h | 4 +++- kdeeducore/keduvocwqlreader.h | 4 +++- kdeeducore/keduvocwqlwriter.h | 4 +++- kdeeducore/keduvowqlreader.h | 4 +++- kdeeducore/keduvowqlwriter.h | 4 +++- kdeeducore/leitnerbox.h | 3 ++- kdeeducore/leitnersystem.h | 4 +++- kdeeducore/leitnersystemview.h | 4 +++- kdeeducore/prefleitner.h | 4 +++- kdeeduplot/kdeedu_plot_export.h | 30 ++++++++++++++++++++++++++++++ kdeeduplot/kplotaxis.h | 4 ++-- kdeeduplot/kplotobject.h | 4 ++-- kdeeduplot/kplotwidget.h | 4 ++-- kdeeduui/kdeedu_ui_export.h | 30 ++++++++++++++++++++++++++++++ kdeeduui/kdeeduglossary.h | 7 ++++--- libscience/chemicaldataobject.h | 4 +++- libscience/element.h | 4 +++- libscience/elementparser.h | 4 +++- libscience/isotope.h | 4 +++- libscience/isotopeparser.h | 4 +++- libscience/kdeedu_science_export.h | 30 ++++++++++++++++++++++++++++++ libscience/parser.h | 4 +++- libscience/spectrum.h | 4 +++- libscience/spectrumparser.h | 4 +++- libscience/tempunit.h | 4 +++- 36 files changed, 251 insertions(+), 51 deletions(-) create mode 100644 extdate/kdeedu_extdate_export.h create mode 100644 kdeeducore/kdeedu_core_export.h create mode 100644 kdeeduplot/kdeedu_plot_export.h create mode 100644 kdeeduui/kdeedu_ui_export.h create mode 100644 libscience/kdeedu_science_export.h diff --git a/extdate/extdatepicker.h b/extdate/extdatepicker.h index 13a7dd4..d7d923f 100644 --- a/extdate/extdatepicker.h +++ b/extdate/extdatepicker.h @@ -22,6 +22,7 @@ #ifndef EXTDATEPICKER_H #define EXTDATEPICKER_H +#include #include "extdatetime.h" #include @@ -52,7 +53,7 @@ class ExtDateTable; * * @short A date selection widget. **/ -class KDE_EXPORT ExtDatePicker: public QFrame +class EXTDATE_EXPORT ExtDatePicker: public QFrame { Q_OBJECT // Q_PROPERTY( ExtDate date READ date WRITE setDate) diff --git a/extdate/extdatetime.h b/extdate/extdatetime.h index 7945c7b..ffd2c9b 100644 --- a/extdate/extdatetime.h +++ b/extdate/extdatetime.h @@ -25,11 +25,12 @@ #ifndef EXTDATETIME_H #define EXTDATETIME_H +#include + #include #include #include #include -#include #define INVALID_DAY LONG_MIN @@ -67,7 +68,7 @@ extern void test2_unit(int y, int m, int d); * *@author Michael Guitel, Jason Harris */ -class KDE_EXPORT ExtDate +class EXTDATE_EXPORT ExtDate { public: /** @@ -420,10 +421,10 @@ private: friend class ExtDateTime; #ifndef QT_NO_DATASTREAM - friend KDE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDate & ); - friend KDE_EXPORT QDataStream &operator>>( QDataStream &, ExtDate & ); - friend KDE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDateTime & ); - friend KDE_EXPORT QDataStream &operator>>( QDataStream &, ExtDateTime & ); + friend EXTDATE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDate & ); + friend EXTDATE_EXPORT QDataStream &operator>>( QDataStream &, ExtDate & ); + friend EXTDATE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDateTime & ); + friend EXTDATE_EXPORT QDataStream &operator>>( QDataStream &, ExtDateTime & ); #endif }; @@ -442,7 +443,7 @@ private: * *@author Michael Guitel, Jason Harris */ -class KDE_EXPORT ExtDateTime +class EXTDATE_EXPORT ExtDateTime { public: /** @@ -656,8 +657,8 @@ public: ExtDate d; QTime t; #ifndef QT_NO_DATASTREAM - friend KDE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDateTime &); - friend KDE_EXPORT QDataStream &operator>>( QDataStream &, ExtDateTime & ); + friend EXTDATE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDateTime &); + friend EXTDATE_EXPORT QDataStream &operator>>( QDataStream &, ExtDateTime & ); #endif }; @@ -666,8 +667,8 @@ public: *****************************************************************************/ #ifndef QT_NO_DATASTREAM -KDE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDate & ); -KDE_EXPORT QDataStream &operator>>( QDataStream &, ExtDate & ); +EXTDATE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDate & ); +EXTDATE_EXPORT QDataStream &operator>>( QDataStream &, ExtDate & ); #endif // QT_NO_DATASTREAM #endif // EXTDATE_H diff --git a/extdate/extdatetimeedit.h b/extdate/extdatetimeedit.h index 847ad57..9fe389c 100644 --- a/extdate/extdatetimeedit.h +++ b/extdate/extdatetimeedit.h @@ -17,6 +17,8 @@ #ifndef EXTDATETIMEEDIT_H #define EXTDATETIMEEDIT_H +#include + /** *@class ExtDateEdit *@short provides a spinbox widget for entering an extended date. @@ -55,7 +57,7 @@ #include "extdatetime.h" #include -class KDE_EXPORT ExtDateEdit : public QSpinBox { +class EXTDATE_EXPORT ExtDateEdit : public QSpinBox { Q_OBJECT public: @@ -247,7 +249,7 @@ class KDE_EXPORT ExtDateEdit : public QSpinBox { *@author Jason Harris *@version 1.0 */ -class KDE_EXPORT ExtDateTimeEdit : public QFrame { +class EXTDATE_EXPORT ExtDateTimeEdit : public QFrame { Q_OBJECT public: diff --git a/extdate/extdatewidget.h b/extdate/extdatewidget.h index 8c2bb6b..44f3632 100644 --- a/extdate/extdatewidget.h +++ b/extdate/extdatewidget.h @@ -22,6 +22,8 @@ #ifndef EXTDATEWIDGET_H #define EXTDATEWIDGET_H +#include + #include "extdatetime.h" /** @@ -32,7 +34,7 @@ * @short A pushbutton to display or allow user selection of a date. * @version $Id$ */ -class KDE_EXPORT ExtDateWidget : public QWidget +class EXTDATE_EXPORT ExtDateWidget : public QWidget { Q_OBJECT // Q_PROPERTY( ExtDate date READ date WRITE setDate ) diff --git a/extdate/kdeedu_extdate_export.h b/extdate/kdeedu_extdate_export.h new file mode 100644 index 0000000..1619740 --- /dev/null +++ b/extdate/kdeedu_extdate_export.h @@ -0,0 +1,30 @@ +/* + This file is part of libkdeedu. + Copyright (c) 2006 Pino Toscano + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KDEEDU_EXTDATE_EXPORT_H +#define KDEEDU_EXTDATE_EXPORT_H + +/* needed for KDE_EXPORT macros */ +#include + +/* export statements for unix */ +#define EXTDATE_EXPORT KDE_EXPORT + +#endif diff --git a/kdeeducore/kdeedu_core_export.h b/kdeeducore/kdeedu_core_export.h new file mode 100644 index 0000000..a973758 --- /dev/null +++ b/kdeeducore/kdeedu_core_export.h @@ -0,0 +1,30 @@ +/* + This file is part of libkdeedu. + Copyright (c) 2006 Pino Toscano + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KDEEDU_CORE_EXPORT_H +#define KDEEDU_CORE_EXPORT_H + +/* needed for KDE_EXPORT macros */ +#include + +/* export statements for unix */ +#define EDUCORE_EXPORT KDE_EXPORT + +#endif diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h index 4d30882..5435630 100644 --- a/kdeeducore/keduvocdocument.h +++ b/kdeeducore/keduvocdocument.h @@ -18,8 +18,9 @@ #ifndef KEDUVOCDOCUMENT_H #define KEDUVOCDOCUMENT_H +#include + #include -#include #define KVD_ZERO_TIME 934329599 // 1999-08-10 23:59:59, never change #define KVD_VERS_PREFIX " v" // kvoctrain v0.1.0 @@ -251,7 +252,7 @@ class LeitnerSystem; * This class contains the expressions of your vocabulary * as well as other information about the vocabulary */ -class KDE_EXPORT KEduVocDocument : public QObject +class EDUCORE_EXPORT KEduVocDocument : public QObject { Q_OBJECT friend class KEduVocKvtmlWriter; diff --git a/kdeeducore/keduvocexpression.h b/kdeeducore/keduvocexpression.h index 600de32..eb063b6 100644 --- a/kdeeducore/keduvocexpression.h +++ b/kdeeducore/keduvocexpression.h @@ -19,6 +19,8 @@ #ifndef KEDUVOCEXPRESSION_H #define KEDUVOCEXPRESSION_H +#include + #define KV_MAX_GRADE 7 #define KV_MIN_GRADE 0 @@ -51,7 +53,6 @@ #include #include -#include #include "keduvocgrammar.h" #include "keduvocmultiplechoice.h" @@ -63,7 +64,7 @@ typedef unsigned short count_t; translations */ -class KDE_EXPORT KEduVocExpression +class EDUCORE_EXPORT KEduVocExpression { public: diff --git a/kdeeducore/keduvocgrammar.h b/kdeeducore/keduvocgrammar.h index 9c9763a..cd23ce7 100644 --- a/kdeeducore/keduvocgrammar.h +++ b/kdeeducore/keduvocgrammar.h @@ -27,6 +27,8 @@ #ifndef grammarmanager_included #define grammarmanager_included +#include + #include #include #include @@ -52,7 +54,7 @@ * It contains all available articles of the language as QString */ -class KEduVocArticle +class EDUCORE_EXPORT KEduVocArticle { public: @@ -107,7 +109,7 @@ protected: }; -class KEduVocComparison +class EDUCORE_EXPORT KEduVocComparison { public: @@ -161,7 +163,7 @@ protected: /** * The conjugation of a verb */ -class KEduVocConjugation +class EDUCORE_EXPORT KEduVocConjugation { public: diff --git a/kdeeducore/keduvockvtmlreader.h b/kdeeducore/keduvockvtmlreader.h index 1b707e8..ef964aa 100644 --- a/kdeeducore/keduvockvtmlreader.h +++ b/kdeeducore/keduvockvtmlreader.h @@ -19,6 +19,8 @@ #ifndef KEDUVOCKVTMLREADER_H #define KEDUVOCKVTMLREADER_H +#include + #include #include #include @@ -69,7 +71,7 @@ class KEduVocDocument; /** @author Eric Pignet */ -class KEduVocKvtmlReader : public QObject +class EDUCORE_EXPORT KEduVocKvtmlReader : public QObject { public: KEduVocKvtmlReader(QFile *file); diff --git a/kdeeducore/keduvockvtmlwriter.h b/kdeeducore/keduvockvtmlwriter.h index 46ceb7d..cc48636 100644 --- a/kdeeducore/keduvockvtmlwriter.h +++ b/kdeeducore/keduvockvtmlwriter.h @@ -19,6 +19,8 @@ #ifndef KEDUVOCKVTMLWRITER_H #define KEDUVOCKVTMLWRITER_H +#include + #include #include #include @@ -65,7 +67,7 @@ class KEduVocDocument; /** @author Eric Pignet */ -class KEduVocKvtmlWriter +class EDUCORE_EXPORT KEduVocKvtmlWriter { public: KEduVocKvtmlWriter(QFile *file); diff --git a/kdeeducore/keduvocmultiplechoice.h b/kdeeducore/keduvocmultiplechoice.h index b59f4d0..7e5a29e 100644 --- a/kdeeducore/keduvocmultiplechoice.h +++ b/kdeeducore/keduvocmultiplechoice.h @@ -27,11 +27,13 @@ #ifndef MultipleChoice_included #define MultipleChoice_included +#include + #include #define MAX_MULTIPLE_CHOICE 5 // select one out of x -class KEduVocMultipleChoice +class EDUCORE_EXPORT KEduVocMultipleChoice { public: diff --git a/kdeeducore/keduvocwqlreader.h b/kdeeducore/keduvocwqlreader.h index 06829ec..55f5ff0 100644 --- a/kdeeducore/keduvocwqlreader.h +++ b/kdeeducore/keduvocwqlreader.h @@ -18,13 +18,15 @@ #ifndef KEDUVOCWQLREADER_H #define KEDUVOCWQLREADER_H +#include + #include #include "keduvocdocument.h" class KEduVocDocument; -class KEduVocWqlReader : public QObject +class EDUCORE_EXPORT KEduVocWqlReader : public QObject { public: KEduVocWqlReader(QFile *file); diff --git a/kdeeducore/keduvocwqlwriter.h b/kdeeducore/keduvocwqlwriter.h index ddf2f29..30abc32 100644 --- a/kdeeducore/keduvocwqlwriter.h +++ b/kdeeducore/keduvocwqlwriter.h @@ -18,13 +18,15 @@ #ifndef KEDUVOCWQLWRITER_H #define KEDUVOCWQLWRITER_H +#include + #include #include #include class KEduVocDocument; -class KEduVocWqlWriter +class EDUCORE_EXPORT KEduVocWqlWriter { public: KEduVocWqlWriter(QFile *file); diff --git a/kdeeducore/keduvowqlreader.h b/kdeeducore/keduvowqlreader.h index 06829ec..55f5ff0 100644 --- a/kdeeducore/keduvowqlreader.h +++ b/kdeeducore/keduvowqlreader.h @@ -18,13 +18,15 @@ #ifndef KEDUVOCWQLREADER_H #define KEDUVOCWQLREADER_H +#include + #include #include "keduvocdocument.h" class KEduVocDocument; -class KEduVocWqlReader : public QObject +class EDUCORE_EXPORT KEduVocWqlReader : public QObject { public: KEduVocWqlReader(QFile *file); diff --git a/kdeeducore/keduvowqlwriter.h b/kdeeducore/keduvowqlwriter.h index ddf2f29..30abc32 100644 --- a/kdeeducore/keduvowqlwriter.h +++ b/kdeeducore/keduvowqlwriter.h @@ -18,13 +18,15 @@ #ifndef KEDUVOCWQLWRITER_H #define KEDUVOCWQLWRITER_H +#include + #include #include #include class KEduVocDocument; -class KEduVocWqlWriter +class EDUCORE_EXPORT KEduVocWqlWriter { public: KEduVocWqlWriter(QFile *file); diff --git a/kdeeducore/leitnerbox.h b/kdeeducore/leitnerbox.h index f0629bc..f6607e9 100644 --- a/kdeeducore/leitnerbox.h +++ b/kdeeducore/leitnerbox.h @@ -20,6 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include #include @@ -32,7 +33,7 @@ * cards of this LeitnerBox * @author Martin Pfeiffer */ -class LeitnerBox +class EDUCORE_EXPORT LeitnerBox { public: /** diff --git a/kdeeducore/leitnersystem.h b/kdeeducore/leitnersystem.h index 0b670ed..1a7214b 100644 --- a/kdeeducore/leitnersystem.h +++ b/kdeeducore/leitnersystem.h @@ -13,6 +13,8 @@ // // +#include + #include #include @@ -22,7 +24,7 @@ @author Martin Pfeiffer */ -class LeitnerSystem +class EDUCORE_EXPORT LeitnerSystem { public: /**Constructor without arguments*/ diff --git a/kdeeducore/leitnersystemview.h b/kdeeducore/leitnersystemview.h index 99ab626..b795d84 100644 --- a/kdeeducore/leitnersystemview.h +++ b/kdeeducore/leitnersystemview.h @@ -12,6 +12,8 @@ #ifndef LEITNERSYSTEMVIEW_H #define LEITNERSYSTEMVIEW_H +#include + #include #include #include @@ -26,7 +28,7 @@ class LeitnerSystem; * @author Martin Pfeiffer */ -class LeitnerSystemView : public QWidget +class EDUCORE_EXPORT LeitnerSystemView : public QWidget { Q_OBJECT diff --git a/kdeeducore/prefleitner.h b/kdeeducore/prefleitner.h index cb75693..7182c78 100644 --- a/kdeeducore/prefleitner.h +++ b/kdeeducore/prefleitner.h @@ -21,6 +21,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * **************************************************************************/ +#include + #include "ui_prefleitnerbase.h" class LeitnerSystemView; @@ -31,7 +33,7 @@ class LeitnerBox; * This class is a dialogue for configuring a LeitnerSystem * @author Martin Pfeiffer */ -class PrefLeitner : public QDialog, public Ui::PrefLeitnerBase +class EDUCORE_EXPORT PrefLeitner : public QDialog, public Ui::PrefLeitnerBase { Q_OBJECT diff --git a/kdeeduplot/kdeedu_plot_export.h b/kdeeduplot/kdeedu_plot_export.h new file mode 100644 index 0000000..4871793 --- /dev/null +++ b/kdeeduplot/kdeedu_plot_export.h @@ -0,0 +1,30 @@ +/* + This file is part of libkdeedu. + Copyright (c) 2006 Pino Toscano + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KDEEDU_PLOT_EXPORT_H +#define KDEEDU_PLOT_EXPORT_H + +/* needed for KDE_EXPORT macros */ +#include + +/* export statements for unix */ +#define EDUPLOT_EXPORT KDE_EXPORT + +#endif diff --git a/kdeeduplot/kplotaxis.h b/kdeeduplot/kplotaxis.h index 41e173c..92d9212 100644 --- a/kdeeduplot/kplotaxis.h +++ b/kdeeduplot/kplotaxis.h @@ -20,7 +20,7 @@ #include -#include +#include /** * @short Axis for KPlotWidget @@ -30,7 +30,7 @@ * @author Andreas Nicolai * @version 1.0 */ -class KDE_EXPORT KPlotAxis { +class EDUPLOT_EXPORT KPlotAxis { public: /** diff --git a/kdeeduplot/kplotobject.h b/kdeeduplot/kplotobject.h index 28e8ae5..38c3351 100644 --- a/kdeeduplot/kplotobject.h +++ b/kdeeduplot/kplotobject.h @@ -22,7 +22,7 @@ #include #include -#include +#include /** * @class KPlotObject @@ -39,7 +39,7 @@ * @author Jason Harris * @version 1.1 */ -class KDE_EXPORT KPlotObject{ +class EDUPLOT_EXPORT KPlotObject{ public: /** * @enum PTYPE diff --git a/kdeeduplot/kplotwidget.h b/kdeeduplot/kplotwidget.h index 138bf7e..601ab2f 100644 --- a/kdeeduplot/kplotwidget.h +++ b/kdeeduplot/kplotwidget.h @@ -22,7 +22,7 @@ #include #include -#include +#include class QPixmap; class KPlotAxis; @@ -70,7 +70,7 @@ class KPlotObject; *@author Jason Harris *@version 1.1 */ -class KDE_EXPORT KPlotWidget : public QFrame { +class EDUPLOT_EXPORT KPlotWidget : public QFrame { Q_OBJECT Q_PROPERTY(int leftPadding READ leftPadding) Q_PROPERTY(int rightPadding READ rightPadding) diff --git a/kdeeduui/kdeedu_ui_export.h b/kdeeduui/kdeedu_ui_export.h new file mode 100644 index 0000000..5520071 --- /dev/null +++ b/kdeeduui/kdeedu_ui_export.h @@ -0,0 +1,30 @@ +/* + This file is part of libkdeedu. + Copyright (c) 2006 Pino Toscano + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KDEEDU_UI_EXPORT_H +#define KDEEDU_UI_EXPORT_H + +/* needed for KDE_EXPORT macros */ +#include + +/* export statements for unix */ +#define EDUUI_EXPORT KDE_EXPORT + +#endif diff --git a/kdeeduui/kdeeduglossary.h b/kdeeduui/kdeeduglossary.h index 805ee63..744a4c5 100644 --- a/kdeeduui/kdeeduglossary.h +++ b/kdeeduui/kdeeduglossary.h @@ -15,6 +15,7 @@ * * ***************************************************************************/ +#include #include #include @@ -35,7 +36,7 @@ class GlossaryItem; * This class stores all items to be displayed. It also * has access-methods to the items */ -class Glossary +class EDUUI_EXPORT Glossary { public: /** @@ -176,7 +177,7 @@ class Glossary * a number of pictures or references associated to it. * These are stored as QStringLists. */ -class GlossaryItem +class EDUUI_EXPORT GlossaryItem { public: GlossaryItem(){}; @@ -241,7 +242,7 @@ class GlossaryItem * @author Pino Toscano * @author Carsten Niehaus */ -class GlossaryDialog : public KDialogBase +class EDUUI_EXPORT GlossaryDialog : public KDialogBase { Q_OBJECT diff --git a/libscience/chemicaldataobject.h b/libscience/chemicaldataobject.h index b6fea72..5144f5a 100644 --- a/libscience/chemicaldataobject.h +++ b/libscience/chemicaldataobject.h @@ -23,6 +23,8 @@ #include #include +#include + class ChemicalDataObjectPrivate; /** @@ -33,7 +35,7 @@ class ChemicalDataObjectPrivate; * * @author Carsten Niehaus */ -class ChemicalDataObject +class EDUSCIENCE_EXPORT ChemicalDataObject { public: /** diff --git a/libscience/element.h b/libscience/element.h index c3889ee..3e2cf73 100644 --- a/libscience/element.h +++ b/libscience/element.h @@ -21,6 +21,8 @@ #ifndef ELEMENT_H #define ELEMENT_H +#include + #include #include @@ -36,7 +38,7 @@ class Isotope; * @short This class is the represention of a chemical element * @author Carsten Niehaus */ -class Element +class EDUSCIENCE_EXPORT Element { public: Element(); diff --git a/libscience/elementparser.h b/libscience/elementparser.h index ccd65e2..a8b989e 100644 --- a/libscience/elementparser.h +++ b/libscience/elementparser.h @@ -15,6 +15,8 @@ #include +#include + #include class Element; @@ -22,7 +24,7 @@ class Element; /** * @author Carsten Niehaus */ -class ElementSaxParser : public QXmlDefaultHandler +class EDUSCIENCE_EXPORT ElementSaxParser : public QXmlDefaultHandler { public: /** diff --git a/libscience/isotope.h b/libscience/isotope.h index d3211be..228e40d 100644 --- a/libscience/isotope.h +++ b/libscience/isotope.h @@ -22,6 +22,8 @@ class ChemicalDataObject; +#include + #include /** @@ -29,7 +31,7 @@ class ChemicalDataObject; * * This class represents an Isotope with all its properties */ -class Isotope +class EDUSCIENCE_EXPORT Isotope { public: /** diff --git a/libscience/isotopeparser.h b/libscience/isotopeparser.h index 301b75a..06ff065 100644 --- a/libscience/isotopeparser.h +++ b/libscience/isotopeparser.h @@ -15,6 +15,8 @@ #include +#include + #include class Isotope; @@ -22,7 +24,7 @@ class Isotope; /** * @author Carsten Niehaus */ -class IsotopeParser : public QXmlDefaultHandler +class EDUSCIENCE_EXPORT IsotopeParser : public QXmlDefaultHandler { public: /** diff --git a/libscience/kdeedu_science_export.h b/libscience/kdeedu_science_export.h new file mode 100644 index 0000000..b4e56df --- /dev/null +++ b/libscience/kdeedu_science_export.h @@ -0,0 +1,30 @@ +/* + This file is part of libkdeedu. + Copyright (c) 2006 Pino Toscano + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KDEEDU_SCIENCE_EXPORT_H +#define KDEEDU_SCIENCE_EXPORT_H + +/* needed for KDE_EXPORT macros */ +#include + +/* export statements for unix */ +#define EDUSCIENCE_EXPORT KDE_EXPORT + +#endif diff --git a/libscience/parser.h b/libscience/parser.h index 5fa840a..e654231 100644 --- a/libscience/parser.h +++ b/libscience/parser.h @@ -14,6 +14,8 @@ #ifndef PARSER_H #define PARSER_H +#include + #include /** @@ -24,7 +26,7 @@ * * @author Inge Wallin */ -class Parser { +class EDUSCIENCE_EXPORT Parser { public: /** * Constructor diff --git a/libscience/spectrum.h b/libscience/spectrum.h index 9edb92b..4148f7d 100644 --- a/libscience/spectrum.h +++ b/libscience/spectrum.h @@ -21,6 +21,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include + #include #include @@ -31,7 +33,7 @@ class Element; * * This class represents an spectrum with all its properties */ -class Spectrum +class EDUSCIENCE_EXPORT Spectrum { public: /** diff --git a/libscience/spectrumparser.h b/libscience/spectrumparser.h index ecee3f6..a355f98 100644 --- a/libscience/spectrumparser.h +++ b/libscience/spectrumparser.h @@ -13,6 +13,8 @@ * * ***************************************************************************/ +#include + #include #include @@ -25,7 +27,7 @@ class Spectrum; /** * @author Carsten Niehaus */ -class SpectrumParser : public QXmlDefaultHandler +class EDUSCIENCE_EXPORT SpectrumParser : public QXmlDefaultHandler { public: /** diff --git a/libscience/tempunit.h b/libscience/tempunit.h index 45153d3..a049155 100644 --- a/libscience/tempunit.h +++ b/libscience/tempunit.h @@ -20,6 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include + #include #include @@ -32,7 +34,7 @@ * * @author Pino Toscano */ -class TempUnit +class EDUSCIENCE_EXPORT TempUnit { public: -- 2.47.3