From dbbb937bcd81eebdd66441d507cbf6899f521274 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 25 Apr 2008 09:19:32 +0000 Subject: [PATCH] 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 --- keduvocdocument/keduvockvtml2reader.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 ) } // - 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. -- 2.47.3