fix lenny build and some warnings

qgis · Aug 20, 2011 · 92e57da · 92e57da
1 parent e591d1c
commit 92e57da
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/debian/control.lucid b/debian/control.lucid
@@ -31,7 +31,7 @@ Build-Depends:
  git-core,
  doxygen,
  graphviz,
- txt2tags 
+ txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

diff --git a/src/core/pal/costcalculator.cpp b/src/core/pal/costcalculator.cpp
@@ -161,7 +161,8 @@ namespace pal
     do
     {
       discrim += 1.0;
-      for ( stop = 0; stop < feat->nblp && feat->lPos[stop]->getCost() < discrim; stop++ );
+      for ( stop = 0; stop < feat->nblp && feat->lPos[stop]->getCost() < discrim; stop++ )
+        ;
     }
     while ( stop == 0 && discrim < feat->lPos[feat->nblp-1]->getCost() + 2.0 );
 

diff --git a/src/core/pal/problem.cpp b/src/core/pal/problem.cpp
@@ -506,7 +506,8 @@ namespace pal
     {
       it++;
       /* find the next seed not ok */
-      for ( i = ( seed + 1 ) % nbft; ok[i] && i != seed; i = ( i + 1 ) % nbft );
+      for ( i = ( seed + 1 ) % nbft; ok[i] && i != seed; i = ( i + 1 ) % nbft )
+        ;
 
       if ( i == seed && ok[seed] )
       {
@@ -2693,7 +2694,8 @@ namespace pal
 
       for ( seed = ( iter + 1 ) % nbft;
             ok[seed] && seed != iter;
-            seed = ( seed + 1 ) % nbft );
+            seed = ( seed + 1 ) % nbft )
+        ;
 
       // All seeds are OK
       if ( seed == iter )

diff --git a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
@@ -201,8 +201,8 @@ void QgsRendererV2PropertiesDialog::showSymbolLevels()
   QgsSymbolV2List symbols = r->symbols();
 
   QgsSymbolLevelsV2Dialog dlg( symbols, r->usingSymbolLevels(), this );
-  connect( this, SIGNAL( forceChkUsingFirstRule() ), mActiveWidget, SLOT( forceUsingFirstRule() ), Qt::UniqueConnection );
-  connect( this, SIGNAL( forceUncheckSymbolLevels() ), mActiveWidget, SLOT( forceNoSymbolLevels() ), Qt::UniqueConnection );
+  connect( this, SIGNAL( forceChkUsingFirstRule() ), mActiveWidget, SLOT( forceUsingFirstRule() ) );
+  connect( this, SIGNAL( forceUncheckSymbolLevels() ), mActiveWidget, SLOT( forceNoSymbolLevels() ) );
 
   if ( dlg.exec() )
   {
@@ -222,6 +222,8 @@ void QgsRendererV2PropertiesDialog::showSymbolLevels()
     }
   }
 
+  disconnect( this, SIGNAL( forceChkUsingFirstRule() ), mActiveWidget, SLOT( forceUsingFirstRule() ) );
+  disconnect( this, SIGNAL( forceUncheckSymbolLevels() ), mActiveWidget, SLOT( forceNoSymbolLevels() ) );
 }
 
 

diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -884,7 +884,6 @@ void QgsGdalProvider::computeMinMax( int theBandNo )
     return;
   }
   GDALRasterBandH myGdalBand = GDALGetRasterBand( mGdalDataset, theBandNo );
-  int bApproxOK = false;
   int             bGotMin, bGotMax;
   double          adfMinMax[2];
   adfMinMax[0] = GDALGetRasterMinimum( myGdalBand, &bGotMin );
@@ -1259,7 +1258,6 @@ void QgsGdalProvider::populateHistogram( int theBandNo,   QgsRasterBandStats & t
   //vector is not equal to the number of bins
   //i.e if the histogram has never previously been generated or the user has
   //selected a new number of bins.
-  bool myCollectHistogramFlag = true;
   if ( theBandStats.histogramVector == 0 ||
        theBandStats.histogramVector->size() != theBinCount ||
        theIgnoreOutOfRangeFlag != theBandStats.isHistogramOutOfRange ||