Code shuffle

qgis · May 12, 2020 · e4b201a · e4b201a
1 parent 7fc9c55
commit e4b201a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -98,6 +98,7 @@ IF(WITH_APIDOC)
       ${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/vectortile
       ${CMAKE_SOURCE_DIR}/src/gui

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -97,6 +97,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core/annotations
   ${CMAKE_SOURCE_DIR}/src/core/auth
   ${CMAKE_SOURCE_DIR}/src/core/callouts
+  ${CMAKE_SOURCE_DIR}/src/core/classification
   ${CMAKE_SOURCE_DIR}/src/core/expression
   ${CMAKE_SOURCE_DIR}/src/core/pal
   ${CMAKE_SOURCE_DIR}/src/core/diagram
@@ -121,7 +122,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core/raster
   ${CMAKE_SOURCE_DIR}/src/core/scalebar
   ${CMAKE_SOURCE_DIR}/src/core/symbology
-  ${CMAKE_SOURCE_DIR}/src/core/classification
+  ${CMAKE_SOURCE_DIR}/src/core/textrenderer
   ${CMAKE_SOURCE_DIR}/src/core/validity
   ${CMAKE_SOURCE_DIR}/src/core/vectortile
   ${CMAKE_SOURCE_DIR}/src/plugins

diff --git a/...ore/auto_generated/qgstextrenderer.sip.in → ...rated/textrenderer/qgstextrenderer.sip.in b/...ore/auto_generated/qgstextrenderer.sip.in → ...rated/textrenderer/qgstextrenderer.sip.in
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgstextrenderer.h                                           *
+ * src/core/textrenderer/qgstextrenderer.h                              *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -2130,7 +2130,7 @@ Attempts to decode a string representation of a text orientation.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgstextrenderer.h                                           *
+ * src/core/textrenderer/qgstextrenderer.h                              *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -209,7 +209,6 @@
 %Include auto_generated/qgstemporalutils.sip
 %Include auto_generated/qgstessellator.sip
 %Include auto_generated/qgstestutils.sip
-%Include auto_generated/qgstextrenderer.sip
 %Include auto_generated/qgstiles.sip
 %Include auto_generated/qgstolerance.sip
 %Include auto_generated/qgstracer.sip
@@ -546,6 +545,7 @@
 %Include auto_generated/symbology/qgssymbollayerregistry.sip
 %Include auto_generated/symbology/qgssymbollayerutils.sip
 %Include auto_generated/symbology/qgsvectorfieldsymbollayer.sip
+%Include auto_generated/textrenderer/qgstextrenderer.sip
 %Include auto_generated/validity/qgsabstractvaliditycheck.sip
 %Include auto_generated/validity/qgsvaliditycheckcontext.sip
 %Include auto_generated/validity/qgsvaliditycheckregistry.sip

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -195,6 +195,8 @@ SET(QGIS_CORE_SRCS
   scalebar/qgssteppedlinescalebarrenderer.cpp
   scalebar/qgsticksscalebarrenderer.cpp
 
+  textrenderer/qgstextrenderer.cpp
+
   qgis.cpp
   qgsabstractcontentcache.cpp
   qgsabstractgeopdfexporter.cpp
@@ -404,7 +406,6 @@ SET(QGIS_CORE_SRCS
   qgstemporalrangeobject.cpp
   qgstemporalutils.cpp
   qgstessellator.cpp
-  qgstextrenderer.cpp
   qgstilecache.cpp
   qgstiles.cpp
   qgstolerance.cpp
@@ -964,7 +965,6 @@ SET(QGIS_CORE_HDRS
   qgstemporalutils.h
   qgstessellator.h
   qgstestutils.h
-  qgstextrenderer.h
   qgsthreadingutils.h
   qgstilecache.h
   qgstiles.h
@@ -1374,6 +1374,8 @@ SET(QGIS_CORE_HDRS
   symbology/qgssymbollayerutils.h
   symbology/qgsvectorfieldsymbollayer.h
 
+  textrenderer/qgstextrenderer.h
+
   validity/qgsabstractvaliditycheck.h
   validity/qgsvaliditycheckcontext.h
   validity/qgsvaliditycheckregistry.h
@@ -1406,7 +1408,8 @@ SET(QGIS_CORE_PRIVATE_HDRS
   qgsproperty_p.h
   qgsrelation_p.h
   qgsspatialindexkdbush_p.h
-  qgstextrenderer_p.h
+
+  textrenderer/qgstextrenderer_p.h
 )
 
 IF (NOT WITH_QTWEBKIT)
@@ -1477,6 +1480,7 @@ INCLUDE_DIRECTORIES(
   layertree
   layout
   locator
+  mesh
   metadata
   numericformats
   pal
@@ -1491,7 +1495,7 @@ INCLUDE_DIRECTORIES(
   renderer
   scalebar
   symbology
-  mesh
+  textrenderer
   validity
   vectortile
   ${CMAKE_SOURCE_DIR}/external

diff --git a/src/core/qgstextrenderer.cpp → src/core/textrenderer/qgstextrenderer.cpp b/src/core/qgstextrenderer.cpp → src/core/textrenderer/qgstextrenderer.cpp
diff --git a/src/core/qgstextrenderer.h → src/core/textrenderer/qgstextrenderer.h b/src/core/qgstextrenderer.h → src/core/textrenderer/qgstextrenderer.h
diff --git a/src/core/qgstextrenderer_p.h → src/core/textrenderer/qgstextrenderer_p.h b/src/core/qgstextrenderer_p.h → src/core/textrenderer/qgstextrenderer_p.h