Make sure entries are loaded and displayed in the order they are stored.

The use of QSet made the order of expression items unspecified, i.e. random.
QSet is used elsewhere in the library. I will leave it to Frederik to review such code.

CCMAIL:frederik.gladhorn@gmx.de

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

diff --git a/keduvocdocument/keduvoccontainer.cpp b/keduvocdocument/keduvoccontainer.cpp
index e46ce554a09cf01e39d744057f6fab6f59e9373c..b6a9d433da0024706770916d09c9a0b1bf394709 100644 (file)
--- a/keduvocdocument/keduvoccontainer.cpp
+++ b/keduvocdocument/keduvoccontainer.cpp
@@ -211,12 +211,13 @@ void KEduVocContainer::insertChildContainer(int row, KEduVocContainer * child)
 
 void KEduVocContainer::updateChildLessonEntries()
 {
-    QSet < KEduVocExpression* > entriesRecursive = entries().toSet();
+    QList < KEduVocExpression* > entriesRecursive = entries();
 
-    foreach(KEduVocContainer *childContainer, d->m_childContainers) {
-        entriesRecursive.unite(childContainer->entries(Recursive).toSet());
-    }
-    d->m_childLessonEntries = entriesRecursive.toList();
+    foreach(KEduVocContainer *childContainer, d->m_childContainers)
+        foreach(KEduVocExpression * expr, childContainer->entries(Recursive))
+            entriesRecursive.append(expr);
+
+    d->m_childLessonEntries = entriesRecursive;
     d->m_childLessonEntriesValid = true;
 }