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

[Barth Netterfield]

SVN commit 778128 by netterfield:

Remove some compiler warnings.


 M  +1 -1      libkst/matrix.cpp  
 M  +2 -2      libkst/matrixfactory.cpp  
 M  +0 -1      libkstmath/defaultnames.cpp  


--- branches/work/kst/portto4/kst/src/libkst/matrix.cpp #778127:778128
@@ -595,7 +595,7 @@
   resizeZ(nX*nY, true);
 
   QDataStream qds(&data, QIODevice::ReadOnly);
-  int i;
+  uint i;
   // fill in the raw array with the data
   for (i = 0; i < nX*nY && !qds.atEnd(); i++) {
     qds >> _z[i];  // stored in the same order as it was saved
--- branches/work/kst/portto4/kst/src/libkst/matrixfactory.cpp #778127:778128
@@ -73,7 +73,7 @@
   }
 
   GeneratedMatrixPtr matrix = store->createObject<GeneratedMatrix>(tag);
-  matrix->change(nX, nY, minX, minY, stepX, stepY, gradZMin, gradZMax, xDirection);
+  matrix->change(uint(nX), uint(nY), minX, minY, stepX, stepY, gradZMin, gradZMax, xDirection);
 
   matrix->writeLock();
   matrix->update(0);
@@ -138,7 +138,7 @@
   }
 
   EditableMatrixPtr matrix = store->createObject<EditableMatrix>(tag);
-  matrix->change(data, nX, nY, minX, minY, stepX, stepY);
+  matrix->change(data, uint(nX), uint(nY), minX, minY, stepX, stepY);
 
   matrix->writeLock();
   matrix->update(0);
--- branches/work/kst/portto4/kst/src/libkstmath/defaultnames.cpp #778127:778128
@@ -46,7 +46,6 @@
 ObjectTag suggestDataObjectName(const QString& field,
                               const QString &A, bool add_c) {
   QString name;
-  int i=1;
   QString cleanedField = ObjectTag::cleanTagComponent(field);
 
   if (add_c) {