Increase QgsGeometry::OperationResult values

m-kuhn · m-kuhn · commit 0df873c505e1 · 2017-08-13T23:08:45.000+02:00
To avoid collisions with old enums and make it easier for plugin devs to
determine if their values have already been ported to QGIS 3.0 or not.
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -104,7 +104,7 @@ class CORE_EXPORT QgsGeometry
     enum OperationResult
     {
       Success = 0, //!< Operation succeeded
-      NothingHappened, //!< Nothing happened, without any error
+      NothingHappened = 1000, //!< Nothing happened, without any error
       InvalidBaseGeometry, //!< The base geometry on which the operation is done is invalid or empty
       InvalidInput, //!< The input geometry (ring, part, split line, etc.) has not the correct geometry type
       GeometryEngineError, //!< Geometry engine misses a method implemented or an error occured in the geometry engine
diff --git a/src/core/geometry/qgsgeometryengine.h b/src/core/geometry/qgsgeometryengine.h
@@ -40,7 +40,7 @@ class CORE_EXPORT QgsGeometryEngine
     enum EngineOperationResult
     {
       Success = 0, //!< Operation succeeded
-      NothingHappened, //!< Nothing happened, without any error
+      NothingHappened = 1000, //!< Nothing happened, without any error
       MethodNotImplemented, //!< Method not implemented in geometry engine
       EngineError, //!< Error occured in the geometry engine
       NodedGeometryError, //!< Error occured while creating a noded geometry

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class CORE_EXPORT QgsGeometry`
`104`	`104`	`enum OperationResult`
`105`	`105`	`{`
`106`	`106`	`Success = 0, //!< Operation succeeded`
`107`		`- NothingHappened, //!< Nothing happened, without any error`
	`107`	`+ NothingHappened = 1000, //!< Nothing happened, without any error`
`108`	`108`	`InvalidBaseGeometry, //!< The base geometry on which the operation is done is invalid or empty`
`109`	`109`	`InvalidInput, //!< The input geometry (ring, part, split line, etc.) has not the correct geometry type`
`110`	`110`	`GeometryEngineError, //!< Geometry engine misses a method implemented or an error occured in the geometry engine`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class CORE_EXPORT QgsGeometryEngine`
`40`	`40`	`enum EngineOperationResult`
`41`	`41`	`{`
`42`	`42`	`Success = 0, //!< Operation succeeded`
`43`		`- NothingHappened, //!< Nothing happened, without any error`
	`43`	`+ NothingHappened = 1000, //!< Nothing happened, without any error`
`44`	`44`	`MethodNotImplemented, //!< Method not implemented in geometry engine`
`45`	`45`	`EngineError, //!< Error occured in the geometry engine`
`46`	`46`	`NodedGeometryError, //!< Error occured while creating a noded geometry`