merge trunk into branch - now passing the app name here as well.

svn path=/branches/work/kdeedu_parley/libkdeedu/; revision=747580

diff --cc keduvocdocument/keduvocdocument.cpp
index feb00b0299cf0521afe1b5de82e4bd39a418327a,31e623e75a9d94e32235325d388e290e2b99480b..2b66dd71799715513b4d96317d784be925a9c85a
--- 1/keduvocdocument/keduvocdocument.cpp
--- 2/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@@ -265,10 -276,9 +265,10 @@@ kDebug() << "open"
                  }
              }
              break;
 -
 +///@todo port me
 +/*
              case Wql: {
-                 kDebug() << "Reading WordQuiz (WQL) document...";
+                 kDebug(1100) << "Reading WordQuiz (WQL) document...";
                  KEduVocWqlReader wqlReader( f );
                  d->m_url.setFileName( i18n( "Untitled" ) );
                  read = wqlReader.readDoc( this );
@@@ -319,10 -329,10 +319,10 @@@
                      errorMessage = i18n( "Parse error at line %1, column %2:\n%3", xdxfReader.lineNumber(), xdxfReader.columnNumber(), xdxfReader.errorString() );
                  }
              }
 -            break;
 +            break;*/
  
              default: {
-                 kDebug() << "Reading KVTML document (fallback)...";
+                 kDebug(1100) << "Reading KVTML document (fallback)...";
                  KEduVocKvtml2Reader kvtmlReader( f );
                  read = kvtmlReader.readDoc( this );
                  if ( !read ) {
@@@ -691,9 -795,22 +691,6 @@@ bool KEduVocDocument::isModified() cons
  }
  
  
 -int KEduVocDocument::entryCount() const
 -{
 -    return d->m_vocabulary.count();
 -}
 -
--
 -void KEduVocDocument::resetEntry( int index, int lesson )
 -{
 -    for ( int i = 0; i < d->m_vocabulary.count(); i++ )
 -        if ( /*lesson == 0 ||*/ lesson == d->m_vocabulary[i].lesson() ) {
 -            // index is the translation number whose grades are reset
 -            d->m_vocabulary[i].resetGrades( index );
 -        }
 -}
--
--
  int KEduVocDocument::identifierCount() const
  {
      return d->m_identifiers.count();  // number of translations

diff --cc keduvocdocument/keduvocgrammar.cpp
Simple merge

diff --cc keduvocdocument/keduvocgrammar.h
Simple merge

diff --cc keduvocdocument/keduvockvtml2writer.cpp
index dcc7663b840a7a955b9fed1b780c3e27ebd6446f,c3fcd5912b08157a678afddfa815e4336a8ca393..ee8daf5c62a288fb7c43a09ec19bb16b6881649a
--- 1/keduvocdocument/keduvockvtml2writer.cpp
--- 2/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@@ -357,9 -396,16 +357,11 @@@ bool KEduVocKvtml2Writer::writeEntries
          // add id
          entryElement.setAttribute( KVTML_ID, QString::number( i ) );
  
-         // write inactive
-         entryElement.appendChild( newTextElement( KVTML_DEACTIVATED, thisEntry->isActive() ? KVTML_FALSE : KVTML_TRUE ) );
+         // write deactivated
+         if(!thisEntry->isActive()) {
+             entryElement.appendChild( newTextElement( KVTML_DEACTIVATED, KVTML_TRUE ) );
+         }
  
 -        // write sizehint
 -        if ( thisEntry->sizeHint() > 0 ) {
 -            entryElement.appendChild( newTextElement( KVTML_SIZEHINT, QString::number( thisEntry->sizeHint() ) ) );
 -        }
 -
          // loop through translations
          foreach( int trans, thisEntry->translationIndices() ) {
              // write translations