Fix to a nasty Bug.

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

diff --git a/keduvocdocument/keduvocconjugation.cpp b/keduvocdocument/keduvocconjugation.cpp
index 7c45b4982d28d01312d3c4fb5b7edaedc3545c5b..d1672dfa996480c26ca9e903c07fca9a191b4428 100644 (file)
--- a/keduvocdocument/keduvocconjugation.cpp
+++ b/keduvocdocument/keduvocconjugation.cpp
@@ -101,9 +101,9 @@ void KEduVocConjugation::toKVTML2(QDomElement & parent, const QString &tense)
     QMap<int, KEduVocWordFlag::Flags> persons;
     persons[0] = KEduVocWordFlag::First;
     persons[1] = KEduVocWordFlag::Second;
-    persons[3] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Masculine);
-    persons[4] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Feminine);
-    persons[5] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Neuter);
+    persons[2] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Masculine);
+    persons[3] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Feminine);
+    persons[4] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Neuter);
 
     // write the tense tag
     QDomDocument domDoc = parent.ownerDocument();
@@ -113,7 +113,7 @@ void KEduVocConjugation::toKVTML2(QDomElement & parent, const QString &tense)
 
     for ( int num = 0; num <= 2; ++num) {
         QDomElement numberElement = domDoc.createElement( KVTML_GRAMMATICAL_NUMBER[num] );
-        for ( int person = 0; person <= 5; ++person) {
+        for ( int person = 0; person < 5; ++person) {
             if (!conjugation(numbers[num] | persons[person]).isEmpty()) {
                 QDomElement personElement = domDoc.createElement( KVTML_GRAMMATICAL_PERSON[person] );
                 numberElement.appendChild(personElement);
@@ -199,9 +199,9 @@ KEduVocConjugation* KEduVocConjugation::fromKVTML2(QDomElement & parent)
     QMap<int, KEduVocWordFlag::Flags> persons;
     persons[0] = KEduVocWordFlag::First;
     persons[1] = KEduVocWordFlag::Second;
-    persons[3] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Masculine);
-    persons[4] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Feminine);
-    persons[5] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Neuter);
+    persons[2] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Masculine);
+    persons[3] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Feminine);
+    persons[4] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Neuter);
 
 
     KEduVocConjugation* conjugation = new KEduVocConjugation;
@@ -210,7 +210,7 @@ KEduVocConjugation* KEduVocConjugation::fromKVTML2(QDomElement & parent)
         QDomElement numberElement = parent.firstChildElement( KVTML_GRAMMATICAL_NUMBER[num] );
 
         if (numberElement.hasChildNodes()) {
-            for (int person = 0; person <= 5; person++) {
+            for (int person = 0; person < 5; person++) {
                 QDomElement personElement = numberElement.firstChildElement( KVTML_GRAMMATICAL_PERSON[person] );
                 if (!personElement.isNull()) {
                     KEduVocText text;

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 56f95800ff1418aba5b40236a3dc5395eb5ec615..6f177497486736591b5d7a48e40c2ba2a15abd12 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -721,7 +721,7 @@ bool KEduVocKvtml2Reader::readPersonalPronounChild(QDomElement & personElement,
 
 
 
-    for (int person = 0; person <= 4; person++) {
+    for (int person = 0; person < 5; person++) {
         QDomElement currentElement = personElement.firstChildElement( KVTML_GRAMMATICAL_PERSON[person] );
         pronoun.setPersonalPronoun( currentElement.text(), persons[person] | number );
     }

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index f6c058dfef89f6176f1db258498b9bb2906368b6..9d58dc6ca9a0431946462528c689ef4248ca0198 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -644,16 +644,16 @@ bool KEduVocKvtml2Writer::writePersonalPronoun(QDomElement & pronounElement, con
     QMap<int, KEduVocWordFlag::Flags> persons;
     persons[0] = KEduVocWordFlag::First;
     persons[1] = KEduVocWordFlag::Second;
-    persons[3] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Masculine);
-    persons[4] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Feminine);
-    persons[5] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Neuter);
+    persons[2] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Masculine);
+    persons[3] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Feminine);
+    persons[4] = (KEduVocWordFlag::Flags)((int)KEduVocWordFlag::Third | (int)KEduVocWordFlag::Neuter);
 
 
 
     // the actual pronouns
     for ( int num = 0; num <= 2; num++ ) {
         QDomElement numberElement = m_domDoc.createElement( KVTML_GRAMMATICAL_NUMBER[num] );
-        for ( int person = 0; person <= 5; person++ ) {
+        for ( int person = 0; person < 5; person++ ) {
             QString pronounString = pronoun.personalPronoun(numbers[num] | persons[person]);
             if (!pronounString.isEmpty()) {
                 numberElement.appendChild( newTextElement( KVTML_GRAMMATICAL_PERSON[person], pronounString ));