Merge pull request #9768 from m-kuhn/qobject_cast

m-kuhn · web-flow · commit 6792d236c97b · 2019-04-11T07:40:46.000+02:00
Use qobject_cast instead of dynamic_cast
diff --git a/src/app/decorations/qgsdecorationgrid.cpp b/src/app/decorations/qgsdecorationgrid.cpp
@@ -809,7 +809,7 @@ bool QgsDecorationGrid::getIntervalFromCurrentLayer( double *values )
     QMessageBox::warning( nullptr, tr( "Get Interval from Layer" ), tr( "Please select a raster layer." ) );
     return false;
   }
-  QgsRasterLayer *rlayer = dynamic_cast<QgsRasterLayer *>( layer );
+  QgsRasterLayer *rlayer = qobject_cast<QgsRasterLayer *>( layer );
   if ( !rlayer || rlayer->width() == 0 || rlayer->height() == 0 )
   {
     QMessageBox::warning( nullptr, tr( "Get Interval from Layer" ), tr( "Invalid raster layer" ) );
diff --git a/src/app/qgsdxfexportdialog.cpp b/src/app/qgsdxfexportdialog.cpp
@@ -124,7 +124,7 @@ QgsVectorLayer *QgsVectorLayerAndAttributeModel::vectorLayer( const QModelIndex
   if ( !n || !QgsLayerTree::isLayer( n ) )
     return nullptr;
 
-  return dynamic_cast<QgsVectorLayer *>( QgsLayerTree::toLayer( n )->layer() );
+  return qobject_cast<QgsVectorLayer *>( QgsLayerTree::toLayer( n )->layer() );
 }
 
 int QgsVectorLayerAndAttributeModel::attributeIndex( const QgsVectorLayer *vl ) const
diff --git a/src/app/qgsjoindialog.cpp b/src/app/qgsjoindialog.cpp
@@ -159,7 +159,7 @@ void QgsJoinDialog::joinedLayerChanged( QgsMapLayer *layer )
 {
   mJoinFieldComboBox->clear();
 
-  QgsVectorLayer *vLayer = dynamic_cast<QgsVectorLayer *>( layer );
+  QgsVectorLayer *vLayer = qobject_cast<QgsVectorLayer *>( layer );
   if ( !vLayer )
   {
     return;
diff --git a/src/app/qgsmaptoolpinlabels.cpp b/src/app/qgsmaptoolpinlabels.cpp
@@ -203,7 +203,7 @@ void QgsMapToolPinLabels::highlightPinnedLabels()
       {
         continue;
       }
-      QgsVectorLayer *vlayer = dynamic_cast<QgsVectorLayer *>( layer );
+      QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
       if ( !vlayer )
       {
         QgsDebugMsg( QStringLiteral( "Failed to cast to vector layer" ) );
diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp
@@ -49,7 +49,7 @@ void QgsMapToolShowHideLabels::canvasPressEvent( QgsMapMouseEvent *e )
   Q_UNUSED( e );
 
   QgsMapLayer *layer = mCanvas->currentLayer();
-  QgsVectorLayer *vlayer = dynamic_cast<QgsVectorLayer *>( layer );
+  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
   if ( !vlayer )
     return;
 
@@ -127,7 +127,7 @@ void QgsMapToolShowHideLabels::canvasReleaseEvent( QgsMapMouseEvent *e )
 void QgsMapToolShowHideLabels::showHideLabels( QMouseEvent *e )
 {
   QgsMapLayer *layer = mCanvas->currentLayer();
-  QgsVectorLayer *vlayer = dynamic_cast<QgsVectorLayer *>( layer );
+  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
   if ( !vlayer )
     return;
 
diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -469,7 +469,7 @@ QSizeF QgsSymbolLegendNode::drawSymbol( const QgsLegendSettings &settings, ItemC
     double dotsPerMM = context.scaleFactor();
 
     int opacity = 255;
-    if ( QgsVectorLayer *vectorLayer = dynamic_cast<QgsVectorLayer *>( layerNode()->layer() ) )
+    if ( QgsVectorLayer *vectorLayer = qobject_cast<QgsVectorLayer *>( layerNode()->layer() ) )
       opacity = ( 255 * vectorLayer->opacity() );
 
     p->save();
@@ -537,7 +537,7 @@ void QgsSymbolLegendNode::exportSymbolToJson( const QgsLegendSettings &settings,
   QImage img( pix.toImage().convertToFormat( QImage::Format_ARGB32_Premultiplied ) );
 
   int opacity = 255;
-  if ( QgsVectorLayer *vectorLayer = dynamic_cast<QgsVectorLayer *>( layerNode()->layer() ) )
+  if ( QgsVectorLayer *vectorLayer = qobject_cast<QgsVectorLayer *>( layerNode()->layer() ) )
     opacity = ( 255 * vectorLayer->opacity() );
 
   if ( opacity != 255 )
@@ -702,7 +702,7 @@ QSizeF QgsRasterSymbolLegendNode::drawSymbol( const QgsLegendSettings &settings,
   if ( ctx && ctx->painter )
   {
     QColor itemColor = mColor;
-    if ( QgsRasterLayer *rasterLayer = dynamic_cast<QgsRasterLayer *>( layerNode()->layer() ) )
+    if ( QgsRasterLayer *rasterLayer = qobject_cast<QgsRasterLayer *>( layerNode()->layer() ) )
     {
       if ( QgsRasterRenderer *rasterRenderer = rasterLayer->renderer() )
         itemColor.setAlpha( rasterRenderer->opacity() * 255.0 );
@@ -737,7 +737,7 @@ void QgsRasterSymbolLegendNode::exportSymbolToJson( const QgsLegendSettings &set
   painter.setRenderHint( QPainter::Antialiasing );
 
   QColor itemColor = mColor;
-  if ( QgsRasterLayer *rasterLayer = dynamic_cast<QgsRasterLayer *>( layerNode()->layer() ) )
+  if ( QgsRasterLayer *rasterLayer = qobject_cast<QgsRasterLayer *>( layerNode()->layer() ) )
   {
     if ( QgsRasterRenderer *rasterRenderer = rasterLayer->renderer() )
       itemColor.setAlpha( rasterRenderer->opacity() * 255.0 );
diff --git a/src/core/qgsmaplayermodel.cpp b/src/core/qgsmaplayermodel.cpp
@@ -369,7 +369,7 @@ QIcon QgsMapLayerModel::iconForLayer( QgsMapLayer *layer )
 
     case QgsMapLayerType::VectorLayer:
     {
-      QgsVectorLayer *vl = dynamic_cast<QgsVectorLayer *>( layer );
+      QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layer );
       if ( !vl )
       {
         return QIcon();
diff --git a/src/core/qgssnappingconfig.cpp b/src/core/qgssnappingconfig.cpp
@@ -151,7 +151,7 @@ void QgsSnappingConfig::reset()
   const auto constMapLayers = mProject->mapLayers();
   for ( QgsMapLayer *ml : constMapLayers )
   {
-    QgsVectorLayer *vl = dynamic_cast<QgsVectorLayer *>( ml );
+    QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( ml );
     if ( vl )
     {
       mIndividualLayerSettings.insert( vl, IndividualLayerSettings( enabled, type, tolerance, units ) );
diff --git a/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp
@@ -299,7 +299,7 @@ bool QgsGeometryCheckerResultTab::exportErrorsDo( const QString &file )
   QStringList toRemove;
   for ( QgsMapLayer *maplayer : QgsProject::instance()->mapLayers() )
   {
-    if ( dynamic_cast<QgsVectorLayer *>( maplayer ) &&
+    if ( qobject_cast<QgsVectorLayer *>( maplayer ) &&
          static_cast<QgsVectorLayer *>( maplayer )->dataProvider()->dataSourceUri() == layer->dataProvider()->dataSourceUri() )
     {
       toRemove.append( maplayer->id() );
diff --git a/src/plugins/georeferencer/qgsgcpcanvasitem.cpp b/src/plugins/georeferencer/qgsgcpcanvasitem.cpp
@@ -193,7 +193,7 @@ double QgsGCPCanvasItem::residualToScreenFactor() const
     QgsMapLayer *mapLayer = canvasLayers.at( 0 );
     if ( mapLayer )
     {
-      QgsRasterLayer *rasterLayer = dynamic_cast<QgsRasterLayer *>( mapLayer );
+      QgsRasterLayer *rasterLayer = qobject_cast<QgsRasterLayer *>( mapLayer );
       if ( rasterLayer )
       {
         mapUnitsPerRasterPixel = rasterLayer->rasterUnitsPerPixelX();
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -913,7 +913,7 @@ void GlobePlugin::updateLayers()
     {
       if ( mapLayer )
         disconnect( mapLayer, SIGNAL( repaintRequested() ), this, SLOT( layerChanged() ) );
-      if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )
+      if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )
         disconnect( static_cast<QgsVectorLayer *>( mapLayer ), SIGNAL( layerTransparencyChanged( int ) ), this, SLOT( layerChanged() ) );
     }
     osgEarth::ModelLayerVector modelLayers;
@@ -927,7 +927,7 @@ void GlobePlugin::updateLayers()
       QgsMapLayer *mapLayer = QgsProject::instance()->mapLayer( QString::fromStdString( modelLayer->getName() ) );
       if ( mapLayer )
         disconnect( mapLayer, SIGNAL( repaintRequested() ), this, SLOT( layerChanged() ) );
-      if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )
+      if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )
         disconnect( static_cast<QgsVectorLayer *>( mapLayer ), SIGNAL( layerTransparencyChanged( int ) ), this, SLOT( layerChanged() ) );
       if ( !selectedLayerIds.contains( QString::fromStdString( modelLayer->getName() ) ) )
         mMapNode->getMap()->removeModelLayer( modelLayer );
@@ -939,7 +939,7 @@ void GlobePlugin::updateLayers()
       connect( mapLayer, SIGNAL( repaintRequested() ), this, SLOT( layerChanged() ) );
 
       QgsGlobeVectorLayerConfig *layerConfig = 0;
-      if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )
+      if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )
       {
         layerConfig = QgsGlobeVectorLayerConfig::getConfig( static_cast<QgsVectorLayer *>( mapLayer ) );
         connect( static_cast<QgsVectorLayer *>( mapLayer ), SIGNAL( layerTransparencyChanged( int ) ), this, SLOT( layerChanged() ) );
@@ -985,7 +985,7 @@ void GlobePlugin::layerChanged( QgsMapLayer *mapLayer )
   if ( mMapNode )
   {
     QgsGlobeVectorLayerConfig *layerConfig = 0;
-    if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )
+    if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )
     {
       layerConfig = QgsGlobeVectorLayerConfig::getConfig( static_cast<QgsVectorLayer *>( mapLayer ) );
     }
diff --git a/src/plugins/globe/qgsglobevectorlayerproperties.cpp b/src/plugins/globe/qgsglobevectorlayerproperties.cpp
@@ -211,7 +211,7 @@ bool QgsGlobeLayerPropertiesFactory::supportsLayer( QgsMapLayer *layer ) const
 
 void QgsGlobeLayerPropertiesFactory::readGlobeVectorLayerConfig( QgsMapLayer *mapLayer, const QDomElement &elem )
 {
-  if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )
+  if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )
   {
     QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( mapLayer );
     QgsGlobeVectorLayerConfig *config = QgsGlobeVectorLayerConfig::getConfig( vLayer );
@@ -254,7 +254,7 @@ void QgsGlobeLayerPropertiesFactory::readGlobeVectorLayerConfig( QgsMapLayer *ma
 
 void QgsGlobeLayerPropertiesFactory::writeGlobeVectorLayerConfig( QgsMapLayer *mapLayer, QDomElement &elem, QDomDocument &doc )
 {
-  if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )
+  if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )
   {
     QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( mapLayer );
     QgsGlobeVectorLayerConfig *config = QgsGlobeVectorLayerConfig::getConfig( vLayer );

Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,7 @@ bool QgsDecorationGrid::getIntervalFromCurrentLayer( double *values )`
`809`	`809`	`QMessageBox::warning( nullptr, tr( "Get Interval from Layer" ), tr( "Please select a raster layer." ) );`
`810`	`810`	`return false;`
`811`	`811`	`}`
`812`		`- QgsRasterLayer rlayer = dynamic_cast<QgsRasterLayer >( layer );`
	`812`	`+ QgsRasterLayer rlayer = qobject_cast<QgsRasterLayer >( layer );`
`813`	`813`	`if ( !rlayer \|\| rlayer->width() == 0 \|\| rlayer->height() == 0 )`
`814`	`814`	`{`
`815`	`815`	`QMessageBox::warning( nullptr, tr( "Get Interval from Layer" ), tr( "Invalid raster layer" ) );`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ QgsVectorLayer *QgsVectorLayerAndAttributeModel::vectorLayer( const QModelIndex`
`124`	`124`	`if ( !n \|\| !QgsLayerTree::isLayer( n ) )`
`125`	`125`	`return nullptr;`
`126`	`126`
`127`		`- return dynamic_cast<QgsVectorLayer *>( QgsLayerTree::toLayer( n )->layer() );`
	`127`	`+ return qobject_cast<QgsVectorLayer *>( QgsLayerTree::toLayer( n )->layer() );`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`int QgsVectorLayerAndAttributeModel::attributeIndex( const QgsVectorLayer *vl ) const`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ void QgsJoinDialog::joinedLayerChanged( QgsMapLayer *layer )`
`159`	`159`	`{`
`160`	`160`	`mJoinFieldComboBox->clear();`
`161`	`161`
`162`		`- QgsVectorLayer vLayer = dynamic_cast<QgsVectorLayer >( layer );`
	`162`	`+ QgsVectorLayer vLayer = qobject_cast<QgsVectorLayer >( layer );`
`163`	`163`	`if ( !vLayer )`
`164`	`164`	`{`
`165`	`165`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ void QgsMapToolPinLabels::highlightPinnedLabels()`
`203`	`203`	`{`
`204`	`204`	`continue;`
`205`	`205`	`}`
`206`		`- QgsVectorLayer vlayer = dynamic_cast<QgsVectorLayer >( layer );`
	`206`	`+ QgsVectorLayer vlayer = qobject_cast<QgsVectorLayer >( layer );`
`207`	`207`	`if ( !vlayer )`
`208`	`208`	`{`
`209`	`209`	`QgsDebugMsg( QStringLiteral( "Failed to cast to vector layer" ) );`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ QIcon QgsMapLayerModel::iconForLayer( QgsMapLayer *layer )`
`369`	`369`
`370`	`370`	`case QgsMapLayerType::VectorLayer:`
`371`	`371`	`{`
`372`		`- QgsVectorLayer vl = dynamic_cast<QgsVectorLayer >( layer );`
	`372`	`+ QgsVectorLayer vl = qobject_cast<QgsVectorLayer >( layer );`
`373`	`373`	`if ( !vl )`
`374`	`374`	`{`
`375`	`375`	`return QIcon();`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ void QgsSnappingConfig::reset()`
`151`	`151`	`const auto constMapLayers = mProject->mapLayers();`
`152`	`152`	`for ( QgsMapLayer *ml : constMapLayers )`
`153`	`153`	`{`
`154`		`- QgsVectorLayer vl = dynamic_cast<QgsVectorLayer >( ml );`
	`154`	`+ QgsVectorLayer vl = qobject_cast<QgsVectorLayer >( ml );`
`155`	`155`	`if ( vl )`
`156`	`156`	`{`
`157`	`157`	`mIndividualLayerSettings.insert( vl, IndividualLayerSettings( enabled, type, tolerance, units ) );`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ bool QgsGeometryCheckerResultTab::exportErrorsDo( const QString &file )`
`299`	`299`	`QStringList toRemove;`
`300`	`300`	`for ( QgsMapLayer *maplayer : QgsProject::instance()->mapLayers() )`
`301`	`301`	`{`
`302`		`- if ( dynamic_cast<QgsVectorLayer *>( maplayer ) &&`
	`302`	`+ if ( qobject_cast<QgsVectorLayer *>( maplayer ) &&`
`303`	`303`	`static_cast<QgsVectorLayer *>( maplayer )->dataProvider()->dataSourceUri() == layer->dataProvider()->dataSourceUri() )`
`304`	`304`	`{`
`305`	`305`	`toRemove.append( maplayer->id() );`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ double QgsGCPCanvasItem::residualToScreenFactor() const`
`193`	`193`	`QgsMapLayer *mapLayer = canvasLayers.at( 0 );`
`194`	`194`	`if ( mapLayer )`
`195`	`195`	`{`
`196`		`- QgsRasterLayer rasterLayer = dynamic_cast<QgsRasterLayer >( mapLayer );`
	`196`	`+ QgsRasterLayer rasterLayer = qobject_cast<QgsRasterLayer >( mapLayer );`
`197`	`197`	`if ( rasterLayer )`
`198`	`198`	`{`
`199`	`199`	`mapUnitsPerRasterPixel = rasterLayer->rasterUnitsPerPixelX();`
Original file line number	Diff line number	Diff line change
`@@ -913,7 +913,7 @@ void GlobePlugin::updateLayers()`
`913`	`913`	`{`
`914`	`914`	`if ( mapLayer )`
`915`	`915`	`disconnect( mapLayer, SIGNAL( repaintRequested() ), this, SLOT( layerChanged() ) );`
`916`		`- if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )`
	`916`	`+ if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )`
`917`	`917`	`disconnect( static_cast<QgsVectorLayer *>( mapLayer ), SIGNAL( layerTransparencyChanged( int ) ), this, SLOT( layerChanged() ) );`
`918`	`918`	`}`
`919`	`919`	`osgEarth::ModelLayerVector modelLayers;`
`@@ -927,7 +927,7 @@ void GlobePlugin::updateLayers()`
`927`	`927`	`QgsMapLayer *mapLayer = QgsProject::instance()->mapLayer( QString::fromStdString( modelLayer->getName() ) );`
`928`	`928`	`if ( mapLayer )`
`929`	`929`	`disconnect( mapLayer, SIGNAL( repaintRequested() ), this, SLOT( layerChanged() ) );`
`930`		`- if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )`
	`930`	`+ if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )`
`931`	`931`	`disconnect( static_cast<QgsVectorLayer *>( mapLayer ), SIGNAL( layerTransparencyChanged( int ) ), this, SLOT( layerChanged() ) );`
`932`	`932`	`if ( !selectedLayerIds.contains( QString::fromStdString( modelLayer->getName() ) ) )`
`933`	`933`	`mMapNode->getMap()->removeModelLayer( modelLayer );`
`@@ -939,7 +939,7 @@ void GlobePlugin::updateLayers()`
`939`	`939`	`connect( mapLayer, SIGNAL( repaintRequested() ), this, SLOT( layerChanged() ) );`
`940`	`940`
`941`	`941`	`QgsGlobeVectorLayerConfig *layerConfig = 0;`
`942`		`- if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )`
	`942`	`+ if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )`
`943`	`943`	`{`
`944`	`944`	`layerConfig = QgsGlobeVectorLayerConfig::getConfig( static_cast<QgsVectorLayer *>( mapLayer ) );`
`945`	`945`	`connect( static_cast<QgsVectorLayer *>( mapLayer ), SIGNAL( layerTransparencyChanged( int ) ), this, SLOT( layerChanged() ) );`
`@@ -985,7 +985,7 @@ void GlobePlugin::layerChanged( QgsMapLayer *mapLayer )`
`985`	`985`	`if ( mMapNode )`
`986`	`986`	`{`
`987`	`987`	`QgsGlobeVectorLayerConfig *layerConfig = 0;`
`988`		`- if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )`
	`988`	`+ if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )`
`989`	`989`	`{`
`990`	`990`	`layerConfig = QgsGlobeVectorLayerConfig::getConfig( static_cast<QgsVectorLayer *>( mapLayer ) );`
`991`	`991`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ bool QgsGlobeLayerPropertiesFactory::supportsLayer( QgsMapLayer *layer ) const`
`211`	`211`
`212`	`212`	`void QgsGlobeLayerPropertiesFactory::readGlobeVectorLayerConfig( QgsMapLayer *mapLayer, const QDomElement &elem )`
`213`	`213`	`{`
`214`		`- if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )`
	`214`	`+ if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )`
`215`	`215`	`{`
`216`	`216`	`QgsVectorLayer vLayer = static_cast<QgsVectorLayer >( mapLayer );`
`217`	`217`	`QgsGlobeVectorLayerConfig *config = QgsGlobeVectorLayerConfig::getConfig( vLayer );`
`@@ -254,7 +254,7 @@ void QgsGlobeLayerPropertiesFactory::readGlobeVectorLayerConfig( QgsMapLayer *ma`
`254`	`254`
`255`	`255`	`void QgsGlobeLayerPropertiesFactory::writeGlobeVectorLayerConfig( QgsMapLayer *mapLayer, QDomElement &elem, QDomDocument &doc )`
`256`	`256`	`{`
`257`		`- if ( dynamic_cast<QgsVectorLayer *>( mapLayer ) )`
	`257`	`+ if ( qobject_cast<QgsVectorLayer *>( mapLayer ) )`
`258`	`258`	`{`
`259`	`259`	`QgsVectorLayer vLayer = static_cast<QgsVectorLayer >( mapLayer );`
`260`	`260`	`QgsGlobeVectorLayerConfig *config = QgsGlobeVectorLayerConfig::getConfig( vLayer );`