Continued refactoring for the future kvtml library

svn path=/branches/work/kwordquiz/src/grammarmanager.cpp; revision=467714

diff --git a/kwordquiz/keduvocdocument.cpp b/kwordquiz/keduvocdocument.cpp
index 9f2e36ca99f9c8f7ce08cf3b53fe6a0b9a8f1206..7637be3ef7a6d49ceb5276e9e97db12139f024a5 100644 (file)
--- a/kwordquiz/keduvocdocument.cpp
+++ b/kwordquiz/keduvocdocument.cpp
@@ -386,23 +386,23 @@ void KEduVocDocument::setUsageName(int idx, QString &id)
 }
 
 
-void KEduVocDocument::setConjugation(int idx, const Conjugation &con)
+void KEduVocDocument::setConjugation(int idx, const KEduVocConjugation &con)
 {
   if ( idx < 0) return;
 
   // extend conjugation with empty elements
   if ((int)m_conjugations.size() <= idx )
     for (int i = m_conjugations.size(); i < idx+1; i++)
-      m_conjugations.push_back (Conjugation());
+      m_conjugations.push_back (KEduVocConjugation());
 
   m_conjugations[idx] = con;
 }
 
 
-Conjugation KEduVocDocument::conjugation (int idx) const
+KEduVocConjugation KEduVocDocument::conjugation (int idx) const
 {
   if (idx >= (int)m_conjugations.size() || idx < 0) {
-    return Conjugation();
+    return KEduVocConjugation();
   }
   else {
     return m_conjugations[idx];
@@ -410,23 +410,23 @@ Conjugation KEduVocDocument::conjugation (int idx) const
 }
 
 
-void KEduVocDocument::setArticle(int idx, const Article &art)
+void KEduVocDocument::setArticle(int idx, const KEduVocArticle &art)
 {
   if ( idx < 0) return;
 
   // extend conjugation with empty elements
   if ((int)m_articles.size() <= idx )
     for (int i = m_articles.size(); i < idx+1; i++)
-      m_articles.push_back (Article());
+      m_articles.push_back (KEduVocArticle());
 
   m_articles[idx] = art;
 }
 
 
-Article KEduVocDocument::article (int idx) const
+KEduVocArticle KEduVocDocument::article (int idx) const
 {
   if (idx >= (int)m_articles.size() || idx < 0) {
-    return Article();
+    return KEduVocArticle();
   }
   else {
     return m_articles[idx];

diff --git a/kwordquiz/keduvocdocument.h b/kwordquiz/keduvocdocument.h
index d3a22a1c779222d2043ea8ae6afa334bd3445403..537404be7de1ec02e65a003fce3102b424c9b054 100644 (file)
--- a/kwordquiz/keduvocdocument.h
+++ b/kwordquiz/keduvocdocument.h
@@ -240,7 +240,7 @@
 
 class QTextStream;
 class QStringList;
-class MultipleChoice;
+class KEduVocMultipleChoice;
 class LeitnerSystem;
 
 /**
@@ -561,27 +561,27 @@ class KEduVocDocument : public QObject
    *
    * @param index            index of translation
    */
-  Conjugation conjugation(int index) const;
+  KEduVocConjugation conjugation(int index) const;
 
   /** sets conjugations
    *
    * @param index            index of translation
    * @param con              conjugation block
    */
-  void setConjugation(int index, const Conjugation &con);
+  void setConjugation(int index, const KEduVocConjugation &con);
 
   /** returns pointer to articles if available
    *
    * @param index            index of translation
    */
-  Article article(int index) const;
+  KEduVocArticle article(int index) const;
 
   /** sets articles
    *
    * @param index            index of translation
    * @param art              article block
    */
-  void setArticle(int index, const Article &art);
+  void setArticle(int index, const KEduVocArticle &art);
 
   /** returns recommended size
    *
@@ -682,8 +682,8 @@ protected:
   QString               m_remark;
   QString               m_version;
 
-  QValueList<Article>   m_articles;
-  QValueList<Conjugation> m_conjugations;
+  QValueList<KEduVocArticle>   m_articles;
+  QValueList<KEduVocConjugation> m_conjugations;
 
   LeitnerSystem*              m_leitnerSystem;
   bool                              m_activeLeitnerSystem;

diff --git a/kwordquiz/keduvocexpression.cpp b/kwordquiz/keduvocexpression.cpp
index 0eb8c469dbe30d3d236e94a225dcc9c376f0687c..7f2a42dc6b48935c960dc00f1f07dbfe6005d964 100644 (file)
--- a/kwordquiz/keduvocexpression.cpp
+++ b/kwordquiz/keduvocexpression.cpp
@@ -278,23 +278,23 @@ QString KEduVocExpression::antonym (int idx) const
 }
 
 
-void KEduVocExpression::setConjugation (int idx, const Conjugation &con)
+void KEduVocExpression::setConjugation (int idx, const KEduVocConjugation &con)
 {
   if ( idx < 0) return;
 
   // extend conjugation with empty elements
   if ((int)m_conjugations.size() <= idx )
     for (int i = m_conjugations.size(); i < idx+1; i++)
-      m_conjugations.push_back (Conjugation());
+      m_conjugations.push_back (KEduVocConjugation());
 
   m_conjugations[idx] = con;
 }
 
 
-Conjugation KEduVocExpression::conjugation (int idx) const
+KEduVocConjugation KEduVocExpression::conjugation (int idx) const
 {
   if (idx >= (int)m_conjugations.size() || idx < 0) {
-    return Conjugation();
+    return KEduVocConjugation();
   }
   else {
     return m_conjugations[idx];
@@ -302,23 +302,23 @@ Conjugation KEduVocExpression::conjugation (int idx) const
 }
 
 
-void KEduVocExpression::setComparison (int idx, const Comparison &con)
+void KEduVocExpression::setComparison (int idx, const KEduVocComparison &con)
 {
   if ( idx < 0) return;
 
   // extend comparison with empty elements
   if ((int)m_comparisons.size() <= idx )
     for (int i = m_comparisons.size(); i < idx+1; i++)
-      m_comparisons.push_back (Comparison());
+      m_comparisons.push_back (KEduVocComparison());
 
   m_comparisons[idx] = con;
 }
 
 
-Comparison KEduVocExpression::comparison (int idx) const
+KEduVocComparison KEduVocExpression::comparison (int idx) const
 {
   if (idx >= (int)m_comparisons.size() || idx < 0) {
-    return Comparison();
+    return KEduVocComparison();
   }
   else {
     return m_comparisons[idx];
@@ -326,23 +326,23 @@ Comparison KEduVocExpression::comparison (int idx) const
 }
 
 
-void KEduVocExpression::setMultipleChoice (int idx, const MultipleChoice &mc)
+void KEduVocExpression::setMultipleChoice (int idx, const KEduVocMultipleChoice &mc)
 {
   if ( idx < 0) return;
 
   // extend comparison with empty elements
   if ((int)m_multipleChoices.size() <= idx )
     for (int i = m_multipleChoices.size(); i < idx+1; i++)
-      m_multipleChoices.push_back (MultipleChoice());
+      m_multipleChoices.push_back (KEduVocMultipleChoice());
 
   m_multipleChoices[idx] = mc;
 }
 
 
-MultipleChoice KEduVocExpression::multipleChoice (int idx) const
+KEduVocMultipleChoice KEduVocExpression::multipleChoice (int idx) const
 {
   if (idx >= (int)m_multipleChoices.size() || idx < 0) {
-    return MultipleChoice();
+    return KEduVocMultipleChoice();
   }
   else {
     return m_multipleChoices[idx];

diff --git a/kwordquiz/keduvocexpression.h b/kwordquiz/keduvocexpression.h
index 0e63703c73cd841f3d9a42c93a2ffeca90fc76bc..0782dd35f0eb90f9824e72e771562edb0f9aca44 100644 (file)
--- a/kwordquiz/keduvocexpression.h
+++ b/kwordquiz/keduvocexpression.h
@@ -51,8 +51,8 @@
 #include <qstringlist.h>
 #include <qdatetime.h>
 
-#include "grammarmanager.h"
-#include "multiplechoice.h"
+#include "keduvocgrammar.h"
+#include "keduvocmultiplechoice.h"
 
 typedef signed char grade_t;
 typedef unsigned short count_t;
@@ -338,40 +338,40 @@ class KEduVocExpression
    *
    * @param index            index of translation
    */
-  Conjugation conjugation(int index) const;
+  KEduVocConjugation conjugation(int index) const;
 
   /** sets conjugations
    *
    * @param index            index of translation
    * @param con              conjugation block
    */
-  void setConjugation(int index, const Conjugation & conjugation);
+  void setConjugation(int index, const KEduVocConjugation & conjugation);
 
   /** returns comparison if available
    *
    * @param index            index of translation
    */
-  Comparison comparison(int index) const;
+  KEduVocComparison comparison(int index) const;
 
   /** sets comparison
    *
    * @param index            index of translation
    * @param con              comparison block
    */
-  void setComparison(int index, const Comparison & comparison);
+  void setComparison(int index, const KEduVocComparison & comparison);
 
   /** returns multiple choice if available
    *
    * @param index            index of multiple choice
    */
-  MultipleChoice multipleChoice(int index) const;
+  KEduVocMultipleChoice multipleChoice(int index) const;
 
   /** sets multiple choice
    *
    * @param index            index of translation
    * @param con              multiple choice block
    */
-  void setMultipleChoice(int index, const MultipleChoice & mc);
+  void setMultipleChoice(int index, const KEduVocMultipleChoice & mc);
 
   /** returns query count of given translation as int
    *
@@ -454,9 +454,9 @@ class KEduVocExpression
   QValueList<count_t> m_reverseBadCounts;
   QValueList<QDateTime> m_queryDates;
   QValueList<QDateTime> m_reverseQueryDates;
-  QValueList<Conjugation> m_conjugations;
-  QValueList<Comparison> m_comparisons;
-  QValueList<MultipleChoice> m_multipleChoices;
+  QValueList<KEduVocConjugation> m_conjugations;
+  QValueList<KEduVocComparison> m_comparisons;
+  QValueList<KEduVocMultipleChoice> m_multipleChoices;
 
   QString m_leitnerBox;
   int m_lesson;

diff --git a/kwordquiz/grammarmanager.cpp b/kwordquiz/keduvocgrammar.cpp
similarity index 75%
rename from kwordquiz/grammarmanager.cpp
rename to kwordquiz/keduvocgrammar.cpp
index 2c78989024394b726bcaf7daa6a4be61c5ee9c16..fac26df3a6ec89370ff83e3db44f35c3ed9d1a59 100644 (file)
--- a/kwordquiz/grammarmanager.cpp
+++ b/kwordquiz/keduvocgrammar.cpp
@@ -4,11 +4,11 @@
 
     -----------------------------------------------------------------------
 
-    begin          : Sat Nov 27 09:50:53 MET 1999
+    begin         : Sat Nov 27 09:50:53 MET 1999
 
-    copyright      : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
-                     (C) 2001 The KDE-EDU team
-                     (C) 2004-2005 Peter Hedlund <peter.hedlund@kdemail.net>
+    copyright     : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
+                    (C) 2001 The KDE-EDU team
+                    (C) 2004-2005 Peter Hedlund <peter.hedlund@kdemail.net>
 
     -----------------------------------------------------------------------
 
@@ -23,12 +23,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "grammarmanager.h"
+#include "keduvocgrammar.h"
 
 #include <klocale.h>
 
-Conjugation::conjug_name_t
-Conjugation::names [] =
+KEduVocConjugation::conjug_name_t
+KEduVocConjugation::names [] =
 {
   { CONJ_SIMPLE_PRESENT,    I18N_NOOP("Simple Present") },
   { CONJ_PRESENT_PROGR,     I18N_NOOP("Preset Progressive") },
@@ -42,12 +42,12 @@ Conjugation::names [] =
 };
 
 
-vector<QString> Conjugation::userTenses;
+vector<QString> KEduVocConjugation::userTenses;
 
 
 //================================================================
 
-Comparison::Comparison (
+KEduVocComparison::KEduVocComparison (
            const QString &l1,
            const QString &l2,
            const QString &l3
@@ -59,7 +59,7 @@ Comparison::Comparison (
 }
 
 
-bool Comparison::isEmpty() const
+bool KEduVocComparison::isEmpty() const
 {
   return   ls1.stripWhiteSpace().isEmpty()
         && ls2.stripWhiteSpace().isEmpty()
@@ -67,7 +67,7 @@ bool Comparison::isEmpty() const
 }
 
 
-void Comparison::clear()
+void KEduVocComparison::clear()
 {
    ls1 = "";
    ls2 = "";
@@ -78,7 +78,7 @@ void Comparison::clear()
 //=================================================================
 
 
-Article::Article
+KEduVocArticle::KEduVocArticle
           (const QString &fem_def, const QString &fem_indef,
            const QString &mal_def, const QString &mal_indef,
            const QString &nat_def, const QString &nat_indef
@@ -90,7 +90,7 @@ Article::Article
 }
 
 
-void Article::setFemale
+void KEduVocArticle::setFemale
   (const QString &def, const QString &indef)
 {
    fem_def = def;
@@ -98,7 +98,7 @@ void Article::setFemale
 }
 
 
-void Article::setMale
+void KEduVocArticle::setMale
   (const QString &def, const QString &indef)
 {
    mal_def = def;
@@ -106,7 +106,7 @@ void Article::setMale
 }
 
 
-void Article::setNatural
+void KEduVocArticle::setNatural
   (const QString &def, const QString &indef)
 {
    nat_def = def;
@@ -114,7 +114,7 @@ void Article::setNatural
 }
 
 
-void Article::female
+void KEduVocArticle::female
   (QString &def, QString &indef) const
 {
    def = fem_def;
@@ -122,7 +122,7 @@ void Article::female
 }
 
 
-void Article::male
+void KEduVocArticle::male
   (QString &def, QString &indef) const
 {
    def = mal_def;
@@ -130,7 +130,7 @@ void Article::male
 }
 
 
-void Article::natural
+void KEduVocArticle::natural
   (QString &def, QString &indef) const
 {
    def = nat_def;
@@ -142,18 +142,18 @@ void Article::natural
 //==============================================================
 
 
-int Conjugation::numEntries() const
+int KEduVocConjugation::numEntries() const
 {
    return conjugations.size();
 }
 
 
-vector<TenseRelation> Conjugation::getRelation ()
+vector<KEduVocTenseRelation> KEduVocConjugation::getRelation ()
 {
-  vector<TenseRelation> vec;
+  vector<KEduVocTenseRelation> vec;
 
   for (int i = 0; i < numInternalNames(); i++) {
-    vec.push_back(TenseRelation(names[i].abbrev,
+    vec.push_back(KEduVocTenseRelation(names[i].abbrev,
                                 i18n(names[i].name)));
   }
 
@@ -161,20 +161,20 @@ vector<TenseRelation> Conjugation::getRelation ()
     QString s;
     s.setNum(i+1);
     s.insert(0, UL_USER_TENSE);
-    vec.push_back(TenseRelation(s, userTenses[i]));
+    vec.push_back(KEduVocTenseRelation(s, userTenses[i]));
   }
 
   return vec;
 }
 
 
-void Conjugation::setTenseNames (vector<QString> names)
+void KEduVocConjugation::setTenseNames (vector<QString> names)
 {
   userTenses = names;
 }
 
 
-QString Conjugation::getName (const QString &abbrev)
+QString KEduVocConjugation::getName (const QString &abbrev)
 {
    if (abbrev.length() >= 2 && abbrev[0] == QString(UL_USER_TENSE)) {
      QString s = abbrev;
@@ -197,7 +197,7 @@ QString Conjugation::getName (const QString &abbrev)
 }
 
 
-QString Conjugation::getName (int idx)
+QString KEduVocConjugation::getName (int idx)
 {
    if (idx < numInternalNames() )
      return i18n(names[idx].name);
@@ -210,7 +210,7 @@ QString Conjugation::getName (int idx)
 }
 
 
-QString Conjugation::getAbbrev (const QString &name)
+QString KEduVocConjugation::getAbbrev (const QString &name)
 {
    for (int i = 0; i < (int) userTenses.size(); i++)
      if (userTenses[i] == name) {
@@ -228,7 +228,7 @@ QString Conjugation::getAbbrev (const QString &name)
 }
 
 
-QString Conjugation::getAbbrev (int idx)
+QString KEduVocConjugation::getAbbrev (int idx)
 {
    if (idx < numInternalNames() )
      return names[idx].abbrev;
@@ -245,19 +245,19 @@ QString Conjugation::getAbbrev (int idx)
 }
 
 
-int Conjugation::numInternalNames()
+int KEduVocConjugation::numInternalNames()
 {
    return sizeof(names) / sizeof(names[0]);
 }
 
 
-int Conjugation::numTenses()
+int KEduVocConjugation::numTenses()
 {
    return numInternalNames()+userTenses.size();
 }
 
 
-QString Conjugation::getType (int idx)
+QString KEduVocConjugation::getType (int idx)
 {
   if (idx >= (int) conjugations.size() )
     return "";
@@ -266,7 +266,7 @@ QString Conjugation::getType (int idx)
 }
 
 
-void Conjugation::setType (int idx, const QString & type)
+void KEduVocConjugation::setType (int idx, const QString & type)
 {
   if (idx >= (int) conjugations.size() )
     return;
@@ -275,7 +275,7 @@ void Conjugation::setType (int idx, const QString & type)
 }
 
 
-void Conjugation::cleanUp ()
+void KEduVocConjugation::cleanUp ()
 {
   for (int i = (int)conjugations.size()-1; i >= 0; i--) {
     const conjug_t *ctp = &conjugations[i];
@@ -295,7 +295,7 @@ void Conjugation::cleanUp ()
 }
 
 
-bool Conjugation::isEmpty (int idx)
+bool KEduVocConjugation::isEmpty (int idx)
 {
   if (idx < (int) conjugations.size()) {
     const conjug_t *ctp = &conjugations[idx];
@@ -321,82 +321,82 @@ bool Conjugation::isEmpty (int idx)
    return default;
 
 
-bool Conjugation::pers3SingularCommon(const QString &type) const
+bool KEduVocConjugation::pers3SingularCommon(const QString &type) const
 {
   _GET_CON_(s3common, type, false);
 }
 
 
-bool Conjugation::pers3PluralCommon(const QString &type) const
+bool KEduVocConjugation::pers3PluralCommon(const QString &type) const
 {
   _GET_CON_(p3common, type, false);
 }
 
 
-QString Conjugation::pers1Singular
+QString KEduVocConjugation::pers1Singular
   (const QString &type) const
 {
   _GET_CON_(pers1_sing, type, "");
 }
 
 
-QString Conjugation::pers2Singular
+QString KEduVocConjugation::pers2Singular
   (const QString &type) const
 {
   _GET_CON_(pers2_sing, type, "");
 }
 
 
-QString Conjugation::pers3FemaleSingular
+QString KEduVocConjugation::pers3FemaleSingular
   (const QString &type) const
 {
   _GET_CON_(pers3_f_sing, type, "");
 }
 
 
-QString Conjugation::pers3MaleSingular
+QString KEduVocConjugation::pers3MaleSingular
   (const QString &type) const
 {
   _GET_CON_(pers3_m_sing, type, "");
 }
 
 
-QString Conjugation::pers3NaturalSingular
+QString KEduVocConjugation::pers3NaturalSingular
   (const QString &type) const
 {
   _GET_CON_(pers3_n_sing, type, "");
 }
 
 
-QString Conjugation::pers1Plural
+QString KEduVocConjugation::pers1Plural
   (const QString &type) const
 {
   _GET_CON_(pers1_plur, type, "");
 }
 
 
-QString Conjugation::pers2Plural
+QString KEduVocConjugation::pers2Plural
   (const QString &type) const
 {
   _GET_CON_(pers2_plur, type, "");
 }
 
 
-QString Conjugation::pers3FemalePlural
+QString KEduVocConjugation::pers3FemalePlural
   (const QString &type) const
 {
   _GET_CON_(pers3_f_plur, type, "");
 }
 
 
-QString Conjugation::pers3MalePlural
+QString KEduVocConjugation::pers3MalePlural
   (const QString &type) const
 {
   _GET_CON_(pers3_m_plur, type, "");
 }
 
 
-QString Conjugation::pers3NaturalPlural
+QString KEduVocConjugation::pers3NaturalPlural
   (const QString &type) const
 {
   _GET_CON_(pers3_n_plur, type, "");
@@ -418,82 +418,82 @@ QString Conjugation::pers3NaturalPlural
    conjugations.push_back(ct);
 
 
-void Conjugation::setPers3PluralCommon(const QString &type, bool f)
+void KEduVocConjugation::setPers3PluralCommon(const QString &type, bool f)
 {
   _SET_CON_(p3common, type, f);
 }
 
 
-void Conjugation::setPers3SingularCommon(const QString &type, bool f)
+void KEduVocConjugation::setPers3SingularCommon(const QString &type, bool f)
 {
   _SET_CON_(s3common, type, f);
 }
 
 
-void Conjugation::setPers1Singular
+void KEduVocConjugation::setPers1Singular
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers1_sing, type, str);
 }
 
 
-void Conjugation::setPers2Singular
+void KEduVocConjugation::setPers2Singular
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers2_sing, type, str);
 }
 
 
-void Conjugation::setPers3FemaleSingular
+void KEduVocConjugation::setPers3FemaleSingular
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers3_f_sing, type, str);
 }
 
 
-void Conjugation::setPers3MaleSingular
+void KEduVocConjugation::setPers3MaleSingular
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers3_m_sing, type, str);
 }
 
 
-void Conjugation::setPers3NaturalSingular
+void KEduVocConjugation::setPers3NaturalSingular
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers3_n_sing, type, str);
 }
 
 
-void Conjugation::setPers1Plural
+void KEduVocConjugation::setPers1Plural
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers1_plur, type, str);
 }
 
 
-void Conjugation::setPers2Plural
+void KEduVocConjugation::setPers2Plural
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers2_plur, type, str);
 }
 
 
-void Conjugation::setPers3FemalePlural
+void KEduVocConjugation::setPers3FemalePlural
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers3_f_plur, type, str);
 }
 
 
-void Conjugation::setPers3MalePlural
+void KEduVocConjugation::setPers3MalePlural
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers3_m_plur, type, str);
 }
 
 
-void Conjugation::setPers3NaturalPlural
+void KEduVocConjugation::setPers3NaturalPlural
   (const QString &type, const QString &str)
 {
   _SET_CON_(pers3_n_plur, type, str);

diff --git a/kwordquiz/grammarmanager.h b/kwordquiz/keduvocgrammar.h
similarity index 89%
rename from kwordquiz/grammarmanager.h
rename to kwordquiz/keduvocgrammar.h
index 1b9cfe761b600bd840643828045a0b9b4f1d16bc..420fb56593e04b9300f687ee47f0a246420e4b8a 100644 (file)
--- a/kwordquiz/grammarmanager.h
+++ b/kwordquiz/keduvocgrammar.h
@@ -1,14 +1,14 @@
 /***************************************************************************
 
-              manage grammer parts (articles, conjugation)
+              manage grammar parts (articles, conjugation)
 
     -----------------------------------------------------------------------
 
-    begin                : Sat Nov 27 09:50:53 MET 1999
+    begin          : Sat Nov 27 09:50:53 MET 1999
 
-    copyright            : (C) 1999-2001 Ewald Arnold
-                           (C) 2001 The KDE-EDU team
-    email                : kvoctrain@ewald-arnold.de
+    copyright      : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
+                     (C) 2001 The KDE-EDU team
+                     (C) 2005 Peter Hedlund <peter.hedlund@kdemail.net>
 
     -----------------------------------------------------------------------
 
@@ -46,14 +46,14 @@ using namespace std;
 
 #define UL_USER_TENSE  "#"   // designates number of user tense
 
-class Article
+class KEduVocArticle
 {
 
 public:
 
-   Article() {}
+   KEduVocArticle() {}
 
-   Article (
+   KEduVocArticle (
            const QString &fem_def, const QString &fem_indef,
            const QString &mal_def, const QString &mal_indef,
            const QString &nat_def, const QString &nat_indef
@@ -75,14 +75,14 @@ protected:
 };
 
 
-class Comparison
+class KEduVocComparison
 {
 
 public:
 
-   Comparison() {}
+   KEduVocComparison() {}
 
-   Comparison (
+   KEduVocComparison (
            const QString &l1,
            const QString &l2,
            const QString &l3
@@ -105,11 +105,11 @@ protected:
 };
 
 
-class TenseRelation
+class KEduVocTenseRelation
 {
  public:
 
-  TenseRelation (const QString & _short, const QString & _long)
+  KEduVocTenseRelation (const QString & _short, const QString & _long)
     : shortId (_short), longId(_long) {}
 
   inline QString shortStr() const { return shortId; }
@@ -121,16 +121,16 @@ class TenseRelation
 };
 
 
-class Conjugation
+class KEduVocConjugation
 {
 
 public:
 
-   Conjugation () {}
+   KEduVocConjugation () {}
 
    int numEntries() const;
 
-   static vector<TenseRelation> getRelation ();
+   static vector<KEduVocTenseRelation> getRelation ();
    static void setTenseNames (vector<QString> names);
 
    static QString getName (const QString &abbrev);

diff --git a/kwordquiz/keduvockvtmlreader.cpp b/kwordquiz/keduvockvtmlreader.cpp
index 405deaa1ead60b6030d830e582c79608a9e4bf7c..7e5bd4a1294cbfe23aa5986799bd96a5a88c0bb1 100644 (file)
--- a/kwordquiz/keduvockvtmlreader.cpp
+++ b/kwordquiz/keduvockvtmlreader.cpp
@@ -218,9 +218,7 @@ bool KEduVocKvtmlReader::readArticle(QDomElement &domElementParent)
       domElementEntryChild = domElementEntryChild.nextSibling().toElement();
     }
 
-    m_doc->m_articles.push_back(Article(  fem_def, fem_indef,
-                                        mal_def, mal_indef,
-                                        nat_def, nat_indef));
+    m_doc->m_articles.push_back(KEduVocArticle(fem_def, fem_indef, mal_def, mal_indef, nat_def, nat_indef));
 
     domElementEntry = domElementEntry.nextSibling().toElement();
     count++;
@@ -230,9 +228,7 @@ bool KEduVocKvtmlReader::readArticle(QDomElement &domElementParent)
 }
 
 
-bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent,
-                                    QValueList<Conjugation> &curr_conjug,
-                                    const QString &entry_tag)
+bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, QValueList<KEduVocConjugation> &curr_conjug, const QString &entry_tag)
 /*
  <conjugation>        used in header for definiton of "prefix"
   <e l="de">          lang determines also lang order in entries !!
@@ -285,7 +281,7 @@ bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent,
   QString lang;
   QString type;
   int count = 0;
-  curr_conjug.push_back(Conjugation());
+  curr_conjug.push_back(KEduVocConjugation());
 
   QDomElement domElementConjugChild = domElementParent.firstChild().toElement();
   while (!domElementConjugChild.isNull())
@@ -441,7 +437,7 @@ bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent,
 
     if (domElementConjugChild.tagName() == KV_CON_ENTRY)
       while (count+1 > (int) curr_conjug.size() )
-        curr_conjug.push_back(Conjugation());
+        curr_conjug.push_back(KEduVocConjugation());
 
     curr_conjug[count].setPers3SingularCommon(type, s3_common);
     curr_conjug[count].setPers3PluralCommon(type, p3_common);
@@ -620,8 +616,7 @@ bool KEduVocKvtmlReader::readUsage(QDomElement &domElementParent)
 }
 
 
-bool KEduVocKvtmlReader::readComparison(QDomElement &domElementParent,
-                                        Comparison &comp)
+bool KEduVocKvtmlReader::readComparison(QDomElement &domElementParent, KEduVocComparison &comp)
 /*
  <comparison>
    <l1>good</l1>
@@ -673,8 +668,7 @@ bool KEduVocKvtmlReader::readComparison(QDomElement &domElementParent,
 }
 
 
-bool KEduVocKvtmlReader::readMultipleChoice(QDomElement &domElementParent,
-                                            MultipleChoice &mc)
+bool KEduVocKvtmlReader::readMultipleChoice(QDomElement &domElementParent, KEduVocMultipleChoice &mc)
 /*
  <multiplechoice>
    <mc1>good</mc1>
@@ -974,9 +968,9 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
   QString       antonym;
   QString       usage;
   QString       paraphrase;
-  QValueList<Conjugation> conjug;
-  Comparison     comparison;
-  MultipleChoice mc;
+  QValueList<KEduVocConjugation> conjug;
+  KEduVocComparison     comparison;
+  KEduVocMultipleChoice mc;
 
   //-------------------------------------------------------------------------
   // Attributes

diff --git a/kwordquiz/keduvockvtmlreader.h b/kwordquiz/keduvockvtmlreader.h
index 7a905a56318331295012494f75f5650a63c0b464..ccc061ae3245b3f314328a2b5e6b8592c6830f1b 100644 (file)
--- a/kwordquiz/keduvockvtmlreader.h
+++ b/kwordquiz/keduvockvtmlreader.h
@@ -23,8 +23,8 @@
 #include <qdom.h>
 
 #include "keduvocdocument.h"
-#include "grammarmanager.h"
-#include "multiplechoice.h"
+#include "keduvocgrammar.h"
+#include "keduvocmultiplechoice.h"
 
 class KEduVocDocument;
 
@@ -78,17 +78,13 @@ public:
 
        bool readLesson(QDomElement &domElementParent);
        bool readArticle(QDomElement &domElementParent);
-       bool readConjug(QDomElement &domElementParent,
-                                                                       QValueList<Conjugation> &curr_conjug,
-                  const QString &entry_tag);
+       bool readConjug(QDomElement &domElementParent, QValueList<KEduVocConjugation> &curr_conjug, const QString &entry_tag);
        bool readOptions(QDomElement &domElementParent);
        bool readType(QDomElement &domElementParent);
        bool readTense(QDomElement &domElementParent);
        bool readUsage(QDomElement &domElementParent);
-       bool readComparison(QDomElement &domElementParent,
-                      Comparison &comp);
-       bool readMultipleChoice(QDomElement &domElementParent,
-                          MultipleChoice &mc);
+       bool readComparison(QDomElement &domElementParent, KEduVocComparison &comp);
+       bool readMultipleChoice(QDomElement &domElementParent, KEduVocMultipleChoice &mc);
        bool readExpressionChildAttributes(     QDomElement &domElementExpressionChild,
                                                                                                                          QString &lang,
                                                                                                                          grade_t &grade, grade_t &rev_grade,

diff --git a/kwordquiz/keduvockvtmlwriter.cpp b/kwordquiz/keduvockvtmlwriter.cpp
index 1bc986f4368a1ab7fb593f89f5e5e8b99aedd8a4..9d80bfe70ea7cb6294c2d83cc54ea7f6726fd511 100644 (file)
--- a/kwordquiz/keduvockvtmlwriter.cpp
+++ b/kwordquiz/keduvockvtmlwriter.cpp
@@ -139,7 +139,7 @@ bool KEduVocKvtmlWriter::saveLessonKvtMl (QDomDocument &domDoc, QDomElement &dom
 
 
 bool KEduVocKvtmlWriter::saveConjug(QDomDocument &domDoc, QDomElement &domElementParent,
-                                    const Conjugation &curr_conjug, QString type)
+                                    const KEduVocConjugation &curr_conjug, QString type)
 {
   if (!curr_conjug.pers1Singular(type).isEmpty() )
   {
@@ -243,7 +243,7 @@ bool KEduVocKvtmlWriter::saveConjug(QDomDocument &domDoc, QDomElement &domElemen
 }
 
 bool KEduVocKvtmlWriter::saveConjugHeader(QDomDocument &domDoc, QDomElement &domElementParent,
-                                          QValueList<Conjugation> &curr_conjug)
+                                          QValueList<KEduVocConjugation> &curr_conjug)
 {
 /*
  <conjugation>    used in header for definiton of "prefix"
@@ -300,8 +300,7 @@ bool KEduVocKvtmlWriter::saveConjugHeader(QDomDocument &domDoc, QDomElement &dom
 }
 
 
-bool KEduVocKvtmlWriter::saveComparison(QDomDocument &domDoc, QDomElement &domElementParent,
-                                        const Comparison &comp)
+bool KEduVocKvtmlWriter::saveComparison(QDomDocument &domDoc, QDomElement &domElementParent, const KEduVocComparison &comp)
 /*
  <comparison>
    <l1>good</l1>
@@ -348,7 +347,7 @@ bool KEduVocKvtmlWriter::saveComparison(QDomDocument &domDoc, QDomElement &domEl
 
 
 bool KEduVocKvtmlWriter::saveMultipleChoice(QDomDocument &domDoc, QDomElement &domElementParent,
-                                            const MultipleChoice &mc)
+                                            const KEduVocMultipleChoice &mc)
 /*
  <multiplechoice>
    <mc1>good</mc1>
@@ -415,7 +414,7 @@ bool KEduVocKvtmlWriter::saveMultipleChoice(QDomDocument &domDoc, QDomElement &d
 
 
 bool KEduVocKvtmlWriter::saveConjugEntry( QDomDocument &domDoc, QDomElement &domElementParent,
-                                          Conjugation &curr_conjug)
+                                          KEduVocConjugation &curr_conjug)
 /*
  <conjugation>    in entry for definition of tenses of (irreg.) verbs
   <t n="sipa">
@@ -791,14 +790,14 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
     if (entype == QM_VERB
         && (*first).conjugation(0).numEntries() > 0)
     {
-      Conjugation conj = (*first).conjugation(0);
+      KEduVocConjugation conj = (*first).conjugation(0);
       if (!saveConjugEntry(domDoc, domElementOriginal, conj))
         return false;
     }
     else if (entype == QM_ADJ
              && !(*first).comparison(0).isEmpty())
     {
-      Comparison comp = (*first).comparison(0);
+      KEduVocComparison comp = (*first).comparison(0);
       if (!saveComparison(domDoc, domElementOriginal, comp))
         return false;
     }
@@ -911,7 +910,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
       if (entype == QM_VERB
           && (*first).conjugation(trans).numEntries() > 0)
       {
-        Conjugation conj = (*first).conjugation(trans);
+        KEduVocConjugation conj = (*first).conjugation(trans);
         if (!saveConjugEntry(domDoc, domElementTranslation, conj))
           return false;
       }
@@ -919,7 +918,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
       if (entype == QM_ADJ
           && !(*first).comparison(trans).isEmpty())
       {
-        Comparison comp = (*first).comparison(trans);
+        KEduVocComparison comp = (*first).comparison(trans);
         if (!saveComparison(domDoc, domElementTranslation, comp))
           return false;
       }

diff --git a/kwordquiz/keduvockvtmlwriter.h b/kwordquiz/keduvockvtmlwriter.h
index d970a2f877d5c7f67ee4b81959c188f33dd91db2..7748933b402d9abcd7c7a0997acf5c39196ce7fc 100644 (file)
--- a/kwordquiz/keduvockvtmlwriter.h
+++ b/kwordquiz/keduvockvtmlwriter.h
@@ -23,8 +23,8 @@
 #include <qdom.h>
 
 //#include "keduvocdocument.h"
-#include "grammarmanager.h"
-#include "multiplechoice.h"
+#include "keduvocgrammar.h"
+#include "keduvocmultiplechoice.h"
 
 class KEduVocDocument;
 
@@ -79,17 +79,17 @@ public:
   bool saveOptionsKvtMl  (QDomDocument &domDoc, QDomElement &domElementParent);
   bool saveArticleKvtMl  (QDomDocument &domDoc, QDomElement &domElementParent);
   bool saveConjugHeader  (QDomDocument &domDoc, QDomElement &domElementParent,
-                          QValueList<Conjugation> &curr_conjug);
+                          QValueList<KEduVocConjugation> &curr_conjug);
   bool saveConjug        (QDomDocument &domDoc, QDomElement &domElementParent,
-                          const Conjugation &curr_conjug, QString type);
+                          const KEduVocConjugation &curr_conjug, QString type);
   bool saveConjugEntry   (QDomDocument &domDoc, QDomElement &domElementParent,
-                          Conjugation &curr_conjug);
+                          KEduVocConjugation &curr_conjug);
 
   bool saveComparison    (QDomDocument &domDoc, QDomElement &domElementParent,
-                          const Comparison &comp);
+                          const KEduVocComparison &comp);
 
   bool saveMultipleChoice(QDomDocument &domDoc, QDomElement &domElementParent,
-                          const MultipleChoice &mc);
+                          const KEduVocMultipleChoice &mc);
 
 private:
   QFile *m_outputFile;

diff --git a/kwordquiz/multiplechoice.cpp b/kwordquiz/keduvocmultiplechoice.cpp
similarity index 89%
rename from kwordquiz/multiplechoice.cpp
rename to kwordquiz/keduvocmultiplechoice.cpp
index 8803fbb4f0a682a9b2162189e94a0a157ccd5a2c..8219517904f11f35f85502f73c02b4cf5402a7eb 100644 (file)
--- a/kwordquiz/multiplechoice.cpp
+++ b/kwordquiz/keduvocmultiplechoice.cpp
@@ -23,9 +23,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "multiplechoice.h"
+#include "keduvocmultiplechoice.h"
 
-MultipleChoice::MultipleChoice (
+KEduVocMultipleChoice::KEduVocMultipleChoice (
            const QString &mc1,
            const QString &mc2,
            const QString &mc3,
@@ -41,7 +41,7 @@ MultipleChoice::MultipleChoice (
 }
 
 
-bool MultipleChoice::isEmpty() const
+bool KEduVocMultipleChoice::isEmpty() const
 {
   return   muc1.stripWhiteSpace().isEmpty()
         && muc2.stripWhiteSpace().isEmpty()
@@ -51,7 +51,7 @@ bool MultipleChoice::isEmpty() const
 }
 
 
-void MultipleChoice::clear()
+void KEduVocMultipleChoice::clear()
 {
    muc1 = "";
    muc2 = "";
@@ -61,7 +61,7 @@ void MultipleChoice::clear()
 }
 
 
-QString MultipleChoice::mc (unsigned idx) const
+QString KEduVocMultipleChoice::mc (unsigned idx) const
 {
    switch (idx) {
      case 0: return muc1;
@@ -74,7 +74,7 @@ QString MultipleChoice::mc (unsigned idx) const
 }
 
 
-unsigned MultipleChoice::size()
+unsigned KEduVocMultipleChoice::size()
 {
    normalize();
    unsigned num = 0;
@@ -92,7 +92,7 @@ unsigned MultipleChoice::size()
 }
 
 
-void MultipleChoice::normalize()
+void KEduVocMultipleChoice::normalize()
 {
   // fill from first to last
 

diff --git a/kwordquiz/multiplechoice.h b/kwordquiz/keduvocmultiplechoice.h
similarity index 96%
rename from kwordquiz/multiplechoice.h
rename to kwordquiz/keduvocmultiplechoice.h
index 6a0b0500639ff172da6f3a745fc2ce573dfdebb8..bd34f90f6f11aa5a5230a43755ad63b8344522f1 100644 (file)
--- a/kwordquiz/multiplechoice.h
+++ b/kwordquiz/keduvocmultiplechoice.h
@@ -31,14 +31,14 @@
 
 #define MAX_MULTIPLE_CHOICE  5  // select one out of x
 
-class MultipleChoice
+class KEduVocMultipleChoice
 {
 
 public:
 
-   MultipleChoice() {}
+   KEduVocMultipleChoice() {}
 
-   MultipleChoice (
+   KEduVocMultipleChoice (
            const QString &mc1,
            const QString &mc2,
            const QString &mc3,