From 26eed014a1bfd2dd0ba24e88452c80388f110946 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 17 Sep 2007 14:11:24 +0000 Subject: [PATCH] Fix adding vocabulary to wrong lessons when reading old documents. svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=713424 --- keduvocdocument/keduvocdocument.cpp | 3 +-- keduvocdocument/keduvockvtmlreader.cpp | 11 +---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp index 682225d..65bcc5b 100644 --- a/keduvocdocument/keduvocdocument.cpp +++ b/keduvocdocument/keduvocdocument.cpp @@ -155,8 +155,7 @@ void KEduVocDocument::setModified( bool dirty ) void KEduVocDocument::appendEntry( KEduVocExpression *expression ) { - d->m_vocabulary.append( *expression ); - setModified(); + insertEntry(expression, d->m_vocabulary.count()); } diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp index 637d342..68c82b2 100644 --- a/keduvocdocument/keduvockvtmlreader.cpp +++ b/keduvocdocument/keduvockvtmlreader.cpp @@ -1003,11 +1003,7 @@ bool KEduVocKvtmlReader::readExpression( QDomElement &domElementParent ) textstr = currentElement.lastChild().toText().data(); if ( i == 0 ) { - expr = KEduVocExpression( textstr ); - expr.setLesson( lesson ); - -///@todo inquery is old and no longer used. get rid of reading it. -// expr.setInQuery( inquery ); + expr = KEduVocExpression( textstr, lesson ); expr.setActive( active ); } else { expr.setTranslation( i, textstr ); @@ -1077,11 +1073,6 @@ bool KEduVocKvtmlReader::readExpression( QDomElement &domElementParent ) // } m_doc->appendEntry( &expr ); - // also add this entryid to the lesson it's part of - if ( lesson >= 0 ) { - m_doc->lesson( lesson ).addEntry( m_doc->entryCount() ); - } - return true; } -- 2.47.3