Skip to content

Commit 226bd9b

Browse files
nyalldawsonnyalldawson
committedApr 12, 2017
Move QgsRectangle and QgsBox3d to geometry folder
Since these are both geometry related classes, it's nicer to keep these all together
·
ltr-3_40final-3_0_0
1 parent 36ca6d2 commit 226bd9b

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed
 

‎python/core/core.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
%Include qgsattributetableconfig.sip
2626
%Include qgsattributeeditorelement.sip
2727
%Include qgsbearingutils.sip
28-
%Include qgsbox3d.sip
2928
%Include qgsbrowsermodel.sip
3029
%Include qgsclipper.sip
3130
%Include qgscolorramp.sip
@@ -127,7 +126,6 @@
127126
%Include qgsprovidermetadata.sip
128127
%Include qgsproviderregistry.sip
129128
%Include qgspythonrunner.sip
130-
%Include qgsrectangle.sip
131129
%Include qgsrelation.sip
132130
%Include qgsrelationmanager.sip
133131
%Include qgsrenderchecker.sip
@@ -358,6 +356,7 @@
358356
%Include dxf/qgsdxfexport.sip
359357

360358
%Include geometry/qgsabstractgeometry.sip
359+
%Include geometry/qgsbox3d.sip
361360
%Include geometry/qgscircularstring.sip
362361
%Include geometry/qgscompoundcurve.sip
363362
%Include geometry/qgscurvepolygon.sip
@@ -374,6 +373,7 @@
374373
%Include geometry/qgsmultisurface.sip
375374
%Include geometry/qgspointv2.sip
376375
%Include geometry/qgspolygon.sip
376+
%Include geometry/qgsrectangle.sip
377377
%Include geometry/qgssurface.sip
378378
%Include geometry/qgstriangle.sip
379379
%Include geometry/qgswkbtypes.sip

‎python/core/qgsbox3d.sip renamed to ‎python/core/geometry/qgsbox3d.sip

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/qgsbox3d.h *
4+
* src/core/geometry/qgsbox3d.h *
55
* *
66
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
77
************************************************************************/
@@ -200,7 +200,7 @@ class QgsBox3d
200200
/************************************************************************
201201
* This file has been generated automatically from *
202202
* *
203-
* src/core/qgsbox3d.h *
203+
* src/core/geometry/qgsbox3d.h *
204204
* *
205205
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
206206
************************************************************************/

‎python/core/qgsrectangle.sip renamed to ‎python/core/geometry/qgsrectangle.sip

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/qgsrectangle.h *
4+
* src/core/geometry/qgsrectangle.h *
55
* *
66
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
77
************************************************************************/
@@ -304,7 +304,7 @@ Copy constructor
304304
/************************************************************************
305305
* This file has been generated automatically from *
306306
* *
307-
* src/core/qgsrectangle.h *
307+
* src/core/geometry/qgsrectangle.h *
308308
* *
309309
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
310310
************************************************************************/

‎src/core/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ SET(QGIS_CORE_SRCS
101101
qgsattributetableconfig.cpp
102102
qgsattributeeditorelement.cpp
103103
qgsbearingutils.cpp
104-
qgsbox3d.cpp
105104
qgsbrowsermodel.cpp
106105
qgscachedfeatureiterator.cpp
107106
qgscacheindex.cpp
@@ -210,7 +209,6 @@ SET(QGIS_CORE_SRCS
210209
qgsprovidermetadata.cpp
211210
qgsproviderregistry.cpp
212211
qgspythonrunner.cpp
213-
qgsrectangle.cpp
214212
qgsrelation.cpp
215213
qgsrelationmanager.cpp
216214
qgsrenderchecker.cpp
@@ -369,6 +367,7 @@ SET(QGIS_CORE_SRCS
369367
raster/qgshillshaderenderer.cpp
370368

371369
geometry/qgsabstractgeometry.cpp
370+
geometry/qgsbox3d.cpp
372371
geometry/qgscircularstring.cpp
373372
geometry/qgscompoundcurve.cpp
374373
geometry/qgscurvepolygon.cpp
@@ -389,6 +388,7 @@ SET(QGIS_CORE_SRCS
389388
geometry/qgsmultisurface.cpp
390389
geometry/qgspointv2.cpp
391390
geometry/qgspolygon.cpp
391+
geometry/qgsrectangle.cpp
392392
geometry/qgstriangle.cpp
393393
geometry/qgswkbptr.cpp
394394
geometry/qgswkbtypes.cpp
@@ -674,7 +674,6 @@ SET(QGIS_CORE_HDRS
674674
qgsattributetableconfig.h
675675
qgsattributeeditorelement.h
676676
qgsbearingutils.h
677-
qgsbox3d.h
678677
qgscachedfeatureiterator.h
679678
qgscacheindex.h
680679
qgscacheindexfeatureid.h
@@ -762,7 +761,6 @@ SET(QGIS_CORE_HDRS
762761
qgsprovidermetadata.h
763762
qgsproviderregistry.h
764763
qgspythonrunner.h
765-
qgsrectangle.h
766764
qgsrenderchecker.h
767765
qgsrendercontext.h
768766
qgsruntimeprofiler.h
@@ -914,6 +912,7 @@ SET(QGIS_CORE_HDRS
914912
layertree/qgslayertreeutils.h
915913

916914
geometry/qgsabstractgeometry.h
915+
geometry/qgsbox3d.h
917916
geometry/qgscircularstring.h
918917
geometry/qgscompoundcurve.h
919918
geometry/qgscurvepolygon.h
@@ -934,6 +933,7 @@ SET(QGIS_CORE_HDRS
934933
geometry/qgsmultisurface.h
935934
geometry/qgspointv2.h
936935
geometry/qgspolygon.h
936+
geometry/qgsrectangle.h
937937
geometry/qgstriangle.h
938938
geometry/qgssurface.h
939939
geometry/qgswkbptr.h

‎src/core/qgsbox3d.cpp renamed to ‎src/core/geometry/qgsbox3d.cpp

File renamed without changes.

‎src/core/qgsbox3d.h renamed to ‎src/core/geometry/qgsbox3d.h

File renamed without changes.

‎src/core/qgsrectangle.cpp renamed to ‎src/core/geometry/qgsrectangle.cpp

File renamed without changes.

‎src/core/qgsrectangle.h renamed to ‎src/core/geometry/qgsrectangle.h

File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.