Drag and drop of lessons should work now.

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

diff --git a/keduvocdocument/keduvoccontainer.cpp b/keduvocdocument/keduvoccontainer.cpp
index ba877f4fb5e05c49d9cbb4bf77c37db237622b91..8e5d1c12d89ad2fa7d5391caaff310db9471d0d8 100644 (file)
--- a/keduvocdocument/keduvoccontainer.cpp
+++ b/keduvocdocument/keduvoccontainer.cpp
@@ -203,23 +203,11 @@ void KEduVocContainer::setImageUrl(const KUrl &url)
     d->m_imageUrl = url;
 }
 
-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;
-}
 
 void KEduVocContainer::insertChildContainer(int row, KEduVocContainer * child)
 {
     d->m_childContainers.insert(row, child);
+    child->d->m_parentContainer = this;
 }
 
 

diff --git a/keduvocdocument/keduvoccontainer.h b/keduvocdocument/keduvoccontainer.h
index 0de1ec0616a09059a6f6ed227d2038cd341a735c..28d04dadf7f9e153ae38ff76136c9cfc57220fee 100644 (file)
--- a/keduvocdocument/keduvoccontainer.h
+++ b/keduvocdocument/keduvoccontainer.h
@@ -111,7 +111,6 @@ public:
      */
     void setContainerType(KEduVocContainer::EnumContainerType type);
 
-    KEduVocContainer* childOfType(KEduVocContainer::EnumContainerType type);
 
     /** get the image url for this container if it exists */
     KUrl imageUrl();

diff --git a/keduvocdocument/keduvocwordtype.cpp b/keduvocdocument/keduvocwordtype.cpp
index 1c48278cb8b1f22bd359f9fc2906896bdfd067a1..74c50f6df8cc5b088a924cad2e2d97ed43672f7f 100644 (file)
--- a/keduvocdocument/keduvocwordtype.cpp
+++ b/keduvocdocument/keduvocwordtype.cpp
@@ -101,4 +101,17 @@ 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;
+// }

diff --git a/keduvocdocument/keduvocwordtype.h b/keduvocdocument/keduvocwordtype.h
index 7c9d4e3ab739ddb8cd2e204c90d6c9b0671401ae..a8c9b6b8d47573564bdfd9231a35982c23c5dbbd 100644 (file)
--- a/keduvocdocument/keduvocwordtype.h
+++ b/keduvocdocument/keduvocwordtype.h
@@ -60,6 +60,8 @@ public:
     KEduVocWordType::EnumWordType wordType() const;
 
 
+//     KEduVocContainer* childOfType(KEduVocContainer::EnumContainerType type);
+
     KEduVocTranslation * translation(int row);
 
     /** get a list of all entries in the lesson */