Unify naming of functions

Aksem · Mar 11, 2024 · b771997 · b771997
1 parent 3f304bb
commit b771997
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cola/libavoid/obstacle.cpp b/cola/libavoid/obstacle.cpp
@@ -352,7 +352,7 @@ ConnRefList Obstacle::attachedConnectors(void) const
     return attachedConns;
 }
 
-unsigned int Obstacle::getUniqueId(void) const
+unsigned int Obstacle::uniqueId(void) const
 {
     return m_unique_id;
 }

diff --git a/cola/libavoid/obstacle.h b/cola/libavoid/obstacle.h
@@ -91,7 +91,7 @@ class Obstacle
         //! @brief   Returns the position of this obstacle.
         //! @returns A point representing the position of this obstacle.
         virtual Point position(void) const = 0;
-        unsigned int getUniqueId(void) const;
+        unsigned int uniqueId(void) const;
 
         void setNewPoly(const Polygon& poly);
         VertInf *firstVert(void);

diff --git a/cola/libavoid/scanline.cpp b/cola/libavoid/scanline.cpp
@@ -42,7 +42,7 @@ bool CmpNodePos::operator() (const Node* u, const Node* v) const
     }
 
     // use unique ids of base objects to differentiate nodes
-    return u->getUniqueId() < v->getUniqueId();
+    return u->uniqueId() < v->uniqueId();
 }
 
 
@@ -294,9 +294,9 @@ bool Node::isShapeInShape(Node *another)
             && max[1] <= another->max[1]);
 }
 
-unsigned int Node::getUniqueId(void) const
+unsigned int Node::uniqueId(void) const
 {
-    return v ? v->getUniqueId() : (c ? c->uniqueId : ss->uniqueId);
+    return v ? v->uniqueId() : (c ? c->uniqueId : ss->uniqueId);
 }
 
 
@@ -322,7 +322,7 @@ int compare_events(const void *a, const void *b)
         return ea->type - eb->type;
     }
     COLA_ASSERT(ea->v != eb->v);
-    return (ea->v->getUniqueId() - eb->v->getUniqueId());
+    return (ea->v->uniqueId() - eb->v->uniqueId());
 }
 
 

diff --git a/cola/libavoid/scanline.h b/cola/libavoid/scanline.h
@@ -104,7 +104,7 @@ class Node
     double firstPointBelow(size_t dim);
     bool isInsideShape(size_t dimension);
     bool isShapeInShape(Node *another);
-    unsigned int getUniqueId(void) const;
+    unsigned int uniqueId(void) const;
 };