make QgsTolerance a Q_GADGET

to use Q_ENUM
qgis · Feb 17, 2018 · f112350 · f112350
1 parent 2f385da
commit f112350
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -115,7 +115,6 @@
 %Include qgsstringstatisticalsummary.sip
 %Include qgsstringutils.sip
 %Include qgstextrenderer.sip
-%Include qgstolerance.sip
 %Include qgstracer.sip
 %Include qgsvectordataprovider.sip
 %Include qgsvectorlayercache.sip
@@ -342,6 +341,7 @@
 %Include qgsrunprocess.sip
 %Include qgssnappingconfig.sip
 %Include qgstaskmanager.sip
+%Include qgstolerance.sip
 %Include qgstrackedvectorlayertools.sip
 %Include qgstransaction.sip
 %Include qgstransactiongroup.sip

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -622,6 +622,7 @@ SET(QGIS_CORE_MOC_HDRS
   qgssnappingconfig.h
   qgssnappingutils.h
   qgstaskmanager.h
+  qgstolerance.h
   qgstracer.h
   qgstrackedvectorlayertools.h
   qgstransaction.h
@@ -907,7 +908,6 @@ SET(QGIS_CORE_HDRS
   qgstextlabelfeature.h
   qgstextrenderer.h
   qgstextrenderer_p.h
-  qgstolerance.h
   qgstracer.h
 
   qgsvectordataprovider.h

diff --git a/src/core/qgstolerance.h b/src/core/qgstolerance.h
@@ -29,7 +29,7 @@ class QgsPointXY;
  */
 class CORE_EXPORT QgsTolerance
 {
-
+    Q_GADGET
   public:
 
     /**
@@ -44,6 +44,7 @@ class CORE_EXPORT QgsTolerance
       //! Map (project) units. Added in 2.8
       ProjectUnits
     };
+    Q_ENUM( UnitType );
 
     /**
      * Static function to get vertex tolerance value.