export correctly the new classes, so they can used from the world outside them;

some small fixes

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

diff --git a/libscience/cmlclasses.h b/libscience/cmlclasses.h
index d5be96acdaf200d9f6f2a0e497d296df93ae1d01..b05770ed096ea53565a1c082fd16136fb345e645 100644 (file)
--- a/libscience/cmlclasses.h
+++ b/libscience/cmlclasses.h
@@ -20,20 +20,22 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         * 
  ***************************************************************************/
 
+#include <libkdeedu_science_export.h>
+
 #include <QString>
 #include <QList>
 
 namespace CML
 {
        
-class Molecule
+class EDUSCIENCE_EXPORT Molecule
 {
        public:
                Molecule();
 
 };
 
-class Atom
+class EDUSCIENCE_EXPORT Atom
 {
        public:
                Atom( );
@@ -76,7 +78,7 @@ class Atom
                           coord_z3;
 };
 
-class Bond
+class EDUSCIENCE_EXPORT Bond
 {
        public:
                Bond();

diff --git a/libscience/tests/CMakeLists.txt b/libscience/tests/CMakeLists.txt
index 1068de39d56cacd980e8098d4137e11146279c50..53c528248c923b7cb696a4c1c99c774f49507bdd 100644 (file)
--- a/libscience/tests/CMakeLists.txt
+++ b/libscience/tests/CMakeLists.txt
@@ -1,6 +1,9 @@
 
 include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/libscience  )
 
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+
+if (KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
@@ -8,43 +11,33 @@ set(xmlreadingtest_SRCS xmlreadingtest.cpp )
 
 kde4_automoc(${xmlreadingtest_SRCS})
 
-if(KDE4_BUILD_TESTS)
-
 kde4_add_executable(xmlreadingtest ${xmlreadingtest_SRCS})
 
 target_link_libraries(xmlreadingtest  ${KDE4_KDECORE_LIBS} science )
 
-endif(KDE4_BUILD_TESTS)
-
 ########### next target ###############
 
 #set(isotopereadingtest_SRCS isotopereadingtest.cpp )
 
 #kde4_automoc(${isotopereadingtest_SRCS})
 
-#if(KDE4_BUILD_TESTS)
-
 #kde4_add_executable(isotopereadingtest ${isotopereadingtest_SRCS})
 
 #target_link_libraries(isotopereadingtest  ${KDE4_KDECORE_LIBS} science )
 
-#endif(KDE4_BUILD_TESTS)
-
 ########### next target ###############
 
 set(cml2test_SRCS cml2test.cpp )
 
 kde4_automoc(${cml2test_SRCS})
 
-if(KDE4_BUILD_TESTS)
-
 kde4_add_executable(cml2test ${cml2test_SRCS})
 
 target_link_libraries(cml2test  ${KDE4_KDECORE_LIBS} science )
 
+
 endif(KDE4_BUILD_TESTS)
 
-########### install files ###############
 
 
 

diff --git a/libscience/xml_cml.cpp b/libscience/xml_cml.cpp
index 12be253d7799f19ec56545cfae2140108cdb3b45..6547f67d13ddaf856d64c15ca1a01f6a50f0bcad 100644 (file)
--- a/libscience/xml_cml.cpp
+++ b/libscience/xml_cml.cpp
@@ -15,12 +15,13 @@
 #include <QtDebug>
 
 CMLParser::CMLParser()
+  : QXmlDefaultHandler()
 {
-};
+}
 
 CMLParser::~CMLParser()
 {
-};
+}
 
 bool CMLParser::startDocument()
 {

diff --git a/libscience/xml_cml.h b/libscience/xml_cml.h
index 7419512b42c166fa89deb072a5fb0a8eed161eb3..09b2034fb2b1ad30b2fa054c3990ab9f773a7685 100644 (file)
--- a/libscience/xml_cml.h
+++ b/libscience/xml_cml.h
@@ -11,6 +11,8 @@
 #ifndef XML_CML_H
 #define XML_CML_H
 
+#include <libkdeedu_science_export.h>
+
 #include <qxml.h>
 #include <QList>
 
@@ -31,11 +33,11 @@ class QString;
 #define CML_BONDARRAY 5
 
 
-class CMLParser : public QXmlDefaultHandler
+class EDUSCIENCE_EXPORT CMLParser : public QXmlDefaultHandler
 {
        public:
                CMLParser();
-               ~CMLParser();
+               virtual ~CMLParser();
 
                bool startDocument();
                
@@ -60,7 +62,7 @@ class CMLParser : public QXmlDefaultHandler
                CML::Atom * atom1;
                CML::Atom * atom2;
 
-               CML::Atom * tmp_atom;
+               CML::Atom * tmp_atom;           
                
                QString indent, last_builtin;