fix warnings

qgis · Jan 24, 2012 · 2d8c8c8 · 2d8c8c8
1 parent 42edad5
commit 2d8c8c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4329,7 +4329,7 @@ bool QgisApp::toggleEditing( QgsMapLayer *layer, bool allowCancel )
 
   if ( !vlayer->isEditable() && !vlayer->isReadOnly() )
   {
-    if ( vlayer->dataProvider()->capabilities() & QgsVectorDataProvider::EditingCapabilities == 0 )
+    if ( !(vlayer->dataProvider()->capabilities() & QgsVectorDataProvider::EditingCapabilities ) )
     {
       QMessageBox::information( 0, tr( "Start editing failed" ), tr( "Provider cannot be opened for editing" ) );
       return false;

diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -370,6 +370,9 @@ void QgsRuleBasedRendererV2::renderFeature( QgsFeature& feature,
     bool selected,
     bool drawVertexMarker )
 {
+  Q_UNUSED( layer );
+  Q_UNUSED( selected );
+  Q_UNUSED( drawVertexMarker );
 
   // TODO: selected features, vertex markers
 

diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
@@ -654,6 +654,8 @@ QMimeData *QgsRuleBasedRendererV2Model::mimeData( const QModelIndexList &indexes
 bool QgsRuleBasedRendererV2Model::dropMimeData( const QMimeData *data,
     Qt::DropAction action, int row, int column, const QModelIndex &parent )
 {
+  Q_UNUSED( column );
+
   if ( action == Qt::IgnoreAction )
     return true;