Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move generic provider related files to src/core/providers
Minor clean up
  • Loading branch information
nyalldawson committed May 19, 2021
1 parent 18dd2c4 commit 0c4dd06
Show file tree
Hide file tree
Showing 19 changed files with 29 additions and 27 deletions.
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
@@ -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 *
************************************************************************/
Expand Down Expand Up @@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
Expand Down Expand Up @@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
Expand Down Expand Up @@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
Expand Down Expand Up @@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
Expand Down Expand Up @@ -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 *
************************************************************************/
10 changes: 5 additions & 5 deletions 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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 12 additions & 10 deletions src/core/CMakeLists.txt
Expand Up @@ -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
Expand Down Expand Up @@ -261,8 +267,6 @@ set(QGIS_CORE_SRCS
qgis.cpp
qgsabstractcontentcache.cpp
qgsabstractgeopdfexporter.cpp
qgsabstractproviderconnection.cpp
qgsabstractdatabaseproviderconnection.cpp
qgsapplication.cpp
qgsaction.cpp
qgsactionscope.cpp
Expand Down Expand Up @@ -301,7 +305,6 @@ set(QGIS_CORE_SRCS
qgsdataitemprovider.cpp
qgsdataitemproviderregistry.cpp
qgsdatasourceuri.cpp
qgsdataprovider.cpp
qgsdataprovidertemporalcapabilities.cpp
qgsdatetimestatisticalsummary.cpp
qgsdbfilterproxymodel.cpp
Expand Down Expand Up @@ -407,8 +410,6 @@ set(QGIS_CORE_SRCS
qgspropertycollection.cpp
qgspropertytransformer.cpp
qgsproviderconnectionmodel.cpp
qgsprovidermetadata.cpp
qgsproviderregistry.cpp
qgsproxyfeaturesink.cpp
qgsproxyprogresstask.cpp
qgspythonrunner.cpp
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -894,7 +893,6 @@ set(QGIS_CORE_HDRS
qgsdataitem.h
qgsdataitemprovider.h
qgsdataitemproviderregistry.h
qgsdataprovider.h
qgsdataprovidertemporalcapabilities.h
qgsdatasourceuri.h
qgsdatetimestatisticalsummary.h
Expand Down Expand Up @@ -1016,8 +1014,6 @@ set(QGIS_CORE_HDRS
qgspropertycollection.h
qgspropertytransformer.h
qgsproviderconnectionmodel.h
qgsprovidermetadata.h
qgsproviderregistry.h
qgsproxyfeaturesink.h
qgsproxyprogresstask.h
qgspythonrunner.h
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 0c4dd06

Please sign in to comment.