clean up the code to avoid deprecation and other warnings

qgis · Sep 15, 2011 · 47f82ab · 47f82ab
1 parent c942ee4
commit 47f82ab
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4847,7 +4847,7 @@ void QgisApp::fullHistogramStretch()
                               tr( "To perform a full histogram stretch, you need to have a raster layer selected." ) );
     return;
   }
-  if ( rlayer->providerKey() == "wms" )
+  if ( rlayer->providerType() == "wms" )
   {
     return;
   }

diff --git a/src/app/qgsidentifyresults.cpp b/src/app/qgsidentifyresults.cpp
@@ -270,7 +270,7 @@ void QgsIdentifyResults::addFeature( QgsRasterLayer *layer,
   featItem->setData( 0, Qt::UserRole, -1 );
   layItem->addChild( featItem );
 
-  if ( layer && layer->providerKey() == "wms" )
+  if ( layer && layer->providerType() == "wms" )
   {
     QTreeWidgetItem *attrItem = new QTreeWidgetItem( QStringList() << attributes.begin().key() << "" );
     featItem->addChild( attrItem );

diff --git a/src/app/qgsmaptoolidentify.cpp b/src/app/qgsmaptoolidentify.cpp
@@ -327,7 +327,7 @@ bool QgsMapToolIdentify::identifyRasterLayer( QgsRasterLayer *layer, int x, int
   idPoint = toLayerCoordinates( layer, idPoint );
   QString type;
 
-  if ( layer->providerKey() == "wms" )
+  if ( layer->providerType() == "wms" )
   {
     type = tr( "WMS layer" );
 

diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -142,7 +142,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
     {
       QgsRasterLayer *rl = qobject_cast<QgsRasterLayer *>( currentLayer );
 
-      if ( rl && rl->providerKey() == "wms" )
+      if ( rl && rl->providerType() == "wms" )
       {
         type = tr( "WMS" );
       }

diff --git a/src/app/qgstilescalewidget.cpp b/src/app/qgstilescalewidget.cpp
@@ -38,7 +38,7 @@ void QgsTileScaleWidget::layerChanged( QgsMapLayer *layer )
   mResolutions.clear();
   mSlider->setDisabled( true );
 
-  if ( !rl || rl->providerKey() != "wms" )
+  if ( !rl || rl->providerType() != "wms" )
     return;
 
   QString uri = rl->source();

diff --git a/src/gui/qgsquerybuilder.h b/src/gui/qgsquerybuilder.h
@@ -93,7 +93,6 @@ class GUI_EXPORT QgsQueryBuilder : public QDialog, private Ui::QgsQueryBuilderBa
      * The number of rows that would be returned is displayed in a message box.
      * The test uses a "select count(*) from ..." query to test the SQL
      * statement.
-     * @param showResults If true, the results are displayed in a QMessageBox
      */
     void test();
     /*!