Move core painting related files to src/core/painting

2025-10-04 00:04:03 -04:00 · 2024-05-21 11:50:13 +10:00 · 2024-05-21 11:50:13 +10:00 · 0a493a0443
commit 0a493a0443
parent a956041495
20 changed files with 36 additions and 32 deletions
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -77,6 +77,7 @@ if(WITH_APIDOC)
      ${CMAKE_SOURCE_DIR}/src/core/metadata
      ${CMAKE_SOURCE_DIR}/src/core/network
      ${CMAKE_SOURCE_DIR}/src/core/numericformats
+      ${CMAKE_SOURCE_DIR}/src/core/painting
      ${CMAKE_SOURCE_DIR}/src/core/pal
      ${CMAKE_SOURCE_DIR}/src/core/pdf
      ${CMAKE_SOURCE_DIR}/src/core/plot
--- a/python/PyQt6/core/auto_generated/painting/qgsmaskpaintdevice.sip.in
+++ b/python/PyQt6/core/auto_generated/painting/qgsmaskpaintdevice.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsmaskpaintdevice.h                                        *
+ * src/core/painting/qgsmaskpaintdevice.h                               *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -50,7 +50,7 @@ Returns the mask painter path painted on this paint device
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsmaskpaintdevice.h                                        *
+ * src/core/painting/qgsmaskpaintdevice.h                               *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/PyQt6/core/auto_generated/painting/qgsnullpainterdevice.sip.in
+++ b/python/PyQt6/core/auto_generated/painting/qgsnullpainterdevice.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsnullpainterdevice.h                                      *
+ * src/core/painting/qgsnullpainterdevice.h                             *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -47,7 +47,7 @@ Sets the ``dpi`` of the device.
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsnullpainterdevice.h                                      *
+ * src/core/painting/qgsnullpainterdevice.h                             *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/PyQt6/core/auto_generated/painting/qgspaintenginehack.sip.in
+++ b/python/PyQt6/core/auto_generated/painting/qgspaintenginehack.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgspaintenginehack.h                                        *
+ * src/core/painting/qgspaintenginehack.h                               *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -29,7 +29,7 @@ Hack to workaround Qt #5114 by disabling PatternTransform
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgspaintenginehack.h                                        *
+ * src/core/painting/qgspaintenginehack.h                               *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/PyQt6/core/auto_generated/painting/qgspainting.sip.in
+++ b/python/PyQt6/core/auto_generated/painting/qgspainting.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgspainting.h                                               *
+ * src/core/painting/qgspainting.h                                      *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -92,7 +92,7 @@ Returns ``True`` if the triangle could be rendered, or ``False`` if it could not
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgspainting.h                                               *
+ * src/core/painting/qgspainting.h                                      *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/PyQt6/core/core_auto.sip
+++ b/python/PyQt6/core/core_auto.sip
@ -121,21 +121,17 @@
 %Include auto_generated/qgsmapunitscale.sip
 %Include auto_generated/qgsmargins.sip
 %Include auto_generated/qgsmaskidprovider.sip
-%Include auto_generated/qgsmaskpaintdevice.sip
 %Include auto_generated/qgsmatrix4x4.sip
 %Include auto_generated/qgsmessagelog.sip
 %Include auto_generated/qgsmessageoutput.sip
 %Include auto_generated/qgsmimedatautils.sip
 %Include auto_generated/qgsmultirenderchecker.sip
-%Include auto_generated/qgsnullpainterdevice.sip
 %Include auto_generated/qgsobjectcustomproperties.sip
 %Include auto_generated/qgsofflineediting.sip
 %Include auto_generated/qgsogcutils.sip
 %Include auto_generated/qgsoptional.sip
 %Include auto_generated/qgsoptionalexpression.sip
 %Include auto_generated/qgsowsconnection.sip
-%Include auto_generated/qgspaintenginehack.sip
-%Include auto_generated/qgspainting.sip
 %Include auto_generated/qgspathresolver.sip
 %Include auto_generated/qgspluginlayer.sip
 %Include auto_generated/qgspluginlayerregistry.sip
@ -488,6 +484,10 @@
 %Include auto_generated/mesh/qgsmeshadvancedediting.sip
 %Include auto_generated/mesh/qgsmeshforcebypolylines.sip
 %Include auto_generated/mesh/qgsmeshlayerlabeling.sip
+%Include auto_generated/painting/qgsmaskpaintdevice.sip
+%Include auto_generated/painting/qgsnullpainterdevice.sip
+%Include auto_generated/painting/qgspaintenginehack.sip
+%Include auto_generated/painting/qgspainting.sip
 %Include auto_generated/pdf/qgspdfrenderer.sip
 %Include auto_generated/plot/qgsplot.sip
 %Include auto_generated/pointcloud/qgspointcloudattribute.sip
--- a/python/core/auto_generated/painting/qgsmaskpaintdevice.sip.in
+++ b/python/core/auto_generated/painting/qgsmaskpaintdevice.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsmaskpaintdevice.h                                        *
+ * src/core/painting/qgsmaskpaintdevice.h                               *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -50,7 +50,7 @@ Returns the mask painter path painted on this paint device
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsmaskpaintdevice.h                                        *
+ * src/core/painting/qgsmaskpaintdevice.h                               *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/core/auto_generated/painting/qgsnullpainterdevice.sip.in
+++ b/python/core/auto_generated/painting/qgsnullpainterdevice.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsnullpainterdevice.h                                      *
+ * src/core/painting/qgsnullpainterdevice.h                             *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -47,7 +47,7 @@ Sets the ``dpi`` of the device.
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgsnullpainterdevice.h                                      *
+ * src/core/painting/qgsnullpainterdevice.h                             *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/core/auto_generated/painting/qgspaintenginehack.sip.in
+++ b/python/core/auto_generated/painting/qgspaintenginehack.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgspaintenginehack.h                                        *
+ * src/core/painting/qgspaintenginehack.h                               *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -29,7 +29,7 @@ Hack to workaround Qt #5114 by disabling PatternTransform
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgspaintenginehack.h                                        *
+ * src/core/painting/qgspaintenginehack.h                               *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
--- a/python/core/auto_generated/painting/qgspainting.sip.in
+++ b/python/core/auto_generated/painting/qgspainting.sip.in
@ -1,7 +1,7 @@
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgspainting.h                                               *
+ * src/core/painting/qgspainting.h                                      *
 *                                                                      *
 * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
 ************************************************************************/
@ -92,7 +92,7 @@ Returns ``True`` if the triangle could be rendered, or ``False`` if it could not
 /************************************************************************
 * This file has been generated automatically from                      *
 *                                                                      *
- * src/core/qgspainting.h                                               *
+ * src/core/painting/qgspainting.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
@ -121,21 +121,17 @@
 %Include auto_generated/qgsmapunitscale.sip
 %Include auto_generated/qgsmargins.sip
 %Include auto_generated/qgsmaskidprovider.sip
-%Include auto_generated/qgsmaskpaintdevice.sip
 %Include auto_generated/qgsmatrix4x4.sip
 %Include auto_generated/qgsmessagelog.sip
 %Include auto_generated/qgsmessageoutput.sip
 %Include auto_generated/qgsmimedatautils.sip
 %Include auto_generated/qgsmultirenderchecker.sip
-%Include auto_generated/qgsnullpainterdevice.sip
 %Include auto_generated/qgsobjectcustomproperties.sip
 %Include auto_generated/qgsofflineediting.sip
 %Include auto_generated/qgsogcutils.sip
 %Include auto_generated/qgsoptional.sip
 %Include auto_generated/qgsoptionalexpression.sip
 %Include auto_generated/qgsowsconnection.sip
-%Include auto_generated/qgspaintenginehack.sip
-%Include auto_generated/qgspainting.sip
 %Include auto_generated/qgspathresolver.sip
 %Include auto_generated/qgspluginlayer.sip
 %Include auto_generated/qgspluginlayerregistry.sip
@ -488,6 +484,10 @@
 %Include auto_generated/mesh/qgsmeshadvancedediting.sip
 %Include auto_generated/mesh/qgsmeshforcebypolylines.sip
 %Include auto_generated/mesh/qgsmeshlayerlabeling.sip
+%Include auto_generated/painting/qgsmaskpaintdevice.sip
+%Include auto_generated/painting/qgsnullpainterdevice.sip
+%Include auto_generated/painting/qgspaintenginehack.sip
+%Include auto_generated/painting/qgspainting.sip
 %Include auto_generated/pdf/qgspdfrenderer.sip
 %Include auto_generated/plot/qgsplot.sip
 %Include auto_generated/pointcloud/qgspointcloudattribute.sip
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -253,6 +253,11 @@ set(QGIS_CORE_SRCS
  network/qgshttpheaders.cpp
  network/qgsrangerequestcache.cpp

+  painting/qgsmaskpaintdevice.cpp
+  painting/qgsnullpainterdevice.cpp
+  painting/qgspaintenginehack.cpp
+  painting/qgspainting.cpp
+
  pdf/qgspdfrenderer.cpp

  processing/qgsprocessing.cpp
@ -505,12 +510,10 @@ set(QGIS_CORE_SRCS
  qgsmaskidprovider.cpp
  qgsmatrix4x4.cpp
  qgsmbtiles.cpp
-  qgsmaskpaintdevice.cpp
  qgsmessagelog.cpp
  qgsmessageoutput.cpp
  qgsmimedatautils.cpp
  qgsmultirenderchecker.cpp
-  qgsnullpainterdevice.cpp
  qgsobjectcustomproperties.cpp
  qgsofflineediting.cpp
  qgsogcutils.cpp
@ -518,8 +521,6 @@ set(QGIS_CORE_SRCS
  qgsogrutils.cpp
  qgsoptionalexpression.cpp
  qgsowsconnection.cpp
-  qgspaintenginehack.cpp
-  qgspainting.cpp
  qgspathresolver.cpp
  qgspluginlayer.cpp
  qgspluginlayerregistry.cpp
@ -1202,14 +1203,12 @@ set(QGIS_CORE_HDRS
  qgsmapunitscale.h
  qgsmargins.h
  qgsmaskidprovider.h
-  qgsmaskpaintdevice.h
  qgsmatrix4x4.h
  qgsmbtiles.h
  qgsmessagelog.h
  qgsmessageoutput.h
  qgsmimedatautils.h
  qgsmultirenderchecker.h
-  qgsnullpainterdevice.h
  qgsobjectcustomproperties.h
  qgsofflineediting.h
  qgsogcutils.h
@ -1218,8 +1217,6 @@ set(QGIS_CORE_HDRS
  qgsoptional.h
  qgsoptionalexpression.h
  qgsowsconnection.h
-  qgspaintenginehack.h
-  qgspainting.h
  qgspathresolver.h
  qgspluginlayer.h
  qgspluginlayerregistry.h
@ -1646,6 +1643,11 @@ set(QGIS_CORE_HDRS
  mesh/qgsmeshlayerlabeling.h
  mesh/qgsmeshlayerlabelprovider.h

+  painting/qgsmaskpaintdevice.h
+  painting/qgsnullpainterdevice.h
+  painting/qgspaintenginehack.h
+  painting/qgspainting.h
+
  pal/costcalculator.h
  pal/feature.h
  pal/geomfunction.h
@ -2332,6 +2334,7 @@ target_include_directories(qgis_core PUBLIC
  metadata
  network
  numericformats
+  painting
  pal
  pdf
  plot
--- a/src/core/painting/qgsmaskpaintdevice.cpp
+++ b/src/core/painting/qgsmaskpaintdevice.cpp
--- a/src/core/painting/qgsmaskpaintdevice.h
+++ b/src/core/painting/qgsmaskpaintdevice.h
--- a/src/core/painting/qgsnullpainterdevice.cpp
+++ b/src/core/painting/qgsnullpainterdevice.cpp
--- a/src/core/painting/qgsnullpainterdevice.h
+++ b/src/core/painting/qgsnullpainterdevice.h
--- a/src/core/painting/qgspaintenginehack.cpp
+++ b/src/core/painting/qgspaintenginehack.cpp
--- a/src/core/painting/qgspaintenginehack.h
+++ b/src/core/painting/qgspaintenginehack.h
--- a/src/core/painting/qgspainting.cpp
+++ b/src/core/painting/qgspainting.cpp
--- a/src/core/painting/qgspainting.h
+++ b/src/core/painting/qgspainting.h