From fd6c6545610c024545db1d6bbfdeeeec682da027 Mon Sep 17 00:00:00 2001
From: Kacper Donat <kadet1090@gmail.com>
Date: Sat, 28 Jun 2025 19:59:28 +0200
Subject: [PATCH] Sketcher: Use generic tool hints table for
 DrawSketchHandlerFillet

---
 .../Sketcher/Gui/DrawSketchHandlerFillet.h    | 53 +++++--------------
 1 file changed, 14 insertions(+), 39 deletions(-)

diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h
index 2963d8a26e..de561bce30 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h
@@ -411,21 +411,23 @@ private:
     int vtId, geoId1, geoId2;
     Base::Vector2d firstPos, secondPos;
 
-    struct HintEntry
-    {
-        SelectMode state;
-        std::list<Gui::InputHint> hints;
-    };
-
-    using HintTable = std::vector<HintEntry>;
-
-    static HintTable getFilletHintTable();
-    static std::list<Gui::InputHint> lookupFilletHints(SelectMode state);
-
 public:
     std::list<Gui::InputHint> getToolHints() const override
     {
-        return lookupFilletHints(state());
+        using enum Gui::InputHint::UserInput;
+
+        return Gui::lookupHints<SelectMode>(
+            state(),
+            {{.state = SelectMode::SeekFirst,
+              .hints = {{QObject::tr("%1 pick first edge or point",
+                                     "Sketcher Fillet/Chamfer: hint"),
+                         {MouseLeft}}}},
+             {.state = SelectMode::SeekSecond,
+              .hints = {{QObject::tr("%1 pick second edge", "Sketcher Fillet/Chamfer: hint"),
+                         {MouseLeft}}}},
+             {.state = SelectMode::End,
+              .hints = {{QObject::tr("%1 create fillet", "Sketcher Fillet/Chamfer: hint"),
+                         {MouseLeft}}}}});
     }
 };
 
@@ -474,33 +476,6 @@ void DSHFilletController::adaptDrawingToCheckboxChange(int checkboxindex, bool v
     handler->updateCursor();
 }
 
-
-DrawSketchHandlerFillet::HintTable DrawSketchHandlerFillet::getFilletHintTable()
-{
-    using enum Gui::InputHint::UserInput;
-
-    return {{.state = SelectMode::SeekFirst,
-             .hints = {{QObject::tr("%1 pick first edge or point", "Sketcher Fillet/Chamfer: hint"),
-                        {MouseLeft}}}},
-            {.state = SelectMode::SeekSecond,
-             .hints = {{QObject::tr("%1 pick second edge", "Sketcher Fillet/Chamfer: hint"),
-                        {MouseLeft}}}},
-            {.state = SelectMode::End,
-             .hints = {
-                 {QObject::tr("%1 create fillet", "Sketcher Fillet/Chamfer: hint"), {MouseLeft}}}}};
-}
-
-std::list<Gui::InputHint> DrawSketchHandlerFillet::lookupFilletHints(SelectMode state)
-{
-    const auto filletHintTable = getFilletHintTable();
-
-    auto it = std::ranges::find_if(filletHintTable, [state](const HintEntry& entry) {
-        return entry.state == state;
-    });
-
-    return (it != filletHintTable.end()) ? it->hints : std::list<Gui::InputHint> {};
-}
-
 }  // namespace SketcherGui
 
 #endif  // SKETCHERGUI_DrawSketchHandlerFillet_H