Skip to content

/ QGIS

Permalink
Browse files

Code shuffle 

Move vector, project and network related core .cpp/.h files into
dedicated subdirectories.

An attempt to organise src/core better to make things easier to find.
  • Loading branch information
@nyalldawson
nyalldawson committed Dec 29, 2020
1 parent 71eed6e commit a9c80e5740475c056a4a9b57f91de2a40e7eb141
Unified Split
Showing with 357 additions and 570 deletions.
  1. +3 −0 doc/CMakeLists.txt
  2. +3 −0 python/CMakeLists.txt
  3. +1 −1 python/core/auto_additions/qgsnetworkcontentfetcherregistry.py
  4. +1 −1 python/core/auto_additions/qgsproject.py
  5. +1 −1 python/core/auto_additions/qgsvectorlayer.py
  6. +1 −1 python/core/auto_additions/qgsvectorlayerserverproperties.py
  7. 0 python/core/auto_generated/geonode/qgsdataitemprovider.sip
  8. 0 python/core/auto_generated/geonode/qgsgeonodeconnection.sip
  9. +0 −151 python/core/auto_generated/geonode/qgsgeonoderequest.sip
  10. +0 −98 python/core/auto_generated/locator/qgslocatorwidgetcore.sip.in
  11. +0 −28 python/core/auto_generated/mesh/qgsnativemesh.sip.in
  12. +2 −2 python/core/auto_generated/{ → network}/qgsblockingnetworkrequest.sip.in
  13. +2 −2 python/core/auto_generated/{ → network}/qgsfiledownloader.sip.in
  14. +2 −2 python/core/auto_generated/{ → network}/qgsnetworkaccessmanager.sip.in
  15. +2 −2 python/core/auto_generated/{ → network}/qgsnetworkcontentfetcher.sip.in
  16. +2 −2 python/core/auto_generated/{ → network}/qgsnetworkcontentfetcherregistry.sip.in
  17. +2 −2 python/core/auto_generated/{ → network}/qgsnetworkcontentfetchertask.sip.in
  18. +2 −2 python/core/auto_generated/{ → network}/qgsnetworkreply.sip.in
  19. +2 −2 python/core/auto_generated/{ → network}/qgsnewsfeedmodel.sip.in
  20. +2 −2 python/core/auto_generated/{ → network}/qgsnewsfeedparser.sip.in
  21. 0 python/core/auto_generated/processing/qgsprocessingparameterholder.sip.in
  22. +2 −2 python/core/auto_generated/{ → project}/qgsproject.sip.in
  23. +2 −2 python/core/auto_generated/{ → project}/qgsprojectbadlayerhandler.sip.in
  24. +2 −2 python/core/auto_generated/{ → project}/qgsprojectdisplaysettings.sip.in
  25. +2 −2 python/core/auto_generated/{ → project}/qgsprojectfiletransform.sip.in
  26. +2 −2 python/core/auto_generated/{ → project}/qgsprojectproperty.sip.in
  27. +2 −2 python/core/auto_generated/{ → project}/qgsprojectservervalidator.sip.in
  28. +2 −2 python/core/auto_generated/{ → project}/qgsprojectstorage.sip.in
  29. +2 −2 python/core/auto_generated/{ → project}/qgsprojectstorageregistry.sip.in
  30. +2 −2 python/core/auto_generated/{ → project}/qgsprojecttimesettings.sip.in
  31. +2 −2 python/core/auto_generated/{ → project}/qgsprojecttranslator.sip.in
  32. +2 −2 python/core/auto_generated/{ → project}/qgsprojectversion.sip.in
  33. +2 −2 python/core/auto_generated/{ → project}/qgsprojectviewsettings.sip.in
  34. +0 −42 python/core/auto_generated/qgsdataprovidertemporalproperties.sip.in
  35. +2 −2 python/core/auto_generated/{ → vector}/qgsvectordataprovider.sip.in
  36. +2 −2 python/core/auto_generated/{ → vector}/qgsvectordataprovidertemporalcapabilities.sip.in
  37. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayer.sip.in
  38. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayercache.sip.in
  39. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayereditbuffer.sip.in
  40. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayereditpassthrough.sip.in
  41. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayereditutils.sip.in
  42. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayerexporter.sip.in
  43. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayerfeaturecounter.sip.in
  44. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayerfeatureiterator.sip.in
  45. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayerjoinbuffer.sip.in
  46. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayerjoininfo.sip.in
  47. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayerserverproperties.sip.in
  48. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayertemporalproperties.sip.in
  49. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayertools.sip.in
  50. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayerundocommand.sip.in
  51. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayerundopassthroughcommand.sip.in
  52. +2 −2 python/core/auto_generated/{ → vector}/qgsvectorlayerutils.sip.in
  53. +39 −39 python/core/core_auto.sip
  54. +10 −8 src/3d/CMakeLists.txt
  55. +9 −7 src/analysis/CMakeLists.txt
  56. +3 −0 src/app/CMakeLists.txt
  57. +1 −0 src/auth/oauth2/CMakeLists.txt
  58. +96 −87 src/core/CMakeLists.txt
  59. 0 src/core/{ → network}/qgsblockingnetworkrequest.cpp
  60. 0 src/core/{ → network}/qgsblockingnetworkrequest.h
  61. 0 src/core/{ → network}/qgsfiledownloader.cpp
  62. 0 src/core/{ → network}/qgsfiledownloader.h
  63. 0 src/core/{ → network}/qgsnetworkaccessmanager.cpp
  64. 0 src/core/{ → network}/qgsnetworkaccessmanager.h
  65. 0 src/core/{ → network}/qgsnetworkcontentfetcher.cpp
  66. 0 src/core/{ → network}/qgsnetworkcontentfetcher.h
  67. 0 src/core/{ → network}/qgsnetworkcontentfetcherregistry.cpp
  68. 0 src/core/{ → network}/qgsnetworkcontentfetcherregistry.h
  69. 0 src/core/{ → network}/qgsnetworkcontentfetchertask.cpp
  70. 0 src/core/{ → network}/qgsnetworkcontentfetchertask.h
  71. 0 src/core/{ → network}/qgsnetworkdiskcache.cpp
  72. 0 src/core/{ → network}/qgsnetworkdiskcache.h
  73. 0 src/core/{ → network}/qgsnetworkreply.cpp
  74. 0 src/core/{ → network}/qgsnetworkreply.h
  75. 0 src/core/{ → network}/qgsnetworkreplyparser.cpp
  76. 0 src/core/{ → network}/qgsnetworkreplyparser.h
  77. 0 src/core/{ → network}/qgsnewsfeedmodel.cpp
  78. 0 src/core/{ → network}/qgsnewsfeedmodel.h
  79. 0 src/core/{ → network}/qgsnewsfeedparser.cpp
  80. 0 src/core/{ → network}/qgsnewsfeedparser.h
  81. 0 src/core/{ → project}/qgsproject.cpp
  82. 0 src/core/{ → project}/qgsproject.h
  83. 0 src/core/{ → project}/qgsprojectbadlayerhandler.cpp
  84. 0 src/core/{ → project}/qgsprojectbadlayerhandler.h
  85. 0 src/core/{ → project}/qgsprojectdisplaysettings.cpp
  86. 0 src/core/{ → project}/qgsprojectdisplaysettings.h
  87. 0 src/core/{ → project}/qgsprojectfiletransform.cpp
  88. 0 src/core/{ → project}/qgsprojectfiletransform.h
  89. 0 src/core/{ → project}/qgsprojectproperty.cpp
  90. 0 src/core/{ → project}/qgsprojectproperty.h
  91. 0 src/core/{ → project}/qgsprojectservervalidator.cpp
  92. 0 src/core/{ → project}/qgsprojectservervalidator.h
  93. 0 src/core/{ → project}/qgsprojectstorage.cpp
  94. 0 src/core/{ → project}/qgsprojectstorage.h
  95. 0 src/core/{ → project}/qgsprojectstorageregistry.cpp
  96. 0 src/core/{ → project}/qgsprojectstorageregistry.h
  97. 0 src/core/{ → project}/qgsprojecttimesettings.cpp
  98. 0 src/core/{ → project}/qgsprojecttimesettings.h
  99. 0 src/core/{ → project}/qgsprojecttranslator.h
  100. 0 src/core/{ → project}/qgsprojectversion.cpp
  101. 0 src/core/{ → project}/qgsprojectversion.h
  102. 0 src/core/{ → project}/qgsprojectviewsettings.cpp
  103. 0 src/core/{ → project}/qgsprojectviewsettings.h
  104. 0 src/core/{ → vector}/qgsvectordataprovider.cpp
  105. 0 src/core/{ → vector}/qgsvectordataprovider.h
  106. 0 src/core/{ → vector}/qgsvectordataprovidertemporalcapabilities.cpp
  107. 0 src/core/{ → vector}/qgsvectordataprovidertemporalcapabilities.h
  108. 0 src/core/{ → vector}/qgsvectorlayer.cpp
  109. 0 src/core/{ → vector}/qgsvectorlayer.h
  110. 0 src/core/{ → vector}/qgsvectorlayercache.cpp
  111. 0 src/core/{ → vector}/qgsvectorlayercache.h
  112. 0 src/core/{ → vector}/qgsvectorlayerdiagramprovider.cpp
  113. 0 src/core/{ → vector}/qgsvectorlayerdiagramprovider.h
  114. 0 src/core/{ → vector}/qgsvectorlayereditbuffer.cpp
  115. 0 src/core/{ → vector}/qgsvectorlayereditbuffer.h
  116. 0 src/core/{ → vector}/qgsvectorlayereditpassthrough.cpp
  117. 0 src/core/{ → vector}/qgsvectorlayereditpassthrough.h
  118. 0 src/core/{ → vector}/qgsvectorlayereditutils.cpp
  119. 0 src/core/{ → vector}/qgsvectorlayereditutils.h
  120. 0 src/core/{ → vector}/qgsvectorlayerexporter.cpp
  121. 0 src/core/{ → vector}/qgsvectorlayerexporter.h
  122. 0 src/core/{ → vector}/qgsvectorlayerfeaturecounter.cpp
  123. 0 src/core/{ → vector}/qgsvectorlayerfeaturecounter.h
  124. 0 src/core/{ → vector}/qgsvectorlayerfeatureiterator.cpp
  125. 0 src/core/{ → vector}/qgsvectorlayerfeatureiterator.h
  126. 0 src/core/{ → vector}/qgsvectorlayerjoinbuffer.cpp
  127. 0 src/core/{ → vector}/qgsvectorlayerjoinbuffer.h
  128. 0 src/core/{ → vector}/qgsvectorlayerjoininfo.cpp
  129. 0 src/core/{ → vector}/qgsvectorlayerjoininfo.h
  130. 0 src/core/{ → vector}/qgsvectorlayerref.h
  131. 0 src/core/{ → vector}/qgsvectorlayerrenderer.cpp
  132. 0 src/core/{ → vector}/qgsvectorlayerrenderer.h
  133. 0 src/core/{ → vector}/qgsvectorlayerserverproperties.cpp
  134. 0 src/core/{ → vector}/qgsvectorlayerserverproperties.h
  135. 0 src/core/{ → vector}/qgsvectorlayertemporalproperties.cpp
  136. 0 src/core/{ → vector}/qgsvectorlayertemporalproperties.h
  137. 0 src/core/{ → vector}/qgsvectorlayertools.cpp
  138. 0 src/core/{ → vector}/qgsvectorlayertools.h
  139. 0 src/core/{ → vector}/qgsvectorlayerundocommand.cpp
  140. 0 src/core/{ → vector}/qgsvectorlayerundocommand.h
  141. 0 src/core/{ → vector}/qgsvectorlayerundopassthroughcommand.cpp
  142. 0 src/core/{ → vector}/qgsvectorlayerundopassthroughcommand.h
  143. 0 src/core/{ → vector}/qgsvectorlayerutils.cpp
  144. 0 src/core/{ → vector}/qgsvectorlayerutils.h
  145. +3 −0 src/gui/CMakeLists.txt
  146. +4 −2 src/plugins/geometry_checker/CMakeLists.txt
  147. +2 −0 src/plugins/gps_importer/CMakeLists.txt
  148. +3 −1 src/plugins/offline_editing/CMakeLists.txt
  149. +2 −0 src/plugins/topology/CMakeLists.txt
  150. +2 −0 src/process/CMakeLists.txt
  151. +7 −4 src/providers/arcgisrest/CMakeLists.txt
  152. +2 −0 src/providers/db2/CMakeLists.txt
  153. +2 −0 src/providers/delimitedtext/CMakeLists.txt
  154. +5 −3 src/providers/geonode/CMakeLists.txt
  155. +3 −1 src/providers/gpx/CMakeLists.txt
  156. +2 −0 src/providers/mdal/CMakeLists.txt
  157. +2 −0 src/providers/mssql/CMakeLists.txt
  158. +3 −1 src/providers/ows/CMakeLists.txt
  159. +2 −0 src/providers/pdal/CMakeLists.txt
  160. +2 −0 src/providers/postgres/CMakeLists.txt
  161. +2 −0 src/providers/spatialite/CMakeLists.txt
  162. +3 −1 src/providers/virtual/CMakeLists.txt
  163. +5 −2 src/providers/wcs/CMakeLists.txt
  164. +3 −0 src/providers/wfs/CMakeLists.txt
  165. +3 −0 src/providers/wms/CMakeLists.txt
  166. +3 −0 src/server/CMakeLists.txt
  167. +4 −2 src/server/services/landingpage/CMakeLists.txt
  168. +1 −0 src/server/services/wcs/CMakeLists.txt
  169. +5 −3 src/server/services/wfs/CMakeLists.txt
  170. +5 −3 src/server/services/wfs3/CMakeLists.txt
  171. +5 −3 src/server/services/wms/CMakeLists.txt
  172. +4 −2 src/server/services/wmts/CMakeLists.txt
  173. +2 −0 tests/bench/CMakeLists.txt
  174. +3 −0 tests/src/3d/CMakeLists.txt
  175. +2 −0 tests/src/analysis/CMakeLists.txt
  176. +2 −0 tests/src/app/CMakeLists.txt
  177. +3 −0 tests/src/core/CMakeLists.txt
  178. +2 −0 tests/src/geometry_checker/CMakeLists.txt
  179. +3 −0 tests/src/gui/CMakeLists.txt
  180. +3 −0 tests/src/providers/CMakeLists.txt
  181. +2 −0 tests/src/server/wms/CMakeLists.txt
3 doc/CMakeLists.txt
View file
@@ -71,10 +71,12 @@ if(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/locator
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/mesh
${CMAKE_SOURCE_DIR}/src/core/network
${CMAKE_SOURCE_DIR}/src/core/numericformats
${CMAKE_SOURCE_DIR}/src/core/pal
${CMAKE_SOURCE_DIR}/src/core/processing
${CMAKE_SOURCE_DIR}/src/core/pointcloud
${CMAKE_SOURCE_DIR}/src/core/project
${CMAKE_SOURCE_DIR}/src/core/providers
${CMAKE_SOURCE_DIR}/src/core/providers/arcgis
${CMAKE_SOURCE_DIR}/src/core/providers/memory
@@ -83,6 +85,7 @@ if(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/textrenderer
${CMAKE_SOURCE_DIR}/src/core/validity
${CMAKE_SOURCE_DIR}/src/core/vector
${CMAKE_SOURCE_DIR}/src/core/vectortile
${CMAKE_SOURCE_DIR}/src/gui
${CMAKE_SOURCE_DIR}/src/gui/auth
3 python/CMakeLists.txt
View file
@@ -121,18 +121,21 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/core/locator
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/mesh
${CMAKE_SOURCE_DIR}/src/core/network
${CMAKE_SOURCE_DIR}/src/core/numericformats
${CMAKE_SOURCE_DIR}/src/core/processing
${CMAKE_SOURCE_DIR}/src/core/processing/models
${CMAKE_SOURCE_DIR}/src/core/providers
${CMAKE_SOURCE_DIR}/src/core/providers/arcgis
${CMAKE_SOURCE_DIR}/src/core/pointcloud
${CMAKE_SOURCE_DIR}/src/core/project
${CMAKE_SOURCE_DIR}/src/core/providers/memory
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/scalebar
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/textrenderer
${CMAKE_SOURCE_DIR}/src/core/validity
${CMAKE_SOURCE_DIR}/src/core/vector
${CMAKE_SOURCE_DIR}/src/core/vectortile
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/external
2 python/core/auto_additions/qgsnetworkcontentfetcherregistry.py
View file
@@ -1,2 +1,2 @@
# The following has been generated automatically from src/core/qgsnetworkcontentfetcherregistry.h
# The following has been generated automatically from src/core/network/qgsnetworkcontentfetcherregistry.h
QgsNetworkContentFetcherRegistry.FetchingMode.baseClass = QgsNetworkContentFetcherRegistry
2 python/core/auto_additions/qgsproject.py
View file
@@ -1,4 +1,4 @@
# The following has been generated automatically from src/core/qgsproject.h
# The following has been generated automatically from src/core/project/qgsproject.h
# monkey patching scoped based enum
QgsProject.FlagDontResolveLayers = QgsProject.ReadFlag.FlagDontResolveLayers
QgsProject.ReadFlag.FlagDontResolveLayers.__doc__ = "Don't resolve layer paths (i.e. don't load any layer content). Dramatically improves project read time if the actual data from the layers is not required."
2 python/core/auto_additions/qgsvectorlayer.py
View file
@@ -1,3 +1,3 @@
# The following has been generated automatically from src/core/qgsvectorlayer.h
# The following has been generated automatically from src/core/vector/qgsvectorlayer.h
QgsVectorLayer.EditResult.baseClass = QgsVectorLayer
QgsVectorLayer.SelectBehavior.baseClass = QgsVectorLayer
2 python/core/auto_additions/qgsvectorlayerserverproperties.py
View file
@@ -1,2 +1,2 @@
# The following has been generated automatically from src/core/qgsvectorlayerserverproperties.h
# The following has been generated automatically from src/core/vector/qgsvectorlayerserverproperties.h
QgsVectorLayerServerProperties.PredefinedWmsDimensionName.baseClass = QgsVectorLayerServerProperties
0 python/core/auto_generated/geonode/qgsdataitemprovider.sip
View file
Empty file.
0 python/core/auto_generated/geonode/qgsgeonodeconnection.sip
View file
Empty file.
151 python/core/auto_generated/geonode/qgsgeonoderequest.sip
View file

This file was deleted.

98 python/core/auto_generated/locator/qgslocatorwidgetcore.sip.in
View file

This file was deleted.

28 python/core/auto_generated/mesh/qgsnativemesh.sip.in
View file

This file was deleted.

4 ...enerated/qgsblockingnetworkrequest.sip.in → .../network/qgsblockingnetworkrequest.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsblockingnetworkrequest.h *
* src/core/network/qgsblockingnetworkrequest.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -200,7 +200,7 @@ Emitted once a request has finished downloading.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsblockingnetworkrequest.h *
* src/core/network/qgsblockingnetworkrequest.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 ...e/auto_generated/qgsfiledownloader.sip.in → ...enerated/network/qgsfiledownloader.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsfiledownloader.h *
* src/core/network/qgsfiledownloader.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -96,7 +96,7 @@ Called to start the download
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsfiledownloader.h *
* src/core/network/qgsfiledownloader.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 ..._generated/qgsnetworkaccessmanager.sip.in → ...ed/network/qgsnetworkaccessmanager.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsnetworkaccessmanager.h *
* src/core/network/qgsnetworkaccessmanager.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -468,7 +468,7 @@ See QgsSslErrorHandler for details on how to handle SSL errors and potentially i
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsnetworkaccessmanager.h *
* src/core/network/qgsnetworkaccessmanager.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

0 comments on commit a9c80e5

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