use text class instead of qstring, so we have grades everywhere

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

diff --git a/keduvocdocument/keduvocdeclension.cpp b/keduvocdocument/keduvocdeclension.cpp
index 6f27bcc7459c0002bd1b0efcf1cb38c71cc8b959..34c83c899afbde34256c9caee882046a29e6c9fc 100644 (file)
--- a/keduvocdocument/keduvocdeclension.cpp
+++ b/keduvocdocument/keduvocdeclension.cpp
@@ -27,7 +27,7 @@
 class KEduVocDeclension::Private
 {
 public:
-    QMap<int, QString> m_declensions;
+    QMap<int, KEduVocText> m_declensions;
 };
 
 KEduVocDeclension::KEduVocDeclension()
@@ -52,16 +52,12 @@ KEduVocDeclension::~KEduVocDeclension()
     delete d;
 }
 
-QString KEduVocDeclension::declension(DeclensionNumber number, DeclensionCase decCase)
+KEduVocText& KEduVocDeclension::declension(DeclensionNumber number, DeclensionCase decCase)
 {
-    if ( d->m_declensions.contains(indexOf(number, decCase)) ) {
-        return d->m_declensions.value(indexOf(number, decCase));
-    } else {
-        return QString();
-    }
+    return d->m_declensions[indexOf(number, decCase)];
 }
 
-void KEduVocDeclension::setDeclension(const QString & declension, DeclensionNumber number, DeclensionCase decCase)
+void KEduVocDeclension::setDeclension(const KEduVocText & declension, DeclensionNumber number, DeclensionCase decCase)
 {
     d->m_declensions[indexOf(number, decCase)] = declension;
 }

diff --git a/keduvocdocument/keduvocdeclension.h b/keduvocdocument/keduvocdeclension.h
index 6c13ee62baf216a37926eb8fae644b74ae236196..494119c4aabd44ed4b3eb5c5475013c24d0682b7 100644 (file)
--- a/keduvocdocument/keduvocdeclension.h
+++ b/keduvocdocument/keduvocdeclension.h
@@ -23,7 +23,7 @@
 #ifndef KEDUVOCDECLENSION_H
 #define KEDUVOCDECLENSION_H
 
-#include <QtCore/QString>
+#include "keduvoctext.h"
 
 /**
 A declension contains all forms that a NOUN possibly can have.
@@ -81,7 +81,7 @@ public:
      * @param decCase
      * @return
      */
-    QString declension(DeclensionNumber number, DeclensionCase decCase);
+    KEduVocText& declension(DeclensionNumber number, DeclensionCase decCase);
 
     /**
      * Set a declension
@@ -89,7 +89,7 @@ public:
      * @param number
      * @param decCase
      */
-    void setDeclension(const QString& declension, DeclensionNumber number, DeclensionCase decCase);
+    void setDeclension(const KEduVocText& declension, DeclensionNumber number, DeclensionCase decCase);
 
     bool isEmpty();