From 743f2075751cfcf93b2a6c14b09af5c93ee52530 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Thu, 29 Sep 2011 21:51:12 +0000 Subject: [PATCH] fix some warnings --- src/gui/symbology-ng/qgsrendererv2widget.cpp | 2 +- src/providers/ogr/qgsogrprovider.cpp | 3 +++ src/providers/postgres/qgspostgresprovider.cpp | 5 ++--- tests/src/core/testqgsapplication.cpp | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp index c4586a858a5..5522662961a 100644 --- 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 index 9a690e4ec44..f4752c68cf2 100644 --- 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 index b0975a65b2d..ff56be200bc 100644 --- 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 index 5441b85bd16..392934804b4 100644 --- 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()