diff --git a/python/gui/auto_generated/qgsproviderguimetadata.sip.in b/python/gui/auto_generated/qgsproviderguimetadata.sip.in index 02ba49ad2f7..59b6bccf2fc 100644 --- a/python/gui/auto_generated/qgsproviderguimetadata.sip.in +++ b/python/gui/auto_generated/qgsproviderguimetadata.sip.in @@ -24,7 +24,7 @@ Holds data for GUI part of the data providers %End public: - QgsProviderGuiMetadata( const QString &key, const QString &description ); + explicit QgsProviderGuiMetadata( const QString &key ); %Docstring Constructor for provider gui metadata %End @@ -54,11 +54,6 @@ Returns source select providers QString key() const; %Docstring Returns unique provider key -%End - - QString description() const; -%Docstring -Returns provider description %End }; diff --git a/src/gui/providers/gdal/qgsgdalguiprovider.cpp b/src/gui/providers/gdal/qgsgdalguiprovider.cpp index 0234fa2743e..f604a17ad18 100644 --- a/src/gui/providers/gdal/qgsgdalguiprovider.cpp +++ b/src/gui/providers/gdal/qgsgdalguiprovider.cpp @@ -34,7 +34,6 @@ #include "qgsgdaldataitems.h" static QString PROVIDER_KEY = QStringLiteral( "gdal" ); -static QString PROVIDER_DESCRIPTION = QStringLiteral( "GDAL provider" ); QgsGdalItemGuiProvider::QgsGdalItemGuiProvider() = default; @@ -129,7 +128,7 @@ class QgsGdalRasterSourceSelectProvider : public QgsSourceSelectProvider QgsGdalGuiProviderMetadata::QgsGdalGuiProviderMetadata(): - QgsProviderGuiMetadata( PROVIDER_KEY, PROVIDER_DESCRIPTION ) + QgsProviderGuiMetadata( PROVIDER_KEY ) { } diff --git a/src/gui/providers/ogr/qgsogrguiprovider.cpp b/src/gui/providers/ogr/qgsogrguiprovider.cpp index 6c84497481c..bf5bb7ea818 100644 --- a/src/gui/providers/ogr/qgsogrguiprovider.cpp +++ b/src/gui/providers/ogr/qgsogrguiprovider.cpp @@ -32,7 +32,6 @@ #include "qgsprojectstorageguiprovider.h" static const QString TEXT_PROVIDER_KEY = QStringLiteral( "ogr" ); -static const QString TEXT_PROVIDER_DESCRIPTION = QStringLiteral( "OGR data provider" ); //! Provider for OGR vector source select class QgsOgrVectorSourceSelectProvider : public QgsSourceSelectProvider @@ -91,7 +90,7 @@ QgsAbstractDataSourceWidget *QgsOgrVectorSourceSelectProvider::createDataSourceW } QgsOgrGuiProviderMetadata::QgsOgrGuiProviderMetadata() - : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY, TEXT_PROVIDER_DESCRIPTION ) + : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY ) { } diff --git a/src/gui/qgsproviderguimetadata.cpp b/src/gui/qgsproviderguimetadata.cpp index 7596d9ddb62..b8b0ecd32fd 100644 --- a/src/gui/qgsproviderguimetadata.cpp +++ b/src/gui/qgsproviderguimetadata.cpp @@ -20,8 +20,8 @@ #include "qgsprojectstorageguiprovider.h" #include "qgssourceselectprovider.h" -QgsProviderGuiMetadata::QgsProviderGuiMetadata( const QString &key, const QString &description ) - : mKey( key ), mDescription( description ) +QgsProviderGuiMetadata::QgsProviderGuiMetadata( const QString &key ) + : mKey( key ) { } @@ -47,11 +47,6 @@ QString QgsProviderGuiMetadata::key() const return mKey; } -QString QgsProviderGuiMetadata::description() const -{ - return mDescription; -} - void QgsProviderGuiMetadata::registerGui( QMainWindow * ) { } diff --git a/src/gui/qgsproviderguimetadata.h b/src/gui/qgsproviderguimetadata.h index 57f8727036e..d8cbece781e 100644 --- a/src/gui/qgsproviderguimetadata.h +++ b/src/gui/qgsproviderguimetadata.h @@ -41,7 +41,7 @@ class GUI_EXPORT QgsProviderGuiMetadata /** * Constructor for provider gui metadata */ - QgsProviderGuiMetadata( const QString &key, const QString &description ); + explicit QgsProviderGuiMetadata( const QString &key ); virtual ~QgsProviderGuiMetadata(); @@ -60,15 +60,9 @@ class GUI_EXPORT QgsProviderGuiMetadata //! Returns unique provider key QString key() const; - //! Returns provider description - QString description() const; - private: - /// unique key for data provider + //! unique key for data provider QString mKey; - - /// associated terse description - QString mDescription; }; #endif //QGSPROVIDERGUIMETADATA_H diff --git a/src/providers/arcgisrest/qgsafsprovider.cpp b/src/providers/arcgisrest/qgsafsprovider.cpp index 6f4d5d07818..42e5d3d9d41 100644 --- a/src/providers/arcgisrest/qgsafsprovider.cpp +++ b/src/providers/arcgisrest/qgsafsprovider.cpp @@ -395,7 +395,7 @@ class QgsAfsSourceSelectProvider : public QgsSourceSelectProvider QgsAfsProviderGuiMetadata::QgsAfsProviderGuiMetadata() - : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY, TEXT_PROVIDER_DESCRIPTION ) + : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY ) { } diff --git a/src/providers/arcgisrest/qgsamsprovider.cpp b/src/providers/arcgisrest/qgsamsprovider.cpp index 1cf09ecbd62..c0936f728d4 100644 --- a/src/providers/arcgisrest/qgsamsprovider.cpp +++ b/src/providers/arcgisrest/qgsamsprovider.cpp @@ -1257,7 +1257,7 @@ class QgsAmsSourceSelectProvider : public QgsSourceSelectProvider }; QgsAmsProviderGuiMetadata::QgsAmsProviderGuiMetadata() - : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY, TEXT_PROVIDER_DESCRIPTION ) + : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY ) { } diff --git a/src/providers/db2/qgsdb2provider.cpp b/src/providers/db2/qgsdb2provider.cpp index 0d8836e60fe..344ae29ff0b 100644 --- a/src/providers/db2/qgsdb2provider.cpp +++ b/src/providers/db2/qgsdb2provider.cpp @@ -1782,7 +1782,7 @@ class QgsDb2SourceSelectProvider : public QgsSourceSelectProvider }; QgsDb2ProviderGuiMetadata::QgsDb2ProviderGuiMetadata() - : QgsProviderGuiMetadata( PROVIDER_KEY, PROVIDER_DESCRIPTION ) + : QgsProviderGuiMetadata( PROVIDER_KEY ) { } diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp index 59cf35a1ce7..6884471bbd6 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp @@ -1168,7 +1168,7 @@ class QgsDelimitedTextSourceSelectProvider : public QgsSourceSelectProvider }; QgsDelimitedTextProviderGuiMetadata::QgsDelimitedTextProviderGuiMetadata() - : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY, TEXT_PROVIDER_DESCRIPTION ) + : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY ) { } diff --git a/src/providers/geonode/qgsgeonodeprovider.cpp b/src/providers/geonode/qgsgeonodeprovider.cpp index 3ec8c8b1036..981141501ce 100644 --- a/src/providers/geonode/qgsgeonodeprovider.cpp +++ b/src/providers/geonode/qgsgeonodeprovider.cpp @@ -48,7 +48,7 @@ QList QgsGeoNodeProviderMetadata::dataItemProviders() con class QgsGeonodeProviderGuiMetadata: public QgsProviderGuiMetadata { public: - QgsGeonodeProviderGuiMetadata(): QgsProviderGuiMetadata( PROVIDER_KEY, PROVIDER_DESCRIPTION ) {} + QgsGeonodeProviderGuiMetadata(): QgsProviderGuiMetadata( PROVIDER_KEY ) {} QList sourceSelectProviders() override { QList providers; diff --git a/src/providers/mdal/qgsmdalprovider.cpp b/src/providers/mdal/qgsmdalprovider.cpp index efafca43661..b0f4a7cf26d 100644 --- a/src/providers/mdal/qgsmdalprovider.cpp +++ b/src/providers/mdal/qgsmdalprovider.cpp @@ -571,7 +571,7 @@ class QgsMdalMeshSourceSelectProvider : public QgsSourceSelectProvider }; QgsMdalProviderGuiMetadata::QgsMdalProviderGuiMetadata() - : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY, TEXT_PROVIDER_DESCRIPTION ) + : QgsProviderGuiMetadata( TEXT_PROVIDER_KEY ) { } diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp index 8ebe84fc177..b50262324f4 100644 --- a/src/providers/mssql/qgsmssqlprovider.cpp +++ b/src/providers/mssql/qgsmssqlprovider.cpp @@ -2379,7 +2379,7 @@ class QgsMssqlSourceSelectProvider : public QgsSourceSelectProvider }; QgsMssqlProviderGuiMetadata::QgsMssqlProviderGuiMetadata(): - QgsProviderGuiMetadata( TEXT_PROVIDER_KEY, TEXT_PROVIDER_DESCRIPTION ) + QgsProviderGuiMetadata( TEXT_PROVIDER_KEY ) { } diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp index d450be6a312..db95703387b 100644 --- a/src/providers/oracle/qgsoracleprovider.cpp +++ b/src/providers/oracle/qgsoracleprovider.cpp @@ -3493,7 +3493,7 @@ class QgsOracleSourceSelectProvider : public QgsSourceSelectProvider }; QgsOracleProviderGuiMetadata::QgsOracleProviderGuiMetadata() - : QgsProviderGuiMetadata( ORACLE_KEY, ORACLE_DESCRIPTION ) + : QgsProviderGuiMetadata( ORACLE_KEY ) { } diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index 059559072be..8cbb054600f 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -5036,7 +5036,7 @@ class QgsPostgresProviderGuiMetadata: public QgsProviderGuiMetadata { public: QgsPostgresProviderGuiMetadata(): - QgsProviderGuiMetadata( POSTGRES_KEY, POSTGRES_DESCRIPTION ) + QgsProviderGuiMetadata( POSTGRES_KEY ) { } QList sourceSelectProviders() override diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp index 34a7113061c..655a35fc50e 100644 --- a/src/providers/spatialite/qgsspatialiteprovider.cpp +++ b/src/providers/spatialite/qgsspatialiteprovider.cpp @@ -6065,7 +6065,7 @@ class QgsSpatialiteSourceSelectProvider : public QgsSourceSelectProvider }; QgsSpatiaLiteProviderGuiMetadata::QgsSpatiaLiteProviderGuiMetadata(): - QgsProviderGuiMetadata( SPATIALITE_KEY, SPATIALITE_DESCRIPTION ) + QgsProviderGuiMetadata( SPATIALITE_KEY ) { } diff --git a/src/providers/virtual/qgsvirtuallayerprovider.cpp b/src/providers/virtual/qgsvirtuallayerprovider.cpp index 8ab76f034a6..1f18330f318 100644 --- a/src/providers/virtual/qgsvirtuallayerprovider.cpp +++ b/src/providers/virtual/qgsvirtuallayerprovider.cpp @@ -671,7 +671,7 @@ class QgsVirtualSourceSelectProvider : public QgsSourceSelectProvider QgsVirtualLayerProviderGuiMetadata::QgsVirtualLayerProviderGuiMetadata() - : QgsProviderGuiMetadata( VIRTUAL_LAYER_KEY, VIRTUAL_LAYER_DESCRIPTION ) + : QgsProviderGuiMetadata( VIRTUAL_LAYER_KEY ) { } diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp index 785d567122b..b2ca99c4266 100644 --- a/src/providers/wcs/qgswcsprovider.cpp +++ b/src/providers/wcs/qgswcsprovider.cpp @@ -1975,7 +1975,7 @@ class QgsWcsSourceSelectProvider : public QgsSourceSelectProvider QgsWcsProviderGuiMetadata::QgsWcsProviderGuiMetadata() - : QgsProviderGuiMetadata( WCS_KEY, WCS_DESCRIPTION ) + : QgsProviderGuiMetadata( WCS_KEY ) { } diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp index c95db4e0b49..51cfdb95b08 100644 --- a/src/providers/wfs/qgswfsprovider.cpp +++ b/src/providers/wfs/qgswfsprovider.cpp @@ -1919,7 +1919,7 @@ class QgsWfsSourceSelectProvider : public QgsSourceSelectProvider }; QgsWfsProviderGuiMetadata::QgsWfsProviderGuiMetadata(): - QgsProviderGuiMetadata( TEXT_PROVIDER_KEY, TEXT_PROVIDER_DESCRIPTION ) + QgsProviderGuiMetadata( TEXT_PROVIDER_KEY ) { } diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp index 71bd3e2a019..70648ed5bb4 100644 --- a/src/providers/wms/qgswmsprovider.cpp +++ b/src/providers/wms/qgswmsprovider.cpp @@ -4248,7 +4248,7 @@ class QgsWmsSourceSelectProvider : public QgsSourceSelectProvider class QgsWmsProviderGuiMetadata: public QgsProviderGuiMetadata { public: - QgsWmsProviderGuiMetadata(): QgsProviderGuiMetadata( WMS_KEY, WMS_DESCRIPTION ) {} + QgsWmsProviderGuiMetadata(): QgsProviderGuiMetadata( WMS_KEY ) {} QList sourceSelectProviders() override { QList providers;