Switch some dynamic_casts to qobject_casts

nyalldawson · nyalldawson · commit ed5e4b69c720 · 2017-09-01T07:56:22.000+10:00
diff --git a/src/app/qgsdxfexportdialog.cpp b/src/app/qgsdxfexportdialog.cpp
@@ -79,7 +79,7 @@ void FieldSelectorDelegate::setEditorData( QWidget *editor, const QModelIndex &i
 
 void FieldSelectorDelegate::setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const
 {
-  QgsVectorLayerAndAttributeModel *m = dynamic_cast< QgsVectorLayerAndAttributeModel *>( model );
+  QgsVectorLayerAndAttributeModel *m = qobject_cast< QgsVectorLayerAndAttributeModel *>( model );
   if ( !m )
     return;
 
@@ -492,7 +492,7 @@ QgsDxfExportDialog::~QgsDxfExportDialog()
 void QgsDxfExportDialog::on_mVisibilityPresets_currentIndexChanged( int index )
 {
   Q_UNUSED( index );
-  QgsVectorLayerAndAttributeModel *model = dynamic_cast< QgsVectorLayerAndAttributeModel * >( mTreeView->model() );
+  QgsVectorLayerAndAttributeModel *model = qobject_cast< QgsVectorLayerAndAttributeModel * >( mTreeView->model() );
   Q_ASSERT( model );
   model->applyVisibilityPreset( mVisibilityPresets->currentText() );
 }
@@ -525,14 +525,14 @@ void QgsDxfExportDialog::cleanGroup( QgsLayerTreeNode *node )
 
 void QgsDxfExportDialog::selectAll()
 {
-  QgsVectorLayerAndAttributeModel *model = dynamic_cast< QgsVectorLayerAndAttributeModel *>( mTreeView->model() );
+  QgsVectorLayerAndAttributeModel *model = qobject_cast< QgsVectorLayerAndAttributeModel *>( mTreeView->model() );
   Q_ASSERT( model );
   model->selectAll();
 }
 
 void QgsDxfExportDialog::deSelectAll()
 {
-  QgsVectorLayerAndAttributeModel *model = dynamic_cast< QgsVectorLayerAndAttributeModel *>( mTreeView->model() );
+  QgsVectorLayerAndAttributeModel *model = qobject_cast< QgsVectorLayerAndAttributeModel *>( mTreeView->model() );
   Q_ASSERT( model );
   model->deSelectAll();
 }
diff --git a/src/app/qgsstatisticalsummarydockwidget.cpp b/src/app/qgsstatisticalsummarydockwidget.cpp
@@ -241,7 +241,7 @@ void QgsStatisticalSummaryDockWidget::updateStringStatistics( bool selectedOnly
 
 void QgsStatisticalSummaryDockWidget::layerChanged( QgsMapLayer *layer )
 {
-  QgsVectorLayer *newLayer = dynamic_cast< QgsVectorLayer * >( layer );
+  QgsVectorLayer *newLayer = qobject_cast< QgsVectorLayer * >( layer );
   if ( mLayer && mLayer != newLayer )
   {
     disconnect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsStatisticalSummaryDockWidget::layerSelectionChanged );
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -3455,7 +3455,7 @@ static QVariant fcnGetLayerProperty( const QVariantList &values, const QgsExpres
   else
   {
     //vector layer methods
-    QgsVectorLayer *vLayer = dynamic_cast< QgsVectorLayer * >( layer );
+    QgsVectorLayer *vLayer = qobject_cast< QgsVectorLayer * >( layer );
     if ( vLayer )
     {
       if ( QString::compare( layerProperty, QStringLiteral( "storage_type" ), Qt::CaseInsensitive ) == 0 )

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ void FieldSelectorDelegate::setEditorData( QWidget *editor, const QModelIndex &i`
`79`	`79`
`80`	`80`	`void FieldSelectorDelegate::setModelData( QWidget editor, QAbstractItemModel model, const QModelIndex &index ) const`
`81`	`81`	`{`
`82`		`- QgsVectorLayerAndAttributeModel m = dynamic_cast< QgsVectorLayerAndAttributeModel >( model );`
	`82`	`+ QgsVectorLayerAndAttributeModel m = qobject_cast< QgsVectorLayerAndAttributeModel >( model );`
`83`	`83`	`if ( !m )`
`84`	`84`	`return;`
`85`	`85`
`@@ -492,7 +492,7 @@ QgsDxfExportDialog::~QgsDxfExportDialog()`
`492`	`492`	`void QgsDxfExportDialog::on_mVisibilityPresets_currentIndexChanged( int index )`
`493`	`493`	`{`
`494`	`494`	`Q_UNUSED( index );`
`495`		`- QgsVectorLayerAndAttributeModel model = dynamic_cast< QgsVectorLayerAndAttributeModel >( mTreeView->model() );`
	`495`	`+ QgsVectorLayerAndAttributeModel model = qobject_cast< QgsVectorLayerAndAttributeModel >( mTreeView->model() );`
`496`	`496`	`Q_ASSERT( model );`
`497`	`497`	`model->applyVisibilityPreset( mVisibilityPresets->currentText() );`
`498`	`498`	`}`
`@@ -525,14 +525,14 @@ void QgsDxfExportDialog::cleanGroup( QgsLayerTreeNode *node )`
`525`	`525`
`526`	`526`	`void QgsDxfExportDialog::selectAll()`
`527`	`527`	`{`
`528`		`- QgsVectorLayerAndAttributeModel model = dynamic_cast< QgsVectorLayerAndAttributeModel >( mTreeView->model() );`
	`528`	`+ QgsVectorLayerAndAttributeModel model = qobject_cast< QgsVectorLayerAndAttributeModel >( mTreeView->model() );`
`529`	`529`	`Q_ASSERT( model );`
`530`	`530`	`model->selectAll();`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`void QgsDxfExportDialog::deSelectAll()`
`534`	`534`	`{`
`535`		`- QgsVectorLayerAndAttributeModel model = dynamic_cast< QgsVectorLayerAndAttributeModel >( mTreeView->model() );`
	`535`	`+ QgsVectorLayerAndAttributeModel model = qobject_cast< QgsVectorLayerAndAttributeModel >( mTreeView->model() );`
`536`	`536`	`Q_ASSERT( model );`
`537`	`537`	`model->deSelectAll();`
`538`	`538`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ void QgsStatisticalSummaryDockWidget::updateStringStatistics( bool selectedOnly`
`241`	`241`
`242`	`242`	`void QgsStatisticalSummaryDockWidget::layerChanged( QgsMapLayer *layer )`
`243`	`243`	`{`
`244`		`- QgsVectorLayer newLayer = dynamic_cast< QgsVectorLayer >( layer );`
	`244`	`+ QgsVectorLayer newLayer = qobject_cast< QgsVectorLayer >( layer );`
`245`	`245`	`if ( mLayer && mLayer != newLayer )`
`246`	`246`	`{`
`247`	`247`	`disconnect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsStatisticalSummaryDockWidget::layerSelectionChanged );`
Original file line number	Diff line number	Diff line change
`@@ -3455,7 +3455,7 @@ static QVariant fcnGetLayerProperty( const QVariantList &values, const QgsExpres`
`3455`	`3455`	`else`
`3456`	`3456`	`{`
`3457`	`3457`	`//vector layer methods`
`3458`		`- QgsVectorLayer vLayer = dynamic_cast< QgsVectorLayer >( layer );`
	`3458`	`+ QgsVectorLayer vLayer = qobject_cast< QgsVectorLayer >( layer );`
`3459`	`3459`	`if ( vLayer )`
`3460`	`3460`	`{`
`3461`	`3461`	`if ( QString::compare( layerProperty, QStringLiteral( "storage_type" ), Qt::CaseInsensitive ) == 0 )`