Skip to content
Permalink
Browse files

Remove redundant virtual keyword from signatures with override

  • Loading branch information
nyalldawson committed Sep 11, 2017
1 parent b7f2144 commit 357f998e448c03171b1db66b603c6aaaec055bfa
@@ -146,7 +146,7 @@ class OneFeatureFilter : public QgsPointLocator::MatchFilter
, fid( fid )
{}

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

virtual bool acceptMatch( const QgsPointLocator::Match &match ) override
bool acceptMatch( const QgsPointLocator::Match &match ) override
{
if ( match.distance() > 0 )
return false;
@@ -6590,9 +6590,9 @@ class QgisAppFieldValueConverter : public QgsVectorFileWriter::FieldValueConvert
public:
QgisAppFieldValueConverter( QgsVectorLayer *vl, const QgsAttributeList &attributesAsDisplayedValues );

virtual QgsField fieldDefinition( const QgsField &field ) override;
QgsField fieldDefinition( const QgsField &field ) override;

virtual QVariant convert( int idx, const QVariant &value ) override;
QVariant convert( int idx, const QVariant &value ) override;

QgisAppFieldValueConverter *clone() const override;

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

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

virtual bool evalCommand( QString command, QString &result ) override
bool evalCommand( QString command, QString &result ) override
{
#ifdef WITH_BINDINGS
if ( mPythonUtils && mPythonUtils->isEnabled() )
@@ -59,7 +59,7 @@ static QString _rasterLayerName( const QString &filename )
struct QgsAlignRasterDialogProgress : public QgsAlignRaster::ProgressHandler
{
explicit QgsAlignRasterDialogProgress( QProgressBar *pb ) : mPb( pb ) {}
virtual bool progress( double complete ) override
bool progress( double complete ) override
{
mPb->setValue( ( int ) std::round( complete * 100 ) );
qApp->processEvents(); // to actually show the progress in GUI
@@ -1202,11 +1202,11 @@ class QgsDelimitedTextSourceSelectProvider : public QgsSourceSelectProvider
{
public:

virtual QString providerKey() const override { return QStringLiteral( "delimitedtext" ); }
virtual QString text() const override { return QObject::tr( "Delimited Text" ); }
virtual int ordering() const override { return 30; }
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddDelimitedTextLayer.svg" ) ); }
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
QString providerKey() const override { return QStringLiteral( "delimitedtext" ); }
QString text() const override { return QObject::tr( "Delimited Text" ); }
int ordering() const override { return 30; }
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddDelimitedTextLayer.svg" ) ); }
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
{
return new QgsDelimitedTextSourceSelect( parent, fl, widgetMode );
}
@@ -3055,11 +3055,11 @@ class QgsGdalRasterSourceSelectProvider : public QgsSourceSelectProvider
{
public:

virtual QString providerKey() const override { return QStringLiteral( "gdal" ); }
virtual QString text() const override { return QObject::tr( "Raster" ); }
virtual int ordering() const override { return 20; }
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddRasterLayer.svg" ) ); }
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
QString providerKey() const override { return QStringLiteral( "gdal" ); }
QString text() const override { return QObject::tr( "Raster" ); }
int ordering() const override { return 20; }
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddRasterLayer.svg" ) ); }
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
{
return new QgsGdalSourceSelect( parent, fl, widgetMode );
}
@@ -4389,11 +4389,11 @@ class QgsOgrVectorSourceSelectProvider : public QgsSourceSelectProvider
{
public:

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

virtual QString providerKey() const override { return QStringLiteral( "ogr" ); }
virtual QString text() const override { return QObject::tr( "GeoPackage" ); }
virtual int ordering() const override { return 45; }
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddGeoPackageLayer.svg" ) ); }
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
QString providerKey() const override { return QStringLiteral( "ogr" ); }
QString text() const override { return QObject::tr( "GeoPackage" ); }
int ordering() const override { return 45; }
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddGeoPackageLayer.svg" ) ); }
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
{
return new QgsOgrDbSourceSelect( QStringLiteral( "GPKG" ), QObject::tr( "GeoPackage" ), QObject::tr( "GeoPackage Database (*.gpkg)" ), parent, fl, widgetMode );
}
@@ -4837,11 +4837,11 @@ class QgsPostgresSourceSelectProvider : public QgsSourceSelectProvider //#spell
{
public:

virtual QString providerKey() const override { return QStringLiteral( "postgres" ); }
virtual QString text() const override { return QObject::tr( "PostgreSQL" ); }
virtual int ordering() const override { return 40; }
virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddPostgisLayer.svg" ) ); }
virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
QString providerKey() const override { return QStringLiteral( "postgres" ); }
QString text() const override { return QObject::tr( "PostgreSQL" ); }
int ordering() const override { return 40; }
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddPostgisLayer.svg" ) ); }
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
{
return new QgsPgSourceSelect( parent, fl, widgetMode );
}
@@ -5928,11 +5928,11 @@ class QgsSpatialiteSourceSelectProvider : public QgsSourceSelectProvider
{
public:

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

0 comments on commit 357f998

Please sign in to comment.
You can’t perform that action at this time.