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

[Peter Kümmel]

SVN commit 1291321 by kuemmel:

remove warnings

 M  +3 -3      datasources/netcdf/netcdfsource.cpp  
 M  +4 -0      libkstapp/dialogscriptinterface.cpp  
 M  +1 -1      plugins/fits/gradient_unweighted/fitgradient_unweighted.cpp  
 M  +1 -1      plugins/fits/gradient_weighted/fitgradient_weighted.cpp  
 M  +1 -1      plugins/fits/linear_unweighted/fitlinear_unweighted.cpp  
 M  +1 -1      plugins/fits/linear_weighted/fitlinear_weighted.cpp  


--- branches/work/kst/portto4/kst/src/datasources/netcdf/netcdfsource.cpp #1291320:1291321
@@ -195,8 +195,8 @@
   for (int i=0; i<var->num_atts(); ++i) {
     NcAtt *att = var->get_att(i);
     // Only handle char attributes as fieldStrings, the others as fieldScalars
-    if (att->type() == NC_BYTE || att->type() == NC_SHORT || att->type() == NC_INT
-        || att->type() == NC_LONG || att->type() == NC_FLOAT || att->type() == NC_DOUBLE) {
+    if (att->type() == ncByte || att->type() == ncShort || att->type() == ncInt
+        || att->type() == ncLong || att->type() == ncFloat || att->type() == ncDouble) {
       // Some attributes may have multiple values => load the first as is, and for the others
       // add a -2, -3, etc... suffix as obviously we can have only one value per scalar.
       // Do it in two steps to avoid a test in the loop while keeping a "clean" name for the first one
@@ -221,7 +221,7 @@
   for (int i=0; i<var->num_atts(); ++i) {
     NcAtt *att = var->get_att(i);
     // Only handle char/unspecified attributes as fieldStrings, the others as fieldScalars
-    if (att->type() == NC_CHAR || att->type() == NC_UNSPECIFIED) {
+    if (att->type() == ncChar || att->type() == NC_UNSPECIFIED) {
       fieldStrings[att->name()] = QString(att->values()->as_string(0));
     }
     // qDebug() << att->name() << ": " << att->values()->num() << endl;
--- branches/work/kst/portto4/kst/src/libkstapp/dialogscriptinterface.cpp #1291320:1291321
@@ -86,6 +86,10 @@
 
 using namespace std;
 
+#ifdef TEXT
+#undef TEXT
+#endif
+
 #define TEXT(T) (T->property("si").isValid()?T->property("si").toString().toAscii():T->text().toAscii())
 #define ORIGTEXT(T) T->text().toAscii()
 #define CBTEXT(T) (T->property("si").isValid()?T->property("si").toString().toAscii():"")
--- branches/work/kst/portto4/kst/src/plugins/fits/gradient_unweighted/fitgradient_unweighted.cpp #1291320:1291321
@@ -187,7 +187,7 @@
   outputVectorYHi->setLabelInfo(label_info);
 
   int i = 0;
-  int iLength;
+  int iLength = 0;
   bool bReturn = false;
   double* pInputs[3];
   double c0 = 0.0;
--- branches/work/kst/portto4/kst/src/plugins/fits/gradient_weighted/fitgradient_weighted.cpp #1291320:1291321
@@ -204,7 +204,7 @@
 
 
   int i = 0;
-  int iLength;
+  int iLength = 0;
   bool bReturn = false;
   double* pInputs[3];
   double c0 = 0.0;
--- branches/work/kst/portto4/kst/src/plugins/fits/linear_unweighted/fitlinear_unweighted.cpp #1291320:1291321
@@ -173,7 +173,7 @@
   Kst::ScalarPtr outputScalar = _outputScalars[SCALAR_OUT];
 
   int i = 0;
-  int iLength;
+  int iLength = 0;
   bool bReturn = false;
   double* pInputs[3];
   double c0 = 0.0;
--- branches/work/kst/portto4/kst/src/plugins/fits/linear_weighted/fitlinear_weighted.cpp #1291320:1291321
@@ -203,7 +203,7 @@
   outputVectorYHi->setLabelInfo(label_info);
 
   int i = 0;
-  int iLength;
+  int iLength = 0;
   bool bReturn = false;
   double* pInputs[3];
   double c0 = 0.0;