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

[Peter Kümmel]

SVN commit 1356714 by kuemmel:

fix some Clang warnings

 M  +2 -2      libkstmath/enodes.h  
 M  +1 -1      plugins/dataobject/genericfilter/filter.h  
 M  +2 -2      plugins/fits/sinusoid_unweighted/fitsinusoid_unweighted.cpp  
 M  +2 -2      plugins/fits/sinusoid_weighted/fitsinusoid_weighted.cpp  


--- branches/work/kst/portto4/kst/src/libkstmath/enodes.h #1356713:1356714
@@ -132,8 +132,8 @@
       void *_f;
 
     private:
-      int _inputScalarCnt, _inputVectorCnt, _inputStringCnt;
-      int _inPid, _outputScalarCnt, _outputVectorCnt, _outputStringCnt;
+      int _inputVectorCnt;
+      int _inPid, _outputVectorCnt;
       int *_inArrayLens, *_outArrayLens;
       double *_inScalars, *_outScalars;
       double **_inVectors, **_outVectors;
--- branches/work/kst/portto4/kst/src/plugins/dataobject/genericfilter/filter.h #1356713:1356714
@@ -59,7 +59,7 @@
     // z+1
     polynom<S> zp1(1); zp1[1]=1.0; zp1[0]=1.0;
     // (z+1)^(n-i)
-    for (int j=i+1; j<=n; j++) pozp1 = pozp1 * zp1;
+    for (int j=i+1; j<=n; j++) pozp1 = (pozp1 * zp1);
     polynom<S> dNz(0); dNz[0]=Ns[i];
     dNz = dNz * pozp1 * potzm1odt;
     Nz = Nz + dNz;
--- branches/work/kst/portto4/kst/src/plugins/fits/sinusoid_unweighted/fitsinusoid_unweighted.cpp #1356713:1356714
@@ -316,11 +316,11 @@
       break;
     case 1:
       parameter = "cos(%1 2PI x/P)";
-      parameter.arg((index + 1 ) / 2);
+      parameter = parameter.arg((index + 1 ) / 2);
       break;
     case 2:
       parameter = "-sin(%1 2PI x/P)";
-      parameter.arg((index + 0 ) / 2);
+      parameter = parameter.arg((index + 0 ) / 2);
       break;
   }
 
--- branches/work/kst/portto4/kst/src/plugins/fits/sinusoid_weighted/fitsinusoid_weighted.cpp #1356713:1356714
@@ -339,11 +339,11 @@
       break;
     case 1:
       parameter = "cos(%1 2PI x/P)";
-      parameter.arg((index + 1 ) / 2);
+      parameter = parameter.arg((index + 1 ) / 2);
       break;
     case 2:
       parameter = "-sin(%1 2PI x/P)";
-      parameter.arg((index + 0 ) / 2);
+      parameter = parameter.arg((index + 0 ) / 2);
       break;
   }