Rename some functions for API consistency. Review of document merge code.

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

diff --git a/kdeeducore/keduvocgrammar.cpp b/kdeeducore/keduvocgrammar.cpp
index 6dff1b295a309adaae537c678b5858b4b78a01a1..2ce92940fb00533c9274b740d4588ec570f7a55d 100644 (file)
--- a/kdeeducore/keduvocgrammar.cpp
+++ b/kdeeducore/keduvocgrammar.cpp
@@ -233,7 +233,7 @@ QString KEduVocConjugation::getVerbName() const
   return d->verbName;
 }
 
-int KEduVocConjugation::numEntries() const
+int KEduVocConjugation::entryCount() const
 {
   return d->conjugations.count();
 }
@@ -291,7 +291,7 @@ QString KEduVocConjugation::getName(int idx)
 {
   if (idx < numInternalNames())
     return i18n(Private::names[idx].name);
-  else if (idx < numTenses() )
+  else if (idx < tenseCount())
     return Private::userTenses[idx-numInternalNames()];
   else
     return "";
@@ -321,7 +321,7 @@ QString KEduVocConjugation::getAbbrev(int idx)
   if (idx < numInternalNames() )
     return Private::names[idx].abbrev;
 
-  else if (idx < numTenses() ) {
+  else if (idx < tenseCount()) {
     QString s;
     s.setNum(idx - numInternalNames() + 1);
     s.prepend(UL_USER_TENSE);
@@ -339,7 +339,7 @@ int KEduVocConjugation::numInternalNames()
 }
 
 
-int KEduVocConjugation::numTenses()
+int KEduVocConjugation::tenseCount()
 {
   return numInternalNames() + Private::userTenses.size();
 }

diff --git a/kdeeducore/keduvocgrammar.h b/kdeeducore/keduvocgrammar.h
index 0728545716b65b23ee656b90c913d82308031c96..59dcd0591ab0735bf0b59a7c1005a1abb7b679a0 100644 (file)
--- a/kdeeducore/keduvocgrammar.h
+++ b/kdeeducore/keduvocgrammar.h
@@ -175,7 +175,7 @@ public:
   /**
    * @return
    */
-  int numEntries() const;
+  int entryCount() const;
 
   /**
    * @return 
@@ -192,7 +192,7 @@ public:
   static QString getAbbrev(const QString &name);
   static QString getAbbrev(int index);
   static int numInternalNames();
-  static int numTenses();
+  static int tenseCount();
 
   QString getVerbName() const;
 

diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp
index f178d4e2771a6f5367b04ba0151afca22a99c636..027dc0d9536dda28019c92c7ed83a76594e564a5 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -169,7 +169,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
     else
       entype = s;
 
-    if (entype == QM_VERB && entry->conjugation(0).numEntries() > 0)
+    if (entype == QM_VERB && entry->conjugation(0).entryCount() > 0)
     {
       KEduVocConjugation conj = entry->conjugation(0);
       if (!writeConjugEntry(domDoc, domElementOriginal, conj))
@@ -262,7 +262,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
       else
         entype = s;
 
-      if (entype == QM_VERB && entry->conjugation(trans).numEntries() > 0)
+      if (entype == QM_VERB && entry->conjugation(trans).entryCount() > 0)
       {
         KEduVocConjugation conj = entry->conjugation(trans);
         if (!writeConjugEntry(domDoc, domElementTranslation, conj))
@@ -721,13 +721,13 @@ bool KEduVocKvtmlWriter::writeConjugEntry(QDomDocument &domDoc, QDomElement &dom
 */
 {
   curr_conjug.cleanUp();
-  if (curr_conjug.numEntries() == 0 )
+  if (curr_conjug.entryCount() == 0 )
     return true;
 
   QDomElement domElementConjug = domDoc.createElement(KV_CONJUG_GRP);
   QString type;
 
-  for (int lfn = 0; lfn < curr_conjug.numEntries(); lfn++)
+  for (int lfn = 0; lfn < curr_conjug.entryCount(); lfn++)
   {
     QDomElement domElementType = domDoc.createElement(KV_CON_TYPE);