From cb0f92dbdee27ce08340cfc7fb59ccefd60b8064 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 26 Mar 2024 07:58:11 +0100
Subject: [PATCH] Sketcher: fix typo in function name -> areCollinear

The same function exists in the Draft module but don't fix it there to avoid to possibly break add-ons
---
 src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h     | 2 +-
 src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h  | 4 ++--
 src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h | 2 +-
 src/Mod/Sketcher/Gui/Utils.cpp                  | 6 +++---
 src/Mod/Sketcher/Gui/Utils.h                    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h
index d837cd61cf..20fd271ec8 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h
@@ -146,7 +146,7 @@ private:
                     }
                 }
                 else {
-                    if (areColinear(firstPoint, secondPoint, onSketchPos)) {
+                    if (areCollinear(firstPoint, secondPoint, onSketchPos)) {
                         // If points are collinear then we can't calculate the center.
                         return;
                     }
diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h
index d988aaedcc..b0ca6547ed 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h
@@ -134,7 +134,7 @@ private:
             } break;
             case SelectMode::SeekThird: {
                 try {
-                    if (areColinear(firstPoint, secondPoint, onSketchPos)) {
+                    if (areCollinear(firstPoint, secondPoint, onSketchPos)) {
                         // If points are collinear then we can't calculate the center.
                         return;
                     }
@@ -465,7 +465,7 @@ void DSHCircleControllerBase::doEnforceControlParameters(Base::Vector2d& onSketc
             }
             if (onViewParameters[OnViewParameter::Fifth]->isSet
                 && onViewParameters[OnViewParameter::Sixth]->isSet
-                && areColinear(handler->firstPoint, handler->secondPoint, onSketchPos)) {
+                && areCollinear(handler->firstPoint, handler->secondPoint, onSketchPos)) {
                 unsetOnViewParameter(onViewParameters[OnViewParameter::Fifth].get());
                 unsetOnViewParameter(onViewParameters[OnViewParameter::Sixth].get());
             }
diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h
index 32aa29e6a0..a63cbe2fd6 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h
@@ -559,7 +559,7 @@ void DSHEllipseControllerBase::doEnforceControlParameters(Base::Vector2d& onSket
 
                 if (onViewParameters[OnViewParameter::Fifth]->isSet
                     && onViewParameters[OnViewParameter::Sixth]->isSet
-                    && areColinear(handler->apoapsis, handler->periapsis, onSketchPos)) {
+                    && areCollinear(handler->apoapsis, handler->periapsis, onSketchPos)) {
                     unsetOnViewParameter(onViewParameters[OnViewParameter::Fifth].get());
                     unsetOnViewParameter(onViewParameters[OnViewParameter::Sixth].get());
                 }
diff --git a/src/Mod/Sketcher/Gui/Utils.cpp b/src/Mod/Sketcher/Gui/Utils.cpp
index fb64c72a61..912df46057 100644
--- a/src/Mod/Sketcher/Gui/Utils.cpp
+++ b/src/Mod/Sketcher/Gui/Utils.cpp
@@ -832,9 +832,9 @@ std::string SketcherGui::angleToDisplayFormat(double value, int digits)
 }
 
 
-bool SketcherGui::areColinear(const Base::Vector2d& p1,
-                              const Base::Vector2d& p2,
-                              const Base::Vector2d& p3)
+bool SketcherGui::areCollinear(const Base::Vector2d& p1,
+                               const Base::Vector2d& p2,
+                               const Base::Vector2d& p3)
 {
     Base::Vector2d u = p2 - p1;
     Base::Vector2d v = p3 - p2;
diff --git a/src/Mod/Sketcher/Gui/Utils.h b/src/Mod/Sketcher/Gui/Utils.h
index 6322f096f7..0266857f59 100644
--- a/src/Mod/Sketcher/Gui/Utils.h
+++ b/src/Mod/Sketcher/Gui/Utils.h
@@ -206,7 +206,7 @@ bool useSystemDecimals();
 std::string lengthToDisplayFormat(double value, int digits);
 std::string angleToDisplayFormat(double value, int digits);
 
-bool areColinear(const Base::Vector2d& p1, const Base::Vector2d& p2, const Base::Vector2d& p3);
+bool areCollinear(const Base::Vector2d& p1, const Base::Vector2d& p2, const Base::Vector2d& p3);
 
 int indexOfGeoId(const std::vector<int>& vec, int elem);