From 55a077bfe8f79b3e76481ce24a09824cc9f15300 Mon Sep 17 00:00:00 2001 From: Carsten Niehaus Date: Sun, 23 Oct 2005 15:26:53 +0000 Subject: [PATCH] make it static: static BlueObeliskUnit unit( const QString& unitname ); svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=473392 --- libscience/chemicaldataobject.cpp | 16 ++++++++++++++++ libscience/chemicaldataobject.h | 6 ++++++ libscience/elementparser.cpp | 18 +----------------- libscience/elementparser.h | 6 ------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/libscience/chemicaldataobject.cpp b/libscience/chemicaldataobject.cpp index 20c62bc..34c2775 100644 --- a/libscience/chemicaldataobject.cpp +++ b/libscience/chemicaldataobject.cpp @@ -168,3 +168,19 @@ QString ChemicalDataObject::unitAsString() return bounit; } + +ChemicalDataObject::BlueObeliskUnit ChemicalDataObject::unit( const QString& unit ) +{ + if ( unit == "bo:kelvin" ) + return ChemicalDataObject::kelvin; + else if ( unit == "bo:ev" ) + return ChemicalDataObject::ev; + else if ( unit == "bo:nm" ) + return ChemicalDataObject::nm; + else if ( unit == "bo:pm" ) + return ChemicalDataObject::pm; + else if ( unit == "bo:noUnit" ) + return ChemicalDataObject::noUnit; + else + return ChemicalDataObject::noUnit; +} diff --git a/libscience/chemicaldataobject.h b/libscience/chemicaldataobject.h index 02eb03f..b5b442c 100644 --- a/libscience/chemicaldataobject.h +++ b/libscience/chemicaldataobject.h @@ -192,6 +192,12 @@ class ChemicalDataObject void setUnit( BlueObeliskUnit unit ){ m_unit = unit; } + + /** + * @return the BlueObeliskUnit of a ChemicalDataObject corresponding to @p text + * @param text the attribute-text of the XML parsed + */ + static BlueObeliskUnit unit( const QString& unitname ); private: QVariant m_value; diff --git a/libscience/elementparser.cpp b/libscience/elementparser.cpp index 89a4f4a..3f9083a 100644 --- a/libscience/elementparser.cpp +++ b/libscience/elementparser.cpp @@ -52,7 +52,7 @@ bool ElementSaxParser::startElement(const QString&, const QString &localName, co { if ( attrs.localName( i ) == "unit" ) { - currentUnit_ = unit( attrs.value( i ) ); + currentUnit_ = ChemicalDataObject::unit( attrs.value( i ) ); continue; } @@ -209,19 +209,3 @@ QList ElementSaxParser::getElements() { return elements_; } - -ChemicalDataObject::BlueObeliskUnit ElementSaxParser::unit( const QString& unit ) -{ - if ( unit == "bo:kelvin" ) - return ChemicalDataObject::kelvin; - else if ( unit == "bo:ev" ) - return ChemicalDataObject::ev; - else if ( unit == "bo:nm" ) - return ChemicalDataObject::nm; - else if ( unit == "bo:pm" ) - return ChemicalDataObject::pm; - else if ( unit == "bo:noUnit" ) - return ChemicalDataObject::noUnit; - else - return ChemicalDataObject::noUnit; -} diff --git a/libscience/elementparser.h b/libscience/elementparser.h index f815ac9..0d82c2e 100644 --- a/libscience/elementparser.h +++ b/libscience/elementparser.h @@ -43,12 +43,6 @@ class ElementSaxParser : public QXmlDefaultHandler private: ChemicalDataObject *currentDataObject_; ChemicalDataObject::BlueObeliskUnit currentUnit_; - - /** - * @return the BlueObeliskUnit of a ChemicalDataObject corresponding to @p text - * @param text the attribute-text of the XML parsed - */ - ChemicalDataObject::BlueObeliskUnit unit( const QString& text ); Element *currentElement_; QList elements_; -- 2.47.3