Make the grammar practice selection much better.

In the config dialog one can check the grammar tests to use now. This also allows for adverb (mixed with adjective or alone) tests.
Give the doc default grammar when using the wizard.
Rewrite the type for test selection funtion as checkType.
Deprecate a function that probably doesn't work, esp if multiple word types are allowed to share a special type.
BUG: 106451

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

diff --git a/keduvocdocument/keduvocwordtype.cpp b/keduvocdocument/keduvocwordtype.cpp
index a1b96652b83ff6c4aab50f965a764a07183d4e57..9344402884a174c7727f7a2b532ef51c6735b3f6 100644 (file)
--- a/keduvocdocument/keduvocwordtype.cpp
+++ b/keduvocdocument/keduvocwordtype.cpp
@@ -150,34 +150,6 @@ KEduVocWordType & KEduVocWordType::operator = ( const KEduVocWordType & other )
 }
 
 
-/*
-
-QString KEduVocWordType::oldType(const QString & mainType, const QString & subType) const
-{
-    QString oldType;
-    oldType = d->m_oldMainTypeNames.key(mainType);
-    if ( subType != QString() ) {
-        oldType.append(KVTML_1_TYPE_DIV);
-        oldType.append(d->m_oldSubTypeNames.key(subType));
-    }
-
-    if ( oldType.isEmpty() ) {
-        kDebug() << "Not found in preset types.";
-        int index = m_userTypeDescriptions.indexOf(mainType);
-        if ( index >= 0 ) {
-            kDebug() << "Found user type.";
-            // for some reason we count from one
-            oldType = KVTML_1_TYPE_USER;
-            oldType.append(QString::number(index + 1));
-        }
-    }
-
-    kDebug() << "KEduVocWordType::getOldType(): " << mainType << ", "<< subType << " gives: " << oldType;
-    return oldType;
-}
-*/
-
-
 void KEduVocWordType::createDefaultWordTypes()
 {
     // first the special types which cannot be deleted:

diff --git a/keduvocdocument/keduvocwordtype.h b/keduvocdocument/keduvocwordtype.h
index 1c292c1694919f7f3f7e2e0f870f7490cd575aa1..a3164bcc0f2ce090985059c93051d3c856892060 100644 (file)
--- a/keduvocdocument/keduvocwordtype.h
+++ b/keduvocdocument/keduvocwordtype.h
@@ -131,7 +131,7 @@ public:
 
     void printDebugWordTypes();
 
-    QString typeOfSpecialType( const QString& specialType ) const;
+    KDE_DEPRECATED QString typeOfSpecialType( const QString& specialType ) const;
 
     QString specialTypeNoun() const;
     QString specialTypeNounMale() const;