Skip to content

Commit 357f998

Browse files
committed
Remove redundant virtual keyword from signatures with override
1 parent b7f2144 commit 357f998

File tree

8 files changed

+37
-37
lines changed

8 files changed

+37
-37
lines changed

src/app/nodetool/qgsnodetool.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class OneFeatureFilter : public QgsPointLocator::MatchFilter
146146
, fid( fid )
147147
{}
148148

149-
virtual bool acceptMatch( const QgsPointLocator::Match &match ) override
149+
bool acceptMatch( const QgsPointLocator::Match &match ) override
150150
{
151151
return match.layer() == layer && match.featureId() == fid;
152152
}
@@ -167,7 +167,7 @@ class MatchCollectingFilter : public QgsPointLocator::MatchFilter
167167
MatchCollectingFilter( QgsNodeTool *nodetool )
168168
: nodetool( nodetool ) {}
169169

170-
virtual bool acceptMatch( const QgsPointLocator::Match &match ) override
170+
bool acceptMatch( const QgsPointLocator::Match &match ) override
171171
{
172172
if ( match.distance() > 0 )
173173
return false;

src/app/qgisapp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6590,9 +6590,9 @@ class QgisAppFieldValueConverter : public QgsVectorFileWriter::FieldValueConvert
65906590
public:
65916591
QgisAppFieldValueConverter( QgsVectorLayer *vl, const QgsAttributeList &attributesAsDisplayedValues );
65926592

6593-
virtual QgsField fieldDefinition( const QgsField &field ) override;
6593+
QgsField fieldDefinition( const QgsField &field ) override;
65946594

6595-
virtual QVariant convert( int idx, const QVariant &value ) override;
6595+
QVariant convert( int idx, const QVariant &value ) override;
65966596

65976597
QgisAppFieldValueConverter *clone() const override;
65986598

@@ -9196,7 +9196,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner
91969196
public:
91979197
explicit QgsPythonRunnerImpl( QgsPythonUtils *pythonUtils ) : mPythonUtils( pythonUtils ) {}
91989198

9199-
virtual bool runCommand( QString command, QString messageOnError = QString() ) override
9199+
bool runCommand( QString command, QString messageOnError = QString() ) override
92009200
{
92019201
#ifdef WITH_BINDINGS
92029202
if ( mPythonUtils && mPythonUtils->isEnabled() )
@@ -9207,7 +9207,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner
92079207
return false;
92089208
}
92099209

9210-
virtual bool evalCommand( QString command, QString &result ) override
9210+
bool evalCommand( QString command, QString &result ) override
92119211
{
92129212
#ifdef WITH_BINDINGS
92139213
if ( mPythonUtils && mPythonUtils->isEnabled() )

src/app/qgsalignrasterdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static QString _rasterLayerName( const QString &filename )
5959
struct QgsAlignRasterDialogProgress : public QgsAlignRaster::ProgressHandler
6060
{
6161
explicit QgsAlignRasterDialogProgress( QProgressBar *pb ) : mPb( pb ) {}
62-
virtual bool progress( double complete ) override
62+
bool progress( double complete ) override
6363
{
6464
mPb->setValue( ( int ) std::round( complete * 100 ) );
6565
qApp->processEvents(); // to actually show the progress in GUI

src/providers/delimitedtext/qgsdelimitedtextprovider.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,11 +1202,11 @@ class QgsDelimitedTextSourceSelectProvider : public QgsSourceSelectProvider
12021202
{
12031203
public:
12041204

1205-
virtual QString providerKey() const override { return QStringLiteral( "delimitedtext" ); }
1206-
virtual QString text() const override { return QObject::tr( "Delimited Text" ); }
1207-
virtual int ordering() const override { return 30; }
1208-
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddDelimitedTextLayer.svg" ) ); }
1209-
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
1205+
QString providerKey() const override { return QStringLiteral( "delimitedtext" ); }
1206+
QString text() const override { return QObject::tr( "Delimited Text" ); }
1207+
int ordering() const override { return 30; }
1208+
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddDelimitedTextLayer.svg" ) ); }
1209+
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
12101210
{
12111211
return new QgsDelimitedTextSourceSelect( parent, fl, widgetMode );
12121212
}

src/providers/gdal/qgsgdalprovider.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3055,11 +3055,11 @@ class QgsGdalRasterSourceSelectProvider : public QgsSourceSelectProvider
30553055
{
30563056
public:
30573057

3058-
virtual QString providerKey() const override { return QStringLiteral( "gdal" ); }
3059-
virtual QString text() const override { return QObject::tr( "Raster" ); }
3060-
virtual int ordering() const override { return 20; }
3061-
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddRasterLayer.svg" ) ); }
3062-
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
3058+
QString providerKey() const override { return QStringLiteral( "gdal" ); }
3059+
QString text() const override { return QObject::tr( "Raster" ); }
3060+
int ordering() const override { return 20; }
3061+
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddRasterLayer.svg" ) ); }
3062+
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
30633063
{
30643064
return new QgsGdalSourceSelect( parent, fl, widgetMode );
30653065
}

src/providers/ogr/qgsogrprovider.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4389,11 +4389,11 @@ class QgsOgrVectorSourceSelectProvider : public QgsSourceSelectProvider
43894389
{
43904390
public:
43914391

4392-
virtual QString providerKey() const override { return QStringLiteral( "ogr" ); }
4393-
virtual QString text() const override { return QObject::tr( "Vector" ); }
4394-
virtual int ordering() const override { return 10; }
4395-
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOgrLayer.svg" ) ); }
4396-
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
4392+
QString providerKey() const override { return QStringLiteral( "ogr" ); }
4393+
QString text() const override { return QObject::tr( "Vector" ); }
4394+
int ordering() const override { return 10; }
4395+
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOgrLayer.svg" ) ); }
4396+
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
43974397
{
43984398
return new QgsOgrSourceSelect( parent, fl, widgetMode );
43994399
}
@@ -4405,11 +4405,11 @@ class QgsGeoPackageSourceSelectProvider : public QgsSourceSelectProvider
44054405
{
44064406
public:
44074407

4408-
virtual QString providerKey() const override { return QStringLiteral( "ogr" ); }
4409-
virtual QString text() const override { return QObject::tr( "GeoPackage" ); }
4410-
virtual int ordering() const override { return 45; }
4411-
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddGeoPackageLayer.svg" ) ); }
4412-
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
4408+
QString providerKey() const override { return QStringLiteral( "ogr" ); }
4409+
QString text() const override { return QObject::tr( "GeoPackage" ); }
4410+
int ordering() const override { return 45; }
4411+
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddGeoPackageLayer.svg" ) ); }
4412+
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
44134413
{
44144414
return new QgsOgrDbSourceSelect( QStringLiteral( "GPKG" ), QObject::tr( "GeoPackage" ), QObject::tr( "GeoPackage Database (*.gpkg)" ), parent, fl, widgetMode );
44154415
}

src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4837,11 +4837,11 @@ class QgsPostgresSourceSelectProvider : public QgsSourceSelectProvider //#spell
48374837
{
48384838
public:
48394839

4840-
virtual QString providerKey() const override { return QStringLiteral( "postgres" ); }
4841-
virtual QString text() const override { return QObject::tr( "PostgreSQL" ); }
4842-
virtual int ordering() const override { return 40; }
4843-
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddPostgisLayer.svg" ) ); }
4844-
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
4840+
QString providerKey() const override { return QStringLiteral( "postgres" ); }
4841+
QString text() const override { return QObject::tr( "PostgreSQL" ); }
4842+
int ordering() const override { return 40; }
4843+
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddPostgisLayer.svg" ) ); }
4844+
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
48454845
{
48464846
return new QgsPgSourceSelect( parent, fl, widgetMode );
48474847
}

src/providers/spatialite/qgsspatialiteprovider.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5928,11 +5928,11 @@ class QgsSpatialiteSourceSelectProvider : public QgsSourceSelectProvider
59285928
{
59295929
public:
59305930

5931-
virtual QString providerKey() const override { return QStringLiteral( "spatialite" ); }
5932-
virtual QString text() const override { return QObject::tr( "SpatiaLite" ); }
5933-
virtual int ordering() const override { return 50; }
5934-
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddSpatiaLiteLayer.svg" ) ); }
5935-
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
5931+
QString providerKey() const override { return QStringLiteral( "spatialite" ); }
5932+
QString text() const override { return QObject::tr( "SpatiaLite" ); }
5933+
int ordering() const override { return 50; }
5934+
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddSpatiaLiteLayer.svg" ) ); }
5935+
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
59365936
{
59375937
return new QgsSpatiaLiteSourceSelect( parent, fl, widgetMode );
59385938
}

0 commit comments

Comments
 (0)