[Scummvm-git-logs] scummvm master -> a83b489ef090381feed8e411d0ba2203352ee752

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a83b489ef0 IMGUI: Fix some GCC const-related warnings


Commit: a83b489ef090381feed8e411d0ba2203352ee752
    https://github.com/scummvm/scummvm/commit/a83b489ef090381feed8e411d0ba2203352ee752
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2024-11-17T00:18:02+02:00

Commit Message:
IMGUI: Fix some GCC const-related warnings

imgui_draw.cpp:3730: warning: cast from type 'const ImFontGlyph*' to type 'void*' casts away qualifiers [-Wcast-qual]
imgui_draw.cpp: In member function 'void ImFont::SetGlyphVisible(ImWchar, bool)':
imgui_draw.cpp:3730:44: warning: cast from type 'const ImFontGlyph*' to type 'void*' casts away qualifiers [-Wcast-qual]
 3730 |     if (ImFontGlyph* glyph = (ImFontGlyph*)(void*)FindGlyph((ImWchar)c))
      |                                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

Changed paths:
    backends/imgui/imgui.cpp
    backends/imgui/imgui_demo.cpp
    backends/imgui/imgui_draw.cpp


diff --git a/backends/imgui/imgui.cpp b/backends/imgui/imgui.cpp
index 50c8d362efe..5b139e306fc 100644
--- a/backends/imgui/imgui.cpp
+++ b/backends/imgui/imgui.cpp
@@ -15234,7 +15234,7 @@ void ImGui::LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size)
             line_end[-1] = 0;
             const char* name_end = line_end - 1;
             const char* type_start = line + 1;
-            char* type_end = (char*)(void*)ImStrchrRange(type_start, name_end, ']');
+            char* type_end = const_cast<char *>(ImStrchrRange(type_start, name_end, ']'));
             const char* name_start = type_end ? ImStrchrRange(type_end + 1, name_end, '[') : NULL;
             if (!type_end || !name_start)
                 continue;
@@ -21345,7 +21345,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
 
         if (TreeNode("SettingsIniData", "Settings unpacked data (.ini): %d bytes", g.SettingsIniData.size()))
         {
-            InputTextMultiline("##Ini", (char*)(void*)g.SettingsIniData.c_str(), g.SettingsIniData.Buf.Size, ImVec2(-FLT_MIN, GetTextLineHeight() * 20), ImGuiInputTextFlags_ReadOnly);
+            InputTextMultiline("##Ini", const_cast<char *>(g.SettingsIniData.c_str()), g.SettingsIniData.Buf.Size, ImVec2(-FLT_MIN, GetTextLineHeight() * 20), ImGuiInputTextFlags_ReadOnly);
             TreePop();
         }
         TreePop();
diff --git a/backends/imgui/imgui_demo.cpp b/backends/imgui/imgui_demo.cpp
index 7ed778b5783..3048b69276c 100644
--- a/backends/imgui/imgui_demo.cpp
+++ b/backends/imgui/imgui_demo.cpp
@@ -3926,7 +3926,7 @@ static void ShowDemoWindowMultiSelect(ImGuiDemoWindowData* demo_data)
                             ImGui::TableNextColumn();
                             ImGui::SetNextItemWidth(-FLT_MIN);
                             ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-                            ImGui::InputText("###NoLabel", (char*)(void*)item_category, strlen(item_category), ImGuiInputTextFlags_ReadOnly);
+                            ImGui::InputText("###NoLabel", const_cast<char *>(item_category), strlen(item_category), ImGuiInputTextFlags_ReadOnly);
                             ImGui::PopStyleVar();
                         }
 
diff --git a/backends/imgui/imgui_draw.cpp b/backends/imgui/imgui_draw.cpp
index acd633ebfb2..e4aa544f31c 100644
--- a/backends/imgui/imgui_draw.cpp
+++ b/backends/imgui/imgui_draw.cpp
@@ -3727,7 +3727,7 @@ bool ImFont::IsGlyphRangeUnused(unsigned int c_begin, unsigned int c_last)
 
 void ImFont::SetGlyphVisible(ImWchar c, bool visible)
 {
-    if (ImFontGlyph* glyph = (ImFontGlyph*)(void*)FindGlyph((ImWchar)c))
+    if (ImFontGlyph* glyph = const_cast<ImFontGlyph *>(FindGlyph((ImWchar)c)))
         glyph->Visible = visible ? 1 : 0;
 }