From 02af3690e69c77515554d95eee77cb2a1651b639 Mon Sep 17 00:00:00 2001 From: Peter Hedlund Date: Sun, 12 Feb 2006 21:33:34 +0000 Subject: [PATCH] Remove KEduVocData. The following programs now all use KEduVocDocument in libkdeedu/kdeeducore: KAnagram KHangman KLatin KVocTrain KWordQuiz CCMAIL:kde-edu@kde.org svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=508854 --- kdeeducore/Makefile.am | 16 +++--- kdeeducore/keduvocdata.cpp | 111 ------------------------------------- kdeeducore/keduvocdata.h | 52 ----------------- 3 files changed, 8 insertions(+), 171 deletions(-) delete mode 100644 kdeeducore/keduvocdata.cpp delete mode 100644 kdeeducore/keduvocdata.h diff --git a/kdeeducore/Makefile.am b/kdeeducore/Makefile.am index 235d770..de0bd55 100644 --- a/kdeeducore/Makefile.am +++ b/kdeeducore/Makefile.am @@ -5,17 +5,17 @@ SUBDIRS = . lib_LTLIBRARIES = libkdeeducore.la -libkdeeducore_la_SOURCES = keduvocdata.cpp keduvocdocument.cpp \ - keduvocexpression.cpp keduvocgrammar.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp \ - keduvocmultiplechoice.cpp keduvowqlreader.cpp keduvowqlwriter.cpp leitnerbox.cpp \ - leitnersystem.cpp leitnersystemview.cpp prefleitner.cpp prefleitnerbase.ui +libkdeeducore_la_SOURCES = keduvocdocument.cpp keduvocexpression.cpp \ + keduvocgrammar.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp keduvocmultiplechoice.cpp \ + keduvowqlreader.cpp keduvowqlwriter.cpp leitnerbox.cpp leitnersystem.cpp \ + leitnersystemview.cpp prefleitner.cpp prefleitnerbase.ui libkdeeducore_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 3:0:2 libkdeeducore_includedir = $(includedir)/libkdeedu -libkdeeducore_include_HEADERS = keduvocdata.h keduvocdocument.h \ - keduvocexpression.h keduvocgrammar.h keduvockvtmlreader.h keduvockvtmlwriter.h \ - keduvocmultiplechoice.h keduvowqlreader.h keduvowqlwriter.h leitnerbox.h leitnersystem.h \ - leitnersystemview.h prefleitner.h +libkdeeducore_include_HEADERS = keduvocdocument.h keduvocexpression.h \ + keduvocgrammar.h keduvockvtmlreader.h keduvockvtmlwriter.h keduvocmultiplechoice.h \ + keduvowqlreader.h keduvowqlwriter.h leitnerbox.h leitnersystem.h leitnersystemview.h \ + prefleitner.h libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE) diff --git a/kdeeducore/keduvocdata.cpp b/kdeeducore/keduvocdata.cpp deleted file mode 100644 index da73cb3..0000000 --- a/kdeeducore/keduvocdata.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/* This file is part of the KDE Edu Library - Copyright (C) 2002 Scott Wheeler - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include - -#include - -#include "keduvocdata.h" - -//////////////////////////////////////////////////////////////////////////////// -// class KEduVocDataItem -//////////////////////////////////////////////////////////////////////////////// - -// public methods - -KEduVocDataItem::KEduVocDataItem() -{ - -} - -KEduVocDataItem::KEduVocDataItem(QDomElement &entry) -{ - domElement = entry; -} - -KEduVocDataItem::~KEduVocDataItem() -{ - -} - -QString KEduVocDataItem::originalText() const -{ - return getText("o"); -} - -QString KEduVocDataItem::translatedText() const -{ - return getText("t"); -} - -// protected methods - -QString KEduVocDataItem::getText(const QString &tagName) const -{ - if(!domElement.isNull()) { - - QDomNodeList list = domElement.elementsByTagName(tagName); - - if(list.count() > 0) { - - QDomElement element = list.item(0).toElement(); - - if(!element.isNull()) { - return element.text(); - } - else - return QString(); - } - else - return QString(); - } - else - return QString(); -} - -//////////////////////////////////////////////////////////////////////////////// -// class KEduVocData -//////////////////////////////////////////////////////////////////////////////// - -// public static methods - -KEduVocDataItemList KEduVocData::parse(const QString &fileName) -{ - KEduVocDataItemList list; - - QDomDocument document; - QFile file(fileName); - document.setContent(&file); - - QDomNodeList entries = document.elementsByTagName("e"); - - // loop through the "e" (entry) tags looking for data - for(int i = 0 ; i < entries.count() ; i++) { - - // get an entry to operate on - QDomElement entry = entries.item(i).toElement(); - - // if the "node" is in fact an element -- i.e. not null - if(!entry.isNull()) { - KEduVocDataItem item(entry); - list.append(item); - } - } - - return list; -} diff --git a/kdeeducore/keduvocdata.h b/kdeeducore/keduvocdata.h deleted file mode 100644 index d1f94b3..0000000 --- a/kdeeducore/keduvocdata.h +++ /dev/null @@ -1,52 +0,0 @@ -/* This file is part of the KDE Edu Library - Copyright (C) 2002 Scott Wheeler - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KEDUVOCDATA_H -#define KEDUVOCDATA_H - -#include -#include - -#include - -class KDE_EXPORT KEduVocDataItem -{ -public: - KEduVocDataItem(); - KEduVocDataItem(QDomElement &entry); - virtual ~KEduVocDataItem(); - - QString originalText() const; - QString translatedText() const; - -protected: - QString getText(const QString &tagName) const; - -private: - QDomElement domElement; -}; - -typedef QList KEduVocDataItemList; - -class KDE_EXPORT KEduVocData -{ -public: - static KEduVocDataItemList parse(const QString &fileName); -}; - -#endif // KEDUVOCDATA_H -- 2.47.3