From: Frederik Gladhorn <gladhorn@kde.org>
Date: Fri, 25 Apr 2008 09:19:32 +0000 (+0000)
Subject: improve reading of documents created with kde 4.1 - sublesson entries are read into... 
X-Git-Tag: v4.0.4^0
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=dbbb937bcd81eebdd66441d507cbf6899f521274;p=libqmvoc.git

improve reading of documents created with kde 4.1 - sublesson entries are read into the parent lesson

svn path=/branches/KDE/4.0/kdeedu/libkdeedu/; revision=800944
---

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 9d0c39d..b20b3a9 100644
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -458,15 +458,14 @@ bool KEduVocKvtml2Reader::readLesson( QDomElement &lessonElement )
     }
 
     //<entry id="123"/>
-    currentElement = lessonElement.firstChildElement( KVTML_ENTRY );
-    while ( !currentElement.isNull() ) {
+    QDomNodeList entries = lessonElement.elementsByTagName( KVTML_ENTRY );
+    for (int i = 0; i < entries.count(); i++) {
         bool result = false;
-        int id = currentElement.attribute( KVTML_ID ).toInt( &result );
+        int id = entries.item(i).toElement().attribute( KVTML_ID ).toInt( &result );
         if(result) {
             m_doc->entry(id)->setLesson(lessonId);
             m_doc->lesson(lessonId).addEntry(id);
         }
-        currentElement = currentElement.nextSiblingElement( KVTML_ENTRY );
     }
 
     ///@todo remove this after 4.0 release. it provides compability with some documents written with kvtml2 prior to the 4.0 release during the beta phase.