Skip to content

Commit

Permalink
Fix virtual dispatch in constructor warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Apr 1, 2023
1 parent a0dabca commit 0ff713b
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 30 deletions.
Expand Up @@ -33,10 +33,8 @@ Constructor for QgsPointCloudRendererPropertiesWidget, associated with the speci
Sets the ``context`` in which the widget is shown, e.g., the associated map canvas and expression contexts.
%End

virtual void syncToLayer( QgsMapLayer *layer );

virtual void setDockMode( bool dockMode );

void syncToLayer( QgsMapLayer *layer ) final;
void setDockMode( bool dockMode ) final;

public slots:

Expand Down
2 changes: 1 addition & 1 deletion src/app/3d/qgsmeshlayer3drendererwidget.h
Expand Up @@ -36,7 +36,7 @@ class QgsMeshLayer3DRendererWidget : public QgsMapLayerConfigWidget
public:
explicit QgsMeshLayer3DRendererWidget( QgsMeshLayer *layer, QgsMapCanvas *canvas, QWidget *parent = nullptr );

void syncToLayer( QgsMapLayer *layer ) override;
void syncToLayer( QgsMapLayer *layer ) final;

//! no transfer of ownership
void setRenderer( const QgsMeshLayer3DRenderer *renderer );
Expand Down
4 changes: 2 additions & 2 deletions src/app/3d/qgspointcloudlayer3drendererwidget.h
Expand Up @@ -36,8 +36,8 @@ class QgsPointCloudLayer3DRendererWidget : public QgsMapLayerConfigWidget
public:
explicit QgsPointCloudLayer3DRendererWidget( QgsPointCloudLayer *layer, QgsMapCanvas *canvas, QWidget *parent = nullptr );

void syncToLayer( QgsMapLayer *layer ) override;
void setDockMode( bool dockMode ) override;
void syncToLayer( QgsMapLayer *layer ) final;
void setDockMode( bool dockMode ) final;

//! no transfer of ownership
void setRenderer( const QgsPointCloudLayer3DRenderer *renderer );
Expand Down
2 changes: 1 addition & 1 deletion src/app/3d/qgsvectorlayer3drendererwidget.h
Expand Up @@ -65,7 +65,7 @@ class QgsVectorLayer3DRendererWidget : public QgsMapLayerConfigWidget
public:
explicit QgsVectorLayer3DRendererWidget( QgsMapLayer *layer, QgsMapCanvas *canvas, QWidget *parent = nullptr );

void syncToLayer( QgsMapLayer *layer ) override;
void syncToLayer( QgsMapLayer *layer ) final;

void setDockMode( bool dockMode ) override;

Expand Down
4 changes: 2 additions & 2 deletions src/app/annotations/qgsannotationitempropertieswidget.h
Expand Up @@ -33,9 +33,9 @@ class QgsAnnotationItemPropertiesWidget : public QgsMapLayerConfigWidget, public
QgsAnnotationItemPropertiesWidget( QgsAnnotationLayer *layer, QgsMapCanvas *canvas, QWidget *parent );
~QgsAnnotationItemPropertiesWidget() override;

void syncToLayer( QgsMapLayer *layer ) override;
void syncToLayer( QgsMapLayer *layer ) final;
void setMapLayerConfigWidgetContext( const QgsMapLayerConfigWidgetContext &context ) override;
void setDockMode( bool dockMode ) override;
void setDockMode( bool dockMode ) final;

public slots:
void apply() override;
Expand Down
2 changes: 1 addition & 1 deletion src/app/mesh/qgsmeshelevationpropertieswidget.h
Expand Up @@ -30,7 +30,7 @@ class QgsMeshElevationPropertiesWidget : public QgsMapLayerConfigWidget, private

QgsMeshElevationPropertiesWidget( QgsMeshLayer *layer, QgsMapCanvas *canvas, QWidget *parent );

void syncToLayer( QgsMapLayer *layer ) override;
void syncToLayer( QgsMapLayer *layer ) final;

public slots:
void apply() override;
Expand Down
2 changes: 0 additions & 2 deletions src/app/qgslayertreegrouppropertieswidget.cpp
Expand Up @@ -14,10 +14,8 @@
***************************************************************************/

#include "qgslayertreegrouppropertieswidget.h"
#include "qgsstyle.h"
#include "qgsapplication.h"
#include "qgsmaplayer.h"
#include "qgsgui.h"
#include "qgspainteffect.h"
#include "qgsmapcanvas.h"
#include "qgspainteffectregistry.h"
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgslayertreegrouppropertieswidget.h
Expand Up @@ -33,9 +33,9 @@ class QgsLayerTreeGroupPropertiesWidget : public QgsMapLayerConfigWidget, public
QgsLayerTreeGroupPropertiesWidget( QgsMapCanvas *canvas, QWidget *parent );
~QgsLayerTreeGroupPropertiesWidget() override;

void syncToLayer( QgsMapLayer *layer ) override;
void syncToLayer( QgsMapLayer *layer ) final;
void setMapLayerConfigWidgetContext( const QgsMapLayerConfigWidgetContext &context ) override;
void setDockMode( bool dockMode ) override;
void setDockMode( bool dockMode ) final;

public slots:
void apply() override;
Expand Down
2 changes: 1 addition & 1 deletion src/app/raster/qgsrasterelevationpropertieswidget.h
Expand Up @@ -30,7 +30,7 @@ class QgsRasterElevationPropertiesWidget : public QgsMapLayerConfigWidget, priva

QgsRasterElevationPropertiesWidget( QgsRasterLayer *layer, QgsMapCanvas *canvas, QWidget *parent );

void syncToLayer( QgsMapLayer *layer ) override;
void syncToLayer( QgsMapLayer *layer ) final;

public slots:
void apply() override;
Expand Down
2 changes: 1 addition & 1 deletion src/app/vector/qgsvectorelevationpropertieswidget.h
Expand Up @@ -32,7 +32,7 @@ class QgsVectorElevationPropertiesWidget : public QgsMapLayerConfigWidget, priva

QgsVectorElevationPropertiesWidget( QgsVectorLayer *layer, QgsMapCanvas *canvas, QWidget *parent );

void syncToLayer( QgsMapLayer *layer ) override;
void syncToLayer( QgsMapLayer *layer ) final;

QgsExpressionContext createExpressionContext() const override;

Expand Down
3 changes: 0 additions & 3 deletions src/gui/mesh/qgsrenderermeshpropertieswidget.cpp
Expand Up @@ -18,11 +18,8 @@
#include "qgis.h"
#include "qgsmapcanvas.h"
#include "qgsmeshlayer.h"
#include "qgsmessagelog.h"
#include "qgsmeshrendererscalarsettingswidget.h"
#include "qgsmeshdatasetgrouptreeview.h"
#include "qgsmeshrendereractivedatasetwidget.h"
#include "qgsmeshlayerutils.h"
#include "qgsproject.h"
#include "qgsprojectutils.h"

Expand Down
2 changes: 1 addition & 1 deletion src/gui/mesh/qgsrenderermeshpropertieswidget.h
Expand Up @@ -55,7 +55,7 @@ class GUI_EXPORT QgsRendererMeshPropertiesWidget : public QgsMapLayerConfigWidge
*
* \since QGIS 3.22, replace syncToLayer() without argument
*/
void syncToLayer( QgsMapLayer *mapLayer ) override;
void syncToLayer( QgsMapLayer *mapLayer ) final;

public slots:
//! Applies the settings made in the dialog
Expand Down
4 changes: 2 additions & 2 deletions src/gui/pointcloud/qgspointcloudrendererpropertieswidget.h
Expand Up @@ -51,8 +51,8 @@ class GUI_EXPORT QgsPointCloudRendererPropertiesWidget : public QgsMapLayerConfi
*/
void setContext( const QgsSymbolWidgetContext &context );

void syncToLayer( QgsMapLayer *layer ) override;
void setDockMode( bool dockMode ) override;
void syncToLayer( QgsMapLayer *layer ) final;
void setDockMode( bool dockMode ) final;

public slots:

Expand Down
Expand Up @@ -17,12 +17,7 @@

#include "qgspostgresrastertemporalsettingswidget.h"
#include "qgsmaplayer.h"
#include "qgsproject.h"
#include "qgsrasterlayer.h"
#include "qgsprojecttimesettings.h"
#include "qgsrasterlayertemporalproperties.h"
#include "qgsproviderregistry.h"
#include "qgsprovidermetadata.h"

QgsPostgresRasterTemporalSettingsWidget::QgsPostgresRasterTemporalSettingsWidget( QgsMapLayer *layer, QgsMapCanvas *canvas, QWidget *parent )
: QgsMapLayerConfigWidget( layer, canvas, parent )
Expand Down
Expand Up @@ -31,7 +31,7 @@ class QgsPostgresRasterTemporalSettingsWidget : public QgsMapLayerConfigWidget,
public:
QgsPostgresRasterTemporalSettingsWidget( QgsMapLayer *layer, QgsMapCanvas *canvas, QWidget *parent = nullptr );

void syncToLayer( QgsMapLayer *layer ) override;
void syncToLayer( QgsMapLayer *layer ) final;
void apply() override;
private slots:

Expand Down
2 changes: 1 addition & 1 deletion src/providers/wms/qgswmstsettingswidget.h
Expand Up @@ -31,7 +31,7 @@ class QgsWmstSettingsWidget : public QgsMapLayerConfigWidget, private Ui::QgsWms
public:
QgsWmstSettingsWidget( QgsMapLayer *layer, QgsMapCanvas *canvas, QWidget *parent = nullptr );

void syncToLayer( QgsMapLayer *layer ) override;
void syncToLayer( QgsMapLayer *layer ) final;
void apply() override;
private slots:
void temporalPropertiesChange();
Expand Down

0 comments on commit 0ff713b

Please sign in to comment.