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

[Zongyi Zhang]

SVN commit 1095651 by zhang:

continue kst1kde4

 M  +1 -1      bin/CMakeLists.txt  
 A             chop/CMakeLists.txt  
 M  +7 -2      chop/chop.cpp  
 M  +1 -0      chop/chop.h  
 A             combine/CMakeLists.txt  
 M  +3 -0      combine/combine.cpp  
 M  +1 -0      combine/combine.h  
 A             convert_time/CMakeLists.txt  
 M  +5 -0      convert_time/converttime.cpp  
 M  +1 -0      convert_time/converttime.h  
 A             convolution/CMakeLists.txt  
 A             convolution/convolve/CMakeLists.txt  
 M  +3 -0      convolution/convolve/convolve.cpp  
 M  +1 -0      convolution/convolve/convolve.h  
 A             convolution/deconvolve/CMakeLists.txt  
 M  +3 -0      convolution/deconvolve/deconvolve.cpp  
 M  +1 -0      convolution/deconvolve/deconvolve.h  


--- branches/work/kst/kst1kde4/kst/src/plugins/bin/CMakeLists.txt #1095650:1095651
@@ -9,7 +9,7 @@
 target_link_libraries(kstobject_bin kstbase kstmath ${KDE4_KPARTS_LIBS})
 
 install(TARGETS kstobject_bin 
-	LIBRARY DESTINATION lib/kde3
+	LIBRARY DESTINATION lib/kde4
  	${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
--- branches/work/kst/kst1kde4/kst/src/plugins/chop/chop.cpp #1095650:1095651
@@ -17,6 +17,8 @@
 #include "chop.h"
 
 #include <kgenericfactory.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 static const QString& ARRAY = KGlobal::staticQString("Array");
 static const QString& ODD = KGlobal::staticQString("Odd Array");
@@ -33,6 +35,9 @@
     : KstBasicPlugin() {
 }
 
+Chop::Chop( QObject */*parent*/, const QStringList &/*args*/ )
+    : KstBasicPlugin() {
+}
 
 Chop::~Chop() {
 }
@@ -47,7 +52,7 @@
   KstVectorPtr diff   = outputVector(DIFF);
   KstVectorPtr index  = outputVector(INDEX);
 
-  QValueList<KstVectorPtr> outputs;
+  Q3ValueList<KstVectorPtr> outputs;
   outputs << odd << even << diff << index;
 
   int iLength = array->length();
@@ -55,7 +60,7 @@
 
   if (iLength > 1) {
 
-    QValueList<KstVectorPtr>::iterator it = outputs.begin();
+    Q3ValueList<KstVectorPtr>::iterator it = outputs.begin();
     for(; it != outputs.end(); ++it) {
       if ((*it)->length() != iLengthNew) {
         (*it)->resize(iLengthNew, false);
--- branches/work/kst/kst1kde4/kst/src/plugins/chop/chop.h #1095650:1095651
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     Chop(QObject *parent, const char *name, const QStringList &args);
+    Chop(QObject *parent, const QStringList &args);
     virtual ~Chop();
 
     virtual bool algorithm();
--- branches/work/kst/kst1kde4/kst/src/plugins/combine/combine.cpp #1095650:1095651
@@ -31,6 +31,9 @@
     : KstBasicPlugin() {
 }
 
+Combine::Combine( QObject */*parent*/, const QStringList &/*args*/ )
+    : KstBasicPlugin() {
+}
 
 Combine::~Combine() {
 }
--- branches/work/kst/kst1kde4/kst/src/plugins/combine/combine.h #1095650:1095651
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     Combine(QObject *parent, const char *name, const QStringList &args);
+    Combine(QObject *parent, const QStringList &args);
     virtual ~Combine();
 
     virtual bool algorithm();
--- branches/work/kst/kst1kde4/kst/src/plugins/convert_time/converttime.cpp #1095650:1095651
@@ -36,6 +36,11 @@
   Q_UNUSED(args)
 }
 
+ConvertTime::ConvertTime( QObject *parent, const QStringList &args )
+    : KstBasicPlugin() {
+  Q_UNUSED(parent)
+  Q_UNUSED(args)
+}
 
 ConvertTime::~ConvertTime() {
 }
--- branches/work/kst/kst1kde4/kst/src/plugins/convert_time/converttime.h #1095650:1095651
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     ConvertTime(QObject *parent, const char *name, const QStringList &args);
+    ConvertTime(QObject *parent, const QStringList &args);
     virtual ~ConvertTime();
 
     virtual bool algorithm();
--- branches/work/kst/kst1kde4/kst/src/plugins/convolution/convolve/convolve.cpp #1095650:1095651
@@ -34,6 +34,9 @@
     : KstBasicPlugin() {
 }
 
+Convolve::Convolve( QObject * /*parent*/, const QStringList &/*args*/ )
+    : KstBasicPlugin() {
+}
 
 Convolve::~Convolve() {
 }
--- branches/work/kst/kst1kde4/kst/src/plugins/convolution/convolve/convolve.h #1095650:1095651
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     Convolve(QObject *parent, const char *name, const QStringList &args);
+    Convolve(QObject *parent, const QStringList &args);
     virtual ~Convolve();
 
     virtual bool algorithm();
--- branches/work/kst/kst1kde4/kst/src/plugins/convolution/deconvolve/deconvolve.cpp #1095650:1095651
@@ -34,6 +34,9 @@
     : KstBasicPlugin() {
 }
 
+Deconvolve::Deconvolve( QObject */*parent*/, const QStringList &/*args*/ )
+    : KstBasicPlugin() {
+}
 
 Deconvolve::~Deconvolve() {
 }
--- branches/work/kst/kst1kde4/kst/src/plugins/convolution/deconvolve/deconvolve.h #1095650:1095651
@@ -23,6 +23,7 @@
   Q_OBJECT
   public:
     Deconvolve(QObject *parent, const char *name, const QStringList &args);
+    Deconvolve(QObject *parent, const QStringList &args);
     virtual ~Deconvolve();
 
     virtual bool algorithm();