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

[Zongyi Zhang]

SVN commit 1098027 by zhang:

continue kst1kde4

 M  +12 -0     CMakeLists.txt  
 M  +20 -0     src/datasources/dirfile/CMakeLists.txt  
 M  +1 -1      src/datasources/dirfile/dirfile.cpp  
 M  +1 -2      src/datasources/dirfile/dirfile.h  
 M  +1 -1      src/datasources/dirfile/getdata.c  


--- branches/work/kst/kst1kde4/kst/CMakeLists.txt #1098026:1098027
@@ -64,6 +64,18 @@
     SET(KST_HAVE_KJSEMBED 1)
 ENDIF (HAVE_KJSEMBED_H_ AND HAVE_KJSEMBED_LIB_)
 
+FIND_PATH(HAVE_GETDATA_H_ NAMES getdata.h)
+FIND_LIBRARY(HAVE_GETDATA_LIB_ NAMES getdata)
+IF (HAVE_GETDATA_H_ AND HAVE_GETDATA_LIB_ AND GETDATA_FOUND)
+    SET(HAVE_EXTERNAL_GETDATA 1)
+    SET(GETDATA_LIBS getdata m)
+    UNSET(GETDATA_C)
+ELSE (HAVE_GETDATA_H_ AND HAVE_GETDATA_LIB_ AND GETDATA_FOUND)
+    UNSET(HAVE_EXTERNAL_GETDATA)
+    UNSET(GETDATA_LIBS)
+    SET(GETDATA_C getdata.c)
+ENDIF (HAVE_GETDATA_H_ AND HAVE_GETDATA_LIB_ AND GETDATA_FOUND)
+
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/config.h)
 
 add_subdirectory(src)
--- branches/work/kst/kst1kde4/kst/src/datasources/dirfile/CMakeLists.txt #1098026:1098027
@@ -22,3 +22,23 @@
 
 install(FILES  kstdata_dirfile.desktop DESTINATION share/services/kst)
 
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/extdate $(all_includes) $(GETDATA_CFLAGS)
+#
+#if NO_EXTERNAL_GETDATA
+#GETDATA_C=getdata.c
+#endif
+#
+#kde_module_LTLIBRARIES=kstdata_dirfile.la
+#
+#kstdata_dirfile_la_LDFLAGS=$(all_libraries) $(GETDATA_LIBS) -module -avoid-version
+#kstdata_dirfile_la_SOURCES=dirfile.cpp $(GETDATA_C)
+#
+#METASOURCES=AUTO
+#
+#services_DATA=kstdata_dirfile.desktop
+#servicesdir=$(kde_servicesdir)/kst
+#
--- branches/work/kst/kst1kde4/kst/src/datasources/dirfile/dirfile.cpp #1098026:1098027
@@ -138,7 +138,7 @@
   }
 
   if (err != GD_E_OK) {
-    if (_errors.find(field) == 0L) {
+    if (_errors.value(field) == 0L) {
       char error[200];
 
       _errors.insert(field, (int*)1L);
--- branches/work/kst/kst1kde4/kst/src/datasources/dirfile/dirfile.h #1098026:1098027
@@ -19,7 +19,6 @@
 #define DIRFILE_H
 
 #include <kstdatasource.h>
-#include <Q3Dict>
 
 
 class DirFileSource : public KstDataSource {
@@ -51,7 +50,7 @@
     bool reset();
 
   private:
-    Q3Dict<int>  _errors;
+    QMap<QString, int*>  _errors;
     int _frameCount;
 };
 
--- branches/work/kst/kst1kde4/kst/src/datasources/dirfile/getdata.c #1098026:1098027
@@ -35,7 +35,7 @@
 
 #define DIRFILE_DEBUG 0
 
-#include <config.h>
+/*#include <config.h>*/
 
 /* The following has been extracted from internal.cpp from kjs */