Enable word type finding code again (only within word type container class). Make...

svn path=/branches/work/kdeedu_parley/libkdeedu/; revision=757439

diff --git a/keduvocdocument/keduvocwordtype.cpp b/keduvocdocument/keduvocwordtype.cpp
index 74c50f6df8cc5b088a924cad2e2d97ed43672f7f..be4b32bdc2044f1488c605f5ecdc0d938645bd0d 100644 (file)
--- a/keduvocdocument/keduvocwordtype.cpp
+++ b/keduvocdocument/keduvocwordtype.cpp
@@ -101,17 +101,16 @@ KEduVocWordType::EnumWordType KEduVocWordType::wordType() const
     return d->m_wordType;
 }
 
-///@todo provide a function to find a certain word type container... used for "make this a noun" buttons
-// KEduVocContainer * KEduVocContainer::childOfType(KEduVocContainer::EnumContainerType type)
-// {
-//     if(containerType()==type) {
-//         return this;
-//     }
-//     foreach(KEduVocContainer* child, childContainers()) {
-//         KEduVocContainer* result = child->childOfType(type);
-//         if(result) {
-//             return result;
-//         }
-//     }
-//     return 0;
-// }
+KEduVocWordType* KEduVocWordType::childOfType(KEduVocWordType::EnumWordType type)
+{
+    if(wordType()==type) {
+        return this;
+    }
+    foreach(KEduVocContainer* child, childContainers()) {
+        KEduVocWordType* result = static_cast<KEduVocWordType*>(child)->childOfType(type);
+        if(result) {
+            return result;
+        }
+    }
+    return 0;
+}

diff --git a/keduvocdocument/keduvocwordtype.h b/keduvocdocument/keduvocwordtype.h
index a8c9b6b8d47573564bdfd9231a35982c23c5dbbd..0a82a8c2d1dec0a28238b55bad24ee4627215870 100644 (file)
--- a/keduvocdocument/keduvocwordtype.h
+++ b/keduvocdocument/keduvocwordtype.h
@@ -60,7 +60,7 @@ public:
     KEduVocWordType::EnumWordType wordType() const;
 
 
-//     KEduVocContainer* childOfType(KEduVocContainer::EnumContainerType type);
+    KEduVocWordType* childOfType(KEduVocWordType::EnumWordType type);
 
     KEduVocTranslation * translation(int row);
 
@@ -72,8 +72,6 @@ public:
     /** get the number of entries in the lesson */
     int entryCount();
 
-//     KEduVocWordType *parent();
-
 private:
     class Private;
     Private * const d;