From 83f69ce32d0e5b84357c010c071fa3cbe64d8d61 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 18 Sep 2007 16:31:15 +0000 Subject: [PATCH] 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 --- keduvocdocument/keduvocwordtype.cpp | 28 ---------------------------- keduvocdocument/keduvocwordtype.h | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/keduvocdocument/keduvocwordtype.cpp b/keduvocdocument/keduvocwordtype.cpp index a1b9665..9344402 100644 --- 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 1c292c1..a3164bc 100644 --- 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; -- 2.47.3