]> Git trees. - libqmvoc.git/commitdiff
enable qmvocvokabelnreader.cpp
authorReto Zingg <g.d0b3rm4n@gmail.com>
Wed, 15 Sep 2010 18:29:45 +0000 (21:29 +0300)
committerReto Zingg <g.d0b3rm4n@gmail.com>
Sat, 15 Dec 2012 16:38:05 +0000 (18:38 +0200)
qmvocdocument.cpp
qmvocvokabelnreader.cpp

index d612f6874a94930b16ff7428457592e6a2a0a649..aa7c6a3f3ca60c6d140093de184bd4bd75f476c6 100644 (file)
@@ -326,14 +326,14 @@ int QmVocDocument::open( const QUrl& url )
 
             case Vokabeln: {
                 qDebug() << "Reading Vokabeln document...";
-                qCritical ("Vokabeln document not yet supported...");
-                errorMessage = "Vokabeln document not yet supported...";
-//                 QmVocVokabelnReader vokabelnReader( f );
-//                 d->m_url.setFileName( "Untitled" );
-//                 read = vokabelnReader.readDoc( this );
-//                 if ( !read ) {
-//                     errorMessage = vokabelnReader.errorMessage();
-//                 }
+//                qCritical ("Vokabeln document not yet supported...");
+//                errorMessage = "Vokabeln document not yet supported...";
+                 QmVocVokabelnReader vokabelnReader( f );
+                 // d->m_url.setFileName( "Untitled" );
+                 read = vokabelnReader.readDoc( this );
+                 if ( !read ) {
+                     errorMessage = vokabelnReader.errorMessage();
+                 }
             }
             break;
 
index 69f702185f1d0f48a3a71b9776f98fe3dee005a5..0dc35028adeaa92b3b3daf77909dcb18205afe51 100644 (file)
@@ -179,10 +179,10 @@ bool QmVocVokabelnReader::readDoc( QmVocDocument *doc )
     for ( int i = 0; !inputStream.atEnd() && i < lines; i++ ) {
         QString lessonDescr = inputStream.readLine();
         lessonDescr = lessonDescr.mid( 1, lessonDescr.length() - 2 );
-        m_doc->lesson()->childContainer(i)->setName(lessonDescr);
         if ( lessonDescr.isEmpty() ) {
             break;
         }
+        m_doc->lesson()->childContainer(i)->setName(lessonDescr);
         inputStream.readLine();
     }