fix some warnings

qgis · Sep 29, 2011 · 743f207 · 743f207
1 parent dfaba7e
commit 743f207
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp
@@ -11,7 +11,7 @@ QgsRendererV2Widget::QgsRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* sty
 {
 }
 
-void QgsRendererV2Widget::contextMenuViewCategories( const QPoint& p )
+void QgsRendererV2Widget::contextMenuViewCategories( const QPoint & )
 {
   QMenu contextMenu;
   contextMenu.addAction( tr( "Change color" ), this, SLOT( changeSymbolColor( ) ) );

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -565,6 +565,9 @@ void QgsOgrProvider::setRelevantFields( bool fetchGeometry, const QgsAttributeLi
 
     OGR_L_SetIgnoredFields( ogrLayer, ignoredFields.data() );
   }
+#else
+  Q_UNUSED( fetchGeometry );
+  Q_UNUSED( fetchAttributes );
 #endif
 }
 

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -4558,9 +4558,8 @@ void QgsPGRootItem::connectionsChanged()
 
 QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
 {
-  QgsPGRootItem * root = new QgsPGRootItem( parentItem, "PostGIS", "pg:" );
-
-  return root;
+  Q_UNUSED( thePath );
+  return new QgsPGRootItem( parentItem, "PostGIS", "pg:" );
 }
 
 QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(

diff --git a/tests/src/core/testqgsapplication.cpp b/tests/src/core/testqgsapplication.cpp
@@ -43,7 +43,7 @@ void TestQgsApplication::initTestCase()
   // init QGIS's paths - true means that all path will be inited from prefix
   QString qgisPath = QCoreApplication::applicationDirPath();
   QgsApplication::setPrefixPath( INSTALL_PREFIX, true );
-  qDebug( "%s", QgsApplication::showSettings().toUtf8() );
+  qDebug( "%s", QgsApplication::showSettings().toUtf8().constData() );
 };
 
 void TestQgsApplication::checkTheme()
-Original file line number
+Diff line change
@@ Expand Up @@
         OGR_L_SetIgnoredFields( ogrLayer, ignoredFields.data() );
       }
+    #else
+      Q_UNUSED( fetchGeometry );
+      Q_UNUSED( fetchAttributes );
     #endif
     }
@@ Expand Down @@