[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu
From:       Peter Hedlund <peter () peterandlinda ! com>
Date:       2007-02-28 16:59:55
Message-ID: 1172681995.710706.20747.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 638040 by hedlund:

numTranslations -> translationCount for API consistency. Cleanup.

 M  +1 -1      kvoctrain/kvoctrain/kva_io.cpp  
 M  +2 -2      kvoctrain/kvoctrain/kvoctrain.cpp  
 M  +1 -1      libkdeedu/kdeeducore/keduvoccsvreader.cpp  
 M  +1 -1      libkdeedu/kdeeducore/keduvocdocument.cpp  
 M  +5 -13     libkdeedu/kdeeducore/keduvocexpression.cpp  
 M  +2 -10     libkdeedu/kdeeducore/keduvocexpression.h  
 M  +1 -1      libkdeedu/kdeeducore/keduvockvtmlwriter.cpp  


--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kva_io.cpp #638039:638040
@@ -314,7 +314,7 @@
 
         expr->setLesson(expr->lesson()+lesson_offset);
 
-        for (int lang = 0; lang <= (int) expr->numTranslations(); lang++) {
+        for (int lang = 0; lang <= (int) expr->translationCount(); lang++) {
           QString t = expr->type (lang);
           // adjust type offset
           if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) {
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kvoctrain.cpp #638039:638040
@@ -193,11 +193,11 @@
        expr->setQueryDate(col, dt, true);
        expr->setType (col, entryDlg->getType());
 
-       for (int j = 0; j <= expr->numTranslations(); j++)
+       for (int j = 0; j <= expr->translationCount(); j++)
          if (expr->type(j).isEmpty() )
            expr->setType(j, entryDlg->getType());
 
-       for (int j = 0; j <= expr->numTranslations(); j++)
+       for (int j = 0; j <= expr->translationCount(); j++)
          if (QueryManager::getMainType(expr->type(j))
                !=
              QueryManager::getMainType(entryDlg->getType()) )
--- trunk/KDE/kdeedu/libkdeedu/kdeeducore/keduvoccsvreader.cpp #638039:638040
@@ -57,7 +57,7 @@
 
     if (!s.simplified().isEmpty()) {
       KEduVocExpression expression(s, separator);
-      languageCount = qMax(languageCount, expression.numTranslations() + 1);
+      languageCount = qMax(languageCount, expression.translationCount() + 1);
       m_doc->appendEntry(&expression);
     }
   }
--- trunk/KDE/kdeedu/libkdeedu/kdeeducore/keduvocdocument.cpp #638039:638040
@@ -831,7 +831,7 @@
     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);
--- trunk/KDE/kdeedu/libkdeedu/kdeeducore/keduvocexpression.cpp #638039:638040
@@ -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(const QString & expression, int lesson)
 {
   Init();
-  setOriginal(expression.simplified() );
+  setOriginal(expression.simplified());
   m_lesson = lesson;
 }
 
@@ -78,7 +78,7 @@
   }
 }
 
-int KEduVocExpression::numTranslations() const
+int KEduVocExpression::translationCount() const
 {
   return m_translations.count();
 }
@@ -394,7 +394,7 @@
   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 @@
 }
 
 
-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 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;
--- trunk/KDE/kdeedu/libkdeedu/kdeeducore/keduvocexpression.h #638039:638040
@@ -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 @@
 
   /** 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 @@
    */
   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
--- trunk/KDE/kdeedu/libkdeedu/kdeeducore/keduvockvtmlwriter.cpp #638039:638040
@@ -208,7 +208,7 @@
       }
 
       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)));


[prev in list] [next in list] [prev in thread] [next in thread]