declinations gui basically works, beware, sofar declinations are neither read nor...

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

diff --git a/keduvocdocument/keduvocdeclension.cpp b/keduvocdocument/keduvocdeclension.cpp
index f58663149295ec12193324820d7f34ad74ff1c10..8fead39cd9253625d0e60bc9504228c7c3ba094e 100644 (file)
--- a/keduvocdocument/keduvocdeclension.cpp
+++ b/keduvocdocument/keduvocdeclension.cpp
@@ -22,11 +22,11 @@
  ***************************************************************************/
 
 #include "keduvocdeclension.h"
-/*
+
 #include "kvtml2defs.h"
 #include "keduvockvtml2writer.h"
 #include <QtXml/QDomDocument>
-*/
+
 #include <QtCore/QMap>
 
 class KEduVocDeclension::Private
@@ -59,12 +59,22 @@ KEduVocDeclension::~KEduVocDeclension()
 
 KEduVocText& KEduVocDeclension::declension(DeclensionNumber number, DeclensionCase decCase)
 {
-    return d->m_declensions[indexOf(number, decCase)];
+    return declension(indexOf(number, decCase));
+}
+
+KEduVocText & KEduVocDeclension::declension(int index)
+{
+    return d->m_declensions[index];
+}
+
+void KEduVocDeclension::setDeclension(const KEduVocText & declension, int index)
+{
+    d->m_declensions[index] = declension;
 }
 
 void KEduVocDeclension::setDeclension(const KEduVocText & declension, DeclensionNumber number, DeclensionCase decCase)
 {
-    d->m_declensions[indexOf(number, decCase)] = declension;
+    setDeclension(declension, indexOf(number, decCase));
 }
 
 int KEduVocDeclension::indexOf(DeclensionNumber number, DeclensionCase decCase)
@@ -77,13 +87,17 @@ bool KEduVocDeclension::isEmpty()
     return d->m_declensions.isEmpty();
 }
 
-// void KEduVocDeclension::toXML(QDomElement & parent)
-// {
-//     if (isEmpty()) {
-//         return;
-//     }
-//     QDomDocument domDoc = parent.ownerDocument();
-//     QDomElement gradeElement = domDoc.createElement( KVTML_DECLENSION );
-// 
-// }
+void KEduVocDeclension::toXML(QDomElement & parent)
+{
+    if (isEmpty()) {
+        return;
+    }
+    QDomDocument domDoc = parent.ownerDocument();
+    QDomElement gradeElement = domDoc.createElement( KVTML_DECLENSION );
+    parent.appendChild(gradeElement);
+
+    ///@todo write contents
+}
+
+
 

diff --git a/keduvocdocument/keduvocdeclension.h b/keduvocdocument/keduvocdeclension.h
index f8124492ef2f1c3ff97ca8bf30d2269e0134ad16..3c44abe6516c2b2c914b2e3c8a86eccc5a19fea7 100644 (file)
--- a/keduvocdocument/keduvocdeclension.h
+++ b/keduvocdocument/keduvocdeclension.h
@@ -83,6 +83,7 @@ public:
      * @return
      */
     KEduVocText& declension(DeclensionNumber number, DeclensionCase decCase);
+    KEduVocText& declension(int index);
 
     /**
      * Set a declension
@@ -92,13 +93,15 @@ public:
      */
     void setDeclension(const KEduVocText& declension, DeclensionNumber number, DeclensionCase decCase);
 
+    void setDeclension(const KEduVocText& declension, int index);
+
     bool isEmpty();
 
-//     void toXML(QDomElement& parent);
+    void toXML(QDomElement& parent);
 
-private:
-    int indexOf(DeclensionNumber number, DeclensionCase decCase);
+    static int indexOf(DeclensionNumber number, DeclensionCase decCase);
 
+private:
     class Private;
     Private * const d;
 };

diff --git a/keduvocdocument/keduvoctext.cpp b/keduvocdocument/keduvoctext.cpp
index bd79a255605d3b66671f974fa29c26dc7afc3cff..471b317c58ae3bfb26f832b1090f8c29208017d4 100644 (file)
--- a/keduvocdocument/keduvoctext.cpp
+++ b/keduvocdocument/keduvoctext.cpp
@@ -151,6 +151,7 @@ void KEduVocText::setPracticeDate( const QDateTime & date )
 
 KEduVocText & KEduVocText::operator =(const KEduVocText & other)
 {
+    d->m_text = other.d->m_text;
     d->m_grade = other.d->m_grade;
     d->m_totalPracticeCount = other.d->m_totalPracticeCount;
     d->m_badCount = other.d->m_badCount;
@@ -161,7 +162,9 @@ KEduVocText & KEduVocText::operator =(const KEduVocText & other)
 
 bool KEduVocText::operator ==(const KEduVocText & other) const
 {
-    return d->m_grade == other.d->m_grade &&
+    return
+        d->m_text == other.d->m_text &&
+        d->m_grade == other.d->m_grade &&
         d->m_totalPracticeCount == other.d->m_totalPracticeCount &&
         d->m_badCount == other.d->m_badCount &&
         d->m_practiceDate == other.d->m_practiceDate;

diff --git a/keduvocdocument/keduvoctranslation.cpp b/keduvocdocument/keduvoctranslation.cpp
index cf46db77ab1a5e574490283df45e5ce84aa53aee..75cbd90395fbfde4cb3a03454b774af69ac39308 100644 (file)
--- a/keduvocdocument/keduvoctranslation.cpp
+++ b/keduvocdocument/keduvoctranslation.cpp
@@ -362,10 +362,7 @@ void KEduVocTranslation::toXML(QDomElement & parent)
     kDebug() << "Write translation xml.";
     KEduVocText::toXML(parent);
     if (d->m_declension) {
-//         d->m_declension->toXML(parent);
+        d->m_declension->toXML(parent);
     }
 }
 
-
-
-