Moved KEduData to KEduVocData as discussed on kde-edu-devel. Made a couple

of cleanups to the code (propper use of const and references).

svn path=/trunk/kdeedu/libkdeedu/; revision=159782

diff --git a/kdeeducore/Makefile.am b/kdeeducore/Makefile.am
index 0e860faad27a9f51875ae51ae700a29980147533..0a1a429089e39297c51d28db38ed6efbf5608d1b 100644 (file)
--- a/kdeeducore/Makefile.am
+++ b/kdeeducore/Makefile.am
@@ -3,11 +3,11 @@ SUBDIRS = . tests
 
 lib_LTLIBRARIES = libkdeeducore.la
 
-libkdeeducore_la_SOURCES = kedudata.cpp
+libkdeeducore_la_SOURCES = keduvocdata.cpp
 
 libkdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0
 
-include_HEADERS = kedudata.h
+include_HEADERS = keduvocdata.h
 # noinst_HEADERS = 
 
 libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)

diff --git a/kdeeducore/kedudata.cpp b/kdeeducore/keduvocdata.cpp
similarity index 82%
rename from kdeeducore/kedudata.cpp
rename to kdeeducore/keduvocdata.cpp
index 285b5d96e9862f2bfa05ba87fa05ff7db981ff71..fd6f0473ba298f95b262e97711291890a0ad8aef 100644 (file)
--- a/kdeeducore/kedudata.cpp
+++ b/kdeeducore/keduvocdata.cpp
@@ -16,46 +16,46 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include "kedudata.h"
+#include "keduvocdata.h"
 
 #include <qfile.h>
 
 #include <kdebug.h>
 
 ////////////////////////////////////////////////////////////////////////////////
-// class KEduDataItem
+// class KEduVocDataItem
 ////////////////////////////////////////////////////////////////////////////////
 
 // public methods
 
-KEduDataItem::KEduDataItem()
+KEduVocDataItem::KEduVocDataItem()
 {
 
 }
 
-KEduDataItem::KEduDataItem(QDomElement &entry)
+KEduVocDataItem::KEduVocDataItem(QDomElement &entry)
 {
     domElement = entry;
 }
 
-KEduDataItem::~KEduDataItem()
+KEduVocDataItem::~KEduVocDataItem()
 {
 
 }
 
-QString KEduDataItem::originalText()
+QString KEduVocDataItem::originalText() const
 {
     return getText("o");
 }
 
-QString KEduDataItem::translatedText()
+QString KEduVocDataItem::translatedText() const
 {
     return getText("t");
 }
 
 // protected methods
 
-QString KEduDataItem::getText(const QString tagName)
+QString KEduVocDataItem::getText(const QString &tagName) const
 {
     if(!domElement.isNull()) {
 
@@ -79,14 +79,14 @@ QString KEduDataItem::getText(const QString tagName)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// class KEduData
+// class KEduVocData
 ////////////////////////////////////////////////////////////////////////////////
 
 // public static methods
 
-KEduDataItemList KEduData::parse(const QString fileName)
+KEduVocDataItemList KEduVocData::parse(const QString &fileName)
 {
-    KEduDataItemList list;
+    KEduVocDataItemList list;
 
     QDomDocument document;
     QFile file(fileName);
@@ -102,7 +102,7 @@ KEduDataItemList KEduData::parse(const QString fileName)
 
         // if the "node" is in fact an element -- i.e. not null
         if(!entry.isNull()) {
-            KEduDataItem item(entry);
+            KEduVocDataItem item(entry);
             list.append(item);
         }
     }

diff --git a/kdeeducore/kedudata.h b/kdeeducore/keduvocdata.h
similarity index 71%
rename from kdeeducore/kedudata.h
rename to kdeeducore/keduvocdata.h
index 9ae59d4622b928d802580b3f7197d212f0bee2aa..32f8d2edf8535a39fa22e6d400368bfdd9098e33 100644 (file)
--- a/kdeeducore/kedudata.h
+++ b/kdeeducore/keduvocdata.h
@@ -19,27 +19,27 @@
 #include <qdom.h>
 #include <qvaluelist.h>
 
-class KEduDataItem
+class KEduVocDataItem
 {
 public:
-    KEduDataItem();
-    KEduDataItem(QDomElement &entry);
-    virtual ~KEduDataItem();
+    KEduVocDataItem();
+    KEduVocDataItem(QDomElement &entry);
+    virtual ~KEduVocDataItem();
 
-    QString originalText();
-    QString translatedText();
+    QString originalText() const;
+    QString translatedText() const;
 
 protected:
-    QString getText(const QString tagName);
+    QString getText(const QString &tagName) const;
 
 private:
     QDomElement domElement;
 };
 
-typedef QValueList<KEduDataItem> KEduDataItemList;
+typedef QValueList<KEduVocDataItem> KEduVocDataItemList;
 
-class KEduData
+class KEduVocData
 {
 public:
-    static KEduDataItemList parse(const QString fileName);
+    static KEduVocDataItemList parse(const QString &fileName);
 };