numEntries() -> entryCount() for API consistency

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

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index bc91a62174988fc147e800cfa6e3b6e803012412..4250c8b8c06baf9f75253917407c0a6ebc3d829d 100644 (file)
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -790,8 +790,8 @@ void KEduVocDocument::setFont(QFont* font)
 
 int KEduVocDocument::search(const QString &substr, int id, int first, int last, bool word_start)
 {
-  if (last >= numEntries() || last < 0)
-    last = numEntries();
+  if (last >= entryCount() || last < 0)
+    last = entryCount();
 
   if (first < 0)
     first = 0;

diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h
index 784adcc669544875b0e5979b7b55533a05f82974..1ffef081180815dc19e0e2f8b2e7f86711d8c108 100644 (file)
--- a/kdeeducore/keduvocdocument.h
+++ b/kdeeducore/keduvocdocument.h
@@ -504,7 +504,7 @@ public:
   /**
    * @returns the number of entries
    */
-  inline int numEntries() const { return m_vocabulary.count(); }
+  inline int entryCount() const { return m_vocabulary.count(); }
 
   /**
    * Sets grades to KV_NORM_GRADE, counts to 0 ...

diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp
index f0f81209200420197d7e591371351103fa0bd338..6639b4c3ab788d030880ff8010ad232532792c66 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.cpp
+++ b/kdeeducore/keduvockvtmlreader.cpp
@@ -1144,7 +1144,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
     return false;
 
 
-  if (m_doc->numEntries() == 0)
+  if (m_doc->entryCount() == 0)
   {
     // only accept in first entry
     if (width >= 0)
@@ -1263,7 +1263,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
                                           pronunce, width, type, faux_ami_f, faux_ami_t, synonym, example, antonym, usage, paraphrase))
         return false;
 
-      if (m_doc->numEntries() == 0)
+      if (m_doc->entryCount() == 0)
       {
         // only accept in first entry
         if (width >= 0)
@@ -1373,7 +1373,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
     }
   }
 
-  if (m_doc->numEntries() == 0)
+  if (m_doc->entryCount() == 0)
     m_doc->setQueryIdentifier(q_org, q_trans);
   m_doc->appendEntry(&expr);
 

diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp
index 9619afc5efb5fb124ce745de5d10022902cba36a..e3812fc72ef9b41b2c13cf9d0c5fdd8df2d5146b 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -44,7 +44,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
   domElementKvtml.setAttribute(KV_ENCODING, (QString) "UTF-8");
   domElementKvtml.setAttribute(KV_GENERATOR, generator);
   domElementKvtml.setAttribute(KV_COLS, m_doc->identifierCount());
-  domElementKvtml.setAttribute(KV_LINES, m_doc->numEntries());
+  domElementKvtml.setAttribute(KV_LINES, m_doc->entryCount());
 
   if (!m_doc->title().isEmpty())
     domElementKvtml.setAttribute(KV_TITLE, m_doc->title());
@@ -87,7 +87,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
   QString q_org, q_trans;
   m_doc->queryIdentifier(q_org, q_trans);
 
-  int entryCount = m_doc->numEntries();
+  int entryCount = m_doc->entryCount();
 
   for (int i = 0; i < entryCount; i++)
   {