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

[Zongyi Zhang]

SVN commit 1095732 by zhang:

continue kst1kde4

 A             correlation/CMakeLists.txt  
 A             correlation/autocorrelation/CMakeLists.txt  
 M  +3 -0      correlation/autocorrelation/autocorrelate.cpp  
 M  +1 -0      correlation/autocorrelation/autocorrelate.h  
 A             correlation/crosscorrelation/CMakeLists.txt  
 M  +3 -0      correlation/crosscorrelation/crosscorrelate.cpp  
 M  +1 -0      correlation/crosscorrelation/crosscorrelate.h  
 M  +4 -6      crosscorrelation_bruteforce/CMakeLists.txt  
 A             cumulative_sum/CMakeLists.txt  
 M  +4 -0      cumulative_sum/cumulative_sum.cpp  
 M  +1 -0      cumulative_sum/cumulative_sum.h  
 A             differentiation/CMakeLists.txt  
 M  +3 -0      differentiation/differentiation.cpp  
 M  +1 -0      differentiation/differentiation.h  
 A             discretizing_filters/CMakeLists.txt  
 M  +6 -3      discretizing_filters/genericfilter.cpp  
 M  +1 -0      discretizing_filters/genericfilter.h  


--- branches/work/kst/kst1kde4/kst/src/plugins/correlation/autocorrelation/autocorrelate.cpp #1095731:1095732
@@ -34,6 +34,9 @@
     : KstBasicPlugin() {
 }
 
+AutoCorrelate::AutoCorrelate( QObject */*parent*/, const QStringList &/*args*/ )
+    : KstBasicPlugin() {
+}
 
 AutoCorrelate::~AutoCorrelate() {
 }
--- branches/work/kst/kst1kde4/kst/src/plugins/correlation/autocorrelation/autocorrelate.h #1095731:1095732
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     AutoCorrelate(QObject *parent, const char *name, const QStringList &args);
+    AutoCorrelate(QObject *parent, const QStringList &args);
     virtual ~AutoCorrelate();
 
     virtual bool algorithm();
--- branches/work/kst/kst1kde4/kst/src/plugins/correlation/crosscorrelation/crosscorrelate.cpp #1095731:1095732
@@ -35,6 +35,9 @@
     : KstBasicPlugin() {
 }
 
+CrossCorrelate::CrossCorrelate( QObject */*parent*/, const QStringList &/*args*/ )
+    : KstBasicPlugin() {
+}
 
 CrossCorrelate::~CrossCorrelate() {
 }
--- branches/work/kst/kst1kde4/kst/src/plugins/correlation/crosscorrelation/crosscorrelate.h #1095731:1095732
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     CrossCorrelate(QObject *parent, const char *name, const QStringList &args);
+    CrossCorrelate(QObject *parent, const QStringList &args);
     virtual ~CrossCorrelate();
 
     virtual bool algorithm();
--- branches/work/kst/kst1kde4/kst/src/plugins/crosscorrelation_bruteforce/CMakeLists.txt #1095731:1095732
@@ -1,17 +1,15 @@
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/libkst ${CMAKE_SOURCE_DIR}/src/libkstmath ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/libkst ${CMAKE_SOURCE_DIR}/src/libkstmath ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR})
 
 ########### next target ###############
 
 set(kstobject_crosscorrelate_bruteforce_PART_SRCS crosscorrelate.cpp)
 
-KDE3_AUTOMOC(${kstobject_crosscorrelate_bruteforce_PART_SRCS})
+kde4_add_plugin(kstobject_crosscorrelate_bruteforce ${kstobject_crosscorrelate_bruteforce_PART_SRCS})
 
-KDE3_ADD_KPART(kstobject_crosscorrelate_bruteforce ${kstobject_crosscorrelate_bruteforce_PART_SRCS})
+target_link_libraries(kstobject_crosscorrelate_bruteforce kstbase kstmath ${KDE4_KPARTS_LIBS} ${KDE4_KDECORE_LIBS})
 
-target_link_libraries(kstobject_crosscorrelate_bruteforce ${KDE4_KDECORE_LIBS})
-
 install(TARGETS kstobject_crosscorrelate_bruteforce  
-	LIBRARY DESTINATION lib/kde3
+	LIBRARY DESTINATION lib/kde4
  	${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
--- branches/work/kst/kst1kde4/kst/src/plugins/cumulative_sum/cumulative_sum.cpp #1095731:1095732
@@ -31,7 +31,11 @@
     : KstBasicPlugin() {
 }
 
+CumulativeSum::CumulativeSum( QObject */*parent*/, const QStringList &/*args*/ )
+    : KstBasicPlugin() {
+}
 
+
 CumulativeSum::~CumulativeSum() {
 }
 
--- branches/work/kst/kst1kde4/kst/src/plugins/cumulative_sum/cumulative_sum.h #1095731:1095732
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     CumulativeSum(QObject *parent, const char *name, const QStringList &args);
+    CumulativeSum(QObject *parent, const QStringList &args);
     virtual ~CumulativeSum();
 
     virtual bool algorithm();
--- branches/work/kst/kst1kde4/kst/src/plugins/differentiation/differentiation.cpp #1095731:1095732
@@ -31,6 +31,9 @@
     : KstBasicPlugin() {
 }
 
+Differentiation::Differentiation( QObject */*parent*/, const QStringList &/*args*/ )
+    : KstBasicPlugin() {
+}
 
 Differentiation::~Differentiation() {
 }
--- branches/work/kst/kst1kde4/kst/src/plugins/differentiation/differentiation.h #1095731:1095732
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     Differentiation(QObject *parent, const char *name, const QStringList &args);
+    Differentiation(QObject *parent, const QStringList &args);
     virtual ~Differentiation();
 
     virtual bool algorithm();
--- branches/work/kst/kst1kde4/kst/src/plugins/discretizing_filters/genericfilter.cpp #1095731:1095732
@@ -18,7 +18,6 @@
 
 #include "filter.h"
 #include "polynom.h"
-
 #include <qregexp.h>
 
 #include <kgenericfactory.h>
@@ -38,6 +37,9 @@
     : KstBasicPlugin() {
 }
 
+GenericFilter::GenericFilter( QObject */*parent*/, const QStringList &/*args*/ )
+    : KstBasicPlugin() {
+}
 
 GenericFilter::~GenericFilter() {
 }
@@ -54,8 +56,9 @@
   int length = y->length();
 
   // Extract polynom coefficients and instantiate polynoms
-  QStringList numCoeffs = QStringList::split(QRegExp("\\s*(,|;|:)\\s*"), numerator->value());
-  QStringList denCoeffs = QStringList::split(QRegExp("\\s*(,|;|:)\\s*"), denominator->value());
+  QStringList numCoeffs = numerator->value().QString::split(QRegExp("\\s*(,|;|:)\\s*")); 
+  QStringList denCoeffs = denominator->value().QString::split(QRegExp("\\s*(,|;|:)\\s*")); 
+
   int numDegree = numCoeffs.count() - 1, denDegree = denCoeffs.count() - 1;
   polynom<double> Num(numDegree), Den(denDegree);
   double tmpDouble = 0.0;
--- branches/work/kst/kst1kde4/kst/src/plugins/discretizing_filters/genericfilter.h #1095731:1095732
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     GenericFilter(QObject *parent, const char *name, const QStringList &args);
+    GenericFilter(QObject *parent, const QStringList &args);
     virtual ~GenericFilter();
 
     virtual bool algorithm();