Skip to content

Commit e4b201a

Browse files
nyalldawsonnyalldawson
committedMay 12, 2020
Code shuffle
·
ltr-3_40final-3_14_0
1 parent 7fc9c55 commit e4b201a

File tree

8 files changed

+14
-8
lines changed

8 files changed

+14
-8
lines changed
 

‎doc/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ IF(WITH_APIDOC)
9898
${CMAKE_SOURCE_DIR}/src/core/raster
9999
${CMAKE_SOURCE_DIR}/src/core/scalebar
100100
${CMAKE_SOURCE_DIR}/src/core/symbology
101+
${CMAKE_SOURCE_DIR}/src/core/textrenderer
101102
${CMAKE_SOURCE_DIR}/src/core/validity
102103
${CMAKE_SOURCE_DIR}/src/core/vectortile
103104
${CMAKE_SOURCE_DIR}/src/gui

‎python/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ INCLUDE_DIRECTORIES(
9797
${CMAKE_SOURCE_DIR}/src/core/annotations
9898
${CMAKE_SOURCE_DIR}/src/core/auth
9999
${CMAKE_SOURCE_DIR}/src/core/callouts
100+
${CMAKE_SOURCE_DIR}/src/core/classification
100101
${CMAKE_SOURCE_DIR}/src/core/expression
101102
${CMAKE_SOURCE_DIR}/src/core/pal
102103
${CMAKE_SOURCE_DIR}/src/core/diagram
@@ -121,7 +122,7 @@ INCLUDE_DIRECTORIES(
121122
${CMAKE_SOURCE_DIR}/src/core/raster
122123
${CMAKE_SOURCE_DIR}/src/core/scalebar
123124
${CMAKE_SOURCE_DIR}/src/core/symbology
124-
${CMAKE_SOURCE_DIR}/src/core/classification
125+
${CMAKE_SOURCE_DIR}/src/core/textrenderer
125126
${CMAKE_SOURCE_DIR}/src/core/validity
126127
${CMAKE_SOURCE_DIR}/src/core/vectortile
127128
${CMAKE_SOURCE_DIR}/src/plugins

‎python/core/auto_generated/qgstextrenderer.sip.in renamed to ‎python/core/auto_generated/textrenderer/qgstextrenderer.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/************************************************************************
22
* This file has been generated automatically from *
33
* *
4-
* src/core/qgstextrenderer.h *
4+
* src/core/textrenderer/qgstextrenderer.h *
55
* *
66
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
77
************************************************************************/
@@ -2130,7 +2130,7 @@ Attempts to decode a string representation of a text orientation.
21302130
/************************************************************************
21312131
* This file has been generated automatically from *
21322132
* *
2133-
* src/core/qgstextrenderer.h *
2133+
* src/core/textrenderer/qgstextrenderer.h *
21342134
* *
21352135
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
21362136
************************************************************************/

‎python/core/core_auto.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@
209209
%Include auto_generated/qgstemporalutils.sip
210210
%Include auto_generated/qgstessellator.sip
211211
%Include auto_generated/qgstestutils.sip
212-
%Include auto_generated/qgstextrenderer.sip
213212
%Include auto_generated/qgstiles.sip
214213
%Include auto_generated/qgstolerance.sip
215214
%Include auto_generated/qgstracer.sip
@@ -546,6 +545,7 @@
546545
%Include auto_generated/symbology/qgssymbollayerregistry.sip
547546
%Include auto_generated/symbology/qgssymbollayerutils.sip
548547
%Include auto_generated/symbology/qgsvectorfieldsymbollayer.sip
548+
%Include auto_generated/textrenderer/qgstextrenderer.sip
549549
%Include auto_generated/validity/qgsabstractvaliditycheck.sip
550550
%Include auto_generated/validity/qgsvaliditycheckcontext.sip
551551
%Include auto_generated/validity/qgsvaliditycheckregistry.sip

‎src/core/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ SET(QGIS_CORE_SRCS
195195
scalebar/qgssteppedlinescalebarrenderer.cpp
196196
scalebar/qgsticksscalebarrenderer.cpp
197197

198+
textrenderer/qgstextrenderer.cpp
199+
198200
qgis.cpp
199201
qgsabstractcontentcache.cpp
200202
qgsabstractgeopdfexporter.cpp
@@ -404,7 +406,6 @@ SET(QGIS_CORE_SRCS
404406
qgstemporalrangeobject.cpp
405407
qgstemporalutils.cpp
406408
qgstessellator.cpp
407-
qgstextrenderer.cpp
408409
qgstilecache.cpp
409410
qgstiles.cpp
410411
qgstolerance.cpp
@@ -964,7 +965,6 @@ SET(QGIS_CORE_HDRS
964965
qgstemporalutils.h
965966
qgstessellator.h
966967
qgstestutils.h
967-
qgstextrenderer.h
968968
qgsthreadingutils.h
969969
qgstilecache.h
970970
qgstiles.h
@@ -1374,6 +1374,8 @@ SET(QGIS_CORE_HDRS
13741374
symbology/qgssymbollayerutils.h
13751375
symbology/qgsvectorfieldsymbollayer.h
13761376

1377+
textrenderer/qgstextrenderer.h
1378+
13771379
validity/qgsabstractvaliditycheck.h
13781380
validity/qgsvaliditycheckcontext.h
13791381
validity/qgsvaliditycheckregistry.h
@@ -1406,7 +1408,8 @@ SET(QGIS_CORE_PRIVATE_HDRS
14061408
qgsproperty_p.h
14071409
qgsrelation_p.h
14081410
qgsspatialindexkdbush_p.h
1409-
qgstextrenderer_p.h
1411+
1412+
textrenderer/qgstextrenderer_p.h
14101413
)
14111414

14121415
IF (NOT WITH_QTWEBKIT)
@@ -1477,6 +1480,7 @@ INCLUDE_DIRECTORIES(
14771480
layertree
14781481
layout
14791482
locator
1483+
mesh
14801484
metadata
14811485
numericformats
14821486
pal
@@ -1491,7 +1495,7 @@ INCLUDE_DIRECTORIES(
14911495
renderer
14921496
scalebar
14931497
symbology
1494-
mesh
1498+
textrenderer
14951499
validity
14961500
vectortile
14971501
${CMAKE_SOURCE_DIR}/external

‎src/core/qgstextrenderer.h renamed to ‎src/core/textrenderer/qgstextrenderer.h

File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.