fix build error in tests

git-svn-id: http://svn.osgeo.org/qgis/trunk@11981 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 7, 2009 · f794b2f · f794b2f
1 parent 4573fd4
commit f794b2f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/src/analysis/vector/qgsgeometryanalyzer.h b/src/analysis/vector/qgsgeometryanalyzer.h
@@ -47,7 +47,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
       @param onlySelectedFeatures if true, only selected features are considered, else all the features
       @param p progress dialog (or 0 if no progress dialog is to be shown)
       @note: added in version 1.4*/
-    bool simplify( QgsVectorLayer* layer, const QString& shapefileName, double tolerance, \
+    bool simplify( QgsVectorLayer* layer, const QString& shapefileName, double tolerance,
                  bool onlySelectedFeatures = false, QProgressDialog* p = 0 );
 
     /**Calculate the true centroids, or 'center of mass' for a vector layer and 
@@ -58,7 +58,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
       @param onlySelectedFeatures if true, only selected features are considered, else all the features
       @param p progress dialog (or 0 if no progress dialog is to be shown)
       @note: added in version 1.4*/
-    bool centroids( QgsVectorLayer* layer, const QString& shapefileName, \
+    bool centroids( QgsVectorLayer* layer, const QString& shapefileName,
                  bool onlySelectedFeatures = false, QProgressDialog* p = 0 );
 
     /**Create a polygon based on the extent of all (selected) features and write it to a new shape file
@@ -80,7 +80,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
       @param bufferDistanceField index of the attribute field that contains the buffer distance (or -1 if all features have the same buffer distance)
       @param p progress dialog (or 0 if no progress dialog is to be shown)
       @note: added in version 1.3*/
-    bool buffer( QgsVectorLayer* layer, const QString& shapefileName, double bufferDistance, \
+    bool buffer( QgsVectorLayer* layer, const QString& shapefileName, double bufferDistance,
                  bool onlySelectedFeatures = false, bool dissolve = false, int bufferDistanceField = -1, QProgressDialog* p = 0 );
 
     /**Create convex hull(s) of a vector layer and write it to a new shape file
@@ -92,7 +92,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
       all features have the same buffer distance)
       @param p progress dialog (or 0 if no progress dialog is to be shown)
       @note: added in version 1.4*/
-    bool convexHull( QgsVectorLayer* layer, const QString& shapefileName, bool onlySelectedFeatures = false, \
+    bool convexHull( QgsVectorLayer* layer, const QString& shapefileName, bool onlySelectedFeatures = false,
                      int uniqueIdField = -1, QProgressDialog* p = 0 );
 
     /**Dissolve a vector layer and write it to a new shape file
@@ -104,7 +104,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
       all features should be dissolved together)
       @param p progress dialog (or 0 if no progress dialog is to be shown)
       @note: added in version 1.4*/
-    bool dissolve( QgsVectorLayer* layer, const QString& shapefileName, bool onlySelectedFeatures = false, \
+    bool dissolve( QgsVectorLayer* layer, const QString& shapefileName, bool onlySelectedFeatures = false,
                      int uniqueIdField = -1, QProgressDialog* p = 0 );
 
   private:
@@ -116,7 +116,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
     /**Helper function to get the cetroid of an individual feature*/
     void centroidFeature( QgsFeature& f, QgsVectorFileWriter* vfw );
     /**Helper function to buffer an individual feature*/
-    void bufferFeature( QgsFeature& f, int nProcessedFeatures, QgsVectorFileWriter* vfw, bool dissolve, QgsGeometry** dissolveGeometry, \
+    void bufferFeature( QgsFeature& f, int nProcessedFeatures, QgsVectorFileWriter* vfw, bool dissolve, QgsGeometry** dissolveGeometry,
                         double bufferDistance, int bufferDistanceField );
     /**Helper function to get the convex hull of feature(s)*/
     void convexFeature( QgsFeature& f, int nProcessedFeatures, QgsGeometry** dissolveGeometry );

diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/src/analysis/vector/qgszonalstatistics.cpp
@@ -41,7 +41,7 @@ QgsZonalStatistics::~QgsZonalStatistics()
 
 int QgsZonalStatistics::calculateStatistics(QProgressDialog* p)
 {
-  if(!mPolygonLayer || !mPolygonLayer->geometryType() == QGis::Polygon)
+  if(!mPolygonLayer || mPolygonLayer->geometryType() != QGis::Polygon)
   {
     return 1;
   }
@@ -170,7 +170,6 @@ int QgsZonalStatistics::calculateStatistics(QProgressDialog* p)
     cellCenterY = rasterBBox.yMaximum() - offsetY * cellsizeY - cellsizeY / 2;
     count = 0;
     sum = 0;
-    float currentValue;
 
     for(int i = 0; i < nCellsY; ++i)
     {

diff --git a/tests/src/analysis/testqgsvectoranalyzer.cpp b/tests/src/analysis/testqgsvectoranalyzer.cpp
@@ -114,24 +114,23 @@ void TestQgsVectorAnalyzer::simplifyGeometry(  )
 {
   QString myTmpDir = QDir::tempPath() + QDir::separator() ;
   QString myFileName = myTmpDir +  "simplify_layer.shp";
-  QVERIFY( mAnalyzer.simplifyGeometry( mpLineLayer,
+  QVERIFY( mAnalyzer.simplify( mpLineLayer,
                              myFileName,
-                             "UTF-8",
                              1.0 ) );
 }
 
 void TestQgsVectorAnalyzer::polygonCentroids(  )
 {
   QString myTmpDir = QDir::tempPath() + QDir::separator() ;
   QString myFileName = myTmpDir +  "centroid_layer.shp";
-  QVERIFY( mAnalyzer.polygonCentroids( mpPolyLayer, myFileName, "UTF-8" ) );
+  QVERIFY( mAnalyzer.centroids( mpPolyLayer, myFileName ) );
 }
 
 void TestQgsVectorAnalyzer::layerExtent(  )
 {
   QString myTmpDir = QDir::tempPath() + QDir::separator() ;
   QString myFileName = myTmpDir +  "extent_layer.shp";
-  QVERIFY( mAnalyzer.layerExtent( mpPointLayer, myFileName, "UTF-8" ) );
+  QVERIFY( mAnalyzer.extent( mpPointLayer, myFileName ) );
 }
 
 QTEST_MAIN( TestQgsVectorAnalyzer )