From e255e92424ef013d2abcae1840e1e05cbb40335f Mon Sep 17 00:00:00 2001 From: Reto Zingg Date: Sat, 15 Dec 2012 19:28:49 +0200 Subject: [PATCH] adapt qmvocvokabelnreader.cpp for querymee --- qmvocvokabelnreader.cpp | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/qmvocvokabelnreader.cpp b/qmvocvokabelnreader.cpp index 7172e5b..83e6245 100644 --- a/qmvocvokabelnreader.cpp +++ b/qmvocvokabelnreader.cpp @@ -1,6 +1,10 @@ /*************************************************************************** +* this file is from kdeedu project. Filename: keduvocvokabelnreader.cpp +***************************************************************************/ - create a KEduVocDocument from a Vokabeln file +/*************************************************************************** + + create a QmVocDocument from a Vokabeln file ----------------------------------------------------------------------- @@ -8,6 +12,7 @@ copyright : (C) 2005, 2007 Peter Hedlund (C) 2007 Frederik Gladhorn + (C) 2010, 2012 Reto Zingg ----------------------------------------------------------------------- @@ -22,17 +27,18 @@ * * ***************************************************************************/ -#include "keduvocvokabelnreader.h" +#include "qmvocvokabelnreader.h" #include -#include -#include +// #include +// #include +#include -#include "keduvocdocument.h" -#include "keduvocexpression.h" +#include "qmvocdocument.h" +#include "qmvocexpression.h" -KEduVocVokabelnReader::KEduVocVokabelnReader( QIODevice *file ) +QmVocVokabelnReader::QmVocVokabelnReader( QIODevice *file ) { // the file must be already open m_inputFile = file; @@ -40,9 +46,9 @@ KEduVocVokabelnReader::KEduVocVokabelnReader( QIODevice *file ) } -bool KEduVocVokabelnReader::readDoc( KEduVocDocument *doc ) +bool QmVocVokabelnReader::readDoc( QmVocDocument *doc ) { - kDebug() << "Reading vokabeln.de document..."; + qDebug() << "Reading vokabeln.de document..."; m_doc = doc; m_doc->setAuthor( "http://www.vokabeln.de" ); @@ -107,13 +113,13 @@ bool KEduVocVokabelnReader::readDoc( KEduVocDocument *doc ) QString language = languages[0].mid( 1 ); m_doc->identifier(0).setLocale(language); m_doc->identifier(0).setName(language); - kDebug() << "First language: " << language; + qDebug() << "First language: " << language; m_doc->appendIdentifier(); language = languages[1].mid( 1 ); m_doc->identifier(1).setLocale(language); m_doc->identifier(1).setName(language); - kDebug() << "Second language: " << language; + qDebug() << "Second language: " << language; while ( !temp.contains("8. Lernhilfe") ) { temp = inputStream.readLine(); //DO NOT translate @@ -142,25 +148,25 @@ bool KEduVocVokabelnReader::readDoc( KEduVocDocument *doc ) translation = words[1].mid( 1 ); lessonNumber = words[2].toInt() - 1; - kDebug() << "Reading entry: " << original << " - " << translation << " Lesson: " << lessonNumber; + qDebug() << "Reading entry: " << original << " - " << translation << " Lesson: " << lessonNumber; // fallback if it's not read correctly if (lessonNumber < 0) { - kDebug() << "Warning, invalid lesson found!"; + qDebug() << "Warning, invalid lesson found!"; lessonNumber = 0; } while(m_doc->lesson()->childContainerCount() <= lessonNumber) { - KEduVocLesson* lesson = new KEduVocLesson(i18n("Lesson %1", lessonNumber), m_doc->lesson()); + QmVocLesson* lesson = new QmVocLesson(QString("Lesson %1").arg(lessonNumber), m_doc->lesson()); m_doc->lesson()->appendChildContainer(lesson); - kDebug() << "Created lesson " << lessonNumber; + qDebug() << "Created lesson " << lessonNumber; } - KEduVocExpression* kve = new KEduVocExpression; + QmVocExpression* kve = new QmVocExpression; kve->setTranslation( 0, original ); kve->setTranslation( 1, translation ); - static_cast(m_doc->lesson()->childContainer(lessonNumber))->appendEntry(kve); + static_cast(m_doc->lesson()->childContainer(lessonNumber))->appendEntry(kve); inputStream.readLine(); inputStream.readLine(); -- 2.47.3