From: Pino Toscano Date: Sat, 3 Mar 2007 01:10:09 +0000 (+0000) Subject: make the readers and the writers really private classes, by not installing their... X-Git-Tag: v3.90.1~52 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=03f81236b227e7adda63400c29f0d911f66ef24e;p=libqmvoc.git make the readers and the writers really private classes, by not installing their headers and not exporting them outside the library svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=638713 --- diff --git a/kdeeducore/CMakeLists.txt b/kdeeducore/CMakeLists.txt index 2a0afbc..22e5e4b 100644 --- a/kdeeducore/CMakeLists.txt +++ b/kdeeducore/CMakeLists.txt @@ -36,17 +36,10 @@ install(TARGETS kdeeducore DESTINATION ${LIB_INSTALL_DIR} ) install(FILES libkdeedu_core_export.h - keduvoccsvreader.h - keduvoccsvwriter.h keduvocdocument.h keduvocexpression.h keduvocgrammar.h - keduvockvtmlreader.h - keduvockvtmlwriter.h keduvocmultiplechoice.h - keduvocpaukerreader.h - keduvocvokabelnreader.h - keduvocwqlreader.h leitnerbox.h leitnersystem.h leitnersystemview.h diff --git a/kdeeducore/keduvoccsvreader.cpp b/kdeeducore/keduvoccsvreader.cpp index c68bdb2..b6e85a0 100644 --- a/kdeeducore/keduvoccsvreader.cpp +++ b/kdeeducore/keduvoccsvreader.cpp @@ -23,6 +23,7 @@ * * ***************************************************************************/ +#include #include #include diff --git a/kdeeducore/keduvoccsvreader.h b/kdeeducore/keduvoccsvreader.h index 6386fa5..2c933e6 100644 --- a/kdeeducore/keduvoccsvreader.h +++ b/kdeeducore/keduvoccsvreader.h @@ -17,13 +17,10 @@ #ifndef KEDUVOCCSVREADER_H #define KEDUVOCCSVREADER_H -#include - -#include - +class QIODevice; class KEduVocDocument; -class KDEEDUCORE_EXPORT KEduVocCsvReader : public QObject +class KEduVocCsvReader : public QObject { public: KEduVocCsvReader(QIODevice *file); diff --git a/kdeeducore/keduvoccsvwriter.cpp b/kdeeducore/keduvoccsvwriter.cpp index cd6f51f..70230ad 100644 --- a/kdeeducore/keduvoccsvwriter.cpp +++ b/kdeeducore/keduvoccsvwriter.cpp @@ -15,6 +15,7 @@ * * ***************************************************************************/ +#include #include #include diff --git a/kdeeducore/keduvoccsvwriter.h b/kdeeducore/keduvoccsvwriter.h index dcfb566..486a8b7 100644 --- a/kdeeducore/keduvoccsvwriter.h +++ b/kdeeducore/keduvoccsvwriter.h @@ -18,13 +18,10 @@ #ifndef KEDUVOCCSVWRITER_H #define KEDUVOCCSVWRITER_H -#include - -#include - +class QFile; class KEduVocDocument; -class KDEEDUCORE_EXPORT KEduVocCsvWriter +class KEduVocCsvWriter { public: KEduVocCsvWriter(QFile *file); diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp index 89cbf6a..db594fd 100644 --- a/kdeeducore/keduvockvtmlreader.cpp +++ b/kdeeducore/keduvockvtmlreader.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include diff --git a/kdeeducore/keduvockvtmlreader.h b/kdeeducore/keduvockvtmlreader.h index fa1bd64..46e6b30 100644 --- a/kdeeducore/keduvockvtmlreader.h +++ b/kdeeducore/keduvockvtmlreader.h @@ -19,18 +19,15 @@ #ifndef KEDUVOCKVTMLREADER_H #define KEDUVOCKVTMLREADER_H -#include - -#include #include #include #include -#include "keduvocdocument.h" #include "keduvocexpression.h" #include "keduvocgrammar.h" #include "keduvocmultiplechoice.h" +class QIODevice; class KEduVocDocument; // internal types, indented are subtypes @@ -73,7 +70,7 @@ class KEduVocDocument; /** @author Eric Pignet */ -class KDEEDUCORE_EXPORT KEduVocKvtmlReader : public QObject +class KEduVocKvtmlReader : public QObject { Q_OBJECT public: diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp index 1f5af4a..7c717b5 100644 --- a/kdeeducore/keduvockvtmlwriter.cpp +++ b/kdeeducore/keduvockvtmlwriter.cpp @@ -17,8 +17,8 @@ ***************************************************************************/ #include -#include #include +#include #include "keduvockvtmlwriter.h" #include "keduvocdocument.h" diff --git a/kdeeducore/keduvockvtmlwriter.h b/kdeeducore/keduvockvtmlwriter.h index ef6f8a5..32e11a6 100644 --- a/kdeeducore/keduvockvtmlwriter.h +++ b/kdeeducore/keduvockvtmlwriter.h @@ -19,9 +19,6 @@ #ifndef KEDUVOCKVTMLWRITER_H #define KEDUVOCKVTMLWRITER_H -#include - -#include #include #include @@ -66,7 +63,7 @@ class KEduVocDocument; /** @author Eric Pignet */ -class KDEEDUCORE_EXPORT KEduVocKvtmlWriter +class KEduVocKvtmlWriter { public: KEduVocKvtmlWriter(QFile *file); diff --git a/kdeeducore/keduvocpaukerreader.cpp b/kdeeducore/keduvocpaukerreader.cpp index 19c150c..3f13f64 100644 --- a/kdeeducore/keduvocpaukerreader.cpp +++ b/kdeeducore/keduvocpaukerreader.cpp @@ -14,6 +14,8 @@ * * ***************************************************************************/ +#include + #include #include "keduvocpaukerreader.h" diff --git a/kdeeducore/keduvocpaukerreader.h b/kdeeducore/keduvocpaukerreader.h index 8704773..6f1e5b8 100644 --- a/kdeeducore/keduvocpaukerreader.h +++ b/kdeeducore/keduvocpaukerreader.h @@ -17,14 +17,12 @@ #ifndef KEDUVOCPAUKERREADER_H #define KEDUVOCPAUKERREADER_H -#include - #include -#include +class QIODevice; class KEduVocDocument; -class KDEEDUCORE_EXPORT KEduVocPaukerReader : public QObject +class KEduVocPaukerReader : public QObject { public: KEduVocPaukerReader(QIODevice *file); diff --git a/kdeeducore/keduvocvokabelnreader.cpp b/kdeeducore/keduvocvokabelnreader.cpp index 50cae92..2078bb4 100644 --- a/kdeeducore/keduvocvokabelnreader.cpp +++ b/kdeeducore/keduvocvokabelnreader.cpp @@ -21,8 +21,9 @@ * * ***************************************************************************/ +#include + #include -#include #include #include "keduvocdocument.h" diff --git a/kdeeducore/keduvocvokabelnreader.h b/kdeeducore/keduvocvokabelnreader.h index 2744311..cdb6873 100644 --- a/kdeeducore/keduvocvokabelnreader.h +++ b/kdeeducore/keduvocvokabelnreader.h @@ -18,13 +18,10 @@ #ifndef KEDUVOCVOKABELNREADER_H #define KEDUVOCVOKABELNREADER_H -#include - -#include - +class QIODevice; class KEduVocDocument; -class KDEEDUCORE_EXPORT KEduVocVokabelnReader : public QObject +class KEduVocVokabelnReader : public QObject { public: KEduVocVokabelnReader(QIODevice *file); diff --git a/kdeeducore/keduvocwqlreader.cpp b/kdeeducore/keduvocwqlreader.cpp index 3d0c4a0..44341d6 100644 --- a/kdeeducore/keduvocwqlreader.cpp +++ b/kdeeducore/keduvocwqlreader.cpp @@ -16,6 +16,7 @@ ***************************************************************************/ #include +#include #include diff --git a/kdeeducore/keduvocwqlreader.h b/kdeeducore/keduvocwqlreader.h index 40ebfc7..a5c19c3 100644 --- a/kdeeducore/keduvocwqlreader.h +++ b/kdeeducore/keduvocwqlreader.h @@ -18,13 +18,10 @@ #ifndef KEDUVOCWQLREADER_H #define KEDUVOCWQLREADER_H -#include - -#include - +class QIODevice; class KEduVocDocument; -class KDEEDUCORE_EXPORT KEduVocWqlReader : public QObject +class KEduVocWqlReader : public QObject { public: KEduVocWqlReader(QIODevice *file);