From 708aee474be5b06ab06a83336f02f07edec1b6a9 Mon Sep 17 00:00:00 2001 From: Carsten Niehaus Date: Sun, 23 Oct 2005 08:27:58 +0000 Subject: [PATCH] Add support for the nameorigin svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=473298 --- libscience/chemicaldataobject.h | 3 ++- libscience/elementparser.cpp | 10 +++++++++- libscience/elementparser.h | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libscience/chemicaldataobject.h b/libscience/chemicaldataobject.h index 7177879..ebe67a2 100644 --- a/libscience/chemicaldataobject.h +++ b/libscience/chemicaldataobject.h @@ -54,7 +54,8 @@ class ChemicalDataObject radiusVDW/**< the van der Waals radius */, meltingpoint, boilingpoint, - periodTableBlock + periodTableBlock, + nameOrigin }; /** diff --git a/libscience/elementparser.cpp b/libscience/elementparser.cpp index d2da7a5..ecf252e 100644 --- a/libscience/elementparser.cpp +++ b/libscience/elementparser.cpp @@ -34,7 +34,8 @@ ElementSaxParser::ElementSaxParser() inRadiusVDW_(false), inBoilingPoint_(false), inMeltingPoint_(false), - inPeriodTableBlock_(false) + inPeriodTableBlock_(false), + inNameOrigin_(false) { } @@ -72,6 +73,8 @@ bool ElementSaxParser::startElement(const QString&, const QString &localName, co inBoilingPoint_ = true; else if (attrs.value(i) == "bo:periodTableBlock") inPeriodTableBlock_ = true; + else if (attrs.value(i) == "bo:nameOrigin") + inNameOrigin_ = true; } } return true; @@ -161,6 +164,11 @@ bool ElementSaxParser::characters(const QString &ch) type = ChemicalDataObject::periodTableBlock; inPeriodTableBlock_ = false; } + else if (inNameOrigin_) { + value = ch; + type = ChemicalDataObject::nameOrigin; + inNameOrigin_ = false; + } else//it is a non known value. Do not create a wrong object but return return true; diff --git a/libscience/elementparser.h b/libscience/elementparser.h index 74602a2..afcb922 100644 --- a/libscience/elementparser.h +++ b/libscience/elementparser.h @@ -47,6 +47,7 @@ class ElementSaxParser : public QXmlDefaultHandler inRadiusVDW_, inBoilingPoint_, inMeltingPoint_, - inPeriodTableBlock_; + inPeriodTableBlock_, + inNameOrigin_; }; #endif // ELEMENTPARSER_H -- 2.47.3