Massively fix conjugations - writing would bork them.

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

diff --git a/keduvocdocument/keduvoccontainer.cpp b/keduvocdocument/keduvoccontainer.cpp
index dd90331aa1f32855fb7dcd7a3afe120ffc5e39d1..1c4cc55d178208aa2076f29c711f359c1598fbf7 100644 (file)
--- a/keduvocdocument/keduvoccontainer.cpp
+++ b/keduvocdocument/keduvoccontainer.cpp
@@ -214,7 +214,6 @@ void KEduVocContainer::insertChildContainer(int row, KEduVocContainer * child)
 
 void KEduVocContainer::updateChildLessonEntries()
 {
-    kDebug() << "updateChildLessonEntries: " << name();
     QList < KEduVocExpression* > entriesRecursive = entries();
 
     foreach(KEduVocContainer *childContainer, d->m_childContainers)
@@ -227,7 +226,6 @@ void KEduVocContainer::updateChildLessonEntries()
 
 void KEduVocContainer::invalidateChildLessonEntries()
 {
-    kDebug() << "invalidateChildLessonEntries: " << name();
     d->m_childLessonEntriesValid = false;
     // propagate to parent
     if (d->m_parentContainer) {

diff --git a/keduvocdocument/keduvockvtml2reader.h b/keduvocdocument/keduvockvtml2reader.h
index c0947c549b751e2b0c5074c036cf78837ab5aa0b..f7bdcbfe2e7abff8591da6e7b1e9838406d1e0cb 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.h
+++ b/keduvocdocument/keduvockvtml2reader.h
@@ -79,14 +79,6 @@ private:
 
     bool readPersonalPronounChild(QDomElement & personElement, KEduVocPersonalPronoun & pronoun, KEduVocConjugation::ConjugationNumber number);
 
-
-    /** read in a conjugation
-     * @param conjugElement QDomElement for the conjugation group
-     * @param curr_conjug conjugation object to populate
-     */
-    bool readConjugation( QDomElement &conjugElement, KEduVocConjugation &conjugation );
-    bool readConjugationPerson( QDomElement &personElement, KEduVocConjugation &conjugation, KEduVocConjugation::ConjugationNumber number );
-
     /** read the types
      * @param typesElement QDomElement for the types group
      */

diff --git a/keduvocdocument/keduvoctranslation.cpp b/keduvocdocument/keduvoctranslation.cpp
index 7a3f695f4fb324380550d044ebc46137887a504e..b2dd481ea2d2e0f78b150dd73090a5be355404eb 100644 (file)
--- a/keduvocdocument/keduvoctranslation.cpp
+++ b/keduvocdocument/keduvoctranslation.cpp
@@ -386,11 +386,9 @@ void KEduVocTranslation::toKVTML2(QDomElement & parent)
     }
 
     // conjugation
-    QDomElement conjugationElement = parent.ownerDocument().createElement( KVTML_CONJUGATION );
     foreach ( const QString &tense, conjugationTenses() ) {
+        QDomElement conjugationElement = parent.ownerDocument().createElement( KVTML_CONJUGATION );
         conjugation(tense).toKVTML2(conjugationElement, tense);
-    }
-    if (conjugationElement.hasChildNodes()) {
         parent.appendChild( conjugationElement );
     }
 
@@ -431,6 +429,7 @@ void KEduVocTranslation::fromKVTML2(QDomElement & parent)
     while ( !conjugationElement.isNull() ) {
         QDomElement tenseElement = conjugationElement.firstChildElement( KVTML_TENSE );
         QString tense = tenseElement.text();
+kDebug() << "Read Conjugation: " << text() << tenseElement.text();
         KEduVocConjugation *conjugation = KEduVocConjugation::fromKVTML2(conjugationElement);
         setConjugation(tense, *conjugation);
         delete conjugation;