From 2fa596e671190a94b9e9e36b17a02e2dab1643f2 Mon Sep 17 00:00:00 2001
From: Peter Murdoch <pete@pmurdoch.com>
Date: Sun, 10 Jun 2007 20:33:31 +0000
Subject: [PATCH] changed calls to original() to translation(0)

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=673673
---
 kdeeducore/keduvoccsvwriter.cpp   |  3 ---
 kdeeducore/keduvockvtmlwriter.cpp | 16 ++++------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/kdeeducore/keduvoccsvwriter.cpp b/kdeeducore/keduvoccsvwriter.cpp
index d45d48d..7e2745b 100644
--- a/kdeeducore/keduvoccsvwriter.cpp
+++ b/kdeeducore/keduvoccsvwriter.cpp
@@ -63,9 +63,6 @@ bool KEduVocCsvWriter::writeDoc(KEduVocDocument *doc, const QString &generator)
       else
         currentRow += separator;
 
-      if (i == 0)
-        currentRow += expression->original();
-      else
         currentRow += expression->translation(i);
     }
 
diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp
index 968f16b..2f45e1a 100644
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -126,7 +126,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
       QString s;
       domElementOriginal.setAttribute(KV_SIZEHINT, m_doc->sizeHint(0));
 
-      s = m_doc->originalIdentifier().simplified();
+      s = m_doc->identifier(0).simplified();
       if (s.isEmpty() )
         s = "original";
       domElementOriginal.setAttribute(KV_LANG, s);
@@ -184,7 +184,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
         return false;
     }
 
-    QDomText domTextOriginal = domDoc.createTextNode(entry->original());
+    QDomText domTextOriginal = domDoc.createTextNode(entry->translation(0));
     domElementOriginal.appendChild(domTextOriginal);
     domElementExpression.appendChild(domElementOriginal);
 
@@ -359,7 +359,7 @@ bool KEduVocKvtmlWriter::writeArticle(QDomDocument &domDoc, QDomElement &domElem
     QDomElement domElementEntry = domDoc.createElement(KV_ART_ENTRY);
     if (lfn == 0)
     {
-      s = m_doc->originalIdentifier().simplified();
+      s = m_doc->identifier(0).simplified();
       if (s.isEmpty())
         s = "original";
     }
@@ -670,21 +670,13 @@ bool KEduVocKvtmlWriter::writeConjugHeader(QDomDocument &domDoc, QDomElement &do
   {
     QDomElement domElementEntry = domDoc.createElement(KV_CON_ENTRY);
 
-    if (ent == 0)
-    {
-      s = m_doc->originalIdentifier().simplified();
-      if (s.isEmpty())
-        s = "original";
-    }
-    else
-    {
       s = m_doc->identifier(ent).simplified();
       if (s.isEmpty())
       {
         s.setNum(ent);
         s.prepend("translation ");
       }
-    }
+
     domElementEntry.setAttribute(KV_LANG, s);
 
     if (!writeConjug(domDoc, domElementEntry, curr_conjug[ent], CONJ_PREFIX))
-- 
2.47.3