numTranslations -> translationCount for API consistency. Cleanup.

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=638040

diff --git a/kdeeducore/keduvoccsvreader.cpp b/kdeeducore/keduvoccsvreader.cpp
index a7b2414899b154fb43010ed9cd7e6c079c39928f..295ff987f0807b731abac008c41c1ede65050d36 100644 (file)
--- a/kdeeducore/keduvoccsvreader.cpp
+++ b/kdeeducore/keduvoccsvreader.cpp
@@ -57,7 +57,7 @@ bool KEduVocCsvReader::readDoc(KEduVocDocument *doc)
 
     if (!s.simplified().isEmpty()) {
       KEduVocExpression expression(s, separator);
-      languageCount = qMax(languageCount, expression.numTranslations() + 1);
+      languageCount = qMax(languageCount, expression.translationCount() + 1);
       m_doc->appendEntry(&expression);
     }
   }

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index 1cf8e87af12cca44a659874d7ad0ce8ef846cec1..3fa26c100990d0647bd63db00b0673780f4b0ebb 100644 (file)
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -831,7 +831,7 @@ public:
     if (cmp != 0)
       return cmp < 0;
 
-    for (int i = 1; i < (int) exp->numTranslations(); i++) {
+    for (int i = 1; i < exp->translationCount(); i++) {
 
       s1 = exp->translation(i);
       s2 = y.exp->translation(i);

diff --git a/kdeeducore/keduvocexpression.cpp b/kdeeducore/keduvocexpression.cpp
index 756d3fd22ffd6374a4ecc14efee0fff958b2d9d8..2efc23c01e7e8ffef2cb4bbbdfdcacad788ef137 100644 (file)
--- a/kdeeducore/keduvocexpression.cpp
+++ b/kdeeducore/keduvocexpression.cpp
@@ -3,7 +3,7 @@
     -----------------------------------------------------------------------
     copyright            : (C) 1999-2001 Ewald Arnold
                            (C) 2001 The KDE-EDU team
-                           (C) 2005-2006 Peter Hedlund
+                           (C) 2005-2007 Peter Hedlund
     email                : peter.hedlund@kdemail.net
  ***************************************************************************/
 
@@ -43,7 +43,7 @@ KEduVocExpression::KEduVocExpression ()
 KEduVocExpression::KEduVocExpression(const QString & expression, int lesson)
 {
   Init();
-  setOriginal(expression.simplified() );
+  setOriginal(expression.simplified());
   m_lesson = lesson;
 }
 
@@ -78,7 +78,7 @@ KEduVocExpression::KEduVocExpression(const QString & expression, const QString &
   }
 }
 
-int KEduVocExpression::numTranslations() const
+int KEduVocExpression::translationCount() const
 {
   return m_translations.count();
 }
@@ -394,7 +394,7 @@ void KEduVocExpression::removeTranslation (int idx)
   if (idx <= 0)
     return;
 
-  if (idx <= numTranslations())
+  if (idx <= translationCount())
     m_translations.removeAt(idx - 1);
 
   if (idx < (int)m_remarks.size())
@@ -473,14 +473,6 @@ void KEduVocExpression::setTranslation (int idx, const QString & expr)
 }
 
 
-QString KEduVocExpression::gradeStr (int idx, bool rev_grade) const
-{
-  QString s;
-  s.setNum(grade(idx, rev_grade));
-  return s;
-}
-
-
 grade_t KEduVocExpression::grade (int idx, bool rev_grade) const
 {
   if (rev_grade) {
@@ -730,7 +722,7 @@ bool KEduVocExpression::uniqueType () const
 {
   bool unique = true;
   QString type0 = type(0);
-  for (int i = 1; i < numTranslations(); i++)
+  for (int i = 1; i < translationCount(); i++)
     if (type0 != type(i) )
       unique = false;
   return unique;

diff --git a/kdeeducore/keduvocexpression.h b/kdeeducore/keduvocexpression.h
index 006b63ea4d5cef1e5df5070529335bca0efd1f17..4e6dad1d824c585716f10ad2b593f216012cc71c 100644 (file)
--- a/kdeeducore/keduvocexpression.h
+++ b/kdeeducore/keduvocexpression.h
@@ -3,7 +3,7 @@
     -----------------------------------------------------------------------
     copyright            : (C) 1999-2001 Ewald Arnold
                            (C) 2001 The KDE-EDU team
-                           (C) 2005-2006 Peter Hedlund
+                           (C) 2005-2007 Peter Hedlund
     email                : peter.hedlund@kdemail.net
  ***************************************************************************/
 
@@ -118,7 +118,7 @@ public:
 
   /** returns number of max. translations of all expressions
    */
-  int numTranslations() const;
+  int translationCount() const;
 
   /** returns flag if entry is "selected" for queries
    */
@@ -290,14 +290,6 @@ public:
    */
   void setType(int index, const QString & type);
 
-  /** returns grade of given translation as string
-   *
-   * @param index            index of expression
-   * @param reverse          if true, represents the direction translation to original
-   * @return                 number of knowlegde: 0=known, x=numbers not knows
-   */
-  QString gradeStr(int index, bool reverse = false) const;
-
   /** sets grade of given translation
    *
    * @param index            index of translation

diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp
index e3812fc72ef9b41b2c13cf9d0c5fdd8df2d5146b..f059a3e19ea69159c21ea1e5cc4a01800b816fb2 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -208,7 +208,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
       }
 
       if (entry->grade(trans, false) != 0 || entry->grade(trans, true) != 0)
-        domElementTranslation.setAttribute(KV_GRADE, entry->gradeStr(trans, false) + ';' + entry->gradeStr(trans, true));
+        domElementTranslation.setAttribute(KV_GRADE, QString::number(entry->grade(trans, false)) + ';' + QString::number(entry->grade(trans, true)));
 
       if (entry->queryCount(trans, false) != 0 || entry->queryCount(trans, true) != 0)
         domElementTranslation.setAttribute(KV_COUNT, QString::number(entry->queryCount(trans, false)) + ';' + QString::number(entry->queryCount(trans, true)));