From: Jörg Buchwald <buchwaldj@web.de>
Date: Sat, 16 Jul 2005 15:20:46 +0000 (+0000)
Subject: substitute the attribute magmoment for moment
X-Git-Tag: v3.80.2~300^2~67
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=00e703745c447721fa19bab6fcc64b0bcc26b377;p=libqmvoc.git

substitute the attribute magmoment for moment

svn path=/trunk/KDE/kdeedu/kalzium/src/element.cpp; revision=435323
---

diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp
index ac8061b..3a6f030 100644
--- a/kalzium/src/element.cpp
+++ b/kalzium/src/element.cpp
@@ -609,9 +609,9 @@ EList KalziumDataObject::readData(  QDomDocument &dataDocument )
 			QString ecdecay = iso.attributeNode( "ecdecay" ).value();
 			double decayenergy = iso.attributeNode( "decayenergy" ).value().toDouble();
 			QString spin = iso.attributeNode( "spin" ).value();
-			double moment = iso.attributeNode( "moment" ).value().toDouble(); 
+			double magmoment = iso.attributeNode( "magmoment" ).value().toDouble(); 
 
-			Isotope *isotope = new Isotope( neutrons, percentage, weight, halflife, format, alphadecay, betaplusdecay, betaminusdecay, ecdecay, decayenergy, spin, moment );
+			Isotope *isotope = new Isotope( neutrons, percentage, weight, halflife, format, alphadecay, betaplusdecay, betaminusdecay, ecdecay, decayenergy, spin, magmoment );
 			isolist.append( isotope );
 		}
 
@@ -675,7 +675,7 @@ const int KalziumDataObject::numberOfElements() const
 	return m_numOfElements;
 }
 
-Isotope::Isotope(  int neutrons, double percentage, double weight, double halflife, QString format, QString alphadecay, QString betaplusdecay, QString betaminusdecay, QString ecdecay, double decayenergy, QString spin, double moment )
+Isotope::Isotope(  int neutrons, double percentage, double weight, double halflife, QString format, QString alphadecay, QString betaplusdecay, QString betaminusdecay, QString ecdecay, double decayenergy, QString spin, double magmoment )
 {
 	m_neutrons = neutrons;
 	m_percentage = percentage;
@@ -688,7 +688,7 @@ Isotope::Isotope(  int neutrons, double percentage, double weight, double halfli
 	m_ecdecay = ecdecay;
 	m_decayenergy = decayenergy;
 	m_spin = spin;
-	m_moment = moment;
+	m_magmoment = magmoment;
 }
 
 QString Isotope::halflifeToHtml() const
diff --git a/kalzium/src/element.h b/kalzium/src/element.h
index fdd6b4e..59ba522 100644
--- a/kalzium/src/element.h
+++ b/kalzium/src/element.h
@@ -39,7 +39,7 @@ typedef QValueList<double> doubleList;
 class Isotope
 {
 	public:
-		Isotope( int neutrons, double percentage, double weight, double halflife, QString format, QString alphadecay, QString betaplusdecay, QString betaminusdecay, QString ecdecay, double decayenergy, QString spin, double moment);
+		Isotope( int neutrons, double percentage, double weight, double halflife, QString format, QString alphadecay, QString betaplusdecay, QString betaminusdecay, QString ecdecay, double decayenergy, QString spin, double magmoment);
 
 		bool seconds() const{
 			if ( m_format == "seconds" )
@@ -98,8 +98,8 @@ class Isotope
 		QString spin() const{
 			return m_spin;
 		}
-		double moment() const{
-			return m_moment;
+		double magmoment() const{
+			return m_magmoment;
 		}
 
 		QString halflifeToHtml() const;
@@ -152,7 +152,7 @@ class Isotope
 		/**
 		* magnetic moment
 		*/
-		double m_moment;
+		double m_magmoment;
 };
 
 /**