oops, I also wanted to commit this

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=549094

diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
index 3aa77f98bc7c8acb524a425e81483b35192d4c35..8b7f2115de86ddd51d9bcdfdcdb4d8be46a9d8d4 100644 (file)
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@ -1,7 +1,5 @@
-
 add_subdirectory(data)
 add_subdirectory(tests)
-add_subdirectory(cml)
 
 
 ########### next target ###############
@@ -17,6 +15,8 @@ set(science_LIB_SRCS
    chemicaldataobject.cpp
    moleculeparser.cpp
    parser.cpp
+   xml_cml.cpp
+   cmlclasses.cpp
 )
 
 kde4_automoc(${science_LIB_SRCS})

diff --git a/libscience/cml/CMakeLists.txt b/libscience/cml/CMakeLists.txt
deleted file mode 100644 (file)
index 699e783..0000000
--- a/libscience/cml/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/libscience  )
-
-set(cml_LIB_SRCS 
-       cmlclasses.cpp 
-       xml_cml.cpp
-)
-
-kde4_automoc(${cml_LIB_SRCS})
-
-kde4_add_library(cml SHARED ${cml_LIB_SRCS})
-
-target_link_libraries(cml ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} )
-
-install_targets(${LIB_INSTALL_DIR} cml )
-

diff --git a/libscience/cml/test.cml b/libscience/cml/test.cml
deleted file mode 100644 (file)
index de138bb..0000000
--- a/libscience/cml/test.cml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<molecule xmlns="http://www.xml-cml.org/schema/cml2/core" id="Ethanol">
- <atomArray>
-  <atom id="a1" elementType="H" x3="-1.916300" y3="-0.043300" z3="-1.055200"/>
-  <atom id="a2" elementType="C" x3="-2.529600" y3="-0.050300" z3="-1.960600"/>
-  <atom id="a3" elementType="H" x3="-2.235900" y3="0.793700" z3="-2.591800"/>
-  <atom id="a4" elementType="H" x3="-2.311100" y3="-0.960600" z3="-2.527100"/>
-  <atom id="a5" elementType="C" x3="-4.003000" y3="0.025300" z3="-1.617800"/>
-  <atom id="a6" elementType="H" x3="-4.299600" y3="-0.832200" z3="-1.006300"/>
-  <atom id="a7" elementType="H" x3="-4.224400" y3="0.947100" z3="-1.071600"/>
-  <atom id="a8" elementType="O" x3="-4.760100" y3="0.012900" z3="-2.821500"/>
-  <atom id="a9" elementType="H" x3="-5.698200" y3="0.061600" z3="-2.569500"/>
- </atomArray>
- <bondArray>
-  <bond atomRefs2="a1 a2" order="1"/>
-  <bond atomRefs2="a2 a3" order="1"/>
-  <bond atomRefs2="a2 a4" order="1"/>
-  <bond atomRefs2="a2 a5" order="1"/>
-  <bond atomRefs2="a5 a6" order="1"/>
-  <bond atomRefs2="a5 a7" order="1"/>
-  <bond atomRefs2="a5 a8" order="1"/>
-  <bond atomRefs2="a8 a9" order="1"/>
- </bondArray>
-</molecule>

diff --git a/libscience/cml/cmlclasses.cpp b/libscience/cmlclasses.cpp
similarity index 100%
rename from libscience/cml/cmlclasses.cpp
rename to libscience/cmlclasses.cpp

diff --git a/libscience/cml/cmlclasses.h b/libscience/cmlclasses.h
similarity index 100%
rename from libscience/cml/cmlclasses.h
rename to libscience/cmlclasses.h

diff --git a/libscience/cml/xml_cml.cpp b/libscience/xml_cml.cpp
similarity index 98%
rename from libscience/cml/xml_cml.cpp
rename to libscience/xml_cml.cpp
index e0731eec735328a85e5f84c08ddc9d48fb76312c..12be253d7799f19ec56545cfae2140108cdb3b45 100644 (file)
--- a/libscience/cml/xml_cml.cpp
+++ b/libscience/xml_cml.cpp
@@ -14,6 +14,14 @@
 
 #include <QtDebug>
 
+CMLParser::CMLParser()
+{
+};
+
+CMLParser::~CMLParser()
+{
+};
+
 bool CMLParser::startDocument()
 {
        qDebug() << "New CML parser started.";

diff --git a/libscience/cml/xml_cml.h b/libscience/xml_cml.h
similarity index 96%
rename from libscience/cml/xml_cml.h
rename to libscience/xml_cml.h
index 77b20ddffa3e2795425bd9aef3d44754350f6fe6..7419512b42c166fa89deb072a5fb0a8eed161eb3 100644 (file)
--- a/libscience/cml/xml_cml.h
+++ b/libscience/xml_cml.h
@@ -34,14 +34,9 @@ class QString;
 class CMLParser : public QXmlDefaultHandler
 {
        public:
-               CMLParser()
-               {
-               };
+               CMLParser();
+               ~CMLParser();
 
-               ~CMLParser()
-               {
-               };
-       
                bool startDocument();
                
                bool startElement( const QString&, const QString&, const QString& ,