From 81d0e4a30737b47e375d96d3d9f8a911da2b7895 Mon Sep 17 00:00:00 2001 From: Peter Hedlund Date: Tue, 12 Feb 2008 22:56:38 +0000 Subject: [PATCH] Give the wql reader some love svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=774289 --- keduvocdocument/keduvocwqlreader.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/keduvocdocument/keduvocwqlreader.cpp b/keduvocdocument/keduvocwqlreader.cpp index eca1c14..70f955a 100644 --- a/keduvocdocument/keduvocwqlreader.cpp +++ b/keduvocdocument/keduvocwqlreader.cpp @@ -1,7 +1,7 @@ /*************************************************************************** read a KEduVocDocument from a WQL file ----------------------------------------------------------------------- - copyright : (C) 2004, 2007 Peter Hedlund + copyright : (C) 2004, 2007, 2008 Peter Hedlund (C) 2005 Eric Pignet (C) 2007 Frederik Gladhorn @@ -22,7 +22,7 @@ #include #include -#include +#include #include "keduvocdocument.h" #include "keduvocexpression.h" @@ -138,6 +138,10 @@ bool KEduVocWqlReader::readDoc( KEduVocDocument *doc ) while ( !inputStream.atEnd() && inputStream.readLine() != "[Vocabulary]" ); if ( inputStream.atEnd() ) return false; + + KEduVocLesson* lesson = new KEduVocLesson( i18n("Vocabulary"), m_doc->lesson()); + m_doc->lesson()->appendChildContainer(lesson); + s = inputStream.readLine(); p = s.indexOf( " [", 0 ); s = s.left( p ); @@ -157,13 +161,12 @@ bool KEduVocWqlReader::readDoc( KEduVocDocument *doc ) //int h = r.toInt(); s = s.left( p ); s = s.simplified(); - QString b; b = inputStream.readLine(); - KEduVocExpression expr = KEduVocExpression( s ); - expr.setTranslation( 1, b ); - m_doc->lesson()->appendEntry( &expr ); + KEduVocExpression * expr = new KEduVocExpression( s ); + expr->setTranslation( 1, b ); + lesson->appendEntry( expr ); } return true; } -- 2.47.3