#include reduction and cleanup in keduvodocument

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

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index 49e1a163b3c171c97f5d0b57abe4022248838b46..fe92dd06272fe9d4616b0c047aad688125115819 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -32,6 +32,7 @@
 
 #include "keduvocexpression.h"
 #include "keduvoclesson.h"
+#include "keduvocwordtype.h"
 #include "keduvockvtmlwriter.h"
 #include "keduvockvtml2writer.h"
 #include "keduvoccsvreader.h"

diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h
index 81c695a8d36aff23cabdaa7936d14d82f75a8fcc..1873eedb346db426e71a293ceb05589d790fcbe6 100644 (file)
--- a/keduvocdocument/keduvocdocument.h
+++ b/keduvocdocument/keduvocdocument.h
@@ -21,13 +21,13 @@
 
 #include "libkeduvocdocument_export.h"
 
+#include "keduvocgrammar.h"
+
 #include <QtCore/QObject>
 #include <QtCore/QList>
+#include <QtCore/QMap>
 
-#include <KUrl>
-
-#include "keduvocgrammar.h"
-#include "keduvocwordtype.h"
+#include <KDE/KUrl>
 
 class QStringList;
 class KEduVocExpression;

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 3a3203fffc4d605b2652ab763cd87d6f1bf98c1c..a340955e9ef8755ea2731160faf643b9e4579c37 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -27,8 +27,8 @@
 
 #include "keduvocdocument.h"
 #include "keduvoclesson.h"
+#include "keduvocwordtype.h"
 #include "kvtml2defs.h"
-// should no longer be needed: #include "kvtmldefs.h"
 #include "keduvockvtmlreader.h"
 #include "keduvoccommon_p.h"
 

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index 98c5b0b7df9b093e71cb6be8c7cb5ad25e3cd009..3307a3a64c5490b5cb8cf13a8cdbb59a5c8230d0 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -23,8 +23,9 @@
 
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"
+#include "keduvocgrade.h"
 #include "keduvoclesson.h"
-// should no longer be needed: #include "kvtmldefs.h"
+#include "keduvocwordtype.h"
 #include "kvtml2defs.h"
 
 KEduVocKvtml2Writer::KEduVocKvtml2Writer(QFile *file)

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index c2161febaa2ba847976432b47343d467c4a7191a..0bf23df59a9952b6cbe4470bca1d0296db823298 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -28,6 +28,7 @@
 
 #include "keduvocdocument.h"
 #include "keduvoclesson.h"
+#include "keduvocwordtype.h"
 #include "kvtmldefs.h"
 #include "keduvoccommon_p.h"
 

diff --git a/keduvocdocument/keduvockvtmlreader.h b/keduvocdocument/keduvockvtmlreader.h
index c983ff5b8d3c7212e5b54d0e99f05a24344e6452..3ed7c3359a1d0788f27f05ca8f6e423131fd4071 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.h
+++ b/keduvocdocument/keduvockvtmlreader.h
@@ -25,6 +25,7 @@
 
 
 #include "keduvocexpression.h"
+#include "keduvocgrade.h"
 #include "keduvocgrammar.h"
 #include "keduvocmultiplechoice.h"
 

diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp
index 02b4194c4b382f180ae7b125451cc84c75658ca1..21dadcf7d06e424797a83e55557b750ed6d93311 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -25,6 +25,7 @@
 #include <KDebug>
 
 #include "keduvocdocument.h"
+#include "keduvocgrade.h"
 #include "keduvoclesson.h"
 #include "keduvocexpression.h"
 #include "kvtmldefs.h"

diff --git a/keduvocdocument/keduvocmultiplechoice.h b/keduvocdocument/keduvocmultiplechoice.h
index ddfe285b27ad1a74a4c9d25a9ea70243039b7ceb..ac716297ddc0c29dac53045b0bb1c19a6f405cae 100644 (file)
--- a/keduvocdocument/keduvocmultiplechoice.h
+++ b/keduvocdocument/keduvocmultiplechoice.h
@@ -29,15 +29,11 @@
 
 #include "libkeduvocdocument_export.h"
 
-#include <QtCore/QString>
 #include <QtCore/QStringList>
 
-
 class KEDUVOCDOCUMENT_EXPORT KEduVocMultipleChoice
 {
-
 public:
-
    KEduVocMultipleChoice();
    KEduVocMultipleChoice(const KEduVocMultipleChoice &other);
    KEduVocMultipleChoice (const QStringList &choices);

diff --git a/keduvocdocument/keduvoctranslation.cpp b/keduvocdocument/keduvoctranslation.cpp
index 568fe9300395cb20e8279a020efaf53de2f0508b..f23f82722bface716f53581cd91d151f40b5bb45 100644 (file)
--- a/keduvocdocument/keduvoctranslation.cpp
+++ b/keduvocdocument/keduvoctranslation.cpp
@@ -15,8 +15,12 @@
 
 
 #include "keduvoctranslation.h"
+
+#include <QtCore/QMap>
+
 #include <KDebug>
 
+#include "keduvocgrade.h"
 
 class KEduVocTranslation::KEduVocTranslationPrivate
 {

diff --git a/keduvocdocument/keduvoctranslation.h b/keduvocdocument/keduvoctranslation.h
index 4c8f15471f2eb25819214a7e00e424010956b3cc..45c3b51a008fa0770400eeed69f7520d678922c9 100644 (file)
--- a/keduvocdocument/keduvoctranslation.h
+++ b/keduvocdocument/keduvoctranslation.h
@@ -19,19 +19,16 @@
 
 #include "libkeduvocdocument_export.h"
 
-#include <QtCore/QMap>
 #include <QtCore/QString>
 
-#include "keduvocgrade.h"
 #include "keduvocgrammar.h"
 #include "keduvocmultiplechoice.h"
-// @todo: move conjugation to it's proper file #include "keduvocconjugation.h"
 
+class KEduVocGrade;
 
 /**
        @author Frederik Gladhorn <frederik.gladhorn@kdemail.net>
 */
-
 class KEDUVOCDOCUMENT_EXPORT KEduVocTranslation
 {
 public:

diff --git a/keduvocdocument/keduvocvokabelnreader.cpp b/keduvocdocument/keduvocvokabelnreader.cpp
index 12a9c1f3f987d4dcb1864d3d8082e2daf1becf49..ef8c16f461bfdfb81e58578171e7b9f8c3c623ca 100644 (file)
--- a/keduvocdocument/keduvocvokabelnreader.cpp
+++ b/keduvocdocument/keduvocvokabelnreader.cpp
@@ -30,6 +30,7 @@
 
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"
+#include "keduvocgrade.h"
 
 KEduVocVokabelnReader::KEduVocVokabelnReader(QIODevice *file)
 {