Work on vocabulary sorting

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

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index 1f2f52ad9a22ab0fb050328d0f8de6424a74b22b..e9827be50558322b4adcaac3cef7067997dc219f 100644 (file)
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -74,7 +74,7 @@ void KEduVocDocument::Init ()
   m_sizeHints.clear();
   m_vocabulary.clear();
   m_dirty = false;
-  m_enableSorting = true;
+  m_sortingEnabled = true;
   m_unknownAttribute = false;
   m_unknownElement = false;
   m_sortLesson = false;
@@ -636,7 +636,7 @@ bool operator< (const KEduVocExpression &e1, const KEduVocExpression &e2)
 bool KEduVocDocument::sort(int index, Qt::SortOrder order)
 {
   bool result = false;
-  if (m_enableSorting && index < numIdentifiers())
+  if (m_sortingEnabled && index < numIdentifiers())
   {
     if (m_sortIdentifier.count() < m_identifiers.count())
       for (int i = m_sortIdentifier.count(); i < (int) m_identifiers.count(); i++)
@@ -651,7 +651,7 @@ bool KEduVocDocument::sort(int index, Qt::SortOrder order)
 bool KEduVocDocument::sort(int index)
 {
   bool result = false;
-  if (m_enableSorting && index < numIdentifiers())
+  if (m_sortingEnabled && index < numIdentifiers())
   {
     if (m_sortIdentifier.count() < m_identifiers.count())
       for (int i = m_sortIdentifier.count(); i < (int) m_identifiers.count(); i++)

diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h
index 8be31f03a216f9edcd3e0971eec38d4dbfd8e28f..e66ae8d4bcc30d660fbe703cc7bf582337706272 100644 (file)
--- a/kdeeducore/keduvocdocument.h
+++ b/kdeeducore/keduvocdocument.h
@@ -360,12 +360,12 @@ class KDEEDUCORE_EXPORT KEduVocDocument : public QObject
   /**
    * Enables sorting
    */
-  inline void enableSorting(bool enable) { m_enableSorting = enable; }
+  inline void setSortingEnabled(bool enable) { m_sortingEnabled = enable; }
 
   /**
    * @returns whether sorting is enabled
    */
-  inline bool isSortingEnabled() { return m_enableSorting; }
+  inline bool isSortingEnabled() { return m_sortingEnabled; }
 
   /**
    * @returns the modification state of the doc
@@ -787,7 +787,7 @@ protected:
   bool                  m_sortLesson;
   bool                  m_unknownAttribute;
   bool                  m_unknownElement;
-  bool                  m_enableSorting;
+  bool                  m_sortingEnabled;
 
   // save these to document
   QStringList           m_identifiers;      //0= origin, 1,.. translations

diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp
index e0c31e04779b97676f5e33900f88d8171498d536..17e277d837ac1121d284334cc80db0b59f5c52ad 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.cpp
+++ b/kdeeducore/keduvockvtmlreader.cpp
@@ -469,15 +469,15 @@ bool KEduVocKvtmlReader::readOptions(QDomElement &domElementParent)
   {
     if (domElementSort.tagName() == KV_OPT_SORT)
     {
-      m_doc->m_enableSorting = true;
+      m_doc->setSortingEnabled(true);
       QDomAttr domAttrOn = domElementSort.attributeNode(KV_BOOL_FLAG);
       if (!domAttrOn.isNull())
-            {
-                bool ok = true;
-        m_doc->m_enableSorting = domAttrOn.value().toInt(&ok);  // returns 0 if the conversion fails
-          if (!ok)
-              m_doc->m_enableSorting = true;
-            }
+      {
+        bool ok = true;
+        m_doc->setSortingEnabled(domAttrOn.value().toInt(&ok));  // returns 0 if the conversion fails
+        if (!ok)
+          m_doc->setSortingEnabled(true);
+      }
     }
 
     domElementSort = domElementSort.nextSibling().toElement();

diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp
index c77b8d8f3f369e221bd37b82aaa906b82a6b0d36..d2a58a9f9974f482196febf8964dbe312861fe0e 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -564,7 +564,7 @@ bool KEduVocKvtmlWriter::saveOptionsKvtMl(QDomDocument &domDoc, QDomElement &dom
   QDomElement domElementOption = domDoc.createElement(KV_OPTION_GRP);
   QDomElement domElementSort = domDoc.createElement(KV_OPT_SORT);
 
-  domElementSort.setAttribute(KV_BOOL_FLAG, (m_doc->m_enableSorting?1:0));
+  domElementSort.setAttribute(KV_BOOL_FLAG, (m_doc->isSortingEnabled()?1:0));
   domElementOption.appendChild(domElementSort);
 
   domElementParent.appendChild(domElementOption);