fix warnings

qgis · Nov 3, 2012 · 33682f2 · 33682f2
1 parent dcef083
commit 33682f2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -919,12 +919,12 @@ bool QgsRasterLayer::hasStatistics( int theBandNo )
 }
 #endif
 
+#if 0
 /**
  * @param thePoint the QgsPoint for which to obtain pixel values
  * @param theResults QMap to hold the pixel values at thePoint for each layer in the raster file
  * @return False if WMS layer and true otherwise
  */
-#if 0
 bool QgsRasterLayer::identify( const QgsPoint& thePoint, QMap<QString, QString>& theResults )
 {
   theResults.clear();
@@ -1019,10 +1019,6 @@ QString QgsRasterLayer::identifyAsHtml( const QgsPoint& thePoint )
 }
 #endif
 
-/**
- * @note Note implemented yet
- * @return Always returns false
- */
 bool QgsRasterLayer::isEditable() const
 {
   return false;

diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp
@@ -860,8 +860,10 @@ QgsCptCityDirectoryItem::QgsCptCityDirectoryItem( QgsCptCityDataItem* parent,
   mType = Directory;
   mValid = QDir( QgsCptCityArchive::defaultBaseDir() ).exists();
   if ( ! mValid )
+  {
     QgsDebugMsg( "created invalid dir item, path = " + QgsCptCityArchive::defaultBaseDir()
                  + QDir::separator() + mPath );
+  }
 
   // parse DESC.xml to get mInfo
   mInfo = "";

diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp
@@ -881,7 +881,7 @@ bool QgsStyleV2::detagSymbol( StyleEntity type, QString symbol, QStringList tags
   sqlite3_stmt *ppStmt;
   int nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
 
-  int symbolid;
+  int symbolid = 0;
   if ( nErr == SQLITE_OK && sqlite3_step( ppStmt ) == SQLITE_ROW )
   {
     symbolid = sqlite3_column_int( ppStmt, 0 );

diff --git a/src/gui/qgserrordialog.h b/src/gui/qgserrordialog.h
@@ -32,6 +32,9 @@ class GUI_EXPORT QgsErrorDialog: public QDialog, private Ui::QgsErrorDialogBase
 
     /** Show dialog with error
      * @param theError error
+     * @param theTitle title
+     * @param parent parent object
+     * @param fl widget flags
      */
     static void show( const QgsError & theError, const QString & theTitle, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
 

diff --git a/src/mapserver/qgsfilter.cpp b/src/mapserver/qgsfilter.cpp
@@ -96,7 +96,7 @@ QgsFilter* QgsFilter::createFilterFromXml( const QDomElement& filterElem, QgsVec
   // if the filter is spatial
   if ( filterName == "BBOX" || filterName == "CONTAINS" || filterName == "CROSSES" || filterName == "DISJOINT" || filterName == "EQUALS" || filterName == "INTERSECTS" || filterName == "OVERLAPS" || filterName == "TOUCHES" || filterName == "WITHIN" )
   {
-    QgsGeometry* geom;
+    QgsGeometry *geom = 0;
 
     QDomNodeList bNodes = filterElem.elementsByTagName( "Box" );
     if ( bNodes.size() > 0 )

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -1445,6 +1445,7 @@ void QgsWMSServer::drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p,
                                         double layerTitleSpace, double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight, double fontOversamplingFactor,
                                         double dpi ) const
 {
+  Q_UNUSED( layerSpace );
   if ( !item )
   {
     return;

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2476,7 +2476,7 @@ bool QgsPostgresProvider::changeGeometryValues( QgsGeometryMap & geometry_map )
       QgsDebugMsg( "iterating over feature id " + FID_TO_STRING( iter.key() ) );
 
       // Save the id of the current topogeometry
-      long old_tg_id;
+      long old_tg_id = -1;
       if ( mSpatialColType == sctTopoGeometry )
       {
         QStringList params;