From: Pino Toscano <pino@kde.org>
Date: Mon, 27 Aug 2007 15:33:00 +0000 (+0000)
Subject: #include reduction and cleanup in keduvodocument
X-Git-Tag: v3.93.0~36
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=20c28d0fcfd9c6e01552b33e461e1b8692e01f5e;p=libqmvoc.git

#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 49e1a16..fe92dd0 100644
--- 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 81c695a..1873eed 100644
--- 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 3a3203f..a340955 100644
--- 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 98c5b0b..3307a3a 100644
--- 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 c2161fe..0bf23df 100644
--- 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 c983ff5..3ed7c33 100644
--- 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 02b4194..21dadcf 100644
--- 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 ddfe285..ac71629 100644
--- 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 568fe93..f23f827 100644
--- 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 4c8f154..45c3b51 100644
--- 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 12a9c1f..ef8c16f 100644
--- 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)
 {