Skip to content

Commit 49459c8

Browse files
committed
[QGIS Server] Use qobject_cast when it's usefull
1 parent e34116d commit 49459c8

9 files changed

+23
-23
lines changed

src/server/qgshostedrdsbuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ QgsMapLayer* QgsHostedRDSBuilder::createMapLayer( const QDomElement& elem,
5959
QgsRasterLayer* rl = nullptr;
6060
if ( allowCaching )
6161
{
62-
rl = dynamic_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( uri, layerName ) );
62+
rl = qobject_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( uri, layerName ) );
6363
}
6464
if ( !rl )
6565
{

src/server/qgsowsserver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/** Apply filter from AccessControl */
2626
void QgsOWSServer::applyAccessControlLayerFilters( QgsMapLayer* mapLayer, QHash<QgsMapLayer*, QString>& originalLayerFilters ) const
2727
{
28-
if ( QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( mapLayer ) )
28+
if ( QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( mapLayer ) )
2929
{
3030
QString sql = mAccessControl->extraSubsetString( layer );
3131
if ( !sql.isEmpty() )
@@ -54,7 +54,7 @@ void QgsOWSServer::restoreLayerFilters( const QHash<QgsMapLayer*, QString>& filt
5454
QHash<QgsMapLayer*, QString>::const_iterator filterIt = filterMap.constBegin();
5555
for ( ; filterIt != filterMap.constEnd(); ++filterIt )
5656
{
57-
QgsVectorLayer* filteredLayer = dynamic_cast<QgsVectorLayer*>( filterIt.key() );
57+
QgsVectorLayer* filteredLayer = qobject_cast<QgsVectorLayer*>( filterIt.key() );
5858
if ( filteredLayer )
5959
{
6060
QgsVectorDataProvider* dp = filteredLayer->dataProvider();

src/server/qgsremoteowsbuilder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ QgsRasterLayer* QgsRemoteOWSBuilder::wmsLayerFromUrl( const QString& url, const
162162

163163
if ( allowCaching )
164164
{
165-
result = dynamic_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( url, layerName ) );
165+
result = qobject_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( url, layerName ) );
166166
}
167167

168168
if ( result )
@@ -414,7 +414,7 @@ QgsVectorLayer* QgsRemoteOWSBuilder::sosLayer( const QDomElement& remoteOWSElem,
414414
QgsVectorLayer* sosLayer = nullptr;
415415
if ( allowCaching )
416416
{
417-
sosLayer = dynamic_cast<QgsVectorLayer*>( QgsMSLayerCache::instance()->searchLayer( providerUrl, layerName ) );
417+
sosLayer = qobject_cast<QgsVectorLayer*>( QgsMSLayerCache::instance()->searchLayer( providerUrl, layerName ) );
418418
if ( sosLayer )
419419
{
420420
return sosLayer;

src/server/qgswcsprojectparser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void QgsWCSProjectParser::describeCoverage( const QString& aCoveName, QDomElemen
224224
QString type = elem.attribute( "type" );
225225
if ( type == "raster" )
226226
{
227-
QgsRasterLayer *rLayer = dynamic_cast<QgsRasterLayer *>( mProjectParser->createLayerFromElement( elem ) );
227+
QgsRasterLayer *rLayer = qobject_cast<QgsRasterLayer *>( mProjectParser->createLayerFromElement( elem ) );
228228
if ( !rLayer )
229229
continue;
230230

@@ -439,7 +439,7 @@ QList<QgsMapLayer*> QgsWCSProjectParser::mapLayerFromCoverage( const QString& cN
439439
if ( type == "raster" )
440440
{
441441
QgsMapLayer *mLayer = mProjectParser->createLayerFromElement( elem, useCache );
442-
QgsRasterLayer* layer = dynamic_cast<QgsRasterLayer*>( mLayer );
442+
QgsRasterLayer* layer = qobject_cast<QgsRasterLayer*>( mLayer );
443443
if ( !layer || !wcsLayersId.contains( layer->id() ) )
444444
return layerList;
445445

src/server/qgswcsserver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ QByteArray* QgsWCSServer::getCoverage()
377377
QgsRectangle rect( minx, miny, maxx, maxy );
378378

379379
QgsMapLayer* layer = layerList.at( 0 );
380-
QgsRasterLayer* rLayer = dynamic_cast<QgsRasterLayer*>( layer );
380+
QgsRasterLayer* rLayer = qobject_cast<QgsRasterLayer*>( layer );
381381
if ( rLayer && wcsLayersId.contains( rLayer->id() ) )
382382
{
383383
#ifdef HAVE_SERVER_PYTHON_PLUGINS

src/server/qgswfsprojectparser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ void QgsWfsProjectParser::describeFeatureType( const QString& aTypeName, QDomEle
347347
if ( type == "vector" )
348348
{
349349
QgsMapLayer *mLayer = mProjectParser->createLayerFromElement( elem );
350-
QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( mLayer );
350+
QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( mLayer );
351351
if ( !layer )
352352
continue;
353353

@@ -566,7 +566,7 @@ QList<QgsMapLayer*> QgsWfsProjectParser::mapLayerFromTypeName( const QString& aT
566566
if ( type == "vector" )
567567
{
568568
QgsMapLayer *mLayer = mProjectParser->createLayerFromElement( elem );
569-
QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( mLayer );
569+
QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( mLayer );
570570
if ( !layer )
571571
continue;
572572

src/server/qgswfsserver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ int QgsWfsServer::getFeature( QgsRequestHandler& request, const QString& format
469469
}
470470

471471
currentLayer = layerList.at( 0 );
472-
QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );
472+
QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );
473473
if ( layer && wfsLayersId.contains( layer->id() ) )
474474
{
475475
#ifdef HAVE_SERVER_PYTHON_PLUGINS
@@ -863,7 +863,7 @@ int QgsWfsServer::getFeature( QgsRequestHandler& request, const QString& format
863863

864864
currentLayer = layerList.at( 0 );
865865

866-
QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );
866+
QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );
867867
if ( layer && wfsLayersId.contains( layer->id() ) )
868868
{
869869
expressionContext << QgsExpressionContextUtils::layerScope( layer );

src/server/qgswmsprojectparser.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -502,19 +502,19 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem
502502
QList<QgsComposerItem *>::iterator itemIt = itemList.begin();
503503
for ( ; itemIt != itemList.end(); ++itemIt )
504504
{
505-
QgsComposerLabel* label = dynamic_cast< QgsComposerLabel *>( *itemIt );
505+
QgsComposerLabel* label = qobject_cast< QgsComposerLabel *>( *itemIt );
506506
if ( label )
507507
{
508508
labelList.push_back( label );
509509
continue;
510510
}
511-
QgsComposerMap* map = dynamic_cast< QgsComposerMap *>( *itemIt );
511+
QgsComposerMap* map = qobject_cast< QgsComposerMap *>( *itemIt );
512512
if ( map )
513513
{
514514
mapList.push_back( map );
515515
continue;
516516
}
517-
QgsComposerLegend* legend = dynamic_cast< QgsComposerLegend *>( *itemIt );
517+
QgsComposerLegend* legend = qobject_cast< QgsComposerLegend *>( *itemIt );
518518
if ( legend )
519519
{
520520
QgsLegendModelV2* model = legend->model();
@@ -566,7 +566,7 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem
566566
legendList.push_back( legend );
567567
continue;
568568
}
569-
QgsComposerPicture* pic = dynamic_cast< QgsComposerPicture *>( *itemIt );
569+
QgsComposerPicture* pic = qobject_cast< QgsComposerPicture *>( *itemIt );
570570
if ( pic )
571571
{
572572
pic->setPicturePath( mProjectParser->convertToAbsolutePath(( pic )->picturePath() ) );
@@ -575,11 +575,11 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem
575575

576576
// an html item will be a composer frame and if it is we can try to get
577577
// its multiframe parent and then try to cast that to a composer html
578-
const QgsComposerFrame* frame = dynamic_cast<const QgsComposerFrame *>( *itemIt );
578+
const QgsComposerFrame* frame = qobject_cast<const QgsComposerFrame *>( *itemIt );
579579
if ( frame )
580580
{
581581
const QgsComposerMultiFrame * multiFrame = frame->multiFrame();
582-
const QgsComposerHtml* composerHtml = dynamic_cast<const QgsComposerHtml *>( multiFrame );
582+
const QgsComposerHtml* composerHtml = qobject_cast<const QgsComposerHtml *>( multiFrame );
583583
if ( composerHtml )
584584
{
585585
htmlList.push_back( composerHtml );
@@ -1331,7 +1331,7 @@ void QgsWmsProjectParser::addLayers( QDomDocument &doc,
13311331
bool geometryLayer = true;
13321332
if ( currentLayer->type() == QgsMapLayer::VectorLayer )
13331333
{
1334-
QgsVectorLayer* vLayer = dynamic_cast<QgsVectorLayer*>( currentLayer );
1334+
QgsVectorLayer* vLayer = qobject_cast<QgsVectorLayer*>( currentLayer );
13351335
if ( vLayer )
13361336
{
13371337
if ( vLayer->wkbType() == QgsWkbTypes::NoGeometry )
@@ -1840,7 +1840,7 @@ QDomDocument QgsWmsProjectParser::getStyles( QStringList& layerList ) const
18401840
for ( int j = 0; j < currentLayerList.size(); j++ )
18411841
{
18421842
QgsMapLayer* currentLayer = currentLayerList.at( j );
1843-
QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );
1843+
QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );
18441844
if ( !layer )
18451845
{
18461846
throw QgsMapServiceException( "Error", QString( "Could not get style because:\n%1" ).arg( "Non-vector layers not supported yet" ) );

src/server/qgswmsserver.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,7 +1742,7 @@ int QgsWmsServer::getFeatureInfo( QDomDocument& result, const QString& version )
17421742
}
17431743

17441744
//switch depending on vector or raster
1745-
QgsVectorLayer* vectorLayer = dynamic_cast<QgsVectorLayer*>( currentLayer );
1745+
QgsVectorLayer* vectorLayer = qobject_cast<QgsVectorLayer*>( currentLayer );
17461746

17471747
QDomElement layerElement;
17481748
if ( infoFormat.startsWith( "application/vnd.ogc.gml" ) )
@@ -1788,7 +1788,7 @@ int QgsWmsServer::getFeatureInfo( QDomDocument& result, const QString& version )
17881788
getFeatureInfoElement.appendChild( layerElement );
17891789
}
17901790

1791-
QgsRasterLayer* rasterLayer = dynamic_cast<QgsRasterLayer*>( currentLayer );
1791+
QgsRasterLayer* rasterLayer = qobject_cast<QgsRasterLayer*>( currentLayer );
17921792
if ( rasterLayer )
17931793
{
17941794
if ( !infoPoint.data() )
@@ -2579,7 +2579,7 @@ void QgsWmsServer::applyRequestedLayerFilters( const QStringList& layerList , QH
25792579

25802580
Q_FOREACH ( QgsMapLayer *filter, layersToFilter )
25812581
{
2582-
QgsVectorLayer* filteredLayer = dynamic_cast<QgsVectorLayer*>( filter );
2582+
QgsVectorLayer* filteredLayer = qobject_cast<QgsVectorLayer*>( filter );
25832583
if ( filteredLayer )
25842584
{
25852585
originalFilters.insert( filteredLayer, filteredLayer->subsetString() );

0 commit comments

Comments
 (0)