Conjugation is now complete. it uses personalpronouns + tense for the prompt when...

Enabling of Hint and Show Solution in all modes.
Deletion of the Hint class (it was unused -- the hint KAction superceded it).

Various small bugfixes.

Fix to make keduvocpersionalpronoun more reliable.

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

diff --git a/keduvocdocument/keduvocpersonalpronoun.cpp b/keduvocdocument/keduvocpersonalpronoun.cpp
index 8135120d440b3944076c6d2703bed8f2ed2a3fba..cc77d53b68e145ec3db2929c7d7bcd5fee884146 100644 (file)
--- a/keduvocdocument/keduvocpersonalpronoun.cpp
+++ b/keduvocdocument/keduvocpersonalpronoun.cpp
@@ -77,7 +77,14 @@ bool KEduVocPersonalPronoun::operator ==(const KEduVocPersonalPronoun& other) co
 
 QString KEduVocPersonalPronoun::personalPronoun(KEduVocWordFlags flags) const
 {
-        return d->m_personalpronouns.value(flags & (KEduVocWordFlag::persons | KEduVocWordFlag::numbers| KEduVocWordFlag::genders));
+        QString p = d->m_personalpronouns.value(flags & (KEduVocWordFlag::persons | KEduVocWordFlag::numbers| KEduVocWordFlag::genders));
+        if (p.isEmpty() && !(flags & KEduVocWordFlag::genders) && d->m_maleFemaleDifferent && d->m_neutralExists)
+        {
+            kDebug() << "initial flag lookup failed, added neuter gender flag";
+           flags |= KEduVocWordFlag::Neuter;
+           p = d->m_personalpronouns.value(flags & (KEduVocWordFlag::persons | KEduVocWordFlag::numbers| KEduVocWordFlag::genders));
+        }
+        return p;
 }
 
 void KEduVocPersonalPronoun::setPersonalPronoun(const QString & personalpronoun, KEduVocWordFlags flags)