move xml reading/writing into the individual classes

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

diff --git a/keduvocdocument/keduvocdeclension.cpp b/keduvocdocument/keduvocdeclension.cpp
index 16c4dfb2227c6451c9b1e0c46dbea8c2a04cb241..55d7037e4efeb281bb2038e8d200ec602fea5677 100644 (file)
--- a/keduvocdocument/keduvocdeclension.cpp
+++ b/keduvocdocument/keduvocdeclension.cpp
@@ -87,7 +87,7 @@ bool KEduVocDeclension::isEmpty()
     return d->m_declensions.isEmpty();
 }
 
-void KEduVocDeclension::toXML(QDomElement & parent)
+void KEduVocDeclension::toKVTML2(QDomElement & parent)
 {
     if (isEmpty()) {
         return;
@@ -99,7 +99,7 @@ void KEduVocDeclension::toXML(QDomElement & parent)
         QDomElement numberElement = domDoc.createElement( KVTML_GRAMMATICAL_NUMBER[num] );
         for ( KEduVocDeclension::DeclensionCase dcase = KEduVocDeclension::Nominative; dcase < KEduVocDeclension::DeclensionCaseMAX; dcase = KEduVocDeclension::DeclensionCase(dcase +1) ) {
             QDomElement caseElement = domDoc.createElement( KVTML_DECLENSION_CASE[dcase] );
-            declension(num, dcase).toXML(caseElement);
+            declension(num, dcase).toKVTML2(caseElement);
 
             if (caseElement.hasChildNodes()) {
                 numberElement.appendChild(caseElement);

diff --git a/keduvocdocument/keduvocdeclension.h b/keduvocdocument/keduvocdeclension.h
index c120fe5bd36cf2a32159d0db045259459754ed7b..70c3f6e8a43f8acb6a73ffe8d2a6213a46db9392 100644 (file)
--- a/keduvocdocument/keduvocdeclension.h
+++ b/keduvocdocument/keduvocdeclension.h
@@ -97,7 +97,8 @@ public:
 
     bool isEmpty();
 
-    void toXML(QDomElement& parent);
+    void fromKVTML2(QDomElement& parent);
+    void toKVTML2(QDomElement& parent);
 
     static int indexOf(DeclensionNumber number, DeclensionCase decCase);
 

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 247cd69d7dce269911274c612eb9c6feba1b3e90..52d1c7639ecffb34d8fa09424f510d3612b964ec 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -307,12 +307,9 @@ bool KEduVocKvtml2Reader::readEntry( QDomElement &entryElement )
 bool KEduVocKvtml2Reader::readTranslation( QDomElement &translationElement,
         KEduVocExpression *expr, int index )
 {
-    QDomElement currentElement = translationElement.firstChildElement( KVTML_TEXT );
-    if ( !currentElement.isNull() ) {
-        expr->translation(index)->setText( currentElement.text() );
-    }
+    expr->translation(index)->fromKVTML2(translationElement);
 
-    currentElement = translationElement.firstChildElement( KVTML_COMMENT );
+    QDomElement currentElement = translationElement.firstChildElement( KVTML_COMMENT );
     if ( !currentElement.isNull() ) {
         expr->translation(index)->setComment( currentElement.text() );
     }

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index ff89493350b8e82dfd0bcb0975a8b68bf1ea62ee..1e2317d82f72ecc7b1627f1b95b32c5957a6a393 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -374,7 +374,7 @@ bool KEduVocKvtml2Writer::writeEntries( QDomElement &entriesElement )
 bool KEduVocKvtml2Writer::writeTranslation( QDomElement &translationElement, KEduVocTranslation* translation )
 {
     // so far only for KEduVocWord - text and grades
-    translation->toXML(translationElement);
+    translation->toKVTML2(translationElement);
 
     ///@todo move into translation->toXML()
 

diff --git a/keduvocdocument/keduvoctext.cpp b/keduvocdocument/keduvoctext.cpp
index 4909911af9f8b00977174514f1b136f5c676b1e8..cf1feb20af3ae4ba2da4535b708cbe3a529d71eb 100644 (file)
--- a/keduvocdocument/keduvoctext.cpp
+++ b/keduvocdocument/keduvoctext.cpp
@@ -170,7 +170,7 @@ bool KEduVocText::operator ==(const KEduVocText & other) const
         d->m_practiceDate == other.d->m_practiceDate;
 }
 
-void KEduVocText::toXML(QDomElement& parent)
+void KEduVocText::toKVTML2(QDomElement& parent)
 {
     QDomDocument domDoc = parent.ownerDocument();
     if (text().isEmpty()) {
@@ -199,3 +199,8 @@ void KEduVocText::toXML(QDomElement& parent)
         parent.appendChild( gradeElement );
     }
 }
+
+void KEduVocText::fromKVTML2(QDomElement & parent)
+{
+    setText( parent.firstChildElement( KVTML_TEXT ).text() );
+}

diff --git a/keduvocdocument/keduvoctext.h b/keduvocdocument/keduvoctext.h
index 91d3cadfd9e51a51c6ed826fdd7307a0b12d1698..5260a33f92f9686293ea6657532793e3fb2b4444 100644 (file)
--- a/keduvocdocument/keduvoctext.h
+++ b/keduvocdocument/keduvoctext.h
@@ -153,7 +153,8 @@ public:
     */
     void setPracticeDate( const QDateTime & date );
 
-    void toXML(QDomElement& parent);
+    void fromKVTML2(QDomElement& parent);
+    void toKVTML2(QDomElement& parent);
 
 private:
     class KEduVocTextPrivate;

diff --git a/keduvocdocument/keduvoctranslation.cpp b/keduvocdocument/keduvoctranslation.cpp
index 830789bf701fa5a15e640b5c22a79447f65c167b..5bae3c8d30b4ea09bbcc9a9c5673e2c38d17f3c7 100644 (file)
--- a/keduvocdocument/keduvoctranslation.cpp
+++ b/keduvocdocument/keduvoctranslation.cpp
@@ -95,8 +95,8 @@ KEduVocTranslation::KEduVocTranslation(KEduVocExpression* entry, const QString &
 }
 
 KEduVocTranslation::KEduVocTranslation( const KEduVocTranslation &other )
-    : d( new KEduVocTranslationPrivate(other.d->m_entry) ),
-         KEduVocText(other)
+    : KEduVocText(other),
+    d( new KEduVocTranslationPrivate(other.d->m_entry) )
 {
     d->m_wordType = other.d->m_wordType;
     d->m_comment = other.d->m_comment;
@@ -358,12 +358,12 @@ void KEduVocTranslation::setDeclension(KEduVocDeclension * declension)
     d->m_declension = declension;
 }
 
-void KEduVocTranslation::toXML(QDomElement & parent)
+void KEduVocTranslation::toKVTML2(QDomElement & parent)
 {
     kDebug() << "Write translation xml.";
-    KEduVocText::toXML(parent);
+    KEduVocText::toKVTML2(parent);
     if (d->m_declension) {
-        d->m_declension->toXML(parent);
+        d->m_declension->toKVTML2(parent);
     }
 }
 

diff --git a/keduvocdocument/keduvoctranslation.h b/keduvocdocument/keduvoctranslation.h
index f90b8eca8d4a0dda863fe87c6c810f80c903d276..309636556a10f1a4100c7e8eb6e26463eca33c9f 100644 (file)
--- a/keduvocdocument/keduvoctranslation.h
+++ b/keduvocdocument/keduvoctranslation.h
@@ -235,7 +235,8 @@ public:
      */
     bool operator== ( const KEduVocTranslation &translation ) const;
 
-    void toXML(QDomElement& parent);
+//     void fromKVTML2(QDomElement& parent);
+    void toKVTML2(QDomElement& parent);
 
 private:
     class KEduVocTranslationPrivate;