Move generic provider related files to src/core/providers

Minor clean up
2025-12-15 00:07:25 -05:00 · 2021-05-17 11:19:23 +10:00 · 2021-05-17 11:19:23 +10:00 · 0c4dd068c4
commit 0c4dd068c4
parent 18dd2c4e48
19 changed files with 29 additions and 27 deletions
--- a/python/core/auto_additions/qgsabstractdatabaseproviderconnection.py
+++ b/python/core/auto_additions/qgsabstractdatabaseproviderconnection.py
@ -1,4 +1,4 @@
-# The following has been generated automatically from src/core/qgsabstractdatabaseproviderconnection.h
+# The following has been generated automatically from src/core/providers/qgsabstractdatabaseproviderconnection.h
 QgsAbstractDatabaseProviderConnection.TableFlag.baseClass = QgsAbstractDatabaseProviderConnection
 QgsAbstractDatabaseProviderConnection.TableFlags.baseClass = QgsAbstractDatabaseProviderConnection
 TableFlags = QgsAbstractDatabaseProviderConnection  # dirty hack since SIP seems to introduce the flags in module
--- a/python/core/auto_additions/qgsprovidermetadata.py
+++ b/python/core/auto_additions/qgsprovidermetadata.py
@ -1,4 +1,4 @@
-# The following has been generated automatically from src/core/qgsprovidermetadata.h
+# The following has been generated automatically from src/core/providers/qgsprovidermetadata.h
 QgsMeshDriverMetadata.MeshDriverCapability.baseClass = QgsMeshDriverMetadata
 QgsMeshDriverMetadata.MeshDriverCapabilities.baseClass = QgsMeshDriverMetadata
 MeshDriverCapabilities = QgsMeshDriverMetadata  # dirty hack since SIP seems to introduce the flags in module
--- a/python/core/auto_generated/providers/qgsabstractdatabaseproviderconnection.sip.in
+++ b/python/core/auto_generated/providers/qgsabstractdatabaseproviderconnection.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsabstractdatabaseproviderconnection.h                     *
+ * src/core/providers/qgsabstractdatabaseproviderconnection.h           *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -663,7 +663,7 @@ QFlags<QgsAbstractDatabaseProviderConnection::Capability> operator|(QgsAbstractD
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsabstractdatabaseproviderconnection.h                     *
+ * src/core/providers/qgsabstractdatabaseproviderconnection.h           *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/core/auto_generated/providers/qgsabstractproviderconnection.sip.in
+++ b/python/core/auto_generated/providers/qgsabstractproviderconnection.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsabstractproviderconnection.h                             *
+ * src/core/providers/qgsabstractproviderconnection.h                   *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -104,7 +104,7 @@ Sets the connection ``configuration``
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsabstractproviderconnection.h                             *
+ * src/core/providers/qgsabstractproviderconnection.h                   *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/core/auto_generated/providers/qgsdataprovider.sip.in
+++ b/python/core/auto_generated/providers/qgsdataprovider.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsdataprovider.h                                           *
+ * src/core/providers/qgsdataprovider.h                                 *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -507,7 +507,7 @@ QFlags<QgsDataProvider::ReadFlag> operator|(QgsDataProvider::ReadFlag f1, QFlags
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsdataprovider.h                                           *
+ * src/core/providers/qgsdataprovider.h                                 *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/core/auto_generated/providers/qgsprovidermetadata.sip.in
+++ b/python/core/auto_generated/providers/qgsprovidermetadata.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsprovidermetadata.h                                       *
+ * src/core/providers/qgsprovidermetadata.h                             *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -602,7 +602,7 @@ QFlags<QgsProviderMetadata::ProviderCapability> operator|(QgsProviderMetadata::P
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsprovidermetadata.h                                       *
+ * src/core/providers/qgsprovidermetadata.h                             *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/core/auto_generated/providers/qgsproviderregistry.sip.in
+++ b/python/core/auto_generated/providers/qgsproviderregistry.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsproviderregistry.h                                       *
+ * src/core/providers/qgsproviderregistry.h                             *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -632,7 +632,7 @@ register a new vector data provider from its ``providerMetadata``
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsproviderregistry.h                                       *
+ * src/core/providers/qgsproviderregistry.h                             *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/core/core_auto.sip
+++ b/python/core/core_auto.sip
@ -1,8 +1,6 @@
 // Include auto-generated SIP files
 %Include auto_generated/qgis.sip
 %Include auto_generated/qgsabstractcontentcache.sip
-%Include auto_generated/qgsabstractdatabaseproviderconnection.sip
-%Include auto_generated/qgsabstractproviderconnection.sip
 %Include auto_generated/qgsaction.sip
 %Include auto_generated/qgsactionmanager.sip
 %Include auto_generated/qgsactionscope.sip
@ -38,7 +36,6 @@
 %Include auto_generated/qgsdataitem.sip
 %Include auto_generated/qgsdataitemprovider.sip
 %Include auto_generated/qgsdataitemproviderregistry.sip
-%Include auto_generated/qgsdataprovider.sip
 %Include auto_generated/qgsdataprovidertemporalcapabilities.sip
 %Include auto_generated/qgsdatasourceuri.sip
 %Include auto_generated/qgsdatetimestatisticalsummary.sip
@ -147,8 +144,6 @@
 %Include auto_generated/qgspropertycollection.sip
 %Include auto_generated/qgspropertytransformer.sip
 %Include auto_generated/qgsproviderconnectionmodel.sip
-%Include auto_generated/qgsprovidermetadata.sip
-%Include auto_generated/qgsproviderregistry.sip
 %Include auto_generated/qgsproxyfeaturesink.sip
 %Include auto_generated/qgsproxyprogresstask.sip
 %Include auto_generated/qgspythonrunner.sip
@ -501,6 +496,11 @@
 %Include auto_generated/project/qgsprojecttranslator.sip
 %Include auto_generated/project/qgsprojectversion.sip
 %Include auto_generated/project/qgsprojectviewsettings.sip
+%Include auto_generated/providers/qgsabstractdatabaseproviderconnection.sip
+%Include auto_generated/providers/qgsabstractproviderconnection.sip
+%Include auto_generated/providers/qgsdataprovider.sip
+%Include auto_generated/providers/qgsprovidermetadata.sip
+%Include auto_generated/providers/qgsproviderregistry.sip
 %Include auto_generated/providers/arcgis/qgsarcgisportalutils.sip
 %Include auto_generated/providers/arcgis/qgsarcgisrestutils.sip
 %Include auto_generated/providers/memory/qgsmemoryproviderutils.sip
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -209,6 +209,12 @@ set(QGIS_CORE_SRCS
  processing/models/qgsprocessingmodelparameter.cpp
  processing/models/qgsprocessingmodeloutput.cpp

+  providers/qgsabstractproviderconnection.cpp
+  providers/qgsabstractdatabaseproviderconnection.cpp
+  providers/qgsdataprovider.cpp
+  providers/qgsprovidermetadata.cpp
+  providers/qgsproviderregistry.cpp
+
  providers/arcgis/qgsarcgisportalutils.cpp
  providers/arcgis/qgsarcgisrestquery.cpp
  providers/arcgis/qgsarcgisrestutils.cpp
@ -261,8 +267,6 @@ set(QGIS_CORE_SRCS
  qgis.cpp
  qgsabstractcontentcache.cpp
  qgsabstractgeopdfexporter.cpp
-  qgsabstractproviderconnection.cpp
-  qgsabstractdatabaseproviderconnection.cpp
  qgsapplication.cpp
  qgsaction.cpp
  qgsactionscope.cpp
@ -301,7 +305,6 @@ set(QGIS_CORE_SRCS
  qgsdataitemprovider.cpp
  qgsdataitemproviderregistry.cpp
  qgsdatasourceuri.cpp
-  qgsdataprovider.cpp
  qgsdataprovidertemporalcapabilities.cpp
  qgsdatetimestatisticalsummary.cpp
  qgsdbfilterproxymodel.cpp
@ -407,8 +410,6 @@ set(QGIS_CORE_SRCS
  qgspropertycollection.cpp
  qgspropertytransformer.cpp
  qgsproviderconnectionmodel.cpp
-  qgsprovidermetadata.cpp
-  qgsproviderregistry.cpp
  qgsproxyfeaturesink.cpp
  qgsproxyprogresstask.cpp
  qgspythonrunner.cpp
@ -854,9 +855,7 @@ set(QGIS_CORE_HDRS
  qgis.h
  qgis_sip.h
  qgsabstractcontentcache.h
-  qgsabstractdatabaseproviderconnection.h
  qgsabstractgeopdfexporter.h
-  qgsabstractproviderconnection.h
  qgsaction.h
  qgsactionmanager.h
  qgsactionscope.h
@ -894,7 +893,6 @@ set(QGIS_CORE_HDRS
  qgsdataitem.h
  qgsdataitemprovider.h
  qgsdataitemproviderregistry.h
-  qgsdataprovider.h
  qgsdataprovidertemporalcapabilities.h
  qgsdatasourceuri.h
  qgsdatetimestatisticalsummary.h
@ -1016,8 +1014,6 @@ set(QGIS_CORE_HDRS
  qgspropertycollection.h
  qgspropertytransformer.h
  qgsproviderconnectionmodel.h
-  qgsprovidermetadata.h
-  qgsproviderregistry.h
  qgsproxyfeaturesink.h
  qgsproxyprogresstask.h
  qgspythonrunner.h
@ -1443,6 +1439,12 @@ set(QGIS_CORE_HDRS
  project/qgsprojectversion.h
  project/qgsprojectviewsettings.h

+  providers/qgsabstractdatabaseproviderconnection.h
+  providers/qgsabstractproviderconnection.h
+  providers/qgsdataprovider.h
+  providers/qgsprovidermetadata.h
+  providers/qgsproviderregistry.h
+
  providers/arcgis/qgsarcgisportalutils.h
  providers/arcgis/qgsarcgisrestquery.h
  providers/arcgis/qgsarcgisrestutils.h
--- a/src/core/providers/qgsabstractdatabaseproviderconnection.cpp
+++ b/src/core/providers/qgsabstractdatabaseproviderconnection.cpp
--- a/src/core/providers/qgsabstractdatabaseproviderconnection.h
+++ b/src/core/providers/qgsabstractdatabaseproviderconnection.h
--- a/src/core/providers/qgsabstractproviderconnection.cpp
+++ b/src/core/providers/qgsabstractproviderconnection.cpp
--- a/src/core/providers/qgsabstractproviderconnection.h
+++ b/src/core/providers/qgsabstractproviderconnection.h
--- a/src/core/providers/qgsdataprovider.cpp
+++ b/src/core/providers/qgsdataprovider.cpp
--- a/src/core/providers/qgsdataprovider.h
+++ b/src/core/providers/qgsdataprovider.h
--- a/src/core/providers/qgsprovidermetadata.cpp
+++ b/src/core/providers/qgsprovidermetadata.cpp
--- a/src/core/providers/qgsprovidermetadata.h
+++ b/src/core/providers/qgsprovidermetadata.h
--- a/src/core/providers/qgsproviderregistry.cpp
+++ b/src/core/providers/qgsproviderregistry.cpp
--- a/src/core/providers/qgsproviderregistry.h
+++ b/src/core/providers/qgsproviderregistry.h