From 1da58ba748e8d65fa6db55ecb6d9bf58ed1af99c Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sun, 2 Mar 2008 21:08:56 +0000 Subject: [PATCH] not only pretend to read grades but do it ;) svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=781433 --- keduvocdocument/keduvockvtml2reader.h | 7 ------- keduvocdocument/keduvoctext.cpp | 14 ++++++++------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/keduvocdocument/keduvockvtml2reader.h b/keduvocdocument/keduvockvtml2reader.h index b5140fd..75be924 100644 --- a/keduvocdocument/keduvockvtml2reader.h +++ b/keduvocdocument/keduvockvtml2reader.h @@ -131,13 +131,6 @@ private: */ bool readMultipleChoice( QDomElement &multipleChoiceElement, KEduVocTranslation* translation ); - /** read a grade - * @param gradeElement element to read from - * @param expr expression element to add grades to - * @param index index of the current translation - */ - bool readGrade( QDomElement &gradeElement, KEduVocExpression *expr, int index ); - /** * Read tags. * @param parentLesson diff --git a/keduvocdocument/keduvoctext.cpp b/keduvocdocument/keduvoctext.cpp index 6a4f410..1c60a1c 100644 --- a/keduvocdocument/keduvoctext.cpp +++ b/keduvocdocument/keduvoctext.cpp @@ -14,6 +14,8 @@ #include "keduvoctext.h" #include "kvtml2defs.h" #include "keduvockvtml2writer.h" + +#include #include class KEduVocText::KEduVocTextPrivate @@ -205,16 +207,16 @@ void KEduVocText::fromKVTML2(QDomElement & parent) setText( parent.firstChildElement( KVTML_TEXT ).text() ); // grade element - parent.firstChildElement() = parent.firstChildElement( KVTML_GRADE ); - if ( !parent.firstChildElement().isNull() ) { + const QDomElement& gradeElement = parent.firstChildElement( KVTML_GRADE ); + if ( !gradeElement.isNull() ) { - setGrade( parent.firstChildElement(KVTML_CURRENTGRADE).text().toInt() ); + setGrade( gradeElement.firstChildElement(KVTML_CURRENTGRADE).text().toInt() ); - setPracticeCount( parent.firstChildElement(KVTML_COUNT).text().toInt() ); + setPracticeCount( gradeElement.firstChildElement(KVTML_COUNT).text().toInt() ); - setBadCount( parent.firstChildElement(KVTML_ERRORCOUNT).text().toInt() ); + setBadCount( gradeElement.firstChildElement(KVTML_ERRORCOUNT).text().toInt() ); - QString dateString = parent.firstChildElement(KVTML_DATE).text(); + QString dateString = gradeElement.firstChildElement(KVTML_DATE).text(); if ( !dateString.isEmpty() ) { QDateTime value = QDateTime::fromString( dateString, Qt::ISODate ); setPracticeDate( value ); -- 2.47.3