From e3c476af218212c25e082dca29c13eaeb34fc1b6 Mon Sep 17 00:00:00 2001
From: Markus Lampert <markus@bibi.ca>
Date: Tue, 29 Sep 2020 12:54:57 -0700
Subject: [PATCH] Unified voronoi indices for python to be of type long

---
 src/Mod/Path/App/VoronoiCellPy.xml      |  6 +++---
 src/Mod/Path/App/VoronoiCellPyImp.cpp   | 10 +++++-----
 src/Mod/Path/App/VoronoiEdgePy.xml      |  4 ++--
 src/Mod/Path/App/VoronoiEdgePyImp.cpp   |  6 +++---
 src/Mod/Path/App/VoronoiVertexPy.xml    |  4 ++--
 src/Mod/Path/App/VoronoiVertexPyImp.cpp |  6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Mod/Path/App/VoronoiCellPy.xml b/src/Mod/Path/App/VoronoiCellPy.xml
index ffc4b57a2b78..6bce1f0b0c34 100644
--- a/src/Mod/Path/App/VoronoiCellPy.xml
+++ b/src/Mod/Path/App/VoronoiCellPy.xml
@@ -20,19 +20,19 @@
             <Documentation>
                 <UserDocu>Internal id of the element.</UserDocu>
             </Documentation>
-            <Parameter Name="Index" Type="Int"/>
+            <Parameter Name="Index" Type="Long"/>
         </Attribute>
         <Attribute Name="Color" ReadOnly="false">
             <Documentation>
                 <UserDocu>Assigned color of the receiver.</UserDocu>
             </Documentation>
-            <Parameter Name="Color" Type="Int"/>
+            <Parameter Name="Color" Type="Long"/>
         </Attribute>
         <Attribute Name="SourceIndex" ReadOnly="true">
             <Documentation>
                 <UserDocu>Returns the index of the cell's source</UserDocu>
             </Documentation>
-            <Parameter Name="SourceIndex" Type="Int"/>
+            <Parameter Name="SourceIndex" Type="Long"/>
         </Attribute>
         <Attribute Name="SourceCategory" ReadOnly="true">
             <Documentation>
diff --git a/src/Mod/Path/App/VoronoiCellPyImp.cpp b/src/Mod/Path/App/VoronoiCellPyImp.cpp
index 95c832886652..bf4e998affeb 100644
--- a/src/Mod/Path/App/VoronoiCellPyImp.cpp
+++ b/src/Mod/Path/App/VoronoiCellPyImp.cpp
@@ -111,12 +111,12 @@ VoronoiCell* getVoronoiCellFromPy(const VoronoiCellPy *c, PyObject *args = 0) {
   return self;
 }
 
-Py::Int VoronoiCellPy::getIndex(void) const {
+Py::Long VoronoiCellPy::getIndex(void) const {
   VoronoiCell *c = getVoronoiCellPtr();
   if (c->isBound()) {
-    return Py::Int(c->dia->index(c->ptr));
+    return Py::Long(c->dia->index(c->ptr));
   }
-  return Py::Int(-1);
+  return Py::Long(-1);
 }
 
 Py::Long VoronoiCellPy::getColor(void) const {
@@ -131,10 +131,10 @@ void VoronoiCellPy::setColor(Py::Long color) {
   getCellFromPy(this)->color(int(color) & Voronoi::ColorMask);
 }
 
-Py::Int VoronoiCellPy::getSourceIndex(void) const
+Py::Long VoronoiCellPy::getSourceIndex(void) const
 {
   VoronoiCell *c = getVoronoiCellFromPy(this);
-  return Py::Int(c->ptr->source_index());
+  return Py::Long(c->ptr->source_index());
 }
 
 Py::Int VoronoiCellPy::getSourceCategory(void) const
diff --git a/src/Mod/Path/App/VoronoiEdgePy.xml b/src/Mod/Path/App/VoronoiEdgePy.xml
index daf107b7a28c..08324ff2ff29 100644
--- a/src/Mod/Path/App/VoronoiEdgePy.xml
+++ b/src/Mod/Path/App/VoronoiEdgePy.xml
@@ -20,13 +20,13 @@
             <Documentation>
                 <UserDocu>Internal id of the element.</UserDocu>
             </Documentation>
-            <Parameter Name="Index" Type="Int"/>
+            <Parameter Name="Index" Type="Long"/>
         </Attribute>
         <Attribute Name="Color" ReadOnly="false">
             <Documentation>
                 <UserDocu>Assigned color of the receiver.</UserDocu>
             </Documentation>
-            <Parameter Name="Color" Type="Int"/>
+            <Parameter Name="Color" Type="Long"/>
         </Attribute>
         <Attribute Name="Cell" ReadOnly="true">
             <Documentation>
diff --git a/src/Mod/Path/App/VoronoiEdgePyImp.cpp b/src/Mod/Path/App/VoronoiEdgePyImp.cpp
index 7ca2f8525122..91a3d5026887 100644
--- a/src/Mod/Path/App/VoronoiEdgePyImp.cpp
+++ b/src/Mod/Path/App/VoronoiEdgePyImp.cpp
@@ -130,12 +130,12 @@ VoronoiEdge* getVoronoiEdgeFromPy(const VoronoiEdgePy *e, PyObject *args = 0) {
   return self;
 }
 
-Py::Int VoronoiEdgePy::getIndex(void) const {
+Py::Long VoronoiEdgePy::getIndex(void) const {
   VoronoiEdge *e = getVoronoiEdgePtr();
   if (e->isBound()) {
-    return Py::Int(e->dia->index(e->ptr));
+    return Py::Long(e->dia->index(e->ptr));
   }
-  return Py::Int(-1);
+  return Py::Long(-1);
 }
 
 Py::Long VoronoiEdgePy::getColor(void) const {
diff --git a/src/Mod/Path/App/VoronoiVertexPy.xml b/src/Mod/Path/App/VoronoiVertexPy.xml
index ef5eca069f73..7cdd517b8b97 100644
--- a/src/Mod/Path/App/VoronoiVertexPy.xml
+++ b/src/Mod/Path/App/VoronoiVertexPy.xml
@@ -20,13 +20,13 @@
             <Documentation>
                 <UserDocu>Internal id of the element.</UserDocu>
             </Documentation>
-            <Parameter Name="Index" Type="Int"/>
+            <Parameter Name="Index" Type="Long"/>
         </Attribute>
         <Attribute Name="Color" ReadOnly="false">
             <Documentation>
                 <UserDocu>Assigned color of the receiver.</UserDocu>
             </Documentation>
-            <Parameter Name="Color" Type="Int"/>
+            <Parameter Name="Color" Type="Long"/>
         </Attribute>
         <Attribute Name="X" ReadOnly="true">
             <Documentation>
diff --git a/src/Mod/Path/App/VoronoiVertexPyImp.cpp b/src/Mod/Path/App/VoronoiVertexPyImp.cpp
index beef937908d5..c03fa30b55d4 100644
--- a/src/Mod/Path/App/VoronoiVertexPyImp.cpp
+++ b/src/Mod/Path/App/VoronoiVertexPyImp.cpp
@@ -113,12 +113,12 @@ VoronoiVertex* getVoronoiVertexFromPy(const VoronoiVertexPy *v, PyObject *args =
 }
 
 
-Py::Int VoronoiVertexPy::getIndex(void) const {
+Py::Long VoronoiVertexPy::getIndex(void) const {
   VoronoiVertex *v = getVoronoiVertexPtr();
   if (v->isBound()) {
-    return Py::Int(v->dia->index(v->ptr));
+    return Py::Long(v->dia->index(v->ptr));
   }
-  return Py::Int(-1);
+  return Py::Long(-1);
 }
 
 Py::Long VoronoiVertexPy::getColor(void) const {