From e9fdc2da5c154fdd27f1e86428f8bce2a70de6e9 Mon Sep 17 00:00:00 2001 From: Peter Hedlund Date: Fri, 11 Apr 2008 17:11:55 +0000 Subject: [PATCH] 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 --- keduvocdocument/keduvoccontainer.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/keduvocdocument/keduvoccontainer.cpp b/keduvocdocument/keduvoccontainer.cpp index e46ce55..b6a9d43 100644 --- 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; } -- 2.47.3