Skip to content

Commit 37f180c

Browse files
authored
Merge pull request #6365 from 3nids/geom_gadget
make QgsGeometry a Q_GADGET
2 parents a8a449f + 91e98ef commit 37f180c

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

python/core/core_auto.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@
269269
%Include geometry/qgsellipse.sip
270270
%Include geometry/qgsgeometrycollection.sip
271271
%Include geometry/qgsgeometryengine.sip
272-
%Include geometry/qgsgeometry.sip
273272
%Include geometry/qgsgeometryutils.sip
274273
%Include geometry/qgslinestring.sip
275274
%Include geometry/qgsmulticurve.sip
@@ -372,6 +371,7 @@
372371
%Include raster/qgsrasterdataprovider.sip
373372
%Include raster/qgsrasterinterface.sip
374373
%Include geometry/qgspoint.sip
374+
%Include geometry/qgsgeometry.sip
375375
%Include geocms/geonode/qgsgeonoderequest.sip
376376
%Include gps/qgsgpsconnection.sip
377377
%Include gps/qgsgpsdetector.sip

src/core/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,7 @@ SET(QGIS_CORE_MOC_HDRS
669669
raster/qgsrasterlayerrenderer.h
670670

671671
geometry/qgspoint.h
672+
geometry/qgsgeometry.h
672673

673674
geocms/geonode/qgsgeonoderequest.h
674675

@@ -1090,7 +1091,6 @@ SET(QGIS_CORE_HDRS
10901091
geometry/qgsgeometryeditutils.h
10911092
geometry/qgsgeometryengine.h
10921093
geometry/qgsgeometryfactory.h
1093-
geometry/qgsgeometry.h
10941094
geometry/qgsgeometryutils.h
10951095
geometry/qgsgeos.h
10961096
geometry/qgsinternalgeometryengine.h

src/core/geometry/qgsgeometry.h

+4
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ struct QgsGeometryPrivate;
110110

111111
class CORE_EXPORT QgsGeometry
112112
{
113+
Q_GADGET
113114
public:
114115

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

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

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

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

0 commit comments

Comments
 (0)