Skip to content

Commit

Permalink
Move core browser and map renderer files to src/core/browser
Browse files Browse the repository at this point in the history 
and src/core/maprenderer subfolders

Helps keep src/core a little more organized
  • Loading branch information
@nyalldawson
nyalldawson committed May 20, 2021
1 parent 85e8715 commit 68c98b5
Show file tree
Hide file tree
Showing 39 changed files with 66 additions and 58 deletions.
2 changes: 2 additions & 0 deletions doc/CMakeLists.txt
View file
Expand Up @@ -53,6 +53,7 @@ if(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/3d
${CMAKE_SOURCE_DIR}/src/core/annotations
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/browser
${CMAKE_SOURCE_DIR}/src/core/callouts
${CMAKE_SOURCE_DIR}/src/core/classification
${CMAKE_SOURCE_DIR}/src/core/diagram
Expand All @@ -69,6 +70,7 @@ if(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/layout
${CMAKE_SOURCE_DIR}/src/core/locator
${CMAKE_SOURCE_DIR}/src/core/maprenderer
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/mesh
${CMAKE_SOURCE_DIR}/src/core/network
Expand Down
2 changes: 1 addition & 1 deletion python/core/auto_additions/qgsdataitem.py
View file
@@ -1,4 +1,4 @@
# The following has been generated automatically from src/core/qgsdataitem.h
# The following has been generated automatically from src/core/browser/qgsdataitem.h
QgsDataItem.Type.baseClass = QgsDataItem
QgsDataItem.State.baseClass = QgsDataItem
QgsLayerItem.LayerType.baseClass = QgsLayerItem
4 changes: 2 additions & 2 deletions ...ore/auto_generated/qgsbrowsermodel.sip.in → ..._generated/browser/qgsbrowsermodel.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsbrowsermodel.h *
* src/core/browser/qgsbrowsermodel.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -247,7 +247,7 @@ Populates the model
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsbrowsermodel.h *
* src/core/browser/qgsbrowsermodel.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...uto_generated/qgsbrowserproxymodel.sip.in → ...rated/browser/qgsbrowserproxymodel.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsbrowserproxymodel.h *
* src/core/browser/qgsbrowserproxymodel.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -201,7 +201,7 @@ Sets show layers to ``showLayers``
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsbrowserproxymodel.h *
* src/core/browser/qgsbrowserproxymodel.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...on/core/auto_generated/qgsdataitem.sip.in → ...auto_generated/browser/qgsdataitem.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataitem.h *
* src/core/browser/qgsdataitem.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -1199,7 +1199,7 @@ Constructor for QgsFieldItem, with the specified ``parent`` item and ``field``.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataitem.h *
* src/core/browser/qgsdataitem.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...auto_generated/qgsdataitemprovider.sip.in → ...erated/browser/qgsdataitemprovider.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataitemprovider.h *
* src/core/browser/qgsdataitemprovider.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -80,7 +80,7 @@ The default implementation returns ``False`` for all paths.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataitemprovider.h *
* src/core/browser/qgsdataitemprovider.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...erated/qgsdataitemproviderregistry.sip.in → ...rowser/qgsdataitemproviderregistry.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataitemproviderregistry.h *
* src/core/browser/qgsdataitemproviderregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -89,7 +89,7 @@ Emitted when a data item provider is about to be removed
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsdataitemproviderregistry.h *
* src/core/browser/qgsdataitemproviderregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...auto_generated/qgsmaprenderercache.sip.in → ...ed/maprenderer/qgsmaprenderercache.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprenderercache.h *
* src/core/maprenderer/qgsmaprenderercache.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -176,7 +176,7 @@ Invalidates cached images which relate to the specified map ``layer``.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprenderercache.h *
* src/core/maprenderer/qgsmaprenderercache.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...ted/qgsmaprenderercustompainterjob.sip.in → ...rer/qgsmaprenderercustompainterjob.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprenderercustompainterjob.h *
* src/core/maprenderer/qgsmaprenderercustompainterjob.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -131,7 +131,7 @@ and an alternative to :py:func:`~QgsMapRendererCustomPainterJob.renderSynchronou
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprenderercustompainterjob.h *
* src/core/maprenderer/qgsmaprenderercustompainterjob.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...e/auto_generated/qgsmaprendererjob.sip.in → ...ated/maprenderer/qgsmaprendererjob.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprendererjob.h *
* src/core/maprenderer/qgsmaprendererjob.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -225,7 +225,7 @@ Gets a preview/resulting image
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprendererjob.h *
* src/core/maprenderer/qgsmaprendererjob.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...enerated/qgsmaprendererparalleljob.sip.in → ...renderer/qgsmaprendererparalleljob.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprendererparalleljob.h *
* src/core/maprenderer/qgsmaprendererparalleljob.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -51,7 +51,7 @@ It is safe to call that function while rendering is active to see preview of the
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprendererparalleljob.h *
* src/core/maprenderer/qgsmaprendererparalleljob.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...erated/qgsmaprenderersequentialjob.sip.in → ...nderer/qgsmaprenderersequentialjob.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprenderersequentialjob.h *
* src/core/maprenderer/qgsmaprenderersequentialjob.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -56,7 +56,7 @@ It is safe to call that function while rendering is active to see preview of the
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprenderersequentialjob.h *
* src/core/maprenderer/qgsmaprenderersequentialjob.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions .../auto_generated/qgsmaprenderertask.sip.in → ...ted/maprenderer/qgsmaprenderertask.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprenderertask.h *
* src/core/maprenderer/qgsmaprenderertask.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -99,7 +99,7 @@ Emitted when map rendering failed.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsmaprenderertask.h *
* src/core/maprenderer/qgsmaprenderertask.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
22 changes: 11 additions & 11 deletions python/core/core_auto.sip
View file
Expand Up @@ -15,8 +15,6 @@
%Include auto_generated/qgsbearingutils.sip
%Include auto_generated/qgsbookmarkmanager.sip
%Include auto_generated/qgsbookmarkmodel.sip
%Include auto_generated/qgsbrowsermodel.sip
%Include auto_generated/qgsbrowserproxymodel.sip
%Include auto_generated/qgscachedfeatureiterator.sip
%Include auto_generated/qgscacheindex.sip
%Include auto_generated/qgscacheindexfeatureid.sip
Expand All @@ -33,9 +31,6 @@
%Include auto_generated/qgsdatabaseschemamodel.sip
%Include auto_generated/qgsdatabasetablemodel.sip
%Include auto_generated/qgsdatadefinedsizelegend.sip
%Include auto_generated/qgsdataitem.sip
%Include auto_generated/qgsdataitemprovider.sip
%Include auto_generated/qgsdataitemproviderregistry.sip
%Include auto_generated/qgsdataprovidertemporalcapabilities.sip
%Include auto_generated/qgsdatasourceuri.sip
%Include auto_generated/qgsdatetimestatisticalsummary.sip
Expand Down Expand Up @@ -108,12 +103,6 @@
%Include auto_generated/qgsmaplayerstylemanager.sip
%Include auto_generated/qgsmaplayerelevationproperties.sip
%Include auto_generated/qgsmaplayertemporalproperties.sip
%Include auto_generated/qgsmaprenderercache.sip
%Include auto_generated/qgsmaprenderercustompainterjob.sip
%Include auto_generated/qgsmaprendererjob.sip
%Include auto_generated/qgsmaprendererparalleljob.sip
%Include auto_generated/qgsmaprenderersequentialjob.sip
%Include auto_generated/qgsmaprenderertask.sip
%Include auto_generated/qgsmapsettings.sip
%Include auto_generated/qgsmapsettingsutils.sip
%Include auto_generated/qgsmapthemecollection.sip
Expand Down Expand Up @@ -224,6 +213,11 @@
%Include auto_generated/auth/qgsauthconfig.sip
%Include auto_generated/auth/qgsauthmanager.sip
%Include auto_generated/auth/qgsauthmethod.sip
%Include auto_generated/browser/qgsbrowsermodel.sip
%Include auto_generated/browser/qgsbrowserproxymodel.sip
%Include auto_generated/browser/qgsdataitem.sip
%Include auto_generated/browser/qgsdataitemprovider.sip
%Include auto_generated/browser/qgsdataitemproviderregistry.sip
%Include auto_generated/callouts/qgscallout.sip
%Include auto_generated/callouts/qgscalloutsregistry.sip
%Include auto_generated/classification/qgsclassificationcustom.sip
Expand Down Expand Up @@ -399,6 +393,12 @@
%Include auto_generated/locator/qgslocatorfilter.sip
%Include auto_generated/locator/qgslocatormodel.sip
%Include auto_generated/locator/qgslocatormodelbridge.sip
%Include auto_generated/maprenderer/qgsmaprenderercache.sip
%Include auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip
%Include auto_generated/maprenderer/qgsmaprendererjob.sip
%Include auto_generated/maprenderer/qgsmaprendererparalleljob.sip
%Include auto_generated/maprenderer/qgsmaprenderersequentialjob.sip
%Include auto_generated/maprenderer/qgsmaprenderertask.sip
%Include auto_generated/mesh/qgsmesh3daveraging.sip
%Include auto_generated/mesh/qgsmeshdataprovider.sip
%Include auto_generated/mesh/qgsmeshdataprovidertemporalcapabilities.sip
Expand Down

0 comments on commit 68c98b5

Please sign in to comment.