From 1e6ed3eb70dd534f33f31a9b0d9b7f75b02be417 Mon Sep 17 00:00:00 2001
From: Dave Corley <smokydave@icloud.com>
Date: Fri, 22 Nov 2024 04:49:55 -0600
Subject: [PATCH] CLEANUP: Define the tooltip text as constexpr

---
 apps/opencs/view/render/instancemode.cpp | 37 ++++++++++++------------
 apps/opencs/view/render/instancemode.hpp |  2 --
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 615ca42aa1..7a59222eff 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -60,6 +60,24 @@
 #include "pagedworldspacewidget.hpp"
 #include "worldspacewidget.hpp"
 
+namespace
+{
+    constexpr std::string_view sInstanceModeTooltip = R"(
+        Instance editing
+        <ul><li>Use {scene-select-primary} and {scene-select-secondary} to select and unselect instances</li>
+        <li>Use {scene-edit-primary} to manipulate instances</li>
+        <li>Use {scene-select-tertiary} to select a reference object and then {scene-edit-secondary} to snap 
+        selection relative to the reference object</li>
+        <li>Use {scene-submode-move}, {scene-submode-rotate}, {scene-submode-scale} to change to move, rotate, and 
+        scale modes respectively</li>
+        <li>Use {scene-axis-x}, {scene-axis-y}, and {scene-axis-z} to lock changes to X, Y, and Z axes 
+        respectively</li>
+        <li>Use {scene-delete} to delete currently selected objects</li>
+        <li>Use {scene-duplicate} to duplicate instances</li>
+        <li>Use {scene-instance-drop} to drop instances</li></ul>
+)";
+}
+
 int CSVRender::InstanceMode::getSubModeFromId(const std::string& id) const
 {
     return id == "move" ? 0 : (id == "rotate" ? 1 : 2);
@@ -297,7 +315,7 @@ void CSVRender::InstanceMode::setDragAxis(const char axis)
 CSVRender::InstanceMode::InstanceMode(
     WorldspaceWidget* worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget* parent)
     : EditMode(worldspaceWidget, Misc::ScalableIcon::load(":scenetoolbar/editing-instance"),
-        Mask_Reference | Mask_Terrain, getTooltip(), parent)
+        Mask_Reference | Mask_Terrain, sInstanceModeTooltip.data(), parent)
     , mSubMode(nullptr)
     , mSubModeId("move")
     , mSelectionMode(nullptr)
@@ -345,23 +363,6 @@ CSVRender::InstanceMode::InstanceMode(
             qOverload<>(&CSMPrefs::Shortcut::activated), this, [this, axis] { this->setDragAxis(axis); });
 }
 
-QString CSVRender::InstanceMode::getTooltip()
-{
-    return QString(
-        "Instance editing"
-        "<ul><li>Use {scene-select-primary} and {scene-select-secondary} to select and unselect instances</li>"
-        "<li>Use {scene-edit-primary} to manipulate instances</li>"
-        "<li>Use {scene-select-tertiary} to select a reference object and then {scene-edit-secondary} to snap "
-        "selection relative to the reference object</li>"
-        "<li>Use {scene-submode-move}, {scene-submode-rotate}, {scene-submode-scale} to change to move, rotate, and "
-        "scale modes respectively</li>"
-        "<li>Use {scene-axis-x}, {scene-axis-y}, and {scene-axis-z} to lock changes to X, Y, and Z axes "
-        "respectively</li>"
-        "<li>Use {scene-delete} to delete currently selected objects</li>"
-        "<li>Use {scene-duplicate} to duplicate instances</li>"
-        "<li>Use {scene-instance-drop} to drop instances</li></ul>");
-}
-
 void CSVRender::InstanceMode::activate(CSVWidget::SceneToolbar* toolbar)
 {
     if (!mSubMode)
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index ae7be10322..193423efd5 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -74,8 +74,6 @@ namespace CSVRender
         InstanceMode(
             WorldspaceWidget* worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget* parent = nullptr);
 
-        QString getTooltip();
-
         void activate(CSVWidget::SceneToolbar* toolbar) override;
 
         void deactivate(CSVWidget::SceneToolbar* toolbar) override;