Skip to content
Permalink
Browse files

Merge pull request #6365 from 3nids/geom_gadget

make QgsGeometry a Q_GADGET
  • Loading branch information
3nids committed Feb 17, 2018
2 parents a8a449f + 91e98ef commit 37f180c59ef95029b1ba7470a2401067e18ed6a0
Showing with 6 additions and 2 deletions.
  1. +1 −1 python/core/core_auto.sip
  2. +1 −1 src/core/CMakeLists.txt
  3. +4 −0 src/core/geometry/qgsgeometry.h
@@ -269,7 +269,6 @@
%Include geometry/qgsellipse.sip
%Include geometry/qgsgeometrycollection.sip
%Include geometry/qgsgeometryengine.sip
%Include geometry/qgsgeometry.sip
%Include geometry/qgsgeometryutils.sip
%Include geometry/qgslinestring.sip
%Include geometry/qgsmulticurve.sip
@@ -372,6 +371,7 @@
%Include raster/qgsrasterdataprovider.sip
%Include raster/qgsrasterinterface.sip
%Include geometry/qgspoint.sip
%Include geometry/qgsgeometry.sip
%Include geocms/geonode/qgsgeonoderequest.sip
%Include gps/qgsgpsconnection.sip
%Include gps/qgsgpsdetector.sip
@@ -669,6 +669,7 @@ SET(QGIS_CORE_MOC_HDRS
raster/qgsrasterlayerrenderer.h

geometry/qgspoint.h
geometry/qgsgeometry.h

geocms/geonode/qgsgeonoderequest.h

@@ -1090,7 +1091,6 @@ SET(QGIS_CORE_HDRS
geometry/qgsgeometryeditutils.h
geometry/qgsgeometryengine.h
geometry/qgsgeometryfactory.h
geometry/qgsgeometry.h
geometry/qgsgeometryutils.h
geometry/qgsgeos.h
geometry/qgsinternalgeometryengine.h
@@ -110,6 +110,7 @@ struct QgsGeometryPrivate;

class CORE_EXPORT QgsGeometry
{
Q_GADGET
public:

/**
@@ -848,6 +849,7 @@ class CORE_EXPORT QgsGeometry
SideLeft = 0, //!< Buffer to left of line
SideRight, //!< Buffer to right of line
};
Q_ENUM( BufferSide );

//! End cap styles for buffers
enum EndCapStyle
@@ -856,6 +858,7 @@ class CORE_EXPORT QgsGeometry
CapFlat, //!< Flat cap (in line with start/end of line)
CapSquare, //!< Square cap (extends past start/end of line by buffer distance)
};
Q_ENUM( EndCapStyle );

//! Join styles for buffers
enum JoinStyle
@@ -864,6 +867,7 @@ class CORE_EXPORT QgsGeometry
JoinStyleMiter, //!< Use mitered joins
JoinStyleBevel, //!< Use beveled joins
};
Q_ENUM( JoinStyle );

/**
* Returns a buffer region around this geometry having the given width and with a specified number

0 comments on commit 37f180c

Please sign in to comment.
You can’t perform that action at this time.