start to get rid of #define's in public headers:

- move the kvocdocument-specific ones into a private header
- move a pair of kvoctrain-specific ones to kvoctrain

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

diff --git a/keduvocdocument/keduvoccommon_p.h b/keduvocdocument/keduvoccommon_p.h
new file mode 100644 (file)
index 0000000..d705a5d
--- /dev/null
+++ b/keduvocdocument/keduvoccommon_p.h
@@ -0,0 +1,26 @@
+/***************************************************************************
+ * Copyright 2007      Jeremy Whiting <jeremy@scitools.com>                *
+ * Copyright 2007      Frederik Gladhorn <frederik.gladhorn@kdemail.net>   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ ***************************************************************************/
+
+#ifndef KEDUVOCCOMMON_P_H
+#define KEDUVOCCOMMON_P_H
+
+#define KVD_VERS_PREFIX " v"       // kvoctrain v0.1.0
+
+#define CONJ_SIMPLE_PRESENT    "PrSi" // I live at home  what you frequently do
+#define CONJ_PRESENT_PROGR     "PrPr" // I am working    what you currently are doing
+#define CONJ_PRESENT_PERFECT   "PrPe" // I have cleaned  tell, #that# something has happened
+
+#define CONJ_SIMPLE_PAST       "PaSi" // the train left 2 min ago  when did it happen
+#define CONJ_PAST_PROGR        "PaPr" // it was raining  what happen at a given time in the past
+#define CONJ_PAST_PARTICIPLE   "PaPa" // I cleaned       tell, #that# it happened
+
+#define CONJ_FUTURE            "FuSi"
+
+#endif

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index 86824a5bfb091100b9be054bd22ce1fc26081f76..49e1a163b3c171c97f5d0b57abe4022248838b46 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -43,6 +43,12 @@
 #include "keduvocxdxfreader.h"
 #include "leitnersystem.h"
 
+#define WQL_IDENT      "WordQuiz"
+
+#define KVTML_EXT        "kvtml"
+#define CSV_EXT          "csv"
+#define TXT_EXT          "txt"
+#define WQL_EXT          "wql"
 
 class KEduVocDocument::KEduVocDocumentPrivate
 {

diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h
index 2c4d7596c93a86493053dee6140d6efbf22c94e0..81c695a8d36aff23cabdaa7936d14d82f75a8fcc 100644 (file)
--- a/keduvocdocument/keduvocdocument.h
+++ b/keduvocdocument/keduvocdocument.h
@@ -21,15 +21,6 @@
 
 #include "libkeduvocdocument_export.h"
 
-#define KVD_VERS_PREFIX " v"       // kvoctrain v0.1.0
-
-#define WQL_IDENT      "WordQuiz"
-
-#define KVTML_EXT        "kvtml"
-#define CSV_EXT          "csv"
-#define TXT_EXT          "txt"
-#define WQL_EXT          "wql"
-
 #include <QtCore/QObject>
 #include <QtCore/QList>
 

diff --git a/keduvocdocument/keduvocgrade.h b/keduvocdocument/keduvocgrade.h
index f0b04bd67f77478be8378381427053bf84a27e54..89a5ac744394c6b0973ceec62ec10075c2310d61 100644 (file)
--- a/keduvocdocument/keduvocgrade.h
+++ b/keduvocdocument/keduvocgrade.h
@@ -20,7 +20,6 @@
 #define KV_MIN_GRADE       0
 
 #define KV_NORM_GRADE      0       // not queried yet
-#define KV_NORM_COLOR      Qt::black
 #define KV_NORM_TEXT       I18N_NOOP("Not Queried Yet")
 
 #define KV_LEV1_GRADE      1

diff --git a/keduvocdocument/keduvocgrammar.cpp b/keduvocdocument/keduvocgrammar.cpp
index 912e3f41d375c9d084d7de244a21060ab7b05649..d6077c22520e5e6940ce4d8293df80724faf38a4 100644 (file)
--- a/keduvocdocument/keduvocgrammar.cpp
+++ b/keduvocdocument/keduvocgrammar.cpp
@@ -25,6 +25,8 @@
 
 #include "keduvocgrammar.h"
 
+#include "keduvoccommon_p.h"
+
 #include <klocale.h>
 
 class KEduVocConjugation::Private

diff --git a/keduvocdocument/keduvocgrammar.h b/keduvocdocument/keduvocgrammar.h
index 0c0b99cb6992bb85b3237e41f58e8b81f01f43df..bd9c44053613f2a6b7f5c6c5ec7742879468e176 100644 (file)
--- a/keduvocdocument/keduvocgrammar.h
+++ b/keduvocdocument/keduvocgrammar.h
@@ -30,16 +30,6 @@
 
 #include <QtCore/QStringList>
 
-#define CONJ_SIMPLE_PRESENT    "PrSi" // I live at home  what you frequently do
-#define CONJ_PRESENT_PROGR     "PrPr" // I am working    what you currently are doing
-#define CONJ_PRESENT_PERFECT   "PrPe" // I have cleaned  tell, #that# something has happened
-
-#define CONJ_SIMPLE_PAST       "PaSi" // the train left 2 min ago  when did it happen
-#define CONJ_PAST_PROGR        "PaPr" // it was raining  what happen at a given time in the past
-#define CONJ_PAST_PARTICIPLE   "PaPa" // I cleaned       tell, #that# it happened
-
-#define CONJ_FUTURE            "FuSi"
-
 #define CONJ_PREFIX            "--"   // definition of prefixes (I, you, ..)
 
 #define UL_USER_TENSE          "#"   // designates number of user tense

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 0d9ec62ebb5cfb812b968536fc1236863e3a3f47..3a3203fffc4d605b2652ab763cd87d6f1bf98c1c 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -30,6 +30,7 @@
 #include "kvtml2defs.h"
 // should no longer be needed: #include "kvtmldefs.h"
 #include "keduvockvtmlreader.h"
+#include "keduvoccommon_p.h"
 
 KEduVocKvtml2Reader::KEduVocKvtml2Reader(QIODevice *file)
 : m_inputFile(file)

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index 35a7a168aaea1ab23f1f6debc8c5ed5d503d7801..c2161febaa2ba847976432b47343d467c4a7191a 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -29,6 +29,7 @@
 #include "keduvocdocument.h"
 #include "keduvoclesson.h"
 #include "kvtmldefs.h"
+#include "keduvoccommon_p.h"
 
 KEduVocKvtmlReader::KEduVocKvtmlReader(QIODevice *file)
 {

diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp
index f284ae541b1776c8b77a1bdcb706c5b12c2ee072..02b4194c4b382f180ae7b125451cc84c75658ca1 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -28,6 +28,7 @@
 #include "keduvoclesson.h"
 #include "keduvocexpression.h"
 #include "kvtmldefs.h"
+#include "keduvoccommon_p.h"
 
 KEduVocKvtmlWriter::KEduVocKvtmlWriter(QFile *file)
 {

diff --git a/keduvocdocument/keduvocmultiplechoice.h b/keduvocdocument/keduvocmultiplechoice.h
index e2b1b9efc83fa637ccac42162043e6e0e27a21eb..ddfe285b27ad1a74a4c9d25a9ea70243039b7ceb 100644 (file)
--- a/keduvocdocument/keduvocmultiplechoice.h
+++ b/keduvocdocument/keduvocmultiplechoice.h
@@ -32,9 +32,6 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-#define MAX_MULTIPLE_CHOICE  5  // select one out of x
-
-
 
 class KEDUVOCDOCUMENT_EXPORT KEduVocMultipleChoice
 {