From: Reto Zingg <g.d0b3rm4n@gmail.com>
Date: Sat, 15 Dec 2012 17:28:48 +0000 (+0200)
Subject: adapt qmvoccsvreader.cpp for querymee
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=a4501b48fc5922ae0ad30c0be78c9b58ab108925;p=libqmvoc.git

adapt qmvoccsvreader.cpp for querymee
---

diff --git a/qmvoccsvreader.cpp b/qmvoccsvreader.cpp
index e3d471c..e71370c 100644
--- a/qmvoccsvreader.cpp
+++ b/qmvoccsvreader.cpp
@@ -1,6 +1,10 @@
 /***************************************************************************
+*   this file is from kdeedu project. Filename: keduvoccsvreader.cpp
+***************************************************************************/
 
-                    create a KEduVocDocument from a text file
+/***************************************************************************
+
+                    create a QmVocDocument from a text file
 
     -----------------------------------------------------------------------
 
@@ -10,6 +14,8 @@
 
                    (C) 2005, 2007 Peter Hedlund <peter.hedlund@kdemail.net>
 
+                   (C) 2010, 2012 Reto Zingg <g.d0b3rm4n@gmail.com>
+
     -----------------------------------------------------------------------
 
  ***************************************************************************/
@@ -23,18 +29,19 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "keduvoccsvreader.h"
+#include "qmvoccsvreader.h"
 
 #include <QIODevice>
 #include <QTextStream>
 
-#include <klocale.h>
+// #include <klocale.h>
+
 
-#include "keduvocdocument.h"
-#include "keduvoclesson.h"
-#include "keduvocexpression.h"
+#include "qmvocdocument.h"
+#include "qmvoclesson.h"
+#include "qmvocexpression.h"
 
-KEduVocCsvReader::KEduVocCsvReader( QIODevice *file )
+QmVocCsvReader::QmVocCsvReader( QIODevice *file )
 {
     // the file must be already open
     m_inputFile = file;
@@ -42,7 +49,7 @@ KEduVocCsvReader::KEduVocCsvReader( QIODevice *file )
 }
 
 
-bool KEduVocCsvReader::readDoc( KEduVocDocument *doc )
+bool QmVocCsvReader::readDoc( QmVocDocument *doc )
 {
     m_doc = doc;
 
@@ -55,14 +62,14 @@ bool KEduVocCsvReader::readDoc( KEduVocDocument *doc )
 
     int languageCount = 0;
 
-    KEduVocLesson* lesson = new KEduVocLesson( i18n("Vocabulary"), m_doc->lesson());
+    QmVocLesson* lesson = new QmVocLesson( "Vocabulary", m_doc->lesson());
     m_doc->lesson()->appendChildContainer(lesson);
 
     while ( !inputStream.atEnd() ) {
         QString s = inputStream.readLine();
 
         if ( !s.simplified().isEmpty() ) {
-            KEduVocExpression* expression = new KEduVocExpression( s.split(separator) );
+            QmVocExpression* expression = new QmVocExpression( s.split(separator) );
             languageCount = qMax( languageCount,
                 expression->translationIndices().count() );
             lesson->appendEntry( expression );