[QGIS Server] Use qobject_cast when it's usefull

rldhont · rldhont · commit 49459c8d703b · 2016-10-10T17:18:59.000+02:00
diff --git a/src/server/qgshostedrdsbuilder.cpp b/src/server/qgshostedrdsbuilder.cpp
@@ -59,7 +59,7 @@ QgsMapLayer* QgsHostedRDSBuilder::createMapLayer( const QDomElement& elem,
     QgsRasterLayer* rl = nullptr;
     if ( allowCaching )
     {
-      rl = dynamic_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( uri, layerName ) );
+      rl = qobject_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( uri, layerName ) );
     }
     if ( !rl )
     {
diff --git a/src/server/qgsowsserver.cpp b/src/server/qgsowsserver.cpp
@@ -25,7 +25,7 @@
 /** Apply filter from AccessControl */
 void QgsOWSServer::applyAccessControlLayerFilters( QgsMapLayer* mapLayer, QHash<QgsMapLayer*, QString>& originalLayerFilters ) const
 {
-  if ( QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( mapLayer ) )
+  if ( QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( mapLayer ) )
   {
     QString sql = mAccessControl->extraSubsetString( layer );
     if ( !sql.isEmpty() )
@@ -54,7 +54,7 @@ void QgsOWSServer::restoreLayerFilters( const QHash<QgsMapLayer*, QString>& filt
   QHash<QgsMapLayer*, QString>::const_iterator filterIt = filterMap.constBegin();
   for ( ; filterIt != filterMap.constEnd(); ++filterIt )
   {
-    QgsVectorLayer* filteredLayer = dynamic_cast<QgsVectorLayer*>( filterIt.key() );
+    QgsVectorLayer* filteredLayer = qobject_cast<QgsVectorLayer*>( filterIt.key() );
     if ( filteredLayer )
     {
       QgsVectorDataProvider* dp = filteredLayer->dataProvider();
diff --git a/src/server/qgsremoteowsbuilder.cpp b/src/server/qgsremoteowsbuilder.cpp
@@ -162,7 +162,7 @@ QgsRasterLayer* QgsRemoteOWSBuilder::wmsLayerFromUrl( const QString& url, const
 
   if ( allowCaching )
   {
-    result = dynamic_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( url, layerName ) );
+    result = qobject_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( url, layerName ) );
   }
 
   if ( result )
@@ -414,7 +414,7 @@ QgsVectorLayer* QgsRemoteOWSBuilder::sosLayer( const QDomElement& remoteOWSElem,
   QgsVectorLayer* sosLayer = nullptr;
   if ( allowCaching )
   {
-    sosLayer = dynamic_cast<QgsVectorLayer*>( QgsMSLayerCache::instance()->searchLayer( providerUrl, layerName ) );
+    sosLayer = qobject_cast<QgsVectorLayer*>( QgsMSLayerCache::instance()->searchLayer( providerUrl, layerName ) );
     if ( sosLayer )
     {
       return sosLayer;
diff --git a/src/server/qgswcsprojectparser.cpp b/src/server/qgswcsprojectparser.cpp
@@ -224,7 +224,7 @@ void QgsWCSProjectParser::describeCoverage( const QString& aCoveName, QDomElemen
     QString type = elem.attribute( "type" );
     if ( type == "raster" )
     {
-      QgsRasterLayer *rLayer = dynamic_cast<QgsRasterLayer *>( mProjectParser->createLayerFromElement( elem ) );
+      QgsRasterLayer *rLayer = qobject_cast<QgsRasterLayer *>( mProjectParser->createLayerFromElement( elem ) );
       if ( !rLayer )
         continue;
 
@@ -439,7 +439,7 @@ QList<QgsMapLayer*> QgsWCSProjectParser::mapLayerFromCoverage( const QString& cN
     if ( type == "raster" )
     {
       QgsMapLayer *mLayer = mProjectParser->createLayerFromElement( elem, useCache );
-      QgsRasterLayer* layer = dynamic_cast<QgsRasterLayer*>( mLayer );
+      QgsRasterLayer* layer = qobject_cast<QgsRasterLayer*>( mLayer );
       if ( !layer || !wcsLayersId.contains( layer->id() ) )
         return layerList;
 
diff --git a/src/server/qgswcsserver.cpp b/src/server/qgswcsserver.cpp
@@ -377,7 +377,7 @@ QByteArray* QgsWCSServer::getCoverage()
   QgsRectangle rect( minx, miny, maxx, maxy );
 
   QgsMapLayer* layer = layerList.at( 0 );
-  QgsRasterLayer* rLayer = dynamic_cast<QgsRasterLayer*>( layer );
+  QgsRasterLayer* rLayer = qobject_cast<QgsRasterLayer*>( layer );
   if ( rLayer && wcsLayersId.contains( rLayer->id() ) )
   {
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
diff --git a/src/server/qgswfsprojectparser.cpp b/src/server/qgswfsprojectparser.cpp
@@ -347,7 +347,7 @@ void QgsWfsProjectParser::describeFeatureType( const QString& aTypeName, QDomEle
     if ( type == "vector" )
     {
       QgsMapLayer *mLayer = mProjectParser->createLayerFromElement( elem );
-      QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( mLayer );
+      QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( mLayer );
       if ( !layer )
         continue;
 
@@ -566,7 +566,7 @@ QList<QgsMapLayer*> QgsWfsProjectParser::mapLayerFromTypeName( const QString& aT
     if ( type == "vector" )
     {
       QgsMapLayer *mLayer = mProjectParser->createLayerFromElement( elem );
-      QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( mLayer );
+      QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( mLayer );
       if ( !layer )
         continue;
 
diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
@@ -469,7 +469,7 @@ int QgsWfsServer::getFeature( QgsRequestHandler& request, const QString& format
       }
 
       currentLayer = layerList.at( 0 );
-      QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );
+      QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );
       if ( layer && wfsLayersId.contains( layer->id() ) )
       {
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
@@ -863,7 +863,7 @@ int QgsWfsServer::getFeature( QgsRequestHandler& request, const QString& format
 
     currentLayer = layerList.at( 0 );
 
-    QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );
+    QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );
     if ( layer && wfsLayersId.contains( layer->id() ) )
     {
       expressionContext << QgsExpressionContextUtils::layerScope( layer );
diff --git a/src/server/qgswmsprojectparser.cpp b/src/server/qgswmsprojectparser.cpp
@@ -502,19 +502,19 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem
   QList<QgsComposerItem *>::iterator itemIt = itemList.begin();
   for ( ; itemIt != itemList.end(); ++itemIt )
   {
-    QgsComposerLabel* label = dynamic_cast< QgsComposerLabel *>( *itemIt );
+    QgsComposerLabel* label = qobject_cast< QgsComposerLabel *>( *itemIt );
     if ( label )
     {
       labelList.push_back( label );
       continue;
     }
-    QgsComposerMap* map = dynamic_cast< QgsComposerMap *>( *itemIt );
+    QgsComposerMap* map = qobject_cast< QgsComposerMap *>( *itemIt );
     if ( map )
     {
       mapList.push_back( map );
       continue;
     }
-    QgsComposerLegend* legend = dynamic_cast< QgsComposerLegend *>( *itemIt );
+    QgsComposerLegend* legend = qobject_cast< QgsComposerLegend *>( *itemIt );
     if ( legend )
     {
       QgsLegendModelV2* model = legend->model();
@@ -566,7 +566,7 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem
       legendList.push_back( legend );
       continue;
     }
-    QgsComposerPicture* pic = dynamic_cast< QgsComposerPicture *>( *itemIt );
+    QgsComposerPicture* pic = qobject_cast< QgsComposerPicture *>( *itemIt );
     if ( pic )
     {
       pic->setPicturePath( mProjectParser->convertToAbsolutePath(( pic )->picturePath() ) );
@@ -575,11 +575,11 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem
 
     // an html item will be a composer frame and if it is we can try to get
     // its multiframe parent and then try to cast that to a composer html
-    const QgsComposerFrame* frame = dynamic_cast<const QgsComposerFrame *>( *itemIt );
+    const QgsComposerFrame* frame = qobject_cast<const QgsComposerFrame *>( *itemIt );
     if ( frame )
     {
       const QgsComposerMultiFrame * multiFrame = frame->multiFrame();
-      const QgsComposerHtml* composerHtml = dynamic_cast<const QgsComposerHtml *>( multiFrame );
+      const QgsComposerHtml* composerHtml = qobject_cast<const QgsComposerHtml *>( multiFrame );
       if ( composerHtml )
       {
         htmlList.push_back( composerHtml );
@@ -1331,7 +1331,7 @@ void QgsWmsProjectParser::addLayers( QDomDocument &doc,
       bool geometryLayer = true;
       if ( currentLayer->type() == QgsMapLayer::VectorLayer )
       {
-        QgsVectorLayer* vLayer = dynamic_cast<QgsVectorLayer*>( currentLayer );
+        QgsVectorLayer* vLayer = qobject_cast<QgsVectorLayer*>( currentLayer );
         if ( vLayer )
         {
           if ( vLayer->wkbType() == QgsWkbTypes::NoGeometry )
@@ -1840,7 +1840,7 @@ QDomDocument QgsWmsProjectParser::getStyles( QStringList& layerList ) const
     for ( int j = 0; j < currentLayerList.size(); j++ )
     {
       QgsMapLayer* currentLayer = currentLayerList.at( j );
-      QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );
+      QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );
       if ( !layer )
       {
         throw QgsMapServiceException( "Error", QString( "Could not get style because:\n%1" ).arg( "Non-vector layers not supported yet" ) );
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -1742,7 +1742,7 @@ int QgsWmsServer::getFeatureInfo( QDomDocument& result, const QString& version )
       }
 
       //switch depending on vector or raster
-      QgsVectorLayer* vectorLayer = dynamic_cast<QgsVectorLayer*>( currentLayer );
+      QgsVectorLayer* vectorLayer = qobject_cast<QgsVectorLayer*>( currentLayer );
 
       QDomElement layerElement;
       if ( infoFormat.startsWith( "application/vnd.ogc.gml" ) )
@@ -1788,7 +1788,7 @@ int QgsWmsServer::getFeatureInfo( QDomDocument& result, const QString& version )
           getFeatureInfoElement.appendChild( layerElement );
         }
 
-        QgsRasterLayer* rasterLayer = dynamic_cast<QgsRasterLayer*>( currentLayer );
+        QgsRasterLayer* rasterLayer = qobject_cast<QgsRasterLayer*>( currentLayer );
         if ( rasterLayer )
         {
           if ( !infoPoint.data() )
@@ -2579,7 +2579,7 @@ void QgsWmsServer::applyRequestedLayerFilters( const QStringList& layerList , QH
 
       Q_FOREACH ( QgsMapLayer *filter, layersToFilter )
       {
-        QgsVectorLayer* filteredLayer = dynamic_cast<QgsVectorLayer*>( filter );
+        QgsVectorLayer* filteredLayer = qobject_cast<QgsVectorLayer*>( filter );
         if ( filteredLayer )
         {
           originalFilters.insert( filteredLayer, filteredLayer->subsetString() );

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ QgsMapLayer* QgsHostedRDSBuilder::createMapLayer( const QDomElement& elem,`
`59`	`59`	`QgsRasterLayer* rl = nullptr;`
`60`	`60`	`if ( allowCaching )`
`61`	`61`	`{`
`62`		`- rl = dynamic_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( uri, layerName ) );`
	`62`	`+ rl = qobject_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( uri, layerName ) );`
`63`	`63`	`}`
`64`	`64`	`if ( !rl )`
`65`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`/** Apply filter from AccessControl */`
`26`	`26`	`void QgsOWSServer::applyAccessControlLayerFilters( QgsMapLayer* mapLayer, QHash<QgsMapLayer*, QString>& originalLayerFilters ) const`
`27`	`27`	`{`
`28`		`- if ( QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( mapLayer ) )`
	`28`	`+ if ( QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( mapLayer ) )`
`29`	`29`	`{`
`30`	`30`	`QString sql = mAccessControl->extraSubsetString( layer );`
`31`	`31`	`if ( !sql.isEmpty() )`
`@@ -54,7 +54,7 @@ void QgsOWSServer::restoreLayerFilters( const QHash<QgsMapLayer*, QString>& filt`
`54`	`54`	`QHash<QgsMapLayer*, QString>::const_iterator filterIt = filterMap.constBegin();`
`55`	`55`	`for ( ; filterIt != filterMap.constEnd(); ++filterIt )`
`56`	`56`	`{`
`57`		`- QgsVectorLayer* filteredLayer = dynamic_cast<QgsVectorLayer*>( filterIt.key() );`
	`57`	`+ QgsVectorLayer* filteredLayer = qobject_cast<QgsVectorLayer*>( filterIt.key() );`
`58`	`58`	`if ( filteredLayer )`
`59`	`59`	`{`
`60`	`60`	`QgsVectorDataProvider* dp = filteredLayer->dataProvider();`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ QgsRasterLayer* QgsRemoteOWSBuilder::wmsLayerFromUrl( const QString& url, const`
`162`	`162`
`163`	`163`	`if ( allowCaching )`
`164`	`164`	`{`
`165`		`- result = dynamic_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( url, layerName ) );`
	`165`	`+ result = qobject_cast<QgsRasterLayer*>( QgsMSLayerCache::instance()->searchLayer( url, layerName ) );`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`if ( result )`
`@@ -414,7 +414,7 @@ QgsVectorLayer* QgsRemoteOWSBuilder::sosLayer( const QDomElement& remoteOWSElem,`
`414`	`414`	`QgsVectorLayer* sosLayer = nullptr;`
`415`	`415`	`if ( allowCaching )`
`416`	`416`	`{`
`417`		`- sosLayer = dynamic_cast<QgsVectorLayer*>( QgsMSLayerCache::instance()->searchLayer( providerUrl, layerName ) );`
	`417`	`+ sosLayer = qobject_cast<QgsVectorLayer*>( QgsMSLayerCache::instance()->searchLayer( providerUrl, layerName ) );`
`418`	`418`	`if ( sosLayer )`
`419`	`419`	`{`
`420`	`420`	`return sosLayer;`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ QByteArray* QgsWCSServer::getCoverage()`
`377`	`377`	`QgsRectangle rect( minx, miny, maxx, maxy );`
`378`	`378`
`379`	`379`	`QgsMapLayer* layer = layerList.at( 0 );`
`380`		`- QgsRasterLayer* rLayer = dynamic_cast<QgsRasterLayer*>( layer );`
	`380`	`+ QgsRasterLayer* rLayer = qobject_cast<QgsRasterLayer*>( layer );`
`381`	`381`	`if ( rLayer && wcsLayersId.contains( rLayer->id() ) )`
`382`	`382`	`{`
`383`	`383`	`#ifdef HAVE_SERVER_PYTHON_PLUGINS`
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ int QgsWfsServer::getFeature( QgsRequestHandler& request, const QString& format`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`currentLayer = layerList.at( 0 );`
`472`		`- QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );`
	`472`	`+ QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );`
`473`	`473`	`if ( layer && wfsLayersId.contains( layer->id() ) )`
`474`	`474`	`{`
`475`	`475`	`#ifdef HAVE_SERVER_PYTHON_PLUGINS`
`@@ -863,7 +863,7 @@ int QgsWfsServer::getFeature( QgsRequestHandler& request, const QString& format`
`863`	`863`
`864`	`864`	`currentLayer = layerList.at( 0 );`
`865`	`865`
`866`		`- QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );`
	`866`	`+ QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );`
`867`	`867`	`if ( layer && wfsLayersId.contains( layer->id() ) )`
`868`	`868`	`{`
`869`	`869`	`expressionContext << QgsExpressionContextUtils::layerScope( layer );`
Original file line number	Diff line number	Diff line change
`@@ -502,19 +502,19 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem`
`502`	`502`	`QList<QgsComposerItem *>::iterator itemIt = itemList.begin();`
`503`	`503`	`for ( ; itemIt != itemList.end(); ++itemIt )`
`504`	`504`	`{`
`505`		`- QgsComposerLabel* label = dynamic_cast< QgsComposerLabel >( itemIt );`
	`505`	`+ QgsComposerLabel* label = qobject_cast< QgsComposerLabel >( itemIt );`
`506`	`506`	`if ( label )`
`507`	`507`	`{`
`508`	`508`	`labelList.push_back( label );`
`509`	`509`	`continue;`
`510`	`510`	`}`
`511`		`- QgsComposerMap* map = dynamic_cast< QgsComposerMap >( itemIt );`
	`511`	`+ QgsComposerMap* map = qobject_cast< QgsComposerMap >( itemIt );`
`512`	`512`	`if ( map )`
`513`	`513`	`{`
`514`	`514`	`mapList.push_back( map );`
`515`	`515`	`continue;`
`516`	`516`	`}`
`517`		`- QgsComposerLegend* legend = dynamic_cast< QgsComposerLegend >( itemIt );`
	`517`	`+ QgsComposerLegend* legend = qobject_cast< QgsComposerLegend >( itemIt );`
`518`	`518`	`if ( legend )`
`519`	`519`	`{`
`520`	`520`	`QgsLegendModelV2* model = legend->model();`
`@@ -566,7 +566,7 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem`
`566`	`566`	`legendList.push_back( legend );`
`567`	`567`	`continue;`
`568`	`568`	`}`
`569`		`- QgsComposerPicture* pic = dynamic_cast< QgsComposerPicture >( itemIt );`
	`569`	`+ QgsComposerPicture* pic = qobject_cast< QgsComposerPicture >( itemIt );`
`570`	`570`	`if ( pic )`
`571`	`571`	`{`
`572`	`572`	`pic->setPicturePath( mProjectParser->convertToAbsolutePath(( pic )->picturePath() ) );`
`@@ -575,11 +575,11 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem`
`575`	`575`
`576`	`576`	`// an html item will be a composer frame and if it is we can try to get`
`577`	`577`	`// 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 );`
`579`	`579`	`if ( frame )`
`580`	`580`	`{`
`581`	`581`	`const QgsComposerMultiFrame * multiFrame = frame->multiFrame();`
`582`		`- const QgsComposerHtml* composerHtml = dynamic_cast<const QgsComposerHtml *>( multiFrame );`
	`582`	`+ const QgsComposerHtml* composerHtml = qobject_cast<const QgsComposerHtml *>( multiFrame );`
`583`	`583`	`if ( composerHtml )`
`584`	`584`	`{`
`585`	`585`	`htmlList.push_back( composerHtml );`
`@@ -1331,7 +1331,7 @@ void QgsWmsProjectParser::addLayers( QDomDocument &doc,`
`1331`	`1331`	`bool geometryLayer = true;`
`1332`	`1332`	`if ( currentLayer->type() == QgsMapLayer::VectorLayer )`
`1333`	`1333`	`{`
`1334`		`- QgsVectorLayer* vLayer = dynamic_cast<QgsVectorLayer*>( currentLayer );`
	`1334`	`+ QgsVectorLayer* vLayer = qobject_cast<QgsVectorLayer*>( currentLayer );`
`1335`	`1335`	`if ( vLayer )`
`1336`	`1336`	`{`
`1337`	`1337`	`if ( vLayer->wkbType() == QgsWkbTypes::NoGeometry )`
`@@ -1840,7 +1840,7 @@ QDomDocument QgsWmsProjectParser::getStyles( QStringList& layerList ) const`
`1840`	`1840`	`for ( int j = 0; j < currentLayerList.size(); j++ )`
`1841`	`1841`	`{`
`1842`	`1842`	`QgsMapLayer* currentLayer = currentLayerList.at( j );`
`1843`		`- QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );`
	`1843`	`+ QgsVectorLayer* layer = qobject_cast<QgsVectorLayer*>( currentLayer );`
`1844`	`1844`	`if ( !layer )`
`1845`	`1845`	`{`
`1846`	`1846`	`throw QgsMapServiceException( "Error", QString( "Could not get style because:\n%1" ).arg( "Non-vector layers not supported yet" ) );`
Original file line number	Diff line number	Diff line change
`@@ -1742,7 +1742,7 @@ int QgsWmsServer::getFeatureInfo( QDomDocument& result, const QString& version )`
`1742`	`1742`	`}`
`1743`	`1743`
`1744`	`1744`	`//switch depending on vector or raster`
`1745`		`- QgsVectorLayer* vectorLayer = dynamic_cast<QgsVectorLayer*>( currentLayer );`
	`1745`	`+ QgsVectorLayer* vectorLayer = qobject_cast<QgsVectorLayer*>( currentLayer );`
`1746`	`1746`
`1747`	`1747`	`QDomElement layerElement;`
`1748`	`1748`	`if ( infoFormat.startsWith( "application/vnd.ogc.gml" ) )`
`@@ -1788,7 +1788,7 @@ int QgsWmsServer::getFeatureInfo( QDomDocument& result, const QString& version )`
`1788`	`1788`	`getFeatureInfoElement.appendChild( layerElement );`
`1789`	`1789`	`}`
`1790`	`1790`
`1791`		`- QgsRasterLayer* rasterLayer = dynamic_cast<QgsRasterLayer*>( currentLayer );`
	`1791`	`+ QgsRasterLayer* rasterLayer = qobject_cast<QgsRasterLayer*>( currentLayer );`
`1792`	`1792`	`if ( rasterLayer )`
`1793`	`1793`	`{`
`1794`	`1794`	`if ( !infoPoint.data() )`
`@@ -2579,7 +2579,7 @@ void QgsWmsServer::applyRequestedLayerFilters( const QStringList& layerList , QH`
`2579`	`2579`
`2580`	`2580`	`Q_FOREACH ( QgsMapLayer *filter, layersToFilter )`
`2581`	`2581`	`{`
`2582`		`- QgsVectorLayer* filteredLayer = dynamic_cast<QgsVectorLayer*>( filter );`
	`2582`	`+ QgsVectorLayer* filteredLayer = qobject_cast<QgsVectorLayer*>( filter );`
`2583`	`2583`	`if ( filteredLayer )`
`2584`	`2584`	`{`
`2585`	`2585`	`originalFilters.insert( filteredLayer, filteredLayer->subsetString() );`