From: Carsten Niehaus <cniehaus@gmx.de>
Date: Sun, 24 Sep 2006 15:57:19 +0000 (+0000)
Subject: Jörg, please try to compile now
X-Git-Tag: v3.80.2~21
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=c39a5c5d4f82dbfba946c7d190b0bf0c3a92bce7;p=libqmvoc.git

Jörg, please try to compile now

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=587981
---

diff --git a/libscience/element.cpp b/libscience/element.cpp
index 55b3e6b..111d0a7 100644
--- a/libscience/element.cpp
+++ b/libscience/element.cpp
@@ -18,22 +18,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#include "spectrum.h"
 #include "element.h"
 #include <kdebug.h>
 
 Element::Element()
 {
-}
-
-ChemicalDataObject& Element::data(ChemicalDataObject::BlueObelisk type) const
-{
-	foreach( ChemicalDataObject*o, dataList ) {
-		if ( o->type() == type )
-			return *o;
-	}
-        kFatal() << "No such object\n";
-        ChemicalDataObject *crashme = 0;
-	return *crashme;
+    m_spectrum = 0;
 }
 
 QVariant Element::dataAsVariant( ChemicalDataObject::BlueObelisk type ) const
diff --git a/libscience/element.h b/libscience/element.h
index 96ed593..6397c4c 100644
--- a/libscience/element.h
+++ b/libscience/element.h
@@ -59,13 +59,6 @@ class EDUSCIENCE_EXPORT Element
 		 */
 		void addData( const QVariant& value, ChemicalDataObject::BlueObelisk type );
 
-		/**
-		 * @return the ChemicalDataObject which stores the information
-		 * of the type @p type
-		 * @param type the type of the requested data
-		 */
-		ChemicalDataObject& data( ChemicalDataObject::BlueObelisk type ) const;
-
 		/**
 		 * @return the requested data of the type @p type as a QVariant
 		 */
@@ -82,11 +75,18 @@ class EDUSCIENCE_EXPORT Element
 		QList<ChemicalDataObject*> data()const{
 			return dataList;
 		}
+
+    Spectrum * spectrum() const{
+        return m_spectrum;
+    }
+
 	private:
 		/**
 		 * this QList stores all information about an element
 		 */
 		QList<ChemicalDataObject*> dataList;
+
+    Spectrum *m_spectrum;
 };
 
 #endif
diff --git a/libscience/spectrum.h b/libscience/spectrum.h
index 02ef5af..bdd4420 100644
--- a/libscience/spectrum.h
+++ b/libscience/spectrum.h
@@ -1,7 +1,7 @@
 #ifndef SPECTRUM_H
 #define SPECTRUM_H
 /***************************************************************************
- *   Copyright (C) 2005 by Carsten Niehaus                                 *
+ *   Copyright (C) 2005, 2006 by Carsten Niehaus                           *
  *   cniehaus@kde.org                                                      *
  *   
  *                                                                         *