Skip to content

Commit

Permalink
clean up the code to avoid deprecation and other warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
brushtyler committed Sep 15, 2011
1 parent c942ee4 commit 47f82ab
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsidentifyresults.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolidentify.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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" );

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsprojectproperties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgstilescalewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsquerybuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
/*!
Expand Down

0 comments on commit 47f82ab

Please sign in to comment.