Fix and enforce parameter naming

.clang-tidy

@@ -11,12 +11,15 @@ Checks: >
   readability-identifier-naming
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(apps|components)/'
+ExcludeHeaderFilterRegex: '_autogen/'
 CheckOptions:
 - key: readability-identifier-naming.ConceptCase
   value: CamelCase
+- key: readability-identifier-naming.LocalVariableCase
+  value: camelBack
 - key: readability-identifier-naming.NamespaceCase
   value: CamelCase
 - key: readability-identifier-naming.NamespaceIgnoredRegexp
   value: 'bpo|osg(DB|FX|Particle|Shadow|Viewer|Util)?'
-- key: readability-identifier-naming.LocalVariableCase
+- key: readability-identifier-naming.ParameterCase
   value: camelBack

apps/launcher/settingspage.cpp

@@ -126,16 +126,16 @@ void Launcher::SettingsPage::on_runScriptAfterStartupBrowseButton_clicked()
 
 namespace
 {
-    constexpr double CellSizeInUnits = 8192;
+    constexpr double cellSizeInUnits = 8192;
 
     double convertToCells(double unitRadius)
     {
-        return unitRadius / CellSizeInUnits;
+        return unitRadius / cellSizeInUnits;
     }
 
-    int convertToUnits(double CellGridRadius)
+    int convertToUnits(double cellGridRadius)
     {
-        return static_cast<int>(CellSizeInUnits * CellGridRadius);
+        return static_cast<int>(cellSizeInUnits * cellGridRadius);
     }
 }
 

apps/opencs/model/doc/document.cpp

@@ -293,11 +293,11 @@ void CSMDoc::Document::createBase()
 }
 
 CSMDoc::Document::Document(const Files::ConfigurationManager& configuration, std::vector<std::filesystem::path> files,
-    bool new_, const std::filesystem::path& savePath, const std::filesystem::path& resDir, ToUTF8::FromType encoding,
+    bool isNew, const std::filesystem::path& savePath, const std::filesystem::path& resDir, ToUTF8::FromType encoding,
     const Files::PathContainer& dataPaths, const std::vector<std::string>& archives)
     : mSavePath(savePath)
     , mContentFiles(std::move(files))
-    , mNew(new_)
+    , mNew(isNew)
     , mData(encoding, dataPaths, archives, resDir)
     , mTools(*this, encoding)
     , mProjectPath((configuration.getUserDataPath() / "projects") / (savePath.filename().u8string() + u8".project"))

apps/opencs/model/doc/document.hpp

@@ -91,7 +91,7 @@ namespace CSMDoc
         void addOptionalMagicEffect(const ESM::MagicEffect& effect);
 
     public:
-        Document(const Files::ConfigurationManager& configuration, std::vector<std::filesystem::path> files, bool new_,
+        Document(const Files::ConfigurationManager& configuration, std::vector<std::filesystem::path> files, bool isNew,
             const std::filesystem::path& savePath, const std::filesystem::path& resDir, ToUTF8::FromType encoding,
             const Files::PathContainer& dataPaths, const std::vector<std::string>& archives);
 

apps/opencs/model/doc/documentmanager.cpp

@@ -52,16 +52,16 @@ bool CSMDoc::DocumentManager::isEmpty()
 }
 
 void CSMDoc::DocumentManager::addDocument(
-    const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool new_)
+    const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool isNew)
 {
-    Document* document = makeDocument(files, savePath, new_);
+    Document* document = makeDocument(files, savePath, isNew);
     insertDocument(document);
 }
 
 CSMDoc::Document* CSMDoc::DocumentManager::makeDocument(
-    const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool new_)
+    const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool isNew)
 {
-    return new Document(mConfiguration, files, new_, savePath, mResDir, mEncoding, mDataPaths, mArchives);
+    return new Document(mConfiguration, files, isNew, savePath, mResDir, mEncoding, mDataPaths, mArchives);
 }
 
 void CSMDoc::DocumentManager::insertDocument(CSMDoc::Document* document)

apps/opencs/model/doc/documentmanager.hpp

@@ -46,18 +46,18 @@ namespace CSMDoc
         ~DocumentManager();
 
         void addDocument(
-            const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool new_);
+            const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool isNew);
-        ///< \param new_ Do not load the last content file in \a files and instead create in an
+        ///< \param isNew Do not load the last content file in \a files and instead create in an
         /// appropriate way.
 
         /// Create a new document. The ownership of the created document is transferred to
         /// the calling function. The DocumentManager does not manage it. Loading has not
         /// taken place at the point when the document is returned.
         ///
-        /// \param new_ Do not load the last content file in \a files and instead create in an
+        /// \param isNew Do not load the last content file in \a files and instead create in an
         /// appropriate way.
         Document* makeDocument(
-            const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool new_);
+            const std::vector<std::filesystem::path>& files, const std::filesystem::path& savePath, bool isNew);
 
         void setResourceDir(const std::filesystem::path& parResDir);
 

apps/opencs/model/doc/messages.cpp

@@ -35,8 +35,8 @@ std::string CSMDoc::Message::toString(Severity severity)
     return "";
 }
 
-CSMDoc::Messages::Messages(Message::Severity default_)
+CSMDoc::Messages::Messages(Message::Severity defaultSeverity)
-    : mDefault(default_)
+    : mDefault(defaultSeverity)
 {
 }
 

apps/opencs/model/doc/messages.hpp

@@ -48,7 +48,7 @@ namespace CSMDoc
         Message::Severity mDefault;
 
     public:
-        Messages(Message::Severity default_);
+        explicit Messages(Message::Severity defaultSeverity);
 
         void add(const CSMWorld::UniversalId& id, const std::string& message, const std::string& hint = "",
             Message::Severity severity = Message::Severity_Default);

apps/opencs/model/filter/booleannode.cpp

@@ -5,8 +5,8 @@ namespace CSMWorld
     class IdTableBase;
 }
 
-CSMFilter::BooleanNode::BooleanNode(bool true_)
+CSMFilter::BooleanNode::BooleanNode(bool value)
-    : mTrue(true_)
+    : mTrue(value)
 {
 }
 

apps/opencs/model/filter/booleannode.hpp

@@ -18,7 +18,7 @@ namespace CSMFilter
         bool mTrue;
 
     public:
-        BooleanNode(bool true_);
+        explicit BooleanNode(bool value);
 
         bool test(const CSMWorld::IdTableBase& table, int row, const std::map<int, int>& columns) const override;
         ///< \return Can the specified table row pass through to filter?

apps/opencs/model/world/commanddispatcher.cpp

@@ -152,7 +152,7 @@ std::vector<CSMWorld::UniversalId> CSMWorld::CommandDispatcher::getExtendedTypes
 }
 
 void CSMWorld::CommandDispatcher::executeModify(
-    QAbstractItemModel* model, const QModelIndex& index, const QVariant& new_)
+    QAbstractItemModel* model, const QModelIndex& index, const QVariant& newValue)
 {
     if (mLocked)
         return;
@@ -167,7 +167,7 @@ void CSMWorld::CommandDispatcher::executeModify(
 
         // Modulate by cell size, update cell id if reference has been moved to a new cell
         if (std::abs(std::fmod(oldPosition, Constants::CellSizeInUnits))
-                - std::abs(std::fmod(new_.toFloat(), Constants::CellSizeInUnits))
+                - std::abs(std::fmod(newValue.toFloat(), Constants::CellSizeInUnits))
             >= 0.5f)
         {
             IdTableProxyModel* proxy = dynamic_cast<IdTableProxyModel*>(model);
@@ -194,7 +194,7 @@ void CSMWorld::CommandDispatcher::executeModify(
         }
     }
 
-    auto modifyData = std::make_unique<CSMWorld::ModifyCommand>(*model, index, new_);
+    auto modifyData = std::make_unique<CSMWorld::ModifyCommand>(*model, index, newValue);
 
     if (modifyCell.get())
     {

apps/opencs/model/world/commanddispatcher.hpp

@@ -62,7 +62,7 @@ namespace CSMWorld
         ///
         /// \attention model must either be a model for the table operated on by this
         /// dispatcher or a proxy of it.
-        void executeModify(QAbstractItemModel* model, const QModelIndex& index, const QVariant& new_);
+        void executeModify(QAbstractItemModel* model, const QModelIndex& index, const QVariant& newValue);
 
     public slots:
 

apps/opencs/model/world/commands.cpp

@@ -187,11 +187,11 @@ void CSMWorld::TouchLandCommand::onUndo()
 }
 
 CSMWorld::ModifyCommand::ModifyCommand(
-    QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_, QUndoCommand* parent)
+    QAbstractItemModel& model, const QModelIndex& index, const QVariant& newValue, QUndoCommand* parent)
     : QUndoCommand(parent)
     , mModel(&model)
     , mIndex(index)
-    , mNew(new_)
+    , mNew(newValue)
     , mHasRecordState(false)
     , mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
 {

apps/opencs/model/world/commands.hpp

@@ -125,8 +125,8 @@ namespace CSMWorld
         CSMWorld::RecordBase::State mOldRecordState;
 
     public:
-        ModifyCommand(
+        explicit ModifyCommand(QAbstractItemModel& model, const QModelIndex& index, const QVariant& newValue,
-            QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_, QUndoCommand* parent = nullptr);
+            QUndoCommand* parent = nullptr);
 
         void redo() override;
 
@@ -169,7 +169,7 @@ namespace CSMWorld
         std::vector<std::pair<int, QVariant>> mOverrideValues;
 
     public:
-        CloneCommand(IdTable& model, const std::string& idOrigin, const std::string& IdDestination,
+        explicit CloneCommand(IdTable& model, const std::string& idOrigin, const std::string& idDestination,
             const UniversalId::Type type, QUndoCommand* parent = nullptr);
 
         void redo() override;

apps/openmw/mwbase/windowmanager.hpp

@@ -275,7 +275,7 @@ namespace MWBase
          * @param id Identifier for the GMST setting, e.g. "aName"
          * @param default Default value if the GMST setting cannot be used.
          */
-        virtual std::string_view getGameSettingString(std::string_view id, std::string_view default_) = 0;
+        virtual std::string_view getGameSettingString(std::string_view id, std::string_view defaultValue) = 0;
 
         virtual void processChangedSettings(const std::set<std::pair<std::string, std::string>>& changed) = 0;
 

apps/openmw/mwgui/alchemywindow.cpp

@@ -112,12 +112,12 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->injectKeyRelease(MyGUI::KeyCode::None);
     }
 
-    void AlchemyWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
+    void AlchemyWindow::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Alchemy);
     }
 
-    void AlchemyWindow::onCreateButtonClicked(MyGUI::Widget* _sender)
+    void AlchemyWindow::onCreateButtonClicked(MyGUI::Widget* /*sender*/)
     {
         mAlchemy->setPotionName(mNameEdit->getCaption());
         int count = mAlchemy->countPotionsToBrew();
@@ -188,11 +188,11 @@ namespace MWGui
         updateFilters();
     }
 
-    void AlchemyWindow::switchFilterType(MyGUI::Widget* _sender)
+    void AlchemyWindow::switchFilterType(MyGUI::Widget* sender)
     {
         auto const& wm = MWBase::Environment::get().getWindowManager();
         std::string_view ingredient = wm->getGameSettingString("sIngredients", "Ingredients");
-        auto* button = _sender->castType<MyGUI::Button>();
+        auto* button = sender->castType<MyGUI::Button>();
 
         if (button->getCaption() == ingredient)
         {
@@ -259,17 +259,17 @@ namespace MWGui
         mItemView->update();
     }
 
-    void AlchemyWindow::onFilterChanged(MyGUI::ComboBox* _sender, size_t _index)
+    void AlchemyWindow::onFilterChanged(MyGUI::ComboBox* sender, size_t index)
     {
         // ignore spurious event fired when one edit the content after selection.
         // onFilterEdited will handle it.
-        if (_index != MyGUI::ITEM_NONE)
+        if (index != MyGUI::ITEM_NONE)
-            applyFilter(_sender->getItemNameAt(_index));
+            applyFilter(sender->getItemNameAt(index));
     }
 
-    void AlchemyWindow::onFilterEdited(MyGUI::EditBox* _sender)
+    void AlchemyWindow::onFilterEdited(MyGUI::EditBox* sender)
     {
-        applyFilter(_sender->getCaption());
+        applyFilter(sender->getCaption());
     }
 
     void AlchemyWindow::onOpen()
@@ -311,9 +311,9 @@ namespace MWGui
             mItemView->setActiveControllerWindow(true);
     }
 
-    void AlchemyWindow::onIngredientSelected(MyGUI::Widget* _sender)
+    void AlchemyWindow::onIngredientSelected(MyGUI::Widget* sender)
     {
-        size_t i = std::distance(mIngredients.begin(), std::find(mIngredients.begin(), mIngredients.end(), _sender));
+        size_t i = std::distance(mIngredients.begin(), std::find(mIngredients.begin(), mIngredients.end(), sender));
         mAlchemy->removeIngredient(i);
         update();
     }
@@ -347,10 +347,10 @@ namespace MWGui
         mItemSelectionDialog->setVisible(false);
     }
 
-    void AlchemyWindow::onApparatusSelected(MyGUI::Widget* _sender)
+    void AlchemyWindow::onApparatusSelected(MyGUI::Widget* sender)
     {
-        size_t i = std::distance(mApparatus.begin(), std::find(mApparatus.begin(), mApparatus.end(), _sender));
+        size_t i = std::distance(mApparatus.begin(), std::find(mApparatus.begin(), mApparatus.end(), sender));
-        if (_sender->getUserData<MWWorld::Ptr>()->isEmpty()) // if this apparatus slot is empty
+        if (sender->getUserData<MWWorld::Ptr>()->isEmpty()) // if this apparatus slot is empty
         {
             std::string title;
             switch (i)
@@ -499,15 +499,15 @@ namespace MWGui
         MyGUI::ControllerManager::getInstance().addItem(widget, controller);
     }
 
-    void AlchemyWindow::onIncreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+    void AlchemyWindow::onIncreaseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
     {
-        addRepeatController(_sender);
+        addRepeatController(sender);
         onIncreaseButtonTriggered();
     }
 
-    void AlchemyWindow::onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+    void AlchemyWindow::onDecreaseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
     {
-        addRepeatController(_sender);
+        addRepeatController(sender);
         onDecreaseButtonTriggered();
     }
 
@@ -519,9 +519,9 @@ namespace MWGui
             onDecreaseButtonTriggered();
     }
 
-    void AlchemyWindow::onCountButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+    void AlchemyWindow::onCountButtonReleased(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
     {
-        MyGUI::ControllerManager::getInstance().removeItem(_sender);
+        MyGUI::ControllerManager::getInstance().removeItem(sender);
     }
 
     void AlchemyWindow::onCountValueChanged(int value)

apps/openmw/mwgui/alchemywindow.hpp

@@ -63,22 +63,22 @@ namespace MWGui
         MyGUI::EditBox* mNameEdit;
         Gui::NumericEditBox* mBrewCountEdit;
 
-        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
-        void onCreateButtonClicked(MyGUI::Widget* _sender);
+        void onCreateButtonClicked(MyGUI::Widget* sender);
-        void onIngredientSelected(MyGUI::Widget* _sender);
+        void onIngredientSelected(MyGUI::Widget* sender);
-        void onApparatusSelected(MyGUI::Widget* _sender);
+        void onApparatusSelected(MyGUI::Widget* sender);
         void onAccept(MyGUI::EditBox*);
-        void onIncreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onIncreaseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id);
-        void onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onDecreaseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id);
-        void onCountButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onCountButtonReleased(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id);
         void onCountValueChanged(int value);
         void onRepeatClick(MyGUI::Widget* widget, MyGUI::ControllerItem* controller);
 
         void applyFilter(const std::string& filter);
         void initFilter();
-        void onFilterChanged(MyGUI::ComboBox* _sender, size_t _index);
+        void onFilterChanged(MyGUI::ComboBox* sender, size_t index);
-        void onFilterEdited(MyGUI::EditBox* _sender);
+        void onFilterEdited(MyGUI::EditBox* sender);
-        void switchFilterType(MyGUI::Widget* _sender);
+        void switchFilterType(MyGUI::Widget* sender);
         void updateFilters();
 
         void addRepeatController(MyGUI::Widget* widget);

apps/openmw/mwgui/backgroundimage.cpp

@@ -48,15 +48,15 @@ namespace MWGui
             leftPadding, topPadding, screenSize.width - leftPadding * 2, screenSize.height - topPadding * 2);
     }
 
-    void BackgroundImage::setSize(const MyGUI::IntSize& _value)
+    void BackgroundImage::setSize(const MyGUI::IntSize& value)
     {
-        MyGUI::Widget::setSize(_value);
+        MyGUI::Widget::setSize(value);
         adjustSize();
     }
 
-    void BackgroundImage::setCoord(const MyGUI::IntCoord& _value)
+    void BackgroundImage::setCoord(const MyGUI::IntCoord& value)
     {
-        MyGUI::Widget::setCoord(_value);
+        MyGUI::Widget::setCoord(value);
         adjustSize();
     }
 

apps/openmw/mwgui/backgroundimage.hpp

@@ -26,8 +26,8 @@ namespace MWGui
          */
         void setBackgroundImage(const std::string& image, bool fixedRatio = true, bool stretch = true);
 
-        void setSize(const MyGUI::IntSize& _value) override;
+        void setSize(const MyGUI::IntSize& value) override;
-        void setCoord(const MyGUI::IntCoord& _value) override;
+        void setCoord(const MyGUI::IntCoord& value) override;
 
     private:
         MyGUI::ImageBox* mChild;

apps/openmw/mwgui/birth.cpp

@@ -124,32 +124,32 @@ namespace MWGui
 
     // widget controls
 
-    void BirthDialog::onOkClicked(MyGUI::Widget* _sender)
+    void BirthDialog::onOkClicked(MyGUI::Widget* /*sender*/)
     {
         if (mBirthList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
 
-    void BirthDialog::onAccept(MyGUI::ListBox* _sender, size_t _index)
+    void BirthDialog::onAccept(MyGUI::ListBox* sender, size_t index)
     {
-        onSelectBirth(_sender, _index);
+        onSelectBirth(sender, index);
         if (mBirthList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
 
-    void BirthDialog::onBackClicked(MyGUI::Widget* _sender)
+    void BirthDialog::onBackClicked(MyGUI::Widget* /*sender*/)
     {
         eventBack();
     }
 
-    void BirthDialog::onSelectBirth(MyGUI::ListBox* _sender, size_t _index)
+    void BirthDialog::onSelectBirth(MyGUI::ListBox* /*sender*/, size_t index)
     {
-        if (_index == MyGUI::ITEM_NONE)
+        if (index == MyGUI::ITEM_NONE)
             return;
 
-        const ESM::RefId& birthId = *mBirthList->getItemDataAt<ESM::RefId>(_index);
+        const ESM::RefId& birthId = *mBirthList->getItemDataAt<ESM::RefId>(index);
         if (mCurrentBirthId == birthId)
             return;
 

apps/openmw/mwgui/birth.hpp

@@ -39,11 +39,11 @@ namespace MWGui
         EventHandle_WindowBase eventDone;
 
     protected:
-        void onSelectBirth(MyGUI::ListBox* _sender, size_t _index);
+        void onSelectBirth(MyGUI::ListBox* sender, size_t index);
 
-        void onAccept(MyGUI::ListBox* _sender, size_t index);
+        void onAccept(MyGUI::ListBox* sender, size_t index);
-        void onOkClicked(MyGUI::Widget* _sender);
+        void onOkClicked(MyGUI::Widget* sender);
-        void onBackClicked(MyGUI::Widget* _sender);
+        void onBackClicked(MyGUI::Widget* sender);
 
     private:
         void updateBirths();

apps/openmw/mwgui/bookpage.cpp

@@ -137,7 +137,7 @@ namespace MWGui
         }
 
         template <typename Visitor>
-        void visitRuns(int top, int bottom, MyGUI::IFont* Font, Visitor const& visitor) const
+        void visitRuns(int top, int bottom, MyGUI::IFont* font, Visitor const& visitor) const
         {
             for (Sections::const_iterator i = mSections.begin(); i != mSections.end(); ++i)
             {
@@ -150,7 +150,7 @@ namespace MWGui
                         continue;
 
                     for (Runs::const_iterator k = j->mRuns.begin(); k != j->mRuns.end(); ++k)
-                        if (!Font || k->mStyle->mFont == Font)
+                        if (!font || k->mStyle->mFont == font)
                             visitor(*i, *j, *k);
                 }
             }
@@ -506,9 +506,9 @@ namespace MWGui
             return mBook;
         }
 
-        void writeImpl(StyleImpl* style, Utf8Stream::Point _begin, Utf8Stream::Point _end)
+        void writeImpl(StyleImpl* style, Utf8Stream::Point begin, Utf8Stream::Point end)
         {
-            Utf8Stream stream(_begin, _end);
+            Utf8Stream stream(begin, end);
 
             while (!stream.eof())
             {
@@ -762,9 +762,9 @@ namespace MWGui
             RenderXform mRenderXform;
             MyGUI::VertexColourType mVertexColourType;
 
-            GlyphStream(MyGUI::IFont* font, float left, float top, float Z, MyGUI::Vertex* vertices,
+            explicit GlyphStream(MyGUI::IFont* font, float left, float top, float z, MyGUI::Vertex* vertices,
                 RenderXform const& renderXform)
-                : mZ(Z)
+                : mZ(z)
                 , mC(0)
                 , mFont(font)
                 , mOrigin(left, top)
@@ -900,7 +900,7 @@ namespace MWGui
 
             // this isn't really a sub-widget, its just a "drawitem" which
             // should have its own interface
-            void createDrawItem(MyGUI::ITexture* _texture, MyGUI::ILayerNode* _node) override {}
+            void createDrawItem(MyGUI::ITexture* /*texture*/, MyGUI::ILayerNode* /*node*/) override {}
             void destroyDrawItem() override {}
         };
 
@@ -1321,7 +1321,7 @@ namespace MWGui
             }
         }
 
-        void onMouseLostFocus(Widget* _new) override
+        void onMouseLostFocus(MyGUI::Widget* /*newWidget*/) override
         {
             // NOTE: MyGUI also fires eventMouseLostFocus for widgets that are about to be destroyed (if they had
             // focus). Child widgets may already be destroyed! So be careful.

apps/openmw/mwgui/bookpage.hpp

@@ -110,8 +110,8 @@ namespace MWGui
         /// Create a hyper-link style with a user-defined identifier based on an
         /// existing style. The unique flag forces a new instance of this style
         /// to be created even if an existing instance is present.
-        virtual Style* createHotStyle(Style* BaseStyle, const Colour& NormalColour, const Colour& HoverColour,
+        virtual Style* createHotStyle(Style* baseStyle, const Colour& normalColour, const Colour& hoverColour,
-            const Colour& ActiveColour, InteractiveId Id, bool Unique = true)
+            const Colour& activeColour, InteractiveId id, bool unique = true)
             = 0;
 
         /// Insert a line break into the document. Newline characters in the input
@@ -129,19 +129,19 @@ namespace MWGui
         virtual void setSectionAlignment(Alignment sectionAlignment) = 0;
 
         // Layout a block of text with the specified style into the document.
-        virtual void write(Style* Style, Utf8Span Text) = 0;
+        virtual void write(Style* style, Utf8Span text) = 0;
 
         /// Adds a content block to the document without laying it out. An
         /// identifier is returned that can be used to refer to it. If select
         /// is true, the block is activated to be references by future writes.
-        virtual intptr_t addContent(Utf8Span Text, bool Select = true) = 0;
+        virtual intptr_t addContent(Utf8Span text, bool select = true) = 0;
 
         /// Select a previously created content block for future writes.
         virtual void selectContent(intptr_t contentHandle) = 0;
 
         /// Layout a span of the selected content block into the document
         /// using the specified style.
-        virtual void write(Style* Style, size_t Begin, size_t End) = 0;
+        virtual void write(Style* style, size_t begin, size_t end) = 0;
 
         /// Finalize the document layout, and return a pointer to it.
         virtual TypesetBook::Ptr complete() = 0;
@@ -156,7 +156,7 @@ namespace MWGui
         typedef std::function<void(InteractiveId)> ClickCallback;
 
         /// Make the widget display the specified page from the specified book.
-        virtual void showPage(TypesetBook::Ptr Book, size_t Page) = 0;
+        virtual void showPage(TypesetBook::Ptr book, size_t page) = 0;
 
         /// Set the callback for a clicking a hyper-link in the document.
         virtual void adviseLinkClicked(ClickCallback callback) = 0;

apps/openmw/mwgui/bookwindow.cpp

@@ -73,9 +73,9 @@ namespace MWGui
         center();
     }
 
-    void BookWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    void BookWindow::onMouseWheel(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (_rel < 0)
+        if (rel < 0)
             nextPage();
         else
             prevPage();
@@ -122,7 +122,7 @@ namespace MWGui
         mTakeButton->setVisible(mTakeButtonShow && mTakeButtonAllowed);
     }
 
-    void BookWindow::onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character)
+    void BookWindow::onKeyButtonPressed(MyGUI::Widget* /*sender*/, MyGUI::KeyCode key, MyGUI::Char character)
     {
         if (key == MyGUI::KeyCode::ArrowUp)
             prevPage();
@@ -136,12 +136,12 @@ namespace MWGui
         mTakeButton->setVisible(mTakeButtonShow && mTakeButtonAllowed);
     }
 
-    void BookWindow::onCloseButtonClicked(MyGUI::Widget* sender)
+    void BookWindow::onCloseButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Book);
     }
 
-    void BookWindow::onTakeButtonClicked(MyGUI::Widget* sender)
+    void BookWindow::onTakeButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Item Book Up"));
 
@@ -151,12 +151,12 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Book);
     }
 
-    void BookWindow::onNextPageButtonClicked(MyGUI::Widget* sender)
+    void BookWindow::onNextPageButtonClicked(MyGUI::Widget* /*sender*/)
     {
         nextPage();
     }
 
-    void BookWindow::onPrevPageButtonClicked(MyGUI::Widget* sender)
+    void BookWindow::onPrevPageButtonClicked(MyGUI::Widget* /*sender*/)
     {
         prevPage();
     }

apps/openmw/mwgui/bookwindow.hpp

@@ -28,7 +28,7 @@ namespace MWGui
         void onPrevPageButtonClicked(MyGUI::Widget* sender);
         void onCloseButtonClicked(MyGUI::Widget* sender);
         void onTakeButtonClicked(MyGUI::Widget* sender);
-        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheel(MyGUI::Widget* sender, int rel);
         void setTakeButtonShow(bool show);
 
         void onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character);

apps/openmw/mwgui/charactercreation.cpp

@@ -357,13 +357,13 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Class);
     }
 
-    void CharacterCreation::onClassChoice(int _index)
+    void CharacterCreation::onClassChoice(int index)
     {
         MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mClassChoiceDialog));
 
         MWBase::Environment::get().getWindowManager()->popGuiMode();
 
-        switch (_index)
+        switch (index)
         {
             case ClassChoiceDialog::Class_Generate:
                 MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_ClassGenerate);
@@ -500,20 +500,20 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Class);
     }
 
-    void CharacterCreation::onClassQuestionChosen(int _index)
+    void CharacterCreation::onClassQuestionChosen(int index)
     {
         MWBase::Environment::get().getSoundManager()->stopSay();
 
         MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mGenerateClassQuestionDialog));
 
-        if (_index < 0 || _index >= 3)
+        if (index < 0 || index >= 3)
         {
             MWBase::Environment::get().getWindowManager()->popGuiMode();
             MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Class);
             return;
         }
 
-        ESM::Class::Specialization specialization = mGenerateClassResponses[_index];
+        ESM::Class::Specialization specialization = mGenerateClassResponses[index];
         if (specialization == ESM::Class::Combat)
             ++mGenerateClassSpecializations[0];
         else if (specialization == ESM::Class::Magic)

apps/openmw/mwgui/charactercreation.hpp

@@ -93,13 +93,13 @@ namespace MWGui
         void selectRace();
 
         // Class dialogs
-        void onClassChoice(int _index);
+        void onClassChoice(int index);
         void onPickClassDialogDone(WindowBase* parWindow);
         void onPickClassDialogBack();
         void onCreateClassDialogDone(WindowBase* parWindow);
         void onCreateClassDialogBack();
         void showClassQuestionDialog();
-        void onClassQuestionChosen(int _index);
+        void onClassQuestionChosen(int index);
         void onGenerateClassBack();
         void onGenerateClassDone(WindowBase* parWindow);
         void selectGeneratedClass();

apps/openmw/mwgui/class.cpp

@@ -104,12 +104,12 @@ namespace MWGui
 
     // widget controls
 
-    void GenerateClassResultDialog::onOkClicked(MyGUI::Widget* _sender)
+    void GenerateClassResultDialog::onOkClicked(MyGUI::Widget* /*sender*/)
     {
         eventDone(this);
     }
 
-    void GenerateClassResultDialog::onBackClicked(MyGUI::Widget* _sender)
+    void GenerateClassResultDialog::onBackClicked(MyGUI::Widget* /*sender*/)
     {
         eventBack();
     }
@@ -215,32 +215,32 @@ namespace MWGui
 
     // widget controls
 
-    void PickClassDialog::onOkClicked(MyGUI::Widget* _sender)
+    void PickClassDialog::onOkClicked(MyGUI::Widget* /*sender*/)
     {
         if (mClassList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
 
-    void PickClassDialog::onBackClicked(MyGUI::Widget* _sender)
+    void PickClassDialog::onBackClicked(MyGUI::Widget* /*sender*/)
     {
         eventBack();
     }
 
-    void PickClassDialog::onAccept(MyGUI::ListBox* _sender, size_t _index)
+    void PickClassDialog::onAccept(MyGUI::ListBox* sender, size_t index)
     {
-        onSelectClass(_sender, _index);
+        onSelectClass(sender, index);
         if (mClassList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
 
-    void PickClassDialog::onSelectClass(MyGUI::ListBox* _sender, size_t _index)
+    void PickClassDialog::onSelectClass(MyGUI::ListBox* sender, size_t index)
     {
-        if (_index == MyGUI::ITEM_NONE)
+        if (index == MyGUI::ITEM_NONE)
             return;
 
-        const ESM::RefId& classId = *mClassList->getItemDataAt<ESM::RefId>(_index);
+        const ESM::RefId& classId = *mClassList->getItemDataAt<ESM::RefId>(index);
         if (mCurrentClassId == classId)
             return;
 
@@ -449,12 +449,12 @@ namespace MWGui
         center();
     }
 
-    void InfoBoxDialog::onButtonClicked(MyGUI::Widget* _sender)
+    void InfoBoxDialog::onButtonClicked(MyGUI::Widget* sender)
     {
         int i = 0;
         for (MyGUI::Button* button : mButtons)
         {
-            if (button == _sender)
+            if (button == sender)
             {
                 eventButtonSelected(i);
                 return;
@@ -735,7 +735,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mDescDialog));
     }
 
-    void CreateClassDialog::onSpecializationClicked(MyGUI::Widget* _sender)
+    void CreateClassDialog::onSpecializationClicked(MyGUI::Widget* /*sender*/)
     {
         mSpecDialog = std::make_unique<SelectSpecializationDialog>();
         mSpecDialog->eventCancel += MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
@@ -761,10 +761,10 @@ namespace MWGui
         ToolTips::createSpecializationToolTip(mSpecializationName, specName, mSpecializationId);
     }
 
-    void CreateClassDialog::onAttributeClicked(Widgets::MWAttributePtr _sender)
+    void CreateClassDialog::onAttributeClicked(Widgets::MWAttributePtr sender)
     {
         mAttribDialog = std::make_unique<SelectAttributeDialog>();
-        mAffectedAttribute = _sender;
+        mAffectedAttribute = sender;
         mAttribDialog->eventCancel += MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
         mAttribDialog->eventItemSelected += MyGUI::newDelegate(this, &CreateClassDialog::onAttributeSelected);
         mAttribDialog->setVisible(true);
@@ -789,10 +789,10 @@ namespace MWGui
         update();
     }
 
-    void CreateClassDialog::onSkillClicked(Widgets::MWSkillPtr _sender)
+    void CreateClassDialog::onSkillClicked(Widgets::MWSkillPtr sender)
     {
         mSkillDialog = std::make_unique<SelectSkillDialog>();
-        mAffectedSkill = _sender;
+        mAffectedSkill = sender;
         mSkillDialog->eventCancel += MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
         mSkillDialog->eventItemSelected += MyGUI::newDelegate(this, &CreateClassDialog::onSkillSelected);
         mSkillDialog->setVisible(true);
@@ -819,7 +819,7 @@ namespace MWGui
         update();
     }
 
-    void CreateClassDialog::onDescriptionClicked(MyGUI::Widget* _sender)
+    void CreateClassDialog::onDescriptionClicked(MyGUI::Widget* /*sender*/)
     {
         mDescDialog = std::make_unique<DescriptionDialog>();
         mDescDialog->setTextInput(mDescription);
@@ -833,14 +833,14 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeDialog(std::move(mDescDialog));
     }
 
-    void CreateClassDialog::onOkClicked(MyGUI::Widget* _sender)
+    void CreateClassDialog::onOkClicked(MyGUI::Widget* /*sender*/)
     {
         if (getName().size() <= 0)
             return;
         eventDone(this);
     }
 
-    void CreateClassDialog::onBackClicked(MyGUI::Widget* _sender)
+    void CreateClassDialog::onBackClicked(MyGUI::Widget* /*sender*/)
     {
         eventBack();
     }
@@ -890,13 +890,13 @@ namespace MWGui
 
     // widget controls
 
-    void SelectSpecializationDialog::onSpecializationClicked(MyGUI::Widget* _sender)
+    void SelectSpecializationDialog::onSpecializationClicked(MyGUI::Widget* sender)
     {
-        if (_sender == mSpecialization0)
+        if (sender == mSpecialization0)
             mSpecializationId = ESM::Class::Combat;
-        else if (_sender == mSpecialization1)
+        else if (sender == mSpecialization1)
             mSpecializationId = ESM::Class::Magic;
-        else if (_sender == mSpecialization2)
+        else if (sender == mSpecialization2)
             mSpecializationId = ESM::Class::Stealth;
         else
             return;
@@ -904,7 +904,7 @@ namespace MWGui
         eventItemSelected();
     }
 
-    void SelectSpecializationDialog::onCancelClicked(MyGUI::Widget* _sender)
+    void SelectSpecializationDialog::onCancelClicked(MyGUI::Widget* /*sender*/)
     {
         exit();
     }
@@ -970,13 +970,13 @@ namespace MWGui
 
     // widget controls
 
-    void SelectAttributeDialog::onAttributeClicked(Widgets::MWAttributePtr _sender)
+    void SelectAttributeDialog::onAttributeClicked(Widgets::MWAttributePtr sender)
     {
-        mAttributeId = _sender->getAttributeId();
+        mAttributeId = sender->getAttributeId();
         eventItemSelected();
     }
 
-    void SelectAttributeDialog::onCancelClicked(MyGUI::Widget* _sender)
+    void SelectAttributeDialog::onCancelClicked(MyGUI::Widget* /*sender*/)
     {
         exit();
     }
@@ -1072,13 +1072,13 @@ namespace MWGui
 
     // widget controls
 
-    void SelectSkillDialog::onSkillClicked(Widgets::MWSkillPtr _sender)
+    void SelectSkillDialog::onSkillClicked(Widgets::MWSkillPtr sender)
     {
-        mSkillId = _sender->getSkillId();
+        mSkillId = sender->getSkillId();
         eventItemSelected();
     }
 
-    void SelectSkillDialog::onCancelClicked(MyGUI::Widget* _sender)
+    void SelectSkillDialog::onCancelClicked(MyGUI::Widget* /*sender*/)
     {
         exit();
     }
@@ -1184,7 +1184,7 @@ namespace MWGui
 
     // widget controls
 
-    void DescriptionDialog::onOkClicked(MyGUI::Widget* _sender)
+    void DescriptionDialog::onOkClicked(MyGUI::Widget* /*sender*/)
     {
         eventDone(this);
     }

apps/openmw/mwgui/class.hpp

@@ -41,7 +41,7 @@ namespace MWGui
         EventHandle_Int eventButtonSelected;
 
     protected:
-        void onButtonClicked(MyGUI::Widget* _sender);
+        void onButtonClicked(MyGUI::Widget* sender);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
 
     private:
@@ -92,8 +92,8 @@ namespace MWGui
         EventHandle_WindowBase eventDone;
 
     protected:
-        void onOkClicked(MyGUI::Widget* _sender);
+        void onOkClicked(MyGUI::Widget* sender);
-        void onBackClicked(MyGUI::Widget* _sender);
+        void onBackClicked(MyGUI::Widget* sender);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
         bool mOkButtonFocus = true;
 
@@ -133,11 +133,11 @@ namespace MWGui
         EventHandle_WindowBase eventDone;
 
     protected:
-        void onSelectClass(MyGUI::ListBox* _sender, size_t _index);
+        void onSelectClass(MyGUI::ListBox* sender, size_t index);
-        void onAccept(MyGUI::ListBox* _sender, size_t _index);
+        void onAccept(MyGUI::ListBox* sender, size_t index);
 
-        void onOkClicked(MyGUI::Widget* _sender);
+        void onOkClicked(MyGUI::Widget* sender);
-        void onBackClicked(MyGUI::Widget* _sender);
+        void onBackClicked(MyGUI::Widget* sender);
 
     private:
         void updateClasses();
@@ -181,8 +181,8 @@ namespace MWGui
         EventHandle_Void eventItemSelected;
 
     protected:
-        void onSpecializationClicked(MyGUI::Widget* _sender);
+        void onSpecializationClicked(MyGUI::Widget* sender);
-        void onCancelClicked(MyGUI::Widget* _sender);
+        void onCancelClicked(MyGUI::Widget* sender);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
 
     private:
@@ -215,8 +215,8 @@ namespace MWGui
         EventHandle_Void eventItemSelected;
 
     protected:
-        void onAttributeClicked(Widgets::MWAttributePtr _sender);
+        void onAttributeClicked(Widgets::MWAttributePtr sender);
-        void onCancelClicked(MyGUI::Widget* _sender);
+        void onCancelClicked(MyGUI::Widget* sender);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
         size_t mControllerFocus = 0;
         std::vector<Widgets::MWAttribute*> mAttributeButtons;
@@ -249,8 +249,8 @@ namespace MWGui
         EventHandle_Void eventItemSelected;
 
     protected:
-        void onSkillClicked(Widgets::MWSkillPtr _sender);
+        void onSkillClicked(Widgets::MWSkillPtr sender);
-        void onCancelClicked(MyGUI::Widget* _sender);
+        void onCancelClicked(MyGUI::Widget* sender);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
         size_t mControllerFocus = 0;
         std::vector<Widgets::MWSkill*> mSkillButtons;
@@ -277,7 +277,7 @@ namespace MWGui
         EventHandle_WindowBase eventDone;
 
     protected:
-        void onOkClicked(MyGUI::Widget* _sender);
+        void onOkClicked(MyGUI::Widget* sender);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
 
     private:
@@ -315,16 +315,16 @@ namespace MWGui
         EventHandle_WindowBase eventDone;
 
     protected:
-        void onOkClicked(MyGUI::Widget* _sender);
+        void onOkClicked(MyGUI::Widget* sender);
-        void onBackClicked(MyGUI::Widget* _sender);
+        void onBackClicked(MyGUI::Widget* sender);
 
-        void onSpecializationClicked(MyGUI::Widget* _sender);
+        void onSpecializationClicked(MyGUI::Widget* sender);
         void onSpecializationSelected();
-        void onAttributeClicked(Widgets::MWAttributePtr _sender);
+        void onAttributeClicked(Widgets::MWAttributePtr sender);
         void onAttributeSelected();
-        void onSkillClicked(Widgets::MWSkillPtr _sender);
+        void onSkillClicked(Widgets::MWSkillPtr sender);
         void onSkillSelected();
-        void onDescriptionClicked(MyGUI::Widget* _sender);
+        void onDescriptionClicked(MyGUI::Widget* sender);
         void onDescriptionEntered(WindowBase* parWindow);
         void onDialogCancel();
 

apps/openmw/mwgui/companionwindow.cpp

@@ -114,9 +114,9 @@ namespace MWGui
             dragItem(nullptr, count);
     }
 
-    void CompanionWindow::onNameFilterChanged(MyGUI::EditBox* _sender)
+    void CompanionWindow::onNameFilterChanged(MyGUI::EditBox* sender)
     {
-        mSortModel->setNameFilter(_sender->getCaption());
+        mSortModel->setNameFilter(sender->getCaption());
         mItemView->update();
     }
 
@@ -186,7 +186,7 @@ namespace MWGui
             mProfitLabel->setCaption({});
     }
 
-    void CompanionWindow::onCloseButtonClicked(MyGUI::Widget* _sender)
+    void CompanionWindow::onCloseButtonClicked(MyGUI::Widget* /*sender*/)
     {
         if (exit())
             MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);

apps/openmw/mwgui/companionwindow.hpp

@@ -63,7 +63,7 @@ namespace MWGui
         MessageBoxManager* mMessageBoxManager;
 
         void onItemSelected(int index);
-        void onNameFilterChanged(MyGUI::EditBox* _sender);
+        void onNameFilterChanged(MyGUI::EditBox* sender);
         void onBackgroundSelected();
         void dragItem(MyGUI::Widget* sender, std::size_t count);
         void transferItem(MyGUI::Widget* sender, std::size_t count);
@@ -72,7 +72,7 @@ namespace MWGui
 
         void updateEncumbranceBar();
 
-        void onCloseButtonClicked(MyGUI::Widget* _sender);
+        void onCloseButtonClicked(MyGUI::Widget* sender);
 
         void onReferenceUnavailable() override;
 

apps/openmw/mwgui/confirmationdialog.cpp

@@ -61,12 +61,12 @@ namespace MWGui
         return true;
     }
 
-    void ConfirmationDialog::onCancelButtonClicked(MyGUI::Widget* _sender)
+    void ConfirmationDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         exit();
     }
 
-    void ConfirmationDialog::onOkButtonClicked(MyGUI::Widget* _sender)
+    void ConfirmationDialog::onOkButtonClicked(MyGUI::Widget* /*sender*/)
     {
         setVisible(false);
 

apps/openmw/mwgui/confirmationdialog.hpp

@@ -25,8 +25,8 @@ namespace MWGui
         MyGUI::Button* mOkButton;
         MyGUI::Button* mCancelButton;
 
-        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
-        void onOkButtonClicked(MyGUI::Widget* _sender);
+        void onOkButtonClicked(MyGUI::Widget* sender);
 
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
         bool mOkButtonFocus = true;

apps/openmw/mwgui/console.cpp

@@ -280,7 +280,7 @@ namespace MWGui
         return c == ' ' || c == '\t';
     }
 
-    void Console::commandBoxKeyPress(MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char _char)
+    void Console::commandBoxKeyPress(MyGUI::Widget* /*sender*/, MyGUI::KeyCode key, MyGUI::Char /*value*/)
     {
         if (MyGUI::InputManager::getInstance().isControlPressed())
         {
@@ -368,7 +368,7 @@ namespace MWGui
         }
     }
 
-    void Console::acceptCommand(MyGUI::EditBox* _sender)
+    void Console::acceptCommand(MyGUI::EditBox* /*sender*/)
     {
         const std::string& cm = mCommandLine->getOnlyText();
         if (cm.empty())
@@ -395,7 +395,7 @@ namespace MWGui
         execute(cm);
     }
 
-    void Console::toggleCaseSensitiveSearch(MyGUI::Widget* _sender)
+    void Console::toggleCaseSensitiveSearch(MyGUI::Widget* /*sender*/)
     {
         mCaseSensitiveSearch = !mCaseSensitiveSearch;
 
@@ -407,7 +407,7 @@ namespace MWGui
         mCaseSensitiveToggleButton->setTextColour(mCaseSensitiveSearch ? textColours.link : textColours.normal);
     }
 
-    void Console::toggleRegExSearch(MyGUI::Widget* _sender)
+    void Console::toggleRegExSearch(MyGUI::Widget* /*sender*/)
     {
         mRegExSearch = !mRegExSearch;
 
@@ -426,7 +426,7 @@ namespace MWGui
         mCaseSensitiveToggleButton->setEnabled(!mRegExSearch);
     }
 
-    void Console::acceptSearchTerm(MyGUI::EditBox* _sender)
+    void Console::acceptSearchTerm(MyGUI::EditBox* /*sender*/)
     {
         const std::string& searchTerm = mSearchTerm->getOnlyText();
 
@@ -453,12 +453,12 @@ namespace MWGui
         Reverse
     };
 
-    void Console::findNextOccurrence(MyGUI::Widget* _sender)
+    void Console::findNextOccurrence(MyGUI::Widget* /*sender*/)
     {
         findOccurrence(SearchDirection::Forward);
     }
 
-    void Console::findPreviousOccurrence(MyGUI::Widget* _sender)
+    void Console::findPreviousOccurrence(MyGUI::Widget* /*sender*/)
     {
         findOccurrence(SearchDirection::Reverse);
     }

apps/openmw/mwgui/console.hpp

@@ -80,15 +80,15 @@ namespace MWGui
 
         void updateConsoleTitle();
 
-        void commandBoxKeyPress(MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char _char);
+        void commandBoxKeyPress(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char value);
-        void acceptCommand(MyGUI::EditBox* _sender);
+        void acceptCommand(MyGUI::EditBox* sender);
 
         enum class SearchDirection;
-        void toggleCaseSensitiveSearch(MyGUI::Widget* _sender);
+        void toggleCaseSensitiveSearch(MyGUI::Widget* sender);
-        void toggleRegExSearch(MyGUI::Widget* _sender);
+        void toggleRegExSearch(MyGUI::Widget* sender);
-        void acceptSearchTerm(MyGUI::EditBox* _sender);
+        void acceptSearchTerm(MyGUI::EditBox* sender);
-        void findNextOccurrence(MyGUI::Widget* _sender);
+        void findNextOccurrence(MyGUI::Widget* sender);
-        void findPreviousOccurrence(MyGUI::Widget* _sender);
+        void findPreviousOccurrence(MyGUI::Widget* sender);
         void findOccurrence(SearchDirection direction);
         void findInHistoryText(
             const std::string& historyText, SearchDirection direction, size_t firstIndex, size_t lastIndex);

apps/openmw/mwgui/container.cpp

@@ -223,12 +223,12 @@ namespace MWGui
         mItemTransfer->removeTarget(*mItemView);
     }
 
-    void ContainerWindow::onCloseButtonClicked(MyGUI::Widget* _sender)
+    void ContainerWindow::onCloseButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
     }
 
-    void ContainerWindow::onTakeAllButtonClicked(MyGUI::Widget* _sender)
+    void ContainerWindow::onTakeAllButtonClicked(MyGUI::Widget* /*sender*/)
     {
         if (!mModel)
             return;
@@ -279,7 +279,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
     }
 
-    void ContainerWindow::onDisposeCorpseButtonClicked(MyGUI::Widget* sender)
+    void ContainerWindow::onDisposeCorpseButtonClicked(MyGUI::Widget* /*sender*/)
     {
         if (mDragAndDrop == nullptr || !mDragAndDrop->mIsOnDragAndDrop)
         {

apps/openmw/mwgui/container.hpp

@@ -74,8 +74,8 @@ namespace MWGui
         void dragItem(MyGUI::Widget* sender, std::size_t count);
         void transferItem(MyGUI::Widget* sender, std::size_t count);
         void dropItem();
-        void onCloseButtonClicked(MyGUI::Widget* _sender);
+        void onCloseButtonClicked(MyGUI::Widget* sender);
-        void onTakeAllButtonClicked(MyGUI::Widget* _sender);
+        void onTakeAllButtonClicked(MyGUI::Widget* sender);
         void onDisposeCorpseButtonClicked(MyGUI::Widget* sender);
 
         void onReferenceUnavailable() override;

apps/openmw/mwgui/controllers.cpp

@@ -7,11 +7,11 @@ namespace MWGui
 {
     namespace Controllers
     {
-        void ControllerFollowMouse::prepareItem(MyGUI::Widget* _widget) {}
+        void ControllerFollowMouse::prepareItem(MyGUI::Widget* widget) {}
 
-        bool ControllerFollowMouse::addTime(MyGUI::Widget* _widget, float _time)
+        bool ControllerFollowMouse::addTime(MyGUI::Widget* widget, float time)
         {
-            _widget->setPosition(MyGUI::InputManager::getInstance().getMousePosition());
+            widget->setPosition(MyGUI::InputManager::getInstance().getMousePosition());
             return true;
         }
 

apps/openmw/mwgui/controllers.hpp

@@ -2,7 +2,6 @@
 #define MWGUI_CONTROLLERS_H
 
 #include <MyGUI_ControllerItem.h>
-#include <string>
 
 namespace MyGUI
 {
@@ -17,8 +16,8 @@ namespace MWGui::Controllers
         MYGUI_RTTI_DERIVED(ControllerFollowMouse)
 
     private:
-        bool addTime(MyGUI::Widget* _widget, float _time) override;
+        bool addTime(MyGUI::Widget* widget, float time) override;
-        void prepareItem(MyGUI::Widget* _widget) override;
+        void prepareItem(MyGUI::Widget* widget) override;
     };
 }
 

apps/openmw/mwgui/countdialog.cpp

@@ -64,12 +64,12 @@ namespace MWGui
         mItemEdit->setValue(count);
     }
 
-    void CountDialog::onCancelButtonClicked(MyGUI::Widget* _sender)
+    void CountDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         setVisible(false);
     }
 
-    void CountDialog::onOkButtonClicked(MyGUI::Widget* _sender)
+    void CountDialog::onOkButtonClicked(MyGUI::Widget* /*sender*/)
     {
         // The order here matters. Hide the dialog first so the OK event tooltips reappear.
         setVisible(false);
@@ -78,9 +78,9 @@ namespace MWGui
 
     // essentially duplicating what the OK button does if user presses
     // Enter key
-    void CountDialog::onEnterKeyPressed(MyGUI::EditBox* _sender)
+    void CountDialog::onEnterKeyPressed(MyGUI::EditBox* sender)
     {
-        onOkButtonClicked(_sender);
+        onOkButtonClicked(sender);
 
         // To do not spam onEnterKeyPressed() again and again
         MWBase::Environment::get().getWindowManager()->injectKeyRelease(MyGUI::KeyCode::None);
@@ -91,9 +91,9 @@ namespace MWGui
         mSlider->setScrollPosition(value - 1);
     }
 
-    void CountDialog::onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position)
+    void CountDialog::onSliderMoved(MyGUI::ScrollBar* sender, size_t position)
     {
-        mItemEdit->setValue(_position + 1);
+        mItemEdit->setValue(position + 1);
     }
 
     bool CountDialog::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)

apps/openmw/mwgui/countdialog.hpp

@@ -30,11 +30,11 @@ namespace MWGui
         MyGUI::Button* mOkButton;
         MyGUI::Button* mCancelButton;
 
-        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
-        void onOkButtonClicked(MyGUI::Widget* _sender);
+        void onOkButtonClicked(MyGUI::Widget* sender);
         void onEditValueChanged(int value);
-        void onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position);
+        void onSliderMoved(MyGUI::ScrollBar* sender, size_t position);
-        void onEnterKeyPressed(MyGUI::EditBox* _sender);
+        void onEnterKeyPressed(MyGUI::EditBox* sender);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
     };
 

apps/openmw/mwgui/cursor.cpp

@@ -16,11 +16,11 @@ namespace MWGui
 
     ResourceImageSetPointerFix::~ResourceImageSetPointerFix() {}
 
-    void ResourceImageSetPointerFix::deserialization(MyGUI::xml::ElementPtr _node, MyGUI::Version _version)
+    void ResourceImageSetPointerFix::deserialization(MyGUI::xml::ElementPtr node, MyGUI::Version version)
     {
-        Base::deserialization(_node, _version);
+        Base::deserialization(node, version);
 
-        MyGUI::xml::ElementEnumerator info = _node->getElementEnumerator();
+        MyGUI::xml::ElementEnumerator info = node->getElementEnumerator();
         while (info.next("Property"))
         {
             auto key = info->findAttribute("key");
@@ -42,15 +42,15 @@ namespace MWGui
         return mRotation;
     }
 
-    void ResourceImageSetPointerFix::setImage(MyGUI::ImageBox* _image)
+    void ResourceImageSetPointerFix::setImage(MyGUI::ImageBox* image)
     {
         if (mImageSet != nullptr)
-            _image->setItemResourceInfo(mImageSet->getIndexInfo(0, 0));
+            image->setItemResourceInfo(mImageSet->getIndexInfo(0, 0));
     }
 
-    void ResourceImageSetPointerFix::setPosition(MyGUI::ImageBox* _image, const MyGUI::IntPoint& _point)
+    void ResourceImageSetPointerFix::setPosition(MyGUI::ImageBox* image, const MyGUI::IntPoint& point)
     {
-        _image->setCoord(_point.left - mPoint.left, _point.top - mPoint.top, mSize.width, mSize.height);
+        image->setCoord(point.left - mPoint.left, point.top - mPoint.top, mSize.width, mSize.height);
     }
 
     MyGUI::ResourceImageSetPtr ResourceImageSetPointerFix::getImageSet()

apps/openmw/mwgui/cursor.hpp

@@ -20,10 +20,10 @@ namespace MWGui
         ResourceImageSetPointerFix();
         virtual ~ResourceImageSetPointerFix();
 
-        void deserialization(MyGUI::xml::ElementPtr _node, MyGUI::Version _version) override;
+        void deserialization(MyGUI::xml::ElementPtr node, MyGUI::Version version) override;
 
-        void setImage(MyGUI::ImageBox* _image) override;
+        void setImage(MyGUI::ImageBox* image) override;
-        void setPosition(MyGUI::ImageBox* _image, const MyGUI::IntPoint& _point) override;
+        void setPosition(MyGUI::ImageBox* image, const MyGUI::IntPoint& point) override;
 
         // and now for the whole point of this class, allow us to get
         // the hot spot, the image and the size of the cursor.

apps/openmw/mwgui/dialogue.cpp

@@ -102,7 +102,7 @@ namespace MWGui
         totalHeight += lineHeight;
     }
 
-    void PersuasionDialog::onCancel(MyGUI::Widget* sender)
+    void PersuasionDialog::onCancel(MyGUI::Widget* /*sender*/)
     {
         setVisible(false);
     }
@@ -413,27 +413,27 @@ namespace MWGui
         }
     }
 
-    void DialogueWindow::onWindowResize(MyGUI::Window* _sender)
+    void DialogueWindow::onWindowResize(MyGUI::Window* sender)
     {
         // if the window has only been moved, not resized, we don't need to update
-        if (mCurrentWindowSize == _sender->getSize())
+        if (mCurrentWindowSize == sender->getSize())
             return;
 
         redrawTopicsList();
         updateHistory();
-        mCurrentWindowSize = _sender->getSize();
+        mCurrentWindowSize = sender->getSize();
     }
 
-    void DialogueWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    void DialogueWindow::onMouseWheel(MyGUI::Widget* /*sender*/, int rel)
     {
         if (!mScrollBar->getVisible())
             return;
         mScrollBar->setScrollPosition(
-            std::clamp<int>(mScrollBar->getScrollPosition() - _rel * 0.3, 0, mScrollBar->getScrollRange() - 1));
+            std::clamp<int>(mScrollBar->getScrollPosition() - rel * 0.3, 0, mScrollBar->getScrollRange() - 1));
         onScrollbarMoved(mScrollBar, mScrollBar->getScrollPosition());
     }
 
-    void DialogueWindow::onByeClicked(MyGUI::Widget* _sender)
+    void DialogueWindow::onByeClicked(MyGUI::Widget* /*sender*/)
     {
         if (exit())
         {

apps/openmw/mwgui/dialogue.hpp

@@ -179,9 +179,9 @@ namespace MWGui
         bool isCompanion();
 
         void onSelectListItem(const std::string& topic, int id);
-        void onByeClicked(MyGUI::Widget* _sender);
+        void onByeClicked(MyGUI::Widget* sender);
-        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheel(MyGUI::Widget* sender, int rel);
-        void onWindowResize(MyGUI::Window* _sender);
+        void onWindowResize(MyGUI::Window* sender);
         void onTopicActivated(const std::string& topicId);
         void onChoiceActivated(int id);
         void onGoodbyeActivated();

apps/openmw/mwgui/enchantingdialog.cpp

@@ -198,12 +198,12 @@ namespace MWGui
         mEnchanting.setEnchanter(MWWorld::Ptr());
     }
 
-    void EnchantingDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    void EnchantingDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Enchanting);
     }
 
-    void EnchantingDialog::onSelectItem(MyGUI::Widget* sender)
+    void EnchantingDialog::onSelectItem(MyGUI::Widget* /*sender*/)
     {
         if (mEnchanting.getOldItem().isEmpty())
         {
@@ -257,7 +257,7 @@ namespace MWGui
         mItemSelectionDialog->setVisible(false);
     }
 
-    void EnchantingDialog::onSelectSoul(MyGUI::Widget* sender)
+    void EnchantingDialog::onSelectSoul(MyGUI::Widget* /*sender*/)
     {
         if (mEnchanting.getGem().isEmpty())
         {
@@ -286,7 +286,7 @@ namespace MWGui
         updateLabels();
     }
 
-    void EnchantingDialog::onTypeButtonClicked(MyGUI::Widget* sender)
+    void EnchantingDialog::onTypeButtonClicked(MyGUI::Widget* /*sender*/)
     {
         mEnchanting.nextCastStyle();
         updateLabels();
@@ -301,7 +301,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->injectKeyRelease(MyGUI::KeyCode::None);
     }
 
-    void EnchantingDialog::onBuyButtonClicked(MyGUI::Widget* sender)
+    void EnchantingDialog::onBuyButtonClicked(MyGUI::Widget* /*sender*/)
     {
         if (mEffects.size() <= 0)
         {

apps/openmw/mwgui/exposedwindow.cpp

@@ -7,13 +7,13 @@ namespace MWGui
         return MyGUI::Widget::getSkinWidgetsByName(name);
     }
 
-    MyGUI::Widget* Window::getSkinWidget(const std::string& _name, bool _throw)
+    MyGUI::Widget* Window::getSkinWidget(const std::string& name)
     {
-        MyGUI::VectorWidgetPtr widgets = getSkinWidgetsByName(_name);
+        MyGUI::VectorWidgetPtr widgets = getSkinWidgetsByName(name);
 
         if (widgets.empty())
         {
-            MYGUI_ASSERT(!_throw, "widget name '" << _name << "' not found in skin of layout '" << getName() << "'");
+            MYGUI_ASSERT(false, "widget name '" << name << "' not found in skin of layout '" << getName() << "'");
             return nullptr;
         }
         else

apps/openmw/mwgui/exposedwindow.hpp

@@ -16,7 +16,7 @@ namespace MWGui
     public:
         MyGUI::VectorWidgetPtr getSkinWidgetsByName(const std::string& name);
 
-        MyGUI::Widget* getSkinWidget(const std::string& _name, bool _throw = true);
+        MyGUI::Widget* getSkinWidget(const std::string& name);
         ///< Get a widget defined in the inner skin of this window.
     };
 

apps/openmw/mwgui/hud.cpp

@@ -199,7 +199,7 @@ namespace MWGui
         mDragAndDrop->drop(&drop, nullptr);
     }
 
-    void HUD::onWorldClicked(MyGUI::Widget* _sender)
+    void HUD::onWorldClicked(MyGUI::Widget* /*sender*/)
     {
         if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
             return;
@@ -238,7 +238,7 @@ namespace MWGui
         }
     }
 
-    void HUD::onWorldMouseOver(MyGUI::Widget* _sender, int x, int y)
+    void HUD::onWorldMouseOver(MyGUI::Widget* /*sender*/, int x, int y)
     {
         if (mDragAndDrop->mIsOnDragAndDrop)
         {
@@ -266,23 +266,23 @@ namespace MWGui
         }
     }
 
-    void HUD::onWorldMouseLostFocus(MyGUI::Widget* _sender, MyGUI::Widget* _new)
+    void HUD::onWorldMouseLostFocus(MyGUI::Widget* /*sender*/, MyGUI::Widget* newWidget)
     {
         MWBase::Environment::get().getWindowManager()->changePointer("arrow");
         mWorldMouseOver = false;
     }
 
-    void HUD::onHMSClicked(MyGUI::Widget* _sender)
+    void HUD::onHMSClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->toggleVisible(GW_Stats);
     }
 
-    void HUD::onMapClicked(MyGUI::Widget* _sender)
+    void HUD::onMapClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->toggleVisible(GW_Map);
     }
 
-    void HUD::onWeaponClicked(MyGUI::Widget* _sender)
+    void HUD::onWeaponClicked(MyGUI::Widget* /*sender*/)
     {
         const MWWorld::Ptr& player = MWMechanics::getPlayer();
         if (player.getClass().getNpcStats(player).isWerewolf())
@@ -294,7 +294,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->toggleVisible(GW_Inventory);
     }
 
-    void HUD::onMagicClicked(MyGUI::Widget* _sender)
+    void HUD::onMagicClicked(MyGUI::Widget* /*sender*/)
     {
         const MWWorld::Ptr& player = MWMechanics::getPlayer();
         if (player.getClass().getNpcStats(player).isWerewolf())

apps/openmw/mwgui/hud.hpp

@@ -106,13 +106,13 @@ namespace MWGui
         bool mIsDrowning;
         float mDrowningFlashTheta;
 
-        void onWorldClicked(MyGUI::Widget* _sender);
+        void onWorldClicked(MyGUI::Widget* sender);
-        void onWorldMouseOver(MyGUI::Widget* _sender, int x, int y);
+        void onWorldMouseOver(MyGUI::Widget* sender, int x, int y);
-        void onWorldMouseLostFocus(MyGUI::Widget* _sender, MyGUI::Widget* _new);
+        void onWorldMouseLostFocus(MyGUI::Widget* sender, MyGUI::Widget* newWidget);
-        void onHMSClicked(MyGUI::Widget* _sender);
+        void onHMSClicked(MyGUI::Widget* sender);
-        void onWeaponClicked(MyGUI::Widget* _sender);
+        void onWeaponClicked(MyGUI::Widget* sender);
-        void onMagicClicked(MyGUI::Widget* _sender);
+        void onMagicClicked(MyGUI::Widget* sender);
-        void onMapClicked(MyGUI::Widget* _sender);
+        void onMapClicked(MyGUI::Widget* sender);
 
         // LocalMapBase
         void customMarkerCreated(MyGUI::Widget* marker) override;

apps/openmw/mwgui/inventorywindow.cpp

@@ -512,19 +512,19 @@ namespace MWGui
         mItemTransfer->removeTarget(*mItemView);
     }
 
-    void InventoryWindow::onWindowResize(MyGUI::Window* _sender)
+    void InventoryWindow::onWindowResize(MyGUI::Window* sender)
     {
-        WindowBase::clampWindowCoordinates(_sender);
+        WindowBase::clampWindowCoordinates(sender);
 
         adjustPanes();
         const WindowSettingValues settings = getModeSettings(mGuiMode);
 
         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
 
-        settings.mRegular.mX.set(_sender->getPosition().left / static_cast<float>(viewSize.width));
+        settings.mRegular.mX.set(sender->getPosition().left / static_cast<float>(viewSize.width));
-        settings.mRegular.mY.set(_sender->getPosition().top / static_cast<float>(viewSize.height));
+        settings.mRegular.mY.set(sender->getPosition().top / static_cast<float>(viewSize.height));
-        settings.mRegular.mW.set(_sender->getSize().width / static_cast<float>(viewSize.width));
+        settings.mRegular.mW.set(sender->getSize().width / static_cast<float>(viewSize.width));
-        settings.mRegular.mH.set(_sender->getSize().height / static_cast<float>(viewSize.height));
+        settings.mRegular.mH.set(sender->getSize().height / static_cast<float>(viewSize.height));
         settings.mIsMaximized.set(false);
 
         if (mMainWidget->getSize().width != mLastXSize || mMainWidget->getSize().height != mLastYSize)
@@ -557,23 +557,23 @@ namespace MWGui
                 viewport.height / float(mPreview->getTextureHeight())));
     }
 
-    void InventoryWindow::onNameFilterChanged(MyGUI::EditBox* _sender)
+    void InventoryWindow::onNameFilterChanged(MyGUI::EditBox* sender)
     {
-        mSortModel->setNameFilter(_sender->getCaption());
+        mSortModel->setNameFilter(sender->getCaption());
         mItemView->update();
     }
 
-    void InventoryWindow::onFilterChanged(MyGUI::Widget* _sender)
+    void InventoryWindow::onFilterChanged(MyGUI::Widget* sender)
     {
-        if (_sender == mFilterAll)
+        if (sender == mFilterAll)
             mSortModel->setCategory(SortFilterItemModel::Category_All);
-        else if (_sender == mFilterWeapon)
+        else if (sender == mFilterWeapon)
             mSortModel->setCategory(SortFilterItemModel::Category_Weapon);
-        else if (_sender == mFilterApparel)
+        else if (sender == mFilterApparel)
             mSortModel->setCategory(SortFilterItemModel::Category_Apparel);
-        else if (_sender == mFilterMagic)
+        else if (sender == mFilterMagic)
             mSortModel->setCategory(SortFilterItemModel::Category_Magic);
-        else if (_sender == mFilterMisc)
+        else if (sender == mFilterMisc)
             mSortModel->setCategory(SortFilterItemModel::Category_Misc);
         mFilterAll->setStateSelected(false);
         mFilterWeapon->setStateSelected(false);
@@ -583,7 +583,7 @@ namespace MWGui
 
         mItemView->update();
 
-        _sender->castType<MyGUI::Button>()->setStateSelected(true);
+        sender->castType<MyGUI::Button>()->setStateSelected(true);
     }
 
     void InventoryWindow::onPinToggled()
@@ -683,7 +683,7 @@ namespace MWGui
         // else: will be updated in open()
     }
 
-    void InventoryWindow::onAvatarClicked(MyGUI::Widget* _sender)
+    void InventoryWindow::onAvatarClicked(MyGUI::Widget* /*sender*/)
     {
         if (mDragAndDrop->mIsOnDragAndDrop)
         {

apps/openmw/mwgui/inventorywindow.hpp

@@ -145,10 +145,10 @@ namespace MWGui
         void transferItem(MyGUI::Widget* sender, std::size_t count);
         void dropItem(MyGUI::Widget* sender, std::size_t count);
 
-        void onWindowResize(MyGUI::Window* _sender);
+        void onWindowResize(MyGUI::Window* sender);
-        void onFilterChanged(MyGUI::Widget* _sender);
+        void onFilterChanged(MyGUI::Widget* sender);
-        void onNameFilterChanged(MyGUI::EditBox* _sender);
+        void onNameFilterChanged(MyGUI::EditBox* sender);
-        void onAvatarClicked(MyGUI::Widget* _sender);
+        void onAvatarClicked(MyGUI::Widget* sender);
         void onPinToggled() override;
 
         void updateEncumbranceBar();

apps/openmw/mwgui/itemselection.cpp

@@ -68,7 +68,7 @@ namespace MWGui
         eventItemSelected(item.mBase);
     }
 
-    void ItemSelectionDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    void ItemSelectionDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         exit();
     }

apps/openmw/mwgui/itemview.cpp

@@ -151,32 +151,32 @@ namespace MWGui
         eventItemClicked(index);
     }
 
-    void ItemView::onSelectedBackground(MyGUI::Widget* sender)
+    void ItemView::onSelectedBackground(MyGUI::Widget* /*sender*/)
     {
         eventBackgroundClicked();
     }
 
-    void ItemView::onMouseWheelMoved(MyGUI::Widget* _sender, int _rel)
+    void ItemView::onMouseWheelMoved(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (mScrollView->getViewOffset().left + _rel * 0.3f > 0)
+        if (mScrollView->getViewOffset().left + rel * 0.3f > 0)
             mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
             mScrollView->setViewOffset(
-                MyGUI::IntPoint(static_cast<int>(mScrollView->getViewOffset().left + _rel * 0.3f), 0));
+                MyGUI::IntPoint(static_cast<int>(mScrollView->getViewOffset().left + rel * 0.3f), 0));
     }
 
-    void ItemView::setSize(const MyGUI::IntSize& _value)
+    void ItemView::setSize(const MyGUI::IntSize& value)
     {
-        bool changed = (_value.width != getWidth() || _value.height != getHeight());
+        bool changed = (value.width != getWidth() || value.height != getHeight());
-        Base::setSize(_value);
+        Base::setSize(value);
         if (changed)
             layoutWidgets();
     }
 
-    void ItemView::setCoord(const MyGUI::IntCoord& _value)
+    void ItemView::setCoord(const MyGUI::IntCoord& value)
     {
-        bool changed = (_value.width != getWidth() || _value.height != getHeight());
+        bool changed = (value.width != getWidth() || value.height != getHeight());
-        Base::setCoord(_value);
+        Base::setCoord(value);
         if (changed)
             layoutWidgets();
     }

apps/openmw/mwgui/itemview.hpp

@@ -43,12 +43,12 @@ namespace MWGui
 
         void layoutWidgets();
 
-        void setSize(const MyGUI::IntSize& _value) override;
+        void setSize(const MyGUI::IntSize& value) override;
-        void setCoord(const MyGUI::IntCoord& _value) override;
+        void setCoord(const MyGUI::IntCoord& value) override;
 
         void onSelectedItem(MyGUI::Widget* sender);
         void onSelectedBackground(MyGUI::Widget* sender);
-        void onMouseWheelMoved(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheelMoved(MyGUI::Widget* sender, int rel);
 
         std::unique_ptr<ItemModel> mModel;
         MyGUI::ScrollView* mScrollView;

apps/openmw/mwgui/journalbooks.cpp

@@ -15,17 +15,17 @@ namespace
         MWGui::BookTypesetter::Ptr mTypesetter;
         MWGui::BookTypesetter::Style* mBodyStyle;
 
-        AddContent(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style)
+        explicit AddContent(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* bodyStyle)
             : mTypesetter(std::move(typesetter))
-            , mBodyStyle(body_style)
+            , mBodyStyle(bodyStyle)
         {
         }
     };
 
     struct AddSpan : AddContent
     {
-        AddSpan(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style)
+        explicit AddSpan(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* bodyStyle)
-            : AddContent(std::move(typesetter), body_style)
+            : AddContent(std::move(typesetter), bodyStyle)
         {
         }
 
@@ -47,9 +47,9 @@ namespace
         MWGui::BookTypesetter::Ptr mTypesetter;
         MWGui::BookTypesetter::Style* mBodyStyle;
 
-        AddEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style)
+        AddEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* bodyStyle)
             : mTypesetter(std::move(typesetter))
-            , mBodyStyle(body_style)
+            , mBodyStyle(bodyStyle)
         {
         }
 
@@ -66,11 +66,11 @@ namespace
         bool mAddHeader;
         MWGui::BookTypesetter::Style* mHeaderStyle;
 
-        AddJournalEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style,
+        explicit AddJournalEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* bodyStyle,
-            MWGui::BookTypesetter::Style* header_style, bool add_header)
+            MWGui::BookTypesetter::Style* headerStyle, bool addHeader)
-            : AddEntry(std::move(typesetter), body_style)
+            : AddEntry(std::move(typesetter), bodyStyle)
-            , mAddHeader(add_header)
+            , mAddHeader(addHeader)
-            , mHeaderStyle(header_style)
+            , mHeaderStyle(headerStyle)
         {
         }
 
@@ -93,11 +93,11 @@ namespace
         intptr_t mContentId;
         MWGui::BookTypesetter::Style* mHeaderStyle;
 
-        AddTopicEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style,
+        explicit AddTopicEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* bodyStyle,
-            MWGui::BookTypesetter::Style* header_style, intptr_t contentId)
+            MWGui::BookTypesetter::Style* headerStyle, intptr_t contentId)
-            : AddEntry(std::move(typesetter), body_style)
+            : AddEntry(std::move(typesetter), bodyStyle)
             , mContentId(contentId)
-            , mHeaderStyle(header_style)
+            , mHeaderStyle(headerStyle)
         {
         }
 

apps/openmw/mwgui/journalwindow.cpp

@@ -461,7 +461,7 @@ namespace
             MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
         }
 
-        void notifyOptions(MyGUI::Widget* _sender)
+        void notifyOptions(MyGUI::Widget* /*sender*/)
         {
             setOptionsMode();
 
@@ -484,7 +484,7 @@ namespace
                 setIndexControllerFocus(true);
         }
 
-        void notifyJournal(MyGUI::Widget* _sender)
+        void notifyJournal(MyGUI::Widget* /*sender*/)
         {
             assert(mStates.size() > 1);
             popBook();
@@ -493,16 +493,16 @@ namespace
             MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
         }
 
-        void addControllerButtons(Gui::MWList* _list, size_t _selectedIndex)
+        void addControllerButtons(Gui::MWList* list, size_t selectedIndex)
         {
             mButtons.clear();
-            for (size_t i = 0; i < _list->getItemCount(); i++)
+            for (size_t i = 0; i < list->getItemCount(); i++)
             {
-                MyGUI::Button* listItem = _list->getItemWidget(_list->getItemNameAt(i));
+                MyGUI::Button* listItem = list->getItemWidget(list->getItemNameAt(i));
                 if (listItem)
                 {
                     listItem->setTextColour(
-                        mButtons.size() == _selectedIndex ? MWGui::journalHeaderColour : MyGUI::Colour::Black);
+                        mButtons.size() == selectedIndex ? MWGui::journalHeaderColour : MyGUI::Colour::Black);
                     mButtons.push_back(listItem);
                 }
             }
@@ -536,7 +536,7 @@ namespace
             MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
         }
 
-        void notifyTopics(MyGUI::Widget* _sender)
+        void notifyTopics(MyGUI::Widget* /*sender*/)
         {
             mQuestMode = false;
             mTopicsMode = false;
@@ -579,7 +579,7 @@ namespace
             }
         };
 
-        void notifyQuests(MyGUI::Widget* _sender)
+        void notifyQuests(MyGUI::Widget* /*sender*/)
         {
             mQuestMode = true;
 
@@ -617,23 +617,23 @@ namespace
             MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
         }
 
-        void notifyShowAll(MyGUI::Widget* _sender)
+        void notifyShowAll(MyGUI::Widget* sender)
         {
             mAllQuests = true;
-            notifyQuests(_sender);
+            notifyQuests(sender);
         }
 
-        void notifyShowActive(MyGUI::Widget* _sender)
+        void notifyShowActive(MyGUI::Widget* sender)
         {
             mAllQuests = false;
-            notifyQuests(_sender);
+            notifyQuests(sender);
         }
 
-        void notifyCancel(MyGUI::Widget* _sender)
+        void notifyCancel(MyGUI::Widget* sender)
         {
             if (mTopicsMode)
             {
-                notifyTopics(_sender);
+                notifyTopics(sender);
             }
             else
             {
@@ -642,7 +642,7 @@ namespace
             }
         }
 
-        void notifyClose(MyGUI::Widget* _sender)
+        void notifyClose(MyGUI::Widget* /*sender*/)
         {
             MWBase::WindowManager* winMgr = MWBase::Environment::get().getWindowManager();
             winMgr->playSound(ESM::RefId::stringRefId("book close"));
@@ -657,7 +657,7 @@ namespace
                 notifyPrevPage(sender);
         }
 
-        void notifyNextPage(MyGUI::Widget* _sender)
+        void notifyNextPage(MyGUI::Widget* /*sender*/)
         {
             if (mOptionsMode)
                 return;
@@ -676,7 +676,7 @@ namespace
             }
         }
 
-        void notifyPrevPage(MyGUI::Widget* _sender)
+        void notifyPrevPage(MyGUI::Widget* /*sender*/)
         {
             if (mOptionsMode)
                 return;
@@ -932,9 +932,9 @@ namespace
 
 // glue the implementation to the interface
 std::unique_ptr<MWGui::JournalWindow> MWGui::JournalWindow::create(
-    JournalViewModel::Ptr Model, bool questList, ToUTF8::FromType encoding)
+    JournalViewModel::Ptr model, bool questList, ToUTF8::FromType encoding)
 {
-    return std::make_unique<JournalWindowImpl>(Model, questList, encoding);
+    return std::make_unique<JournalWindowImpl>(model, questList, encoding);
 }
 
 MWGui::JournalWindow::JournalWindow()

apps/openmw/mwgui/layout.cpp

@@ -9,10 +9,10 @@
 
 namespace MWGui
 {
-    void Layout::initialise(std::string_view _layout)
+    void Layout::initialise(std::string_view layout)
     {
         constexpr char mainWindow[] = "_Main";
-        mLayoutName = _layout;
+        mLayoutName = layout;
 
         mPrefix = MyGUI::utility::toString(this, "_");
         mListWindowRoot = MyGUI::LayoutManager::getInstance().loadLayout(mLayoutName, mPrefix);
@@ -62,10 +62,10 @@ namespace MWGui
             window->setCaptionWithReplacing(MyGUI::UString(title));
     }
 
-    MyGUI::Widget* Layout::getWidget(std::string_view _name)
+    MyGUI::Widget* Layout::getWidget(std::string_view name)
     {
         std::string target = mPrefix;
-        target += _name;
+        target += name;
         for (MyGUI::Widget* widget : mListWindowRoot)
         {
             MyGUI::Widget* find = widget->findWidget(target);
@@ -74,7 +74,7 @@ namespace MWGui
                 return find;
             }
         }
-        MYGUI_EXCEPT("widget name '" << _name << "' in layout '" << mLayoutName << "' not found.");
+        MYGUI_EXCEPT("widget name '" << name << "' in layout '" << mLayoutName << "' not found.");
     }
 
 }

apps/openmw/mwgui/layout.hpp

@@ -38,9 +38,9 @@ namespace MWGui
         MyGUI::Widget* getWidget(std::string_view name);
 
         template <typename T>
-        void getWidget(T*& _widget, std::string_view _name)
+        void getWidget(T*& widget, std::string_view name)
         {
-            MyGUI::Widget* w = getWidget(_name);
+            MyGUI::Widget* w = getWidget(name);
             T* cast = w->castType<T>(false);
             if (!cast)
             {
@@ -49,7 +49,7 @@ namespace MWGui
                                                           << "' in layout '" << mLayoutName << "'");
             }
             else
-                _widget = cast;
+                widget = cast;
         }
 
     private:

apps/openmw/mwgui/levelupdialog.cpp

@@ -238,7 +238,7 @@ namespace MWGui
         MWBase::Environment::get().getSoundManager()->streamMusic(MWSound::triumphMusic, MWSound::MusicType::Normal);
     }
 
-    void LevelupDialog::onOkButtonClicked(MyGUI::Widget* sender)
+    void LevelupDialog::onOkButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats(player);

apps/openmw/mwgui/mapwindow.cpp

@@ -76,9 +76,9 @@ namespace
         MyGUI::Colour mNormalColour;
         MyGUI::Colour mHoverColour;
 
-        void onMouseLostFocus(MyGUI::Widget* _new) override { setColour(mNormalColour); }
+        void onMouseLostFocus(MyGUI::Widget* /*newWidget*/) override { setColour(mNormalColour); }
 
-        void onMouseSetFocus(MyGUI::Widget* _old) override { setColour(mHoverColour); }
+        void onMouseSetFocus(MyGUI::Widget* /*oldWidget*/) override { setColour(mHoverColour); }
     };
 
     MyGUI::IntRect createRect(const MyGUI::IntPoint& center, int radius)
@@ -878,7 +878,7 @@ namespace MWGui
         mEditNoteDialog.setVisible(true);
     }
 
-    void MapWindow::onMapDoubleClicked(MyGUI::Widget* sender)
+    void MapWindow::onMapDoubleClicked(MyGUI::Widget* /*sender*/)
     {
         MyGUI::IntPoint clickedPos = MyGUI::InputManager::getInstance().getMousePosition();
 
@@ -911,7 +911,7 @@ namespace MWGui
         mEditNoteDialog.setText({});
     }
 
-    void MapWindow::onMapZoomed(MyGUI::Widget* sender, int rel)
+    void MapWindow::onMapZoomed(MyGUI::Widget* /*sender*/, int rel)
     {
         const int localWidgetSize = Settings::map().mLocalMapWidgetSize;
         const bool zoomOut = rel < 0;
@@ -1193,19 +1193,19 @@ namespace MWGui
             setGlobalMapMarkerTooltip(widgetPair.widget, widgetPair.position.x(), widgetPair.position.y());
     }
 
-    void MapWindow::onDragStart(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+    void MapWindow::onDragStart(MyGUI::Widget* /*sender*/, int left, int top, MyGUI::MouseButton id)
     {
-        if (_id != MyGUI::MouseButton::Left)
+        if (id != MyGUI::MouseButton::Left)
             return;
-        mLastDragPos = MyGUI::IntPoint(_left, _top);
+        mLastDragPos = MyGUI::IntPoint(left, top);
     }
 
-    void MapWindow::onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+    void MapWindow::onMouseDrag(MyGUI::Widget* /*sender*/, int left, int top, MyGUI::MouseButton id)
     {
-        if (_id != MyGUI::MouseButton::Left)
+        if (id != MyGUI::MouseButton::Left)
             return;
 
-        MyGUI::IntPoint diff = MyGUI::IntPoint(_left, _top) - mLastDragPos;
+        MyGUI::IntPoint diff = MyGUI::IntPoint(left, top) - mLastDragPos;
 
         if (!Settings::map().mGlobal)
         {
@@ -1215,10 +1215,10 @@ namespace MWGui
         else
             mGlobalMap->setViewOffset(mGlobalMap->getViewOffset() + diff);
 
-        mLastDragPos = MyGUI::IntPoint(_left, _top);
+        mLastDragPos = MyGUI::IntPoint(left, top);
     }
 
-    void MapWindow::onWorldButtonClicked(MyGUI::Widget* _sender)
+    void MapWindow::onWorldButtonClicked(MyGUI::Widget* /*sender*/)
     {
         const bool global = !Settings::map().mGlobal;
 
@@ -1515,17 +1515,17 @@ namespace MWGui
         }
     }
 
-    void EditNoteDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    void EditNoteDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         setVisible(false);
     }
 
-    void EditNoteDialog::onOkButtonClicked(MyGUI::Widget* sender)
+    void EditNoteDialog::onOkButtonClicked(MyGUI::Widget* /*sender*/)
     {
         eventOkClicked();
     }
 
-    void EditNoteDialog::onDeleteButtonClicked(MyGUI::Widget* sender)
+    void EditNoteDialog::onDeleteButtonClicked(MyGUI::Widget* /*sender*/)
     {
         eventDeleteClicked();
     }

apps/openmw/mwgui/mapwindow.hpp

@@ -275,9 +275,9 @@ namespace MWGui
         void setActiveControllerWindow(bool active) override;
 
     private:
-        void onDragStart(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onDragStart(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id);
-        void onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onMouseDrag(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id);
-        void onWorldButtonClicked(MyGUI::Widget* _sender);
+        void onWorldButtonClicked(MyGUI::Widget* sender);
         void onMapDoubleClicked(MyGUI::Widget* sender);
         void onMapZoomed(MyGUI::Widget* sender, int rel);
         void zoomOnCursor(float speedDiff);

apps/openmw/mwgui/merchantrepair.cpp

@@ -129,12 +129,12 @@ namespace MWGui
         mGoldLabel->setCaptionWithReplacing("#{sGold}: " + MyGUI::utility::toString(playerGold));
     }
 
-    void MerchantRepair::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    void MerchantRepair::onMouseWheel(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (mList->getViewOffset().top + _rel * 0.3f > 0)
+        if (mList->getViewOffset().top + rel * 0.3f > 0)
             mList->setViewOffset(MyGUI::IntPoint(0, 0));
         else
-            mList->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mList->getViewOffset().top + _rel * 0.3f)));
+            mList->setViewOffset(MyGUI::IntPoint(0, static_cast<int>(mList->getViewOffset().top + rel * 0.3f)));
     }
 
     void MerchantRepair::onOpen()
@@ -169,7 +169,7 @@ namespace MWGui
         setPtr(mActor);
     }
 
-    void MerchantRepair::onOkButtonClick(MyGUI::Widget* sender)
+    void MerchantRepair::onOkButtonClick(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_MerchantRepair);
     }

apps/openmw/mwgui/merchantrepair.hpp

@@ -30,7 +30,7 @@ namespace MWGui
         size_t mControllerFocus = 0;
 
     protected:
-        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheel(MyGUI::Widget* sender, int rel);
         void onRepairButtonClick(MyGUI::Widget* sender);
         void onOkButtonClick(MyGUI::Widget* sender);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;

apps/openmw/mwgui/messagebox.cpp

@@ -417,18 +417,18 @@ namespace MWGui
         return nullptr;
     }
 
-    void InteractiveMessageBox::mousePressed(MyGUI::Widget* pressed)
+    void InteractiveMessageBox::mousePressed(MyGUI::Widget* widget)
     {
-        buttonActivated(pressed);
+        buttonActivated(widget);
     }
 
-    void InteractiveMessageBox::buttonActivated(MyGUI::Widget* pressed)
+    void InteractiveMessageBox::buttonActivated(MyGUI::Widget* widget)
     {
         mMarkedToDelete = true;
         int index = 0;
         for (const MyGUI::Button* button : mButtons)
         {
-            if (button == pressed)
+            if (button == widget)
             {
                 mButtonPressed = index;
                 mMessageBoxManager.onButtonPressed(mButtonPressed);

apps/openmw/mwgui/messagebox.hpp

@@ -94,7 +94,7 @@ namespace MWGui
     public:
         InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message,
             const std::vector<std::string>& buttons, bool immediate, size_t defaultFocus);
-        void mousePressed(MyGUI::Widget* _widget);
+        void mousePressed(MyGUI::Widget* widget);
         int readPressedButton();
 
         MyGUI::Widget* getDefaultKeyFocus() override;
@@ -106,7 +106,7 @@ namespace MWGui
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
 
     private:
-        void buttonActivated(MyGUI::Widget* _widget);
+        void buttonActivated(MyGUI::Widget* widget);
 
         MessageBoxManager& mMessageBoxManager;
         MyGUI::EditBox* mMessageWidget;

apps/openmw/mwgui/postprocessorhud.cpp

@@ -108,7 +108,7 @@ namespace MWGui
         layout();
     }
 
-    void PostProcessorHud::notifyResetButtonClicked(MyGUI::Widget* sender)
+    void PostProcessorHud::notifyResetButtonClicked(MyGUI::Widget* /*sender*/)
     {
         for (size_t i = 1; i < mConfigArea->getChildCount(); ++i)
         {
@@ -153,12 +153,12 @@ namespace MWGui
         }
     }
 
-    void PostProcessorHud::notifyActivatePressed(MyGUI::Widget* sender)
+    void PostProcessorHud::notifyActivatePressed(MyGUI::Widget* /*sender*/)
     {
         toggleTechnique(true);
     }
 
-    void PostProcessorHud::notifyDeactivatePressed(MyGUI::Widget* sender)
+    void PostProcessorHud::notifyDeactivatePressed(MyGUI::Widget* /*sender*/)
     {
         toggleTechnique(false);
     }
@@ -187,12 +187,12 @@ namespace MWGui
         }
     }
 
-    void PostProcessorHud::notifyShaderUpPressed(MyGUI::Widget* sender)
+    void PostProcessorHud::notifyShaderUpPressed(MyGUI::Widget* /*sender*/)
     {
         moveShader(Direction::Up);
     }
 
-    void PostProcessorHud::notifyShaderDownPressed(MyGUI::Widget* sender)
+    void PostProcessorHud::notifyShaderDownPressed(MyGUI::Widget* /*sender*/)
     {
         moveShader(Direction::Down);
     }
@@ -277,7 +277,7 @@ namespace MWGui
         mConfigLayout->setSize(mConfigLayout->getWidth(), mConfigLayout->getParentSize().height - padding2);
     }
 
-    void PostProcessorHud::notifyMouseWheel(MyGUI::Widget* sender, int rel)
+    void PostProcessorHud::notifyMouseWheel(MyGUI::Widget* /*sender*/, int rel)
     {
         int offset = mConfigLayout->getViewOffset().top + rel * 0.3;
         if (offset > 0)

apps/openmw/mwgui/quickkeysmenu.cpp

@@ -201,12 +201,12 @@ namespace MWGui
         mAssignDialog->setVisible(true);
     }
 
-    void QuickKeysMenu::onOkButtonClicked(MyGUI::Widget* sender)
+    void QuickKeysMenu::onOkButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_QuickKeysMenu);
     }
 
-    void QuickKeysMenu::onItemButtonClicked(MyGUI::Widget* sender)
+    void QuickKeysMenu::onItemButtonClicked(MyGUI::Widget* /*sender*/)
     {
         if (!mItemSelectionDialog)
         {
@@ -221,7 +221,7 @@ namespace MWGui
         mAssignDialog->setVisible(false);
     }
 
-    void QuickKeysMenu::onMagicButtonClicked(MyGUI::Widget* sender)
+    void QuickKeysMenu::onMagicButtonClicked(MyGUI::Widget* /*sender*/)
     {
         if (!mMagicSelectionDialog)
         {
@@ -232,13 +232,13 @@ namespace MWGui
         mAssignDialog->setVisible(false);
     }
 
-    void QuickKeysMenu::onUnassignButtonClicked(MyGUI::Widget* sender)
+    void QuickKeysMenu::onUnassignButtonClicked(MyGUI::Widget* /*sender*/)
     {
         unassign(mSelected);
         mAssignDialog->setVisible(false);
     }
 
-    void QuickKeysMenu::onCancelButtonClicked(MyGUI::Widget* sender)
+    void QuickKeysMenu::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         mAssignDialog->setVisible(false);
     }
@@ -708,7 +708,7 @@ namespace MWGui
         center();
     }
 
-    void MagicSelectionDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    void MagicSelectionDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         exit();
     }

apps/openmw/mwgui/race.cpp

@@ -221,24 +221,24 @@ namespace MWGui
 
     // widget controls
 
-    void RaceDialog::onOkClicked(MyGUI::Widget* _sender)
+    void RaceDialog::onOkClicked(MyGUI::Widget* /*sender*/)
     {
         if (mRaceList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);
     }
 
-    void RaceDialog::onBackClicked(MyGUI::Widget* _sender)
+    void RaceDialog::onBackClicked(MyGUI::Widget* /*sender*/)
     {
         eventBack();
     }
 
-    void RaceDialog::onPreviewScroll(MyGUI::Widget*, int _delta)
+    void RaceDialog::onPreviewScroll(MyGUI::Widget*, int delta)
     {
         size_t oldPos = mHeadRotate->getScrollPosition();
         size_t maxPos = mHeadRotate->getScrollRange() - 1;
         size_t scrollPage = mHeadRotate->getScrollWheelPage();
-        if (_delta < 0)
+        if (delta < 0)
             mHeadRotate->setScrollPosition(oldPos + std::min(maxPos - oldPos, scrollPage));
         else
             mHeadRotate->setScrollPosition(oldPos - std::min(oldPos, scrollPage));
@@ -246,9 +246,9 @@ namespace MWGui
         onHeadRotate(mHeadRotate, mHeadRotate->getScrollPosition());
     }
 
-    void RaceDialog::onHeadRotate(MyGUI::ScrollBar* scroll, size_t _position)
+    void RaceDialog::onHeadRotate(MyGUI::ScrollBar* scroll, size_t position)
     {
-        float angle = (float(_position) / (scroll->getScrollRange() - 1) - 0.5f) * osg::PI * 2;
+        float angle = (float(position) / (scroll->getScrollRange() - 1) - 0.5f) * osg::PI * 2;
         mPreview->setAngle(angle);
 
         mCurrentAngle = angle;
@@ -294,12 +294,12 @@ namespace MWGui
         updatePreview();
     }
 
-    void RaceDialog::onSelectRace(MyGUI::ListBox* _sender, size_t _index)
+    void RaceDialog::onSelectRace(MyGUI::ListBox* sender, size_t index)
     {
-        if (_index == MyGUI::ITEM_NONE)
+        if (index == MyGUI::ITEM_NONE)
             return;
 
-        ESM::RefId& raceId = *mRaceList->getItemDataAt<ESM::RefId>(_index);
+        ESM::RefId& raceId = *mRaceList->getItemDataAt<ESM::RefId>(index);
         if (mCurrentRaceId == raceId)
             return;
 
@@ -312,9 +312,9 @@ namespace MWGui
         updateSpellPowers();
     }
 
-    void RaceDialog::onAccept(MyGUI::ListBox* _sender, size_t _index)
+    void RaceDialog::onAccept(MyGUI::ListBox* sender, size_t index)
     {
-        onSelectRace(_sender, _index);
+        onSelectRace(sender, index);
         if (mRaceList->getIndexSelected() == MyGUI::ITEM_NONE)
             return;
         eventDone(this);

apps/openmw/mwgui/race.hpp

@@ -65,23 +65,23 @@ namespace MWGui
         EventHandle_WindowBase eventDone;
 
     protected:
-        void onPreviewScroll(MyGUI::Widget* _sender, int _delta);
+        void onPreviewScroll(MyGUI::Widget* sender, int delta);
-        void onHeadRotate(MyGUI::ScrollBar* _sender, size_t _position);
+        void onHeadRotate(MyGUI::ScrollBar* sender, size_t position);
 
-        void onSelectPreviousGender(MyGUI::Widget* _sender);
+        void onSelectPreviousGender(MyGUI::Widget* sender);
-        void onSelectNextGender(MyGUI::Widget* _sender);
+        void onSelectNextGender(MyGUI::Widget* sender);
 
-        void onSelectPreviousFace(MyGUI::Widget* _sender);
+        void onSelectPreviousFace(MyGUI::Widget* sender);
-        void onSelectNextFace(MyGUI::Widget* _sender);
+        void onSelectNextFace(MyGUI::Widget* sender);
 
-        void onSelectPreviousHair(MyGUI::Widget* _sender);
+        void onSelectPreviousHair(MyGUI::Widget* sender);
-        void onSelectNextHair(MyGUI::Widget* _sender);
+        void onSelectNextHair(MyGUI::Widget* sender);
 
-        void onSelectRace(MyGUI::ListBox* _sender, size_t _index);
+        void onSelectRace(MyGUI::ListBox* sender, size_t index);
-        void onAccept(MyGUI::ListBox* _sender, size_t _index);
+        void onAccept(MyGUI::ListBox* sender, size_t index);
 
-        void onOkClicked(MyGUI::Widget* _sender);
+        void onOkClicked(MyGUI::Widget* sender);
-        void onBackClicked(MyGUI::Widget* _sender);
+        void onBackClicked(MyGUI::Widget* sender);
 
     private:
         void updateRaces();

apps/openmw/mwgui/recharge.cpp

@@ -99,12 +99,12 @@ namespace MWGui
         center();
     }
 
-    void Recharge::onCancel(MyGUI::Widget* sender)
+    void Recharge::onCancel(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Recharge);
     }
 
-    void Recharge::onSelectItem(MyGUI::Widget* sender)
+    void Recharge::onSelectItem(MyGUI::Widget* /*sender*/)
     {
         mItemSelectionDialog = std::make_unique<ItemSelectionDialog>("#{sSoulGemsWithSouls}");
         mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &Recharge::onItemSelected);
@@ -131,7 +131,7 @@ namespace MWGui
         mItemSelectionDialog->setVisible(false);
     }
 
-    void Recharge::onItemClicked(MyGUI::Widget* sender, const MWWorld::Ptr& item)
+    void Recharge::onItemClicked(MyGUI::Widget* /*sender*/, const MWWorld::Ptr& item)
     {
         MWWorld::Ptr gem = *mGemIcon->getUserData<MWWorld::Ptr>();
         if (!MWMechanics::rechargeItem(item, gem))

apps/openmw/mwgui/recharge.hpp

@@ -50,7 +50,7 @@ namespace MWGui
 
         void onItemClicked(MyGUI::Widget* sender, const MWWorld::Ptr& item);
         void onCancel(MyGUI::Widget* sender);
-        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheel(MyGUI::Widget* sender, int rel);
 
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
     };

apps/openmw/mwgui/repair.cpp

@@ -110,7 +110,7 @@ namespace MWGui
         center();
     }
 
-    void Repair::onSelectItem(MyGUI::Widget* sender)
+    void Repair::onSelectItem(MyGUI::Widget* /*sender*/)
     {
         mItemSelectionDialog = std::make_unique<ItemSelectionDialog>("#{sRepair}");
         mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &Repair::onItemSelected);

apps/openmw/mwgui/resourceskin.cpp

@@ -6,65 +6,68 @@
 
 namespace MWGui
 {
-    void resizeSkin(MyGUI::xml::ElementPtr _node)
+    namespace
     {
-        _node->setAttribute("type", "ResourceSkin");
+        void resizeSkin(MyGUI::xml::ElementPtr node)
-        if (!_node->findAttribute("size").empty())
-            return;
-
-        auto textureName = _node->findAttribute("texture");
-        if (textureName.empty())
-            return;
-
-        MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture(std::string{ textureName });
-        if (!texture)
-            return;
-
-        MyGUI::IntCoord coord(0, 0, texture->getWidth(), texture->getHeight());
-        MyGUI::xml::ElementEnumerator basis = _node->getElementEnumerator();
-        const std::string textureSize = std::to_string(coord.width) + " " + std::to_string(coord.height);
-        _node->addAttribute("size", textureSize);
-        while (basis.next())
         {
-            if (basis->getName() != "BasisSkin")
+            node->setAttribute("type", "ResourceSkin");
-                continue;
+            if (!node->findAttribute("size").empty())
+                return;
 
-            auto basisSkinType = basis->findAttribute("type");
+            auto textureName = node->findAttribute("texture");
-            if (Misc::StringUtils::ciEqual(basisSkinType, "SimpleText"))
+            if (textureName.empty())
-                continue;
+                return;
-            bool isTileRect = Misc::StringUtils::ciEqual(basisSkinType, "TileRect");
 
-            if (!basis->findAttribute("offset").empty())
+            MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture(std::string{ textureName });
-                continue;
+            if (!texture)
+                return;
 
-            basis->addAttribute("offset", coord);
+            MyGUI::IntCoord coord(0, 0, texture->getWidth(), texture->getHeight());
-
+            MyGUI::xml::ElementEnumerator basis = node->getElementEnumerator();
-            MyGUI::xml::ElementEnumerator state = basis->getElementEnumerator();
+            const std::string textureSize = std::to_string(coord.width) + " " + std::to_string(coord.height);
-            while (state.next())
+            node->addAttribute("size", textureSize);
+            while (basis.next())
             {
-                if (state->getName() == "State")
+                if (basis->getName() != "BasisSkin")
+                    continue;
+
+                auto basisSkinType = basis->findAttribute("type");
+                if (Misc::StringUtils::ciEqual(basisSkinType, "SimpleText"))
+                    continue;
+                bool isTileRect = Misc::StringUtils::ciEqual(basisSkinType, "TileRect");
+
+                if (!basis->findAttribute("offset").empty())
+                    continue;
+
+                basis->addAttribute("offset", coord);
+
+                MyGUI::xml::ElementEnumerator state = basis->getElementEnumerator();
+                while (state.next())
                 {
-                    if (!state->findAttribute("offset").empty())
+                    if (state->getName() == "State")
-                        continue;
-
-                    state->addAttribute("offset", coord);
-                    if (isTileRect)
                     {
-                        MyGUI::xml::ElementEnumerator property = state->getElementEnumerator();
+                        if (!state->findAttribute("offset").empty())
-                        bool hasTileSize = false;
+                            continue;
-                        while (property.next("Property"))
-                        {
-                            if (property->findAttribute("key") != "TileSize")
-                                continue;
 
-                            hasTileSize = true;
+                        state->addAttribute("offset", coord);
-                        }
+                        if (isTileRect)
-
-                        if (!hasTileSize)
                         {
-                            MyGUI::xml::ElementPtr tileSizeProperty = state->createChild("Property");
+                            MyGUI::xml::ElementEnumerator property = state->getElementEnumerator();
-                            tileSizeProperty->addAttribute("key", "TileSize");
+                            bool hasTileSize = false;
-                            tileSizeProperty->addAttribute("value", textureSize);
+                            while (property.next("Property"))
+                            {
+                                if (property->findAttribute("key") != "TileSize")
+                                    continue;
+
+                                hasTileSize = true;
+                            }
+
+                            if (!hasTileSize)
+                            {
+                                MyGUI::xml::ElementPtr tileSizeProperty = state->createChild("Property");
+                                tileSizeProperty->addAttribute("key", "TileSize");
+                                tileSizeProperty->addAttribute("value", textureSize);
+                            }
                         }
                     }
                 }
@@ -72,9 +75,9 @@ namespace MWGui
         }
     }
 
-    void AutoSizedResourceSkin::deserialization(MyGUI::xml::ElementPtr _node, MyGUI::Version _version)
+    void AutoSizedResourceSkin::deserialization(MyGUI::xml::ElementPtr node, MyGUI::Version version)
     {
-        resizeSkin(_node);
+        resizeSkin(node);
-        Base::deserialization(_node, _version);
+        Base::deserialization(node, version);
     }
 }

apps/openmw/mwgui/resourceskin.hpp

@@ -10,7 +10,7 @@ namespace MWGui
         MYGUI_RTTI_DERIVED(AutoSizedResourceSkin)
 
     public:
-        void deserialization(MyGUI::xml::ElementPtr _node, MyGUI::Version _version) override;
+        void deserialization(MyGUI::xml::ElementPtr node, MyGUI::Version version) override;
     };
 
 }

apps/openmw/mwgui/review.cpp

@@ -500,43 +500,43 @@ namespace MWGui
 
     // widget controls
 
-    void ReviewDialog::onOkClicked(MyGUI::Widget* _sender)
+    void ReviewDialog::onOkClicked(MyGUI::Widget* /*sender*/)
     {
         eventDone(this);
     }
 
-    void ReviewDialog::onBackClicked(MyGUI::Widget* _sender)
+    void ReviewDialog::onBackClicked(MyGUI::Widget* /*sender*/)
     {
         eventBack();
     }
 
-    void ReviewDialog::onNameClicked(MyGUI::Widget* _sender)
+    void ReviewDialog::onNameClicked(MyGUI::Widget* /*sender*/)
     {
         eventActivateDialog(NAME_DIALOG);
     }
 
-    void ReviewDialog::onRaceClicked(MyGUI::Widget* _sender)
+    void ReviewDialog::onRaceClicked(MyGUI::Widget* /*sender*/)
     {
         eventActivateDialog(RACE_DIALOG);
     }
 
-    void ReviewDialog::onClassClicked(MyGUI::Widget* _sender)
+    void ReviewDialog::onClassClicked(MyGUI::Widget* /*sender*/)
     {
         eventActivateDialog(CLASS_DIALOG);
     }
 
-    void ReviewDialog::onBirthSignClicked(MyGUI::Widget* _sender)
+    void ReviewDialog::onBirthSignClicked(MyGUI::Widget* /*sender*/)
     {
         eventActivateDialog(BIRTHSIGN_DIALOG);
     }
 
-    void ReviewDialog::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    void ReviewDialog::onMouseWheel(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (mSkillView->getViewOffset().top + _rel * 0.3 > 0)
+        if (mSkillView->getViewOffset().top + rel * 0.3 > 0)
             mSkillView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
             mSkillView->setViewOffset(
-                MyGUI::IntPoint(0, static_cast<int>(mSkillView->getViewOffset().top + _rel * 0.3)));
+                MyGUI::IntPoint(0, static_cast<int>(mSkillView->getViewOffset().top + rel * 0.3)));
     }
 
     bool ReviewDialog::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)

apps/openmw/mwgui/review.hpp

@@ -63,15 +63,15 @@ namespace MWGui
         EventHandle_Int eventActivateDialog;
 
     protected:
-        void onOkClicked(MyGUI::Widget* _sender);
+        void onOkClicked(MyGUI::Widget* sender);
-        void onBackClicked(MyGUI::Widget* _sender);
+        void onBackClicked(MyGUI::Widget* sender);
 
-        void onNameClicked(MyGUI::Widget* _sender);
+        void onNameClicked(MyGUI::Widget* sender);
-        void onRaceClicked(MyGUI::Widget* _sender);
+        void onRaceClicked(MyGUI::Widget* sender);
-        void onClassClicked(MyGUI::Widget* _sender);
+        void onClassClicked(MyGUI::Widget* sender);
-        void onBirthSignClicked(MyGUI::Widget* _sender);
+        void onBirthSignClicked(MyGUI::Widget* sender);
 
-        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheel(MyGUI::Widget* sender, int rel);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
 
     private:

apps/openmw/mwgui/savegamedialog.cpp

@@ -274,12 +274,12 @@ namespace MWGui
         center();
     }
 
-    void SaveGameDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    void SaveGameDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         setVisible(false);
     }
 
-    void SaveGameDialog::onDeleteButtonClicked(MyGUI::Widget* sender)
+    void SaveGameDialog::onDeleteButtonClicked(MyGUI::Widget* /*sender*/)
     {
         if (mCurrentSlot)
             confirmDeleteSave();
@@ -347,13 +347,13 @@ namespace MWGui
         }
     }
 
-    void SaveGameDialog::onKeyButtonPressed(MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char character)
+    void SaveGameDialog::onKeyButtonPressed(MyGUI::Widget* /*sender*/, MyGUI::KeyCode key, MyGUI::Char character)
     {
         if (key == MyGUI::KeyCode::Delete && mCurrentSlot)
             confirmDeleteSave();
     }
 
-    void SaveGameDialog::onOkButtonClicked(MyGUI::Widget* sender)
+    void SaveGameDialog::onOkButtonClicked(MyGUI::Widget* /*sender*/)
     {
         accept();
     }

apps/openmw/mwgui/savegamedialog.hpp

@@ -29,7 +29,7 @@ namespace MWGui
     private:
         void confirmDeleteSave();
 
-        void onKeyButtonPressed(MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char character);
+        void onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character);
         void onCancelButtonClicked(MyGUI::Widget* sender);
         void onOkButtonClicked(MyGUI::Widget* sender);
         void onDeleteButtonClicked(MyGUI::Widget* sender);

apps/openmw/mwgui/scrollwindow.cpp

@@ -82,7 +82,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mCloseButton);
     }
 
-    void ScrollWindow::onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character)
+    void ScrollWindow::onKeyButtonPressed(MyGUI::Widget* /*sender*/, MyGUI::KeyCode key, MyGUI::Char character)
     {
         int scroll = 0;
         if (key == MyGUI::KeyCode::ArrowUp)
@@ -106,12 +106,12 @@ namespace MWGui
         mTakeButton->setVisible(mTakeButtonShow && mTakeButtonAllowed);
     }
 
-    void ScrollWindow::onCloseButtonClicked(MyGUI::Widget* _sender)
+    void ScrollWindow::onCloseButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Scroll);
     }
 
-    void ScrollWindow::onTakeButtonClicked(MyGUI::Widget* _sender)
+    void ScrollWindow::onTakeButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Item Book Up"));
 

apps/openmw/mwgui/scrollwindow.hpp

@@ -28,8 +28,8 @@ namespace MWGui
         ControllerButtons* getControllerButtons() override;
 
     protected:
-        void onCloseButtonClicked(MyGUI::Widget* _sender);
+        void onCloseButtonClicked(MyGUI::Widget* sender);
-        void onTakeButtonClicked(MyGUI::Widget* _sender);
+        void onTakeButtonClicked(MyGUI::Widget* sender);
         void setTakeButtonShow(bool show);
         void onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;

apps/openmw/mwgui/settingswindow.cpp

@@ -468,17 +468,17 @@ namespace MWGui
         mControllerButtons.mLStick = "#{sMouse}";
     }
 
-    void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/)
+    void SettingsWindow::onTabChanged(MyGUI::TabControl* /*sender*/, size_t /*index*/)
     {
         resetScrollbars();
     }
 
-    void SettingsWindow::onOkButtonClicked(MyGUI::Widget* _sender)
+    void SettingsWindow::onOkButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->toggleSettingsWindow();
     }
 
-    void SettingsWindow::onResolutionSelected(MyGUI::ListBox* _sender, size_t index)
+    void SettingsWindow::onResolutionSelected(MyGUI::ListBox* /*sender*/, size_t index)
     {
         if (index == MyGUI::ITEM_NONE)
             return;
@@ -528,7 +528,7 @@ namespace MWGui
         }
     }
 
-    void SettingsWindow::onRefractionButtonClicked(MyGUI::Widget* _sender)
+    void SettingsWindow::onRefractionButtonClicked(MyGUI::Widget* /*sender*/)
     {
         const bool refractionEnabled = Settings::water().mRefraction;
 
@@ -536,7 +536,7 @@ namespace MWGui
         mWobblyShoresButton->setEnabled(refractionEnabled);
     }
 
-    void SettingsWindow::onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos)
+    void SettingsWindow::onWaterTextureSizeChanged(MyGUI::ComboBox* /*sender*/, size_t pos)
     {
         int size = 0;
         if (pos == 0)
@@ -549,39 +549,39 @@ namespace MWGui
         apply();
     }
 
-    void SettingsWindow::onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
+    void SettingsWindow::onWaterReflectionDetailChanged(MyGUI::ComboBox* /*sender*/, size_t pos)
     {
         Settings::water().mReflectionDetail.set(static_cast<int>(pos));
         apply();
     }
 
-    void SettingsWindow::onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos)
+    void SettingsWindow::onWaterRainRippleDetailChanged(MyGUI::ComboBox* /*sender*/, size_t pos)
     {
         Settings::water().mRainRippleDetail.set(static_cast<int>(pos));
         apply();
     }
 
-    void SettingsWindow::onLightingMethodButtonChanged(MyGUI::ComboBox* _sender, size_t pos)
+    void SettingsWindow::onLightingMethodButtonChanged(MyGUI::ComboBox* sender, size_t pos)
     {
         if (pos == MyGUI::ITEM_NONE)
             return;
 
-        _sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected()));
+        sender->setCaptionWithReplacing(sender->getItemNameAt(sender->getIndexSelected()));
 
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
             "#{OMWEngine:ChangeRequiresRestart}", { "#{Interface:OK}" }, true);
 
         Settings::shaders().mLightingMethod.set(
-            Settings::parseLightingMethod(*_sender->getItemDataAt<std::string>(pos)));
+            Settings::parseLightingMethod(*sender->getItemDataAt<std::string>(pos)));
         apply();
     }
 
-    void SettingsWindow::onLanguageChanged(size_t langPriority, MyGUI::ComboBox* _sender, size_t pos)
+    void SettingsWindow::onLanguageChanged(size_t langPriority, MyGUI::ComboBox* sender, size_t pos)
     {
         if (pos == MyGUI::ITEM_NONE)
             return;
 
-        _sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected()));
+        sender->setCaptionWithReplacing(sender->getItemNameAt(sender->getIndexSelected()));
 
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
             "#{OMWEngine:ChangeRequiresRestart}", { "#{Interface:OK}" }, true);
@@ -590,7 +590,7 @@ namespace MWGui
         if (currentLocales.size() <= langPriority)
             currentLocales.resize(langPriority + 1, "en");
 
-        const auto& languageCode = *_sender->getItemDataAt<std::string>(pos);
+        const auto& languageCode = *sender->getItemDataAt<std::string>(pos);
         if (!languageCode.empty())
             currentLocales[langPriority] = languageCode;
         else
@@ -640,14 +640,14 @@ namespace MWGui
         apply();
     }
 
-    void SettingsWindow::onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos)
+    void SettingsWindow::onMaxLightsChanged(MyGUI::ComboBox* /*sender*/, size_t pos)
     {
         Settings::shaders().mMaxLights.set(8 * (pos + 1));
         apply();
         configureWidgets(mMainWidget, false);
     }
 
-    void SettingsWindow::onLightsResetButtonClicked(MyGUI::Widget* _sender)
+    void SettingsWindow::onLightsResetButtonClicked(MyGUI::Widget* /*sender*/)
     {
         std::vector<std::string> buttons = { "#{Interface:Yes}", "#{Interface:No}" };
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
@@ -675,31 +675,31 @@ namespace MWGui
         configureWidgets(mMainWidget, false);
     }
 
-    void SettingsWindow::onButtonToggled(MyGUI::Widget* _sender)
+    void SettingsWindow::onButtonToggled(MyGUI::Widget* sender)
     {
         const std::string on = MWBase::Environment::get().getL10nManager()->getMessage("Interface", "On");
         const std::string off = MWBase::Environment::get().getL10nManager()->getMessage("Interface", "Off");
         bool newState;
-        if (_sender->castType<MyGUI::Button>()->getCaption() == on)
+        if (sender->castType<MyGUI::Button>()->getCaption() == on)
         {
-            _sender->castType<MyGUI::Button>()->setCaption(MyGUI::UString(off));
+            sender->castType<MyGUI::Button>()->setCaption(MyGUI::UString(off));
             newState = false;
         }
         else
         {
-            _sender->castType<MyGUI::Button>()->setCaption(MyGUI::UString(on));
+            sender->castType<MyGUI::Button>()->setCaption(MyGUI::UString(on));
             newState = true;
         }
 
-        if (getSettingType(_sender) == checkButtonType)
+        if (getSettingType(sender) == checkButtonType)
         {
-            Settings::get<bool>(getSettingCategory(_sender), getSettingName(_sender)).set(newState);
+            Settings::get<bool>(getSettingCategory(sender), getSettingName(sender)).set(newState);
             apply();
             return;
         }
     }
 
-    void SettingsWindow::onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos)
+    void SettingsWindow::onTextureFilteringChanged(MyGUI::ComboBox* /*sender*/, size_t pos)
     {
         auto& generalSettings = Settings::general();
         switch (pos)
@@ -722,7 +722,7 @@ namespace MWGui
         apply();
     }
 
-    void SettingsWindow::onResChange(int width, int height)
+    void SettingsWindow::onResChange(int /*width*/, int /*height*/)
     {
         center();
         highlightCurrentResolution();
@@ -785,7 +785,7 @@ namespace MWGui
         Settings::Manager::resetPendingChanges();
     }
 
-    void SettingsWindow::onKeyboardSwitchClicked(MyGUI::Widget* _sender)
+    void SettingsWindow::onKeyboardSwitchClicked(MyGUI::Widget* /*sender*/)
     {
         if (mKeyboardMode)
             return;
@@ -796,7 +796,7 @@ namespace MWGui
         resetScrollbars();
     }
 
-    void SettingsWindow::onControllerSwitchClicked(MyGUI::Widget* _sender)
+    void SettingsWindow::onControllerSwitchClicked(MyGUI::Widget* /*sender*/)
     {
         if (!mKeyboardMode)
             return;
@@ -1048,11 +1048,11 @@ namespace MWGui
         }
     }
 
-    void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)
+    void SettingsWindow::onRebindAction(MyGUI::Widget* sender)
     {
-        int actionId = *_sender->getUserData<int>();
+        int actionId = *sender->getUserData<int>();
 
-        _sender->castType<MyGUI::Button>()->setCaptionWithReplacing("#{Interface:None}");
+        sender->castType<MyGUI::Button>()->setCaptionWithReplacing("#{Interface:None}");
 
         MWBase::Environment::get().getWindowManager()->staticMessageBox("#{OMWEngine:RebindAction}");
         MWBase::Environment::get().getWindowManager()->disallowMouse();
@@ -1060,16 +1060,16 @@ namespace MWGui
         MWBase::Environment::get().getInputManager()->enableDetectingBindingMode(actionId, mKeyboardMode);
     }
 
-    void SettingsWindow::onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel)
+    void SettingsWindow::onInputTabMouseWheel(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (mControlsBox->getViewOffset().top + _rel * 0.3f > 0)
+        if (mControlsBox->getViewOffset().top + rel * 0.3f > 0)
             mControlsBox->setViewOffset(MyGUI::IntPoint(0, 0));
         else
             mControlsBox->setViewOffset(
-                MyGUI::IntPoint(0, static_cast<int>(mControlsBox->getViewOffset().top + _rel * 0.3f)));
+                MyGUI::IntPoint(0, static_cast<int>(mControlsBox->getViewOffset().top + rel * 0.3f)));
     }
 
-    void SettingsWindow::onResetDefaultBindings(MyGUI::Widget* _sender)
+    void SettingsWindow::onResetDefaultBindings(MyGUI::Widget* /*sender*/)
     {
         ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
         dialog->askForConfirmation("#{OMWEngine:ConfirmResetBindings}");
@@ -1107,7 +1107,7 @@ namespace MWGui
         MWBase::Environment::get().getInputManager()->saveBindings();
     }
 
-    void SettingsWindow::onWindowResize(MyGUI::Window* _sender)
+    void SettingsWindow::onWindowResize(MyGUI::Window* /*sender*/)
     {
         layoutControlsBox();
     }

apps/openmw/mwgui/settingswindow.hpp

@@ -74,41 +74,41 @@ namespace MWGui
         LuaUi::LuaAdapter* mScriptAdapter;
         int mCurrentPage;
 
-        void onTabChanged(MyGUI::TabControl* _sender, size_t index);
+        void onTabChanged(MyGUI::TabControl* sender, size_t index);
-        void onOkButtonClicked(MyGUI::Widget* _sender);
+        void onOkButtonClicked(MyGUI::Widget* sender);
-        void onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onTextureFilteringChanged(MyGUI::ComboBox* sender, size_t pos);
         void onSliderChangePosition(MyGUI::ScrollBar* scroller, size_t pos);
-        void onButtonToggled(MyGUI::Widget* _sender);
+        void onButtonToggled(MyGUI::Widget* sender);
-        void onResolutionSelected(MyGUI::ListBox* _sender, size_t index);
+        void onResolutionSelected(MyGUI::ListBox* sender, size_t index);
         void onResolutionAccept();
         void onResolutionCancel();
         void highlightCurrentResolution();
 
-        void onRefractionButtonClicked(MyGUI::Widget* _sender);
+        void onRefractionButtonClicked(MyGUI::Widget* sender);
-        void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onWaterTextureSizeChanged(MyGUI::ComboBox* sender, size_t pos);
-        void onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onWaterReflectionDetailChanged(MyGUI::ComboBox* sender, size_t pos);
-        void onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onWaterRainRippleDetailChanged(MyGUI::ComboBox* sender, size_t pos);
 
-        void onLightingMethodButtonChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onLightingMethodButtonChanged(MyGUI::ComboBox* sender, size_t pos);
-        void onLightsResetButtonClicked(MyGUI::Widget* _sender);
+        void onLightsResetButtonClicked(MyGUI::Widget* sender);
-        void onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onMaxLightsChanged(MyGUI::ComboBox* sender, size_t pos);
 
-        void onPrimaryLanguageChanged(MyGUI::ComboBox* _sender, size_t pos) { onLanguageChanged(0, _sender, pos); }
+        void onPrimaryLanguageChanged(MyGUI::ComboBox* sender, size_t pos) { onLanguageChanged(0, sender, pos); }
-        void onSecondaryLanguageChanged(MyGUI::ComboBox* _sender, size_t pos) { onLanguageChanged(1, _sender, pos); }
+        void onSecondaryLanguageChanged(MyGUI::ComboBox* sender, size_t pos) { onLanguageChanged(1, sender, pos); }
-        void onLanguageChanged(size_t langPriority, MyGUI::ComboBox* _sender, size_t pos);
+        void onLanguageChanged(size_t langPriority, MyGUI::ComboBox* sender, size_t pos);
-        void onGmstOverridesL10nChanged(MyGUI::Widget* _sender);
+        void onGmstOverridesL10nChanged(MyGUI::Widget* sender);
 
-        void onWindowModeChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onWindowModeChanged(MyGUI::ComboBox* sender, size_t pos);
-        void onVSyncModeChanged(MyGUI::ComboBox* _sender, size_t pos);
+        void onVSyncModeChanged(MyGUI::ComboBox* sender, size_t pos);
 
-        void onRebindAction(MyGUI::Widget* _sender);
+        void onRebindAction(MyGUI::Widget* sender);
-        void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onInputTabMouseWheel(MyGUI::Widget* sender, int rel);
-        void onResetDefaultBindings(MyGUI::Widget* _sender);
+        void onResetDefaultBindings(MyGUI::Widget* sender);
         void onResetDefaultBindingsAccept();
-        void onKeyboardSwitchClicked(MyGUI::Widget* _sender);
+        void onKeyboardSwitchClicked(MyGUI::Widget* sender);
-        void onControllerSwitchClicked(MyGUI::Widget* _sender);
+        void onControllerSwitchClicked(MyGUI::Widget* sender);
 
-        void onWindowResize(MyGUI::Window* _sender);
+        void onWindowResize(MyGUI::Window* sender);
 
         void onScriptFilterChange(MyGUI::EditBox*);
         void onScriptListSelection(MyGUI::ListBox*, size_t index);

apps/openmw/mwgui/spellbuyingwindow.cpp

@@ -172,9 +172,9 @@ namespace MWGui
         return player.getClass().getCreatureStats(player).getSpells().hasSpell(id);
     }
 
-    void SpellBuyingWindow::onSpellButtonClick(MyGUI::Widget* _sender)
+    void SpellBuyingWindow::onSpellButtonClick(MyGUI::Widget* sender)
     {
-        int price = *_sender->getUserData<int>();
+        int price = *sender->getUserData<int>();
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
         if (price > player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId))
@@ -182,7 +182,7 @@ namespace MWGui
 
         MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
-        auto spell = mSpellsWidgetMap.find(_sender);
+        auto spell = mSpellsWidgetMap.find(sender);
         assert(spell != mSpellsWidgetMap.end());
 
         spells.add(spell->second);
@@ -197,7 +197,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Item Gold Up"));
     }
 
-    void SpellBuyingWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
+    void SpellBuyingWindow::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_SpellBuying);
     }
@@ -219,13 +219,13 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
     }
 
-    void SpellBuyingWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    void SpellBuyingWindow::onMouseWheel(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (mSpellsView->getViewOffset().top + _rel * 0.3 > 0)
+        if (mSpellsView->getViewOffset().top + rel * 0.3 > 0)
             mSpellsView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
             mSpellsView->setViewOffset(
-                MyGUI::IntPoint(0, static_cast<int>(mSpellsView->getViewOffset().top + _rel * 0.3f)));
+                MyGUI::IntPoint(0, static_cast<int>(mSpellsView->getViewOffset().top + rel * 0.3f)));
     }
 
     bool SpellBuyingWindow::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)

apps/openmw/mwgui/spellbuyingwindow.hpp

@@ -42,9 +42,9 @@ namespace MWGui
         /// List of enabled/purchasable spells and their index in the full list.
         std::vector<std::pair<MyGUI::Button*, size_t>> mSpellButtons;
 
-        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
-        void onSpellButtonClick(MyGUI::Widget* _sender);
+        void onSpellButtonClick(MyGUI::Widget* sender);
-        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheel(MyGUI::Widget* sender, int rel);
         void addSpell(const ESM::Spell& spell);
         void clearSpells();
         int mCurrentY;

apps/openmw/mwgui/spellcreationdialog.cpp

@@ -279,7 +279,7 @@ namespace MWGui
         }
     }
 
-    void EditEffectDialog::onRangeButtonClicked(MyGUI::Widget* sender)
+    void EditEffectDialog::onRangeButtonClicked(MyGUI::Widget* /*sender*/)
     {
         mEffect.mRange = (mEffect.mRange + 1) % 3;
 
@@ -313,19 +313,19 @@ namespace MWGui
         eventEffectModified(mEffect);
     }
 
-    void EditEffectDialog::onDeleteButtonClicked(MyGUI::Widget* sender)
+    void EditEffectDialog::onDeleteButtonClicked(MyGUI::Widget* /*sender*/)
     {
         setVisible(false);
 
         eventEffectRemoved(mEffect);
     }
 
-    void EditEffectDialog::onOkButtonClicked(MyGUI::Widget* sender)
+    void EditEffectDialog::onOkButtonClicked(MyGUI::Widget* /*sender*/)
     {
         setVisible(false);
     }
 
-    void EditEffectDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    void EditEffectDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         setVisible(false);
         exit();
@@ -621,12 +621,12 @@ namespace MWGui
         startEditing();
     }
 
-    void SpellCreationDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    void SpellCreationDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_SpellCreation);
     }
 
-    void SpellCreationDialog::onBuyButtonClicked(MyGUI::Widget* sender)
+    void SpellCreationDialog::onBuyButtonClicked(MyGUI::Widget* /*sender*/)
     {
         if (mEffects.size() <= 0)
         {

apps/openmw/mwgui/spellview.cpp

@@ -278,18 +278,18 @@ namespace MWGui
         mGroupIndices.push_back(mButtons.size());
     }
 
-    void SpellView::setSize(const MyGUI::IntSize& _value)
+    void SpellView::setSize(const MyGUI::IntSize& value)
     {
-        bool changed = (_value.width != getWidth() || _value.height != getHeight());
+        bool changed = (value.width != getWidth() || value.height != getHeight());
-        Base::setSize(_value);
+        Base::setSize(value);
         if (changed)
             layoutWidgets();
     }
 
-    void SpellView::setCoord(const MyGUI::IntCoord& _value)
+    void SpellView::setCoord(const MyGUI::IntCoord& value)
     {
-        bool changed = (_value.width != getWidth() || _value.height != getHeight());
+        bool changed = (value.width != getWidth() || value.height != getHeight());
-        Base::setCoord(_value);
+        Base::setCoord(value);
         if (changed)
             layoutWidgets();
     }
@@ -318,18 +318,18 @@ namespace MWGui
         return MyGUI::utility::parseInt(widget->getUserString(sSpellModelIndex));
     }
 
-    void SpellView::onSpellSelected(MyGUI::Widget* _sender)
+    void SpellView::onSpellSelected(MyGUI::Widget* sender)
     {
-        eventSpellClicked(getSpellModelIndex(_sender));
+        eventSpellClicked(getSpellModelIndex(sender));
     }
 
-    void SpellView::onMouseWheelMoved(MyGUI::Widget* _sender, int _rel)
+    void SpellView::onMouseWheelMoved(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (mScrollView->getViewOffset().top + _rel * 0.3f > 0)
+        if (mScrollView->getViewOffset().top + rel * 0.3f > 0)
             mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
             mScrollView->setViewOffset(
-                MyGUI::IntPoint(0, static_cast<int>(mScrollView->getViewOffset().top + _rel * 0.3f)));
+                MyGUI::IntPoint(0, static_cast<int>(mScrollView->getViewOffset().top + rel * 0.3f)));
     }
 
     void SpellView::resetScrollbars()

apps/openmw/mwgui/spellview.hpp

@@ -54,8 +54,8 @@ namespace MWGui
 
         void initialiseOverride() override;
 
-        void setSize(const MyGUI::IntSize& _value) override;
+        void setSize(const MyGUI::IntSize& value) override;
-        void setCoord(const MyGUI::IntCoord& _value) override;
+        void setCoord(const MyGUI::IntCoord& value) override;
 
         void resetScrollbars();
 
@@ -106,10 +106,10 @@ namespace MWGui
         int mControllerFocus;
         void updateControllerFocus(int prevFocus, int newFocus);
 
-        void onSpellSelected(MyGUI::Widget* _sender);
+        void onSpellSelected(MyGUI::Widget* sender);
-        void onMouseWheelMoved(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheelMoved(MyGUI::Widget* sender, int rel);
 
-        SpellModel::ModelIndex getSpellModelIndex(MyGUI::Widget* _sender);
+        SpellModel::ModelIndex getSpellModelIndex(MyGUI::Widget* sender);
 
         static const char* sSpellModelIndex;
     };

apps/openmw/mwgui/statswindow.cpp

@@ -92,13 +92,13 @@ namespace MWGui
         onWindowResize(t);
     }
 
-    void StatsWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    void StatsWindow::onMouseWheel(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (mSkillView->getViewOffset().top + _rel * 0.3 > 0)
+        if (mSkillView->getViewOffset().top + rel * 0.3 > 0)
             mSkillView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
             mSkillView->setViewOffset(
-                MyGUI::IntPoint(0, static_cast<int>(mSkillView->getViewOffset().top + _rel * 0.3)));
+                MyGUI::IntPoint(0, static_cast<int>(mSkillView->getViewOffset().top + rel * 0.3)));
     }
 
     void StatsWindow::onWindowResize(MyGUI::Window* window)

apps/openmw/mwgui/statswindow.hpp

@@ -69,7 +69,7 @@ namespace MWGui
         void setBirthSign(const ESM::RefId& signId);
 
         void onWindowResize(MyGUI::Window* window);
-        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheel(MyGUI::Widget* sender, int rel);
 
         MyGUI::Widget* mLeftPane;
         MyGUI::Widget* mRightPane;

apps/openmw/mwgui/textinput.cpp

@@ -58,7 +58,7 @@ namespace MWGui
 
     // widget controls
 
-    void TextInputDialog::onOkClicked(MyGUI::Widget* _sender)
+    void TextInputDialog::onOkClicked(MyGUI::Widget* /*sender*/)
     {
         if (mTextEdit->getCaption().empty())
         {
@@ -69,9 +69,9 @@ namespace MWGui
             eventDone(this);
     }
 
-    void TextInputDialog::onTextAccepted(MyGUI::EditBox* _sender)
+    void TextInputDialog::onTextAccepted(MyGUI::EditBox* sender)
     {
-        onOkClicked(_sender);
+        onOkClicked(sender);
 
         // To do not spam onTextAccepted() again and again
         MWBase::Environment::get().getWindowManager()->injectKeyRelease(MyGUI::KeyCode::None);

apps/openmw/mwgui/textinput.hpp

@@ -25,8 +25,8 @@ namespace MWGui
         EventHandle_WindowBase eventDone;
 
     protected:
-        void onOkClicked(MyGUI::Widget* _sender);
+        void onOkClicked(MyGUI::Widget* sender);
-        void onTextAccepted(MyGUI::EditBox* _sender);
+        void onTextAccepted(MyGUI::EditBox* sender);
         bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
 
     private:

apps/openmw/mwgui/tradewindow.cpp

@@ -251,23 +251,23 @@ namespace MWGui
         }
     }
 
-    void TradeWindow::onNameFilterChanged(MyGUI::EditBox* _sender)
+    void TradeWindow::onNameFilterChanged(MyGUI::EditBox* sender)
     {
-        mSortModel->setNameFilter(_sender->getCaption());
+        mSortModel->setNameFilter(sender->getCaption());
         mItemView->update();
     }
 
-    void TradeWindow::onFilterChanged(MyGUI::Widget* _sender)
+    void TradeWindow::onFilterChanged(MyGUI::Widget* sender)
     {
-        if (_sender == mFilterAll)
+        if (sender == mFilterAll)
             mSortModel->setCategory(SortFilterItemModel::Category_All);
-        else if (_sender == mFilterWeapon)
+        else if (sender == mFilterWeapon)
             mSortModel->setCategory(SortFilterItemModel::Category_Weapon);
-        else if (_sender == mFilterApparel)
+        else if (sender == mFilterApparel)
             mSortModel->setCategory(SortFilterItemModel::Category_Apparel);
-        else if (_sender == mFilterMagic)
+        else if (sender == mFilterMagic)
             mSortModel->setCategory(SortFilterItemModel::Category_Magic);
-        else if (_sender == mFilterMisc)
+        else if (sender == mFilterMisc)
             mSortModel->setCategory(SortFilterItemModel::Category_Misc);
 
         mFilterAll->setStateSelected(false);
@@ -276,7 +276,7 @@ namespace MWGui
         mFilterMagic->setStateSelected(false);
         mFilterMisc->setStateSelected(false);
 
-        _sender->castType<MyGUI::Button>()->setStateSelected(true);
+        sender->castType<MyGUI::Button>()->setStateSelected(true);
 
         mItemView->update();
     }
@@ -382,14 +382,14 @@ namespace MWGui
         }
     }
 
-    void TradeWindow::onOfferSubmitted(MyGUI::Widget* _sender, size_t offerAmount)
+    void TradeWindow::onOfferSubmitted(MyGUI::Widget* /*sender*/, size_t offerAmount)
     {
         mCurrentBalance = offerAmount * (mCurrentBalance < 0 ? -1 : 1);
         updateLabels();
         onOfferButtonClicked(mOfferButton);
     }
 
-    void TradeWindow::onOfferButtonClicked(MyGUI::Widget* _sender)
+    void TradeWindow::onOfferButtonClicked(MyGUI::Widget* /*sender*/)
     {
         TradeItemModel* playerItemModel
             = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
@@ -492,13 +492,13 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->injectKeyRelease(MyGUI::KeyCode::None);
     }
 
-    void TradeWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
+    void TradeWindow::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         exit();
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Barter);
     }
 
-    void TradeWindow::onMaxSaleButtonClicked(MyGUI::Widget* _sender)
+    void TradeWindow::onMaxSaleButtonClicked(MyGUI::Widget* /*sender*/)
     {
         mCurrentBalance = getMerchantGold();
         updateLabels();
@@ -513,15 +513,15 @@ namespace MWGui
         MyGUI::ControllerManager::getInstance().addItem(widget, controller);
     }
 
-    void TradeWindow::onIncreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+    void TradeWindow::onIncreaseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
     {
-        addRepeatController(_sender);
+        addRepeatController(sender);
         onIncreaseButtonTriggered();
     }
 
-    void TradeWindow::onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+    void TradeWindow::onDecreaseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
     {
-        addRepeatController(_sender);
+        addRepeatController(sender);
         onDecreaseButtonTriggered();
     }
 
@@ -533,9 +533,9 @@ namespace MWGui
             onDecreaseButtonTriggered();
     }
 
-    void TradeWindow::onBalanceButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+    void TradeWindow::onBalanceButtonReleased(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id)
     {
-        MyGUI::ControllerManager::getInstance().removeItem(_sender);
+        MyGUI::ControllerManager::getInstance().removeItem(sender);
     }
 
     void TradeWindow::onBalanceValueChanged(int value)

apps/openmw/mwgui/tradewindow.hpp

@@ -105,18 +105,18 @@ namespace MWGui
 
         int getMerchantServices();
 
-        void onFilterChanged(MyGUI::Widget* _sender);
+        void onFilterChanged(MyGUI::Widget* sender);
-        void onNameFilterChanged(MyGUI::EditBox* _sender);
+        void onNameFilterChanged(MyGUI::EditBox* sender);
-        void onOfferButtonClicked(MyGUI::Widget* _sender);
+        void onOfferButtonClicked(MyGUI::Widget* sender);
         void onAccept(MyGUI::EditBox* sender);
-        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
-        void onMaxSaleButtonClicked(MyGUI::Widget* _sender);
+        void onMaxSaleButtonClicked(MyGUI::Widget* sender);
-        void onIncreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onIncreaseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id);
-        void onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onDecreaseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id);
-        void onBalanceButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onBalanceButtonReleased(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id);
         void onBalanceValueChanged(int value);
         void onRepeatClick(MyGUI::Widget* widget, MyGUI::ControllerItem* controller);
-        void onOfferSubmitted(MyGUI::Widget* _sender, size_t offerAmount);
+        void onOfferSubmitted(MyGUI::Widget* sender, size_t offerAmount);
 
         void addRepeatController(MyGUI::Widget* widget);
 

apps/openmw/mwgui/trainingwindow.cpp

@@ -155,7 +155,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Training);
     }
 
-    void TrainingWindow::onCancelButtonClicked(MyGUI::Widget* sender)
+    void TrainingWindow::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Training);
     }

apps/openmw/mwgui/travelwindow.cpp

@@ -172,9 +172,9 @@ namespace MWGui
         mDestinationsView->setVisibleVScroll(true);
     }
 
-    void TravelWindow::onTravelButtonClick(MyGUI::Widget* _sender)
+    void TravelWindow::onTravelButtonClick(MyGUI::Widget* sender)
     {
-        const int price = Misc::StringUtils::toNumeric<int>(_sender->getUserString("price"), 0);
+        const int price = Misc::StringUtils::toNumeric<int>(sender->getUserString("price"), 0);
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
         int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
@@ -197,9 +197,9 @@ namespace MWGui
         npcStats.setGoldPool(npcStats.getGoldPool() + price);
 
         MWBase::Environment::get().getWindowManager()->fadeScreenOut(1);
-        ESM::Position pos = *_sender->getUserData<ESM::Position>();
+        ESM::Position pos = *sender->getUserData<ESM::Position>();
-        std::string_view cellname = _sender->getUserString("Destination");
+        std::string_view cellname = sender->getUserString("Destination");
-        bool interior = _sender->getUserString("interior") == "y";
+        bool interior = sender->getUserString("interior") == "y";
         if (mPtr.getCell()->isExterior())
         {
             ESM::Position playerPos = player.getRefData().getPosition();
@@ -230,7 +230,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->fadeScreenIn(1);
     }
 
-    void TravelWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
+    void TravelWindow::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Travel);
     }
@@ -250,13 +250,13 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
     }
 
-    void TravelWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    void TravelWindow::onMouseWheel(MyGUI::Widget* /*sender*/, int rel)
     {
-        if (mDestinationsView->getViewOffset().top + _rel * 0.3f > 0)
+        if (mDestinationsView->getViewOffset().top + rel * 0.3f > 0)
             mDestinationsView->setViewOffset(MyGUI::IntPoint(0, 0));
         else
             mDestinationsView->setViewOffset(
-                MyGUI::IntPoint(0, static_cast<int>(mDestinationsView->getViewOffset().top + _rel * 0.3f)));
+                MyGUI::IntPoint(0, static_cast<int>(mDestinationsView->getViewOffset().top + rel * 0.3f)));
     }
 
     bool TravelWindow::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)

apps/openmw/mwgui/travelwindow.hpp

@@ -29,9 +29,9 @@ namespace MWGui
 
         MyGUI::ScrollView* mDestinationsView;
 
-        void onCancelButtonClicked(MyGUI::Widget* _sender);
+        void onCancelButtonClicked(MyGUI::Widget* sender);
-        void onTravelButtonClick(MyGUI::Widget* _sender);
+        void onTravelButtonClick(MyGUI::Widget* sender);
-        void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+        void onMouseWheel(MyGUI::Widget* sender, int rel);
         void addDestination(const ESM::RefId& name, const ESM::Position& pos, bool interior);
         void clearDestinations();
         int mCurrentY;

apps/openmw/mwgui/waitdialog.cpp

@@ -174,14 +174,14 @@ namespace MWGui
         mDateTimeText->setCaptionWithReplacing(dateTimeText);
     }
 
-    void WaitDialog::onUntilHealedButtonClicked(MyGUI::Widget* sender)
+    void WaitDialog::onUntilHealedButtonClicked(MyGUI::Widget* /*sender*/)
     {
         int autoHours = MWBase::Environment::get().getMechanicsManager()->getHoursToRest();
 
         startWaiting(autoHours);
     }
 
-    void WaitDialog::onWaitButtonClicked(MyGUI::Widget* sender)
+    void WaitDialog::onWaitButtonClicked(MyGUI::Widget* /*sender*/)
     {
         startWaiting(mManualHours);
     }
@@ -231,7 +231,7 @@ namespace MWGui
         mProgressBar.setProgress(0, hoursToWait);
     }
 
-    void WaitDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    void WaitDialog::onCancelButtonClicked(MyGUI::Widget* /*sender*/)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Rest);
     }
@@ -243,7 +243,7 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mWaitButton);
     }
 
-    void WaitDialog::onKeyButtonPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char character)
+    void WaitDialog::onKeyButtonPressed(MyGUI::Widget* /*sender*/, MyGUI::KeyCode key, MyGUI::Char character)
     {
         if (key == MyGUI::KeyCode::ArrowUp)
             mHourSlider->setScrollPosition(

apps/openmw/mwgui/widgets.cpp

@@ -74,7 +74,7 @@ namespace MWGui::Widgets
         mSkillNameWidget->setTextColour(selected ? textColours.link : textColours.normal);
     }
 
-    void MWSkill::onClicked(MyGUI::Widget* _sender)
+    void MWSkill::onClicked(MyGUI::Widget* /*sender*/)
     {
         eventClicked(this);
     }
@@ -125,7 +125,7 @@ namespace MWGui::Widgets
         updateWidgets();
     }
 
-    void MWAttribute::onClicked(MyGUI::Widget* _sender)
+    void MWAttribute::onClicked(MyGUI::Widget* /*sender*/)
     {
         eventClicked(this);
     }

apps/openmw/mwgui/widgets.hpp

@@ -106,7 +106,7 @@ namespace MWGui
             typedef MyGUI::delegates::MultiDelegate<MWSkill*> EventHandle_SkillVoid;
 
             /** Event : Skill clicked.\n
-                signature : void method(MWSkill* _sender)\n
+                signature : void method(MWSkill* sender)\n
             */
             EventHandle_SkillVoid eventClicked;
 
@@ -117,7 +117,7 @@ namespace MWGui
 
             void initialiseOverride() override;
 
-            void onClicked(MyGUI::Widget* _sender);
+            void onClicked(MyGUI::Widget* sender);
 
         private:
             void updateWidgets();
@@ -147,7 +147,7 @@ namespace MWGui
             typedef MyGUI::delegates::MultiDelegate<MWAttribute*> EventHandle_AttributeVoid;
 
             /** Event : Attribute clicked.\n
-                signature : void method(MWAttribute* _sender)\n
+                signature : void method(MWAttribute* sender)\n
             */
             EventHandle_AttributeVoid eventClicked;
 
@@ -158,7 +158,7 @@ namespace MWGui
 
             void initialiseOverride() override;
 
-            void onClicked(MyGUI::Widget* _sender);
+            void onClicked(MyGUI::Widget* sender);
 
         private:
             void updateWidgets();