From 55f0bd5fbba5cdf655888a67b6a2f3b49d32a6bf Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sun, 24 Feb 2008 14:10:42 +0000 Subject: [PATCH] use text class instead of qstring, so we have grades everywhere svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=778742 --- keduvocdocument/keduvocdeclension.cpp | 12 ++++-------- keduvocdocument/keduvocdeclension.h | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/keduvocdocument/keduvocdeclension.cpp b/keduvocdocument/keduvocdeclension.cpp index 6f27bcc..34c83c8 100644 --- a/keduvocdocument/keduvocdeclension.cpp +++ b/keduvocdocument/keduvocdeclension.cpp @@ -27,7 +27,7 @@ class KEduVocDeclension::Private { public: - QMap m_declensions; + QMap 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 6c13ee6..494119c 100644 --- a/keduvocdocument/keduvocdeclension.h +++ b/keduvocdocument/keduvocdeclension.h @@ -23,7 +23,7 @@ #ifndef KEDUVOCDECLENSION_H #define KEDUVOCDECLENSION_H -#include +#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(); -- 2.47.3