From: Frederik Gladhorn <gladhorn@kde.org>
Date: Sun, 6 Jan 2008 20:45:08 +0000 (+0000)
Subject: fix another merge bug
X-Git-Tag: v4.0.71~87
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=6ec62e0982f5ce1fd9028df3fd7c88e619157e9c;p=libqmvoc.git

fix another merge bug

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=758069
---

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index 613b457..faaa60d 100644
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -77,12 +77,11 @@ bool KEduVocKvtml2Writer::writeDoc( KEduVocDocument *doc, const QString &generat
     if ( currentElement.hasChildNodes() ) {
         domElementKvtml.appendChild( currentElement );
     }
-kDebug() << "Write word types.";
+
     // types
     currentElement = m_domDoc.createElement( KVTML_WORDTYPES );
     writeWordTypes( currentElement, m_doc->wordTypeContainer() );
     if ( currentElement.hasChildNodes() ) {
-kDebug() << "Write word types (has child nodes).";
         domElementKvtml.appendChild( currentElement );
     }
 
@@ -271,8 +270,6 @@ bool KEduVocKvtml2Writer::writeWordTypes( QDomElement &typesElement, KEduVocWord
     foreach( KEduVocContainer* container, parentContainer->childContainers() ) {
         KEduVocWordType* wordType = static_cast<KEduVocWordType*>(container);
 
-        kDebug() << "Writing type: " << wordType->name();
-
         QDomElement typeDefinitionElement = m_domDoc.createElement( KVTML_CONTAINER );
         typeDefinitionElement.appendChild( newTextElement( KVTML_NAME, wordType->name() ) );
 
@@ -310,13 +307,10 @@ bool KEduVocKvtml2Writer::writeWordTypes( QDomElement &typesElement, KEduVocWord
         foreach(KEduVocExpression *entry, wordType->entries()) {
             QDomElement entryElement = m_domDoc.createElement( KVTML_ENTRY );
             entryElement.setAttribute( KVTML_ID, QString::number(m_allEntries.indexOf(entry)) );
-
             for(int translation = 0; translation<m_doc->identifierCount(); translation++) {
                 if (entry->translation(translation)->wordType()== wordType) {
-                    // create <element id="123">
-                    entryElement.setAttribute( KVTML_ID, QString::number(translation) );
-                    // create <translation id="123">
                     QDomElement translationElement = m_domDoc.createElement( KVTML_TRANSLATION );
+                    // create <translation id="123">
                     translationElement.setAttribute( KVTML_ID, QString::number(translation) );
                     // append both
                     entryElement.appendChild(translationElement);