From c53b1bf2c0ead839b08a17da3f0f629207b8739e Mon Sep 17 00:00:00 2001
From: Andrew Lanzone <andy@enoznal.com>
Date: Fri, 18 Jul 2025 01:06:25 -0700
Subject: [PATCH] Replace more C-style casts with C++ variants

---
 apps/openmw/mwgui/bookpage.cpp            |  2 +-
 apps/openmw/mwgui/inventorywindow.cpp     | 12 ++++--------
 apps/openmw/mwgui/spellcreationdialog.cpp |  4 ++--
 apps/openmw/mwgui/spellview.cpp           |  6 +++---
 apps/openmw/mwgui/windowmanagerimp.cpp    |  3 ++-
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 2c58ca3b72..ef296534c4 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -1302,7 +1302,7 @@ namespace MWGui
 
         void setFocusItem(BookTypesetter::Style* itemStyle) override
         {
-            mPageDisplay->mFocusItem = (TypesetBookImpl::StyleImpl*)itemStyle;
+            mPageDisplay->mFocusItem = static_cast<TypesetBookImpl::StyleImpl*>(itemStyle);
             mPageDisplay->dirtyFocusItem();
         }
 
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index c15494d2c3..6b1ea84c68 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -1046,20 +1046,16 @@ namespace MWGui
             {
                 // Take all. Pass the button press to the container window and let it do the
                 // logic of taking all.
-                MWGui::ContainerWindow* containerWindow = (MWGui::ContainerWindow*)MWBase::Environment::get()
-                                                              .getWindowManager()
-                                                              ->getGuiModeWindows(mGuiMode)
-                                                              .at(0);
+                MWGui::ContainerWindow* containerWindow = static_cast<MWGui::ContainerWindow*>(
+                    MWBase::Environment::get().getWindowManager()->getGuiModeWindows(mGuiMode).at(0));
                 containerWindow->onControllerButtonEvent(arg);
             }
             else if (mGuiMode == MWGui::GM_Barter)
             {
                 // Offer. Pass the button press to the barter window and let it do the logic
                 // of making an offer.
-                MWGui::TradeWindow* tradeWindow = (MWGui::TradeWindow*)MWBase::Environment::get()
-                                                      .getWindowManager()
-                                                      ->getGuiModeWindows(mGuiMode)
-                                                      .at(1);
+                MWGui::TradeWindow* tradeWindow = static_cast<MWGui::TradeWindow*>(
+                    MWBase::Environment::get().getWindowManager()->getGuiModeWindows(mGuiMode).at(1));
                 tradeWindow->onControllerButtonEvent(arg);
             }
         }
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 25d8499193..190793b77a 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -556,7 +556,7 @@ namespace MWGui
             }
             else
             {
-                ((MyGUI::Button*)button)->setStateSelected(false);
+                static_cast<MyGUI::Button*>(button)->setStateSelected(false);
             }
         }
 
@@ -570,7 +570,7 @@ namespace MWGui
             }
             else
             {
-                ((MyGUI::Button*)button)->setStateSelected(true);
+                static_cast<MyGUI::Button*>(button)->setStateSelected(true);
             }
         }
     }
diff --git a/apps/openmw/mwgui/spellview.cpp b/apps/openmw/mwgui/spellview.cpp
index 44bdcffe07..6ae757b7be 100644
--- a/apps/openmw/mwgui/spellview.cpp
+++ b/apps/openmw/mwgui/spellview.cpp
@@ -143,7 +143,7 @@ namespace MWGui
                 mLines.emplace_back(t, costChance, i);
             }
             else
-                mLines.emplace_back(t, (MyGUI::Widget*)nullptr, i);
+                mLines.emplace_back(t, static_cast<MyGUI::Widget*>(nullptr), i);
 
             t->setStateSelected(spell.mSelected);
         }
@@ -252,7 +252,7 @@ namespace MWGui
             MyGUI::ImageBox* separator = mScrollView->createWidget<MyGUI::ImageBox>(
                 "MW_HLine", MyGUI::IntCoord(0, 0, mScrollView->getWidth(), 18), MyGUI::Align::Left | MyGUI::Align::Top);
             separator->setNeedMouseFocus(false);
-            mLines.emplace_back(separator, (MyGUI::Widget*)nullptr, NoSpellIndex);
+            mLines.emplace_back(separator, static_cast<MyGUI::Widget*>(nullptr), NoSpellIndex);
         }
 
         MyGUI::TextBox* groupWidget = mScrollView->createWidget<Gui::TextBox>("SandBrightText",
@@ -272,7 +272,7 @@ namespace MWGui
             mLines.emplace_back(groupWidget, groupWidget2, NoSpellIndex);
         }
         else
-            mLines.emplace_back(groupWidget, (MyGUI::Widget*)nullptr, NoSpellIndex);
+            mLines.emplace_back(groupWidget, static_cast<MyGUI::Widget*>(nullptr), NoSpellIndex);
 
         mGroupIndices.push_back(mButtons.size());
     }
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 78ea13af35..0138811691 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1922,7 +1922,8 @@ namespace MWGui
         // If using controller menus, don't persist changes to size of the stats or magic
         // windows.
         if (Settings::gui().mControllerMenus
-            && (window == (MyGUI::Window*)mStatsWindow || window == (MyGUI::Window*)mSpellWindow))
+            && (window == mStatsWindow->mMainWidget->castType<MyGUI::Window>()
+                || window == mSpellWindow->mMainWidget->castType<MyGUI::Window>()))
             return;
 
         const auto it = mTrackedWindows.find(window);