Skip to content
Permalink
Browse files

Methods in QgsProviderRegistry should not be virtual -- this class

is not designed to be subclassed
  • Loading branch information
nyalldawson committed Nov 4, 2020
1 parent 8ebab94 commit 6885a1604c376aa23aed926281531ecaee26d177
Showing with 18 additions and 18 deletions.
  1. +9 −9 python/core/auto_generated/qgsproviderregistry.sip.in
  2. +9 −9 src/core/qgsproviderregistry.h
@@ -49,7 +49,7 @@ ogr and postgres.
Means of accessing canonical single instance
%End

virtual ~QgsProviderRegistry();
~QgsProviderRegistry();

QString library( const QString &providerKey ) const /Deprecated/;
%Docstring
@@ -107,7 +107,7 @@ Returns the provider capabilities
%End


virtual QgsRasterDataProvider *createRasterDataProvider(
QgsRasterDataProvider *createRasterDataProvider(
const QString &providerKey,
const QString &uri,
const QString &format,
@@ -281,7 +281,7 @@ Returns list of available providers by their keys
Returns metadata of the provider or ``None`` if not found
%End

virtual QString fileVectorFilters() const;
QString fileVectorFilters() const;
%Docstring
Returns vector file filter string

@@ -296,7 +296,7 @@ fileVectorFilters to a string, which is then returned.
It'd be nice to eventually be raster/vector neutral.
%End

virtual QString fileRasterFilters() const;
QString fileRasterFilters() const;
%Docstring
Returns raster file filter string

@@ -311,7 +311,7 @@ buildSupportedRasterFileFilter to a string, which is then returned.
This replaces :py:func:`QgsRasterLayer.buildSupportedRasterFileFilter()`
%End

virtual QString fileMeshFilters() const;
QString fileMeshFilters() const;
%Docstring
Returns mesh file filter string

@@ -326,7 +326,7 @@ fileMeshFilters to a string, which is then returned.
.. versionadded:: 3.6
%End

virtual QString fileMeshDatasetFilters() const;
QString fileMeshDatasetFilters() const;
%Docstring
Returns mesh's dataset file filter string

@@ -341,15 +341,15 @@ fileMeshFilters to a string, which is then returned.
.. versionadded:: 3.6
%End

virtual QString databaseDrivers() const;
QString databaseDrivers() const;
%Docstring
Returns a string containing the available database drivers
%End
virtual QString directoryDrivers() const;
QString directoryDrivers() const;
%Docstring
Returns a string containing the available directory drivers
%End
virtual QString protocolDrivers() const;
QString protocolDrivers() const;
%Docstring
Returns a string containing the available protocol drivers
%End
@@ -88,7 +88,7 @@ class CORE_EXPORT QgsProviderRegistry
//! Means of accessing canonical single instance
static QgsProviderRegistry *instance( const QString &pluginPath = QString() );

virtual ~QgsProviderRegistry();
~QgsProviderRegistry();

/**
* Returns path for the library of the provider.
@@ -147,7 +147,7 @@ class CORE_EXPORT QgsProviderRegistry
* \see createProvider()
* \since QGIS 3.10
*/
virtual QgsRasterDataProvider *createRasterDataProvider(
QgsRasterDataProvider *createRasterDataProvider(
const QString &providerKey,
const QString &uri,
const QString &format,
@@ -295,7 +295,7 @@ class CORE_EXPORT QgsProviderRegistry
*
* It'd be nice to eventually be raster/vector neutral.
*/
virtual QString fileVectorFilters() const;
QString fileVectorFilters() const;

/**
* Returns raster file filter string
@@ -308,7 +308,7 @@ class CORE_EXPORT QgsProviderRegistry
*
* \note This replaces QgsRasterLayer::buildSupportedRasterFileFilter()
*/
virtual QString fileRasterFilters() const;
QString fileRasterFilters() const;

/**
* Returns mesh file filter string
@@ -323,7 +323,7 @@ class CORE_EXPORT QgsProviderRegistry
*
* \since QGIS 3.6
*/
virtual QString fileMeshFilters() const;
QString fileMeshFilters() const;

/**
* Returns mesh's dataset file filter string
@@ -338,14 +338,14 @@ class CORE_EXPORT QgsProviderRegistry
*
* \since QGIS 3.6
*/
virtual QString fileMeshDatasetFilters() const;
QString fileMeshDatasetFilters() const;

//! Returns a string containing the available database drivers
virtual QString databaseDrivers() const;
QString databaseDrivers() const;
//! Returns a string containing the available directory drivers
virtual QString directoryDrivers() const;
QString directoryDrivers() const;
//! Returns a string containing the available protocol drivers
virtual QString protocolDrivers() const;
QString protocolDrivers() const;

/**
* \deprecated since QGIS 3.10 - does nothing - use QgsGui::providerGuiRegistry()

0 comments on commit 6885a16

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