From 7990e978e7590626521680a3e9dfd59c78a5fc4c Mon Sep 17 00:00:00 2001 From: Reto Zingg Date: Wed, 15 Sep 2010 21:29:45 +0300 Subject: [PATCH] enable qmvocvokabelnreader.cpp --- qmvocdocument.cpp | 16 ++++++++-------- qmvocvokabelnreader.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qmvocdocument.cpp b/qmvocdocument.cpp index 55da4f7..a8125e4 100644 --- a/qmvocdocument.cpp +++ b/qmvocdocument.cpp @@ -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; diff --git a/qmvocvokabelnreader.cpp b/qmvocvokabelnreader.cpp index 83e6245..3306727 100644 --- a/qmvocvokabelnreader.cpp +++ b/qmvocvokabelnreader.cpp @@ -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(); } -- 2.47.3