From 74fa4367aa591d6e040c123bf00a2d9007a837a2 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Wed, 7 Jun 2006 12:44:15 +0000
Subject: [PATCH] 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
---
 libscience/cmlclasses.h         |  8 +++++---
 libscience/tests/CMakeLists.txt | 15 ++++-----------
 libscience/xml_cml.cpp          |  5 +++--
 libscience/xml_cml.h            |  8 +++++---
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/libscience/cmlclasses.h b/libscience/cmlclasses.h
index d5be96a..b05770e 100644
--- 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 1068de3..53c5282 100644
--- 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 12be253..6547f67 100644
--- 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 7419512..09b2034 100644
--- 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;
 		
-- 
2.47.3