[Kst] branches/work/kst/kst1kde4/kst/src

[Andrew Walker]

SVN commit 1079351 by arwalker:

build libkst and libkstmath for kst1kde4

 M  +1 -1      libkst/CMakeLists.txt  
 M  +0 -17     libkst/kst_export.h  
 M  +8 -8      libkst/kstobject.h  
 M  +7 -6      libkst/kstvector.h  
 M  +1 -3      libkstmath/CMakeLists.txt  


--- branches/work/kst/kst1kde4/kst/src/libkst/CMakeLists.txt #1079350:1079351
@@ -43,7 +43,7 @@
 
 target_link_libraries(kstbase ${KDE4_KDECORE_LIBS} kio kstextdate QtXml QtGui)
 
-set_target_properties(kstbase PROPERTIES VERSION 1.0.0 SOVERSION 1)
+set_target_properties(kstbase PROPERTIES VERSION ${KST_LIBKST_VERSION} SOVERSION 1)
 
 install(TARGETS kstbase ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- branches/work/kst/kst1kde4/kst/src/libkst/kst_export.h #1079350:1079351
@@ -19,27 +19,10 @@
 #define KST_EXPORT_H
 
 #include <kdeversion.h>
-#if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
 #include <kdemacros.h>
 
-#if KDE_IS_VERSION( 3,3,90 )
-/* life is great */
-#else
-/* workaround typo that breaks compilation with newer gcc */
-#undef KDE_EXPORT
-#define KDE_EXPORT
-#undef KDE_NO_EXPORT
-#define KDE_NO_EXPORT
-#endif
-
 #define KST_EXPORT KDE_EXPORT
 #define KSTMDI_EXPORT KDE_EXPORT
 #define KJSEMBED_EXPORT KDE_EXPORT
-#else
-/* no kdemacros */
-#define KST_EXPORT
-#define KSTMDI_EXPORT
-#define KJSEMBED_EXPORT
-#endif
 
 #endif
--- branches/work/kst/kst1kde4/kst/src/libkst/kstobject.h #1079350:1079351
@@ -18,14 +18,14 @@
 #ifndef KSTOBJECT_H
 #define KSTOBJECT_H
 
-#include <qmap.h>
-#include <qmutex.h>
-#include <qlinkedlist.h>
-#include <qobject.h>
-#include <qpointer.h>
 #include <QExplicitlySharedDataPointer>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <QLinkedList>
+#include <QMap>
+#include <QMutex>
+#include <QObject>
+#include <QPointer>
+#include <QString>
+#include <QStringList>
 
 #include <kdebug.h>
 #include <kglobal.h>
@@ -54,7 +54,7 @@
 //       non-virtual functions.
 
 
-class KstObjectTag {
+class KST_EXPORT KstObjectTag {
   public:
     static const KstObjectTag invalidTag;
 
--- branches/work/kst/kst1kde4/kst/src/libkst/kstvector.h #1079350:1079351
@@ -19,8 +19,10 @@
 #define KSTVECTOR_H
 
 #include <math.h>
-#include <qhash.h>
-#include <qpointer.h>
+
+#include <QHash>
+#include <QPointer>
+
 #include "kstobjectcollection.h"
 #include "kstprimitive.h"
 #include "kstscalar.h"
@@ -39,14 +41,13 @@
 }
 
 class KstDataObject;
-
 class KstVector;
 typedef QExplicitlySharedDataPointer<KstVector> KstVectorPtr;
-// KST::interpolate is still too polluting
-extern double kstInterpolate(double *v, int _size, int in_i, int ns_i);
-extern double kstInterpolateNoHoles(double *v, int _size, int in_i, int ns_i);
 
+extern KST_EXPORT double kstInterpolate(double *v, int _size, int in_i, int ns_i);
+extern KST_EXPORT double kstInterpolateNoHoles(double *v, int _size, int in_i, int ns_i);
 
+
 class KST_EXPORT KstVector : public KstPrimitive {
   Q_OBJECT
   public:
--- branches/work/kst/kst1kde4/kst/src/libkstmath/CMakeLists.txt #1079350:1079351
@@ -1,7 +1,5 @@
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/extdate ${CMAKE_SOURCE_DIR}/src/libkst ${CMAKE_CURRENT_SOURCE_DIR} ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})
 
-link_directories(${CMAKE_SOURCE_DIR}/src/kstlib)
-
 ########### next target ###############
 
 set(kstmath_LIB_SRCS
@@ -41,7 +39,7 @@
 
 kde4_add_library(kstmath SHARED ${kstmath_LIB_SRCS})
 
-target_link_libraries(kstmath ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${QT_LIBRARIES} kstbase)
+target_link_libraries(kstmath kstbase ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${QT_LIBRARIES})
 
 set_target_properties(kstmath PROPERTIES VERSION ${KST_LIBKST_VERSION} SOVERSION 1)