make the readers and the writers really private classes, by not installing their...

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

diff --git a/kdeeducore/CMakeLists.txt b/kdeeducore/CMakeLists.txt
index 2a0afbc96c3f2938a61e4af91bac2eb17690203e..22e5e4bab435c48aa53f9be4fd9321e9785939ac 100644 (file)
--- 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 c68bdb2406b7fbe3fbb4855f0a3538272d0f6c15..b6e85a0a4626ba78fbe4d205dc28bdf47aa246f0 100644 (file)
--- a/kdeeducore/keduvoccsvreader.cpp
+++ b/kdeeducore/keduvoccsvreader.cpp
@@ -23,6 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QIODevice>
 #include <QTextStream>
 
 #include <klocale.h>

diff --git a/kdeeducore/keduvoccsvreader.h b/kdeeducore/keduvoccsvreader.h
index 6386fa5a6da80ca99bb5c8d1ebb3db29905e7cb1..2c933e61f762c189256b1309e93857ef1618f551 100644 (file)
--- a/kdeeducore/keduvoccsvreader.h
+++ b/kdeeducore/keduvoccsvreader.h
@@ -17,13 +17,10 @@
 #ifndef KEDUVOCCSVREADER_H
 #define KEDUVOCCSVREADER_H
 
-#include <libkdeedu_core_export.h>
-
-#include <QIODevice>
-
+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 cd6f51f54b389585fec91ff3c3d49ae002cbe439..70230adb0afbc696263461054051d2006e6e5414 100644 (file)
--- a/kdeeducore/keduvoccsvwriter.cpp
+++ b/kdeeducore/keduvoccsvwriter.cpp
@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QFile>
 #include <QTextStream>
 
 #include <KLocale>

diff --git a/kdeeducore/keduvoccsvwriter.h b/kdeeducore/keduvoccsvwriter.h
index dcfb5664c7c1dab292dcb043c8436b7854617e6b..486a8b75522b910c81dc311ff4b312fb00896ea5 100644 (file)
--- a/kdeeducore/keduvoccsvwriter.h
+++ b/kdeeducore/keduvoccsvwriter.h
@@ -18,13 +18,10 @@
 #ifndef KEDUVOCCSVWRITER_H
 #define KEDUVOCCSVWRITER_H
 
-#include <libkdeedu_core_export.h>
-
-#include <QFile>
-
+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 89cbf6a9ec651bed965efca2f031bd9d8384ba72..db594fd4da9ab4a1481feb66e7d497599651a779 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.cpp
+++ b/kdeeducore/keduvockvtmlreader.cpp
@@ -19,6 +19,7 @@
 #include <QTextStream>
 #include <QList>
 #include <QStringList>
+#include <QIODevice>
 
 #include <kdebug.h>
 #include <klocale.h>

diff --git a/kdeeducore/keduvockvtmlreader.h b/kdeeducore/keduvockvtmlreader.h
index fa1bd64055ea16292247d1851c62dd6c65935843..46e6b30044af522116fde5866f7c03360c09e90e 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.h
+++ b/kdeeducore/keduvockvtmlreader.h
@@ -19,18 +19,15 @@
 #ifndef KEDUVOCKVTMLREADER_H
 #define KEDUVOCKVTMLREADER_H
 
-#include <libkdeedu_core_export.h>
-
-#include <QIODevice>
 #include <QtXml/QDomDocument>
 #include <QList>
 #include <QString>
 
-#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 1f5af4a605879f8968de0ecfc048ac43d7b454b7..7c717b51b863090ae38c9ad5e233915cc5f1d90e 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -17,8 +17,8 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <QtXml/QDomDocument>
 #include <QTextStream>
+#include <QFile>
 
 #include "keduvockvtmlwriter.h"
 #include "keduvocdocument.h"

diff --git a/kdeeducore/keduvockvtmlwriter.h b/kdeeducore/keduvockvtmlwriter.h
index ef6f8a52070698cd95096da5989250afce7d7c61..32e11a6095e58a2c6932949373547d627f29ffc0 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.h
+++ b/kdeeducore/keduvockvtmlwriter.h
@@ -19,9 +19,6 @@
 #ifndef KEDUVOCKVTMLWRITER_H
 #define KEDUVOCKVTMLWRITER_H
 
-#include <libkdeedu_core_export.h>
-
-#include <QFile>
 #include <QtXml/QDomDocument>
 #include <QList>
 
@@ -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 19c150c06a0bea6d84e8112276bb8d5aef8631a8..3f13f645159907d59f6dd10a212a864c16e681f0 100644 (file)
--- a/kdeeducore/keduvocpaukerreader.cpp
+++ b/kdeeducore/keduvocpaukerreader.cpp
@@ -14,6 +14,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QIODevice>
+
 #include <klocale.h>
 
 #include "keduvocpaukerreader.h"

diff --git a/kdeeducore/keduvocpaukerreader.h b/kdeeducore/keduvocpaukerreader.h
index 870477336f7f4270a9051846c3ab538601273999..6f1e5b8c79121aa8ee41f8ff65c01927988afa46 100644 (file)
--- a/kdeeducore/keduvocpaukerreader.h
+++ b/kdeeducore/keduvocpaukerreader.h
@@ -17,14 +17,12 @@
 #ifndef KEDUVOCPAUKERREADER_H
 #define KEDUVOCPAUKERREADER_H
 
-#include <libkdeedu_core_export.h>
-
 #include <QtXml>
-#include <QIODevice>
 
+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 50cae9247fddfe97e7cb0ecfb0b7f7c9b03cc427..2078bb49ea80b1c79985273559bf0a4eb3970e97 100644 (file)
--- a/kdeeducore/keduvocvokabelnreader.cpp
+++ b/kdeeducore/keduvocvokabelnreader.cpp
@@ -21,8 +21,9 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QIODevice>
+
 #include <klocale.h>
-#include <kmessagebox.h>
 #include <kdebug.h>
 
 #include "keduvocdocument.h"

diff --git a/kdeeducore/keduvocvokabelnreader.h b/kdeeducore/keduvocvokabelnreader.h
index 27443118b21e23c127f86ceaafa36b7b98870320..cdb687343b5378fd5bacef56aae72630e95ade09 100644 (file)
--- a/kdeeducore/keduvocvokabelnreader.h
+++ b/kdeeducore/keduvocvokabelnreader.h
@@ -18,13 +18,10 @@
 #ifndef KEDUVOCVOKABELNREADER_H
 #define KEDUVOCVOKABELNREADER_H
 
-#include <libkdeedu_core_export.h>
-
-#include <QIODevice>
-
+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 3d0c4a0fb6e4c554c7f430f634bf0a4d1ea08e08..44341d62cb3fc53bfe486db4282b5dac28e0bb07 100644 (file)
--- a/kdeeducore/keduvocwqlreader.cpp
+++ b/kdeeducore/keduvocwqlreader.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include <QTextStream>
+#include <QIODevice>
 
 #include <klocale.h>
 

diff --git a/kdeeducore/keduvocwqlreader.h b/kdeeducore/keduvocwqlreader.h
index 40ebfc7c11ad0e50f2ca4e58187c9d37350460c7..a5c19c3c58ef0761e529a30439b2fb1961b52f39 100644 (file)
--- a/kdeeducore/keduvocwqlreader.h
+++ b/kdeeducore/keduvocwqlreader.h
@@ -18,13 +18,10 @@
 #ifndef KEDUVOCWQLREADER_H
 #define KEDUVOCWQLREADER_H
 
-#include <libkdeedu_core_export.h>
-
-#include <QIODevice>
-
+class QIODevice;
 class KEduVocDocument;
 
-class KDEEDUCORE_EXPORT KEduVocWqlReader : public QObject
+class KEduVocWqlReader : public QObject
 {
 public:
   KEduVocWqlReader(QIODevice *file);