Move QgsRectangle and QgsBox3d to geometry folder

Since these are both geometry related classes, it's nicer to
keep these all together

Author: nyalldawson

python/core/core.sip

@@ -25,7 +25,6 @@
 %Include qgsattributetableconfig.sip
 %Include qgsattributeeditorelement.sip
 %Include qgsbearingutils.sip
-%Include qgsbox3d.sip
 %Include qgsbrowsermodel.sip
 %Include qgsclipper.sip
 %Include qgscolorramp.sip
@@ -127,7 +126,6 @@
 %Include qgsprovidermetadata.sip
 %Include qgsproviderregistry.sip
 %Include qgspythonrunner.sip
-%Include qgsrectangle.sip
 %Include qgsrelation.sip
 %Include qgsrelationmanager.sip
 %Include qgsrenderchecker.sip
@@ -358,6 +356,7 @@
 %Include dxf/qgsdxfexport.sip
 
 %Include geometry/qgsabstractgeometry.sip
+%Include geometry/qgsbox3d.sip
 %Include geometry/qgscircularstring.sip
 %Include geometry/qgscompoundcurve.sip
 %Include geometry/qgscurvepolygon.sip
@@ -374,6 +373,7 @@
 %Include geometry/qgsmultisurface.sip
 %Include geometry/qgspointv2.sip
 %Include geometry/qgspolygon.sip
+%Include geometry/qgsrectangle.sip
 %Include geometry/qgssurface.sip
 %Include geometry/qgstriangle.sip
 %Include geometry/qgswkbtypes.sip

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

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsbox3d.h                                                  *
+ * src/core/geometry/qgsbox3d.h                                         *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -200,7 +200,7 @@ class QgsBox3d
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsbox3d.h                                                  *
+ * src/core/geometry/qgsbox3d.h                                         *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/

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

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsrectangle.h                                              *
+ * src/core/geometry/qgsrectangle.h                                     *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -304,7 +304,7 @@ Copy constructor
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsrectangle.h                                              *
+ * src/core/geometry/qgsrectangle.h                                     *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/

src/core/CMakeLists.txt

@@ -101,7 +101,6 @@ SET(QGIS_CORE_SRCS
   qgsattributetableconfig.cpp
   qgsattributeeditorelement.cpp
   qgsbearingutils.cpp
-  qgsbox3d.cpp
   qgsbrowsermodel.cpp
   qgscachedfeatureiterator.cpp
   qgscacheindex.cpp
@@ -210,7 +209,6 @@ SET(QGIS_CORE_SRCS
   qgsprovidermetadata.cpp
   qgsproviderregistry.cpp
   qgspythonrunner.cpp
-  qgsrectangle.cpp
   qgsrelation.cpp
   qgsrelationmanager.cpp
   qgsrenderchecker.cpp
@@ -369,6 +367,7 @@ SET(QGIS_CORE_SRCS
   raster/qgshillshaderenderer.cpp
 
   geometry/qgsabstractgeometry.cpp
+  geometry/qgsbox3d.cpp
   geometry/qgscircularstring.cpp
   geometry/qgscompoundcurve.cpp
   geometry/qgscurvepolygon.cpp
@@ -389,6 +388,7 @@ SET(QGIS_CORE_SRCS
   geometry/qgsmultisurface.cpp
   geometry/qgspointv2.cpp
   geometry/qgspolygon.cpp
+  geometry/qgsrectangle.cpp
   geometry/qgstriangle.cpp
   geometry/qgswkbptr.cpp
   geometry/qgswkbtypes.cpp
@@ -674,7 +674,6 @@ SET(QGIS_CORE_HDRS
   qgsattributetableconfig.h
   qgsattributeeditorelement.h
   qgsbearingutils.h
-  qgsbox3d.h
   qgscachedfeatureiterator.h
   qgscacheindex.h
   qgscacheindexfeatureid.h
@@ -762,7 +761,6 @@ SET(QGIS_CORE_HDRS
   qgsprovidermetadata.h
   qgsproviderregistry.h
   qgspythonrunner.h
-  qgsrectangle.h
   qgsrenderchecker.h
   qgsrendercontext.h
   qgsruntimeprofiler.h
@@ -914,6 +912,7 @@ SET(QGIS_CORE_HDRS
   layertree/qgslayertreeutils.h
 
   geometry/qgsabstractgeometry.h
+  geometry/qgsbox3d.h
   geometry/qgscircularstring.h
   geometry/qgscompoundcurve.h
   geometry/qgscurvepolygon.h
@@ -934,6 +933,7 @@ SET(QGIS_CORE_HDRS
   geometry/qgsmultisurface.h
   geometry/qgspointv2.h
   geometry/qgspolygon.h
+  geometry/qgsrectangle.h
   geometry/qgstriangle.h
   geometry/qgssurface.h
   geometry/qgswkbptr.h