From 4bfb5956f39f7171df01735c65b09adc620f877e Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 27 Aug 2007 15:07:06 +0000 Subject: [PATCH] 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 --- keduvocdocument/keduvoccommon_p.h | 26 +++++++++++++++++++++++++ keduvocdocument/keduvocdocument.cpp | 6 ++++++ keduvocdocument/keduvocdocument.h | 9 --------- keduvocdocument/keduvocgrade.h | 1 - keduvocdocument/keduvocgrammar.cpp | 2 ++ keduvocdocument/keduvocgrammar.h | 10 ---------- keduvocdocument/keduvockvtml2reader.cpp | 1 + keduvocdocument/keduvockvtmlreader.cpp | 1 + keduvocdocument/keduvockvtmlwriter.cpp | 1 + keduvocdocument/keduvocmultiplechoice.h | 3 --- 10 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 keduvocdocument/keduvoccommon_p.h diff --git a/keduvocdocument/keduvoccommon_p.h b/keduvocdocument/keduvoccommon_p.h new file mode 100644 index 0000000..d705a5d --- /dev/null +++ b/keduvocdocument/keduvoccommon_p.h @@ -0,0 +1,26 @@ +/*************************************************************************** + * Copyright 2007 Jeremy Whiting * + * Copyright 2007 Frederik Gladhorn * + * * + * 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 86824a5..49e1a16 100644 --- 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 2c4d759..81c695a 100644 --- 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 #include diff --git a/keduvocdocument/keduvocgrade.h b/keduvocdocument/keduvocgrade.h index f0b04bd..89a5ac7 100644 --- 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 912e3f4..d6077c2 100644 --- a/keduvocdocument/keduvocgrammar.cpp +++ b/keduvocdocument/keduvocgrammar.cpp @@ -25,6 +25,8 @@ #include "keduvocgrammar.h" +#include "keduvoccommon_p.h" + #include class KEduVocConjugation::Private diff --git a/keduvocdocument/keduvocgrammar.h b/keduvocdocument/keduvocgrammar.h index 0c0b99c..bd9c440 100644 --- a/keduvocdocument/keduvocgrammar.h +++ b/keduvocdocument/keduvocgrammar.h @@ -30,16 +30,6 @@ #include -#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 0d9ec62..3a3203f 100644 --- 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 35a7a16..c2161fe 100644 --- 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 f284ae5..02b4194 100644 --- 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 e2b1b9e..ddfe285 100644 --- a/keduvocdocument/keduvocmultiplechoice.h +++ b/keduvocdocument/keduvocmultiplechoice.h @@ -32,9 +32,6 @@ #include #include -#define MAX_MULTIPLE_CHOICE 5 // select one out of x - - class KEDUVOCDOCUMENT_EXPORT KEduVocMultipleChoice { -- 2.47.3