From 0f36b7fc975a6d2b6842a09d790fe757b228e385 Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 6 Aug 2025 23:47:21 +0200 Subject: [PATCH] Fix and enforce parameter naming --- .clang-tidy | 5 +- apps/launcher/settingspage.cpp | 8 +- apps/opencs/model/doc/document.cpp | 4 +- apps/opencs/model/doc/document.hpp | 2 +- apps/opencs/model/doc/documentmanager.cpp | 8 +- apps/opencs/model/doc/documentmanager.hpp | 8 +- apps/opencs/model/doc/messages.cpp | 4 +- apps/opencs/model/doc/messages.hpp | 2 +- apps/opencs/model/filter/booleannode.cpp | 4 +- apps/opencs/model/filter/booleannode.hpp | 2 +- apps/opencs/model/world/commanddispatcher.cpp | 6 +- apps/opencs/model/world/commanddispatcher.hpp | 2 +- apps/opencs/model/world/commands.cpp | 4 +- apps/opencs/model/world/commands.hpp | 6 +- apps/openmw/mwbase/windowmanager.hpp | 2 +- apps/openmw/mwgui/alchemywindow.cpp | 40 +++---- apps/openmw/mwgui/alchemywindow.hpp | 20 ++-- apps/openmw/mwgui/backgroundimage.cpp | 8 +- apps/openmw/mwgui/backgroundimage.hpp | 4 +- apps/openmw/mwgui/birth.cpp | 14 +-- apps/openmw/mwgui/birth.hpp | 8 +- apps/openmw/mwgui/bookpage.cpp | 16 +-- apps/openmw/mwgui/bookpage.hpp | 12 +- apps/openmw/mwgui/bookwindow.cpp | 14 +-- apps/openmw/mwgui/bookwindow.hpp | 2 +- apps/openmw/mwgui/charactercreation.cpp | 10 +- apps/openmw/mwgui/charactercreation.hpp | 4 +- apps/openmw/mwgui/class.cpp | 62 +++++----- apps/openmw/mwgui/class.hpp | 40 +++---- apps/openmw/mwgui/companionwindow.cpp | 6 +- apps/openmw/mwgui/companionwindow.hpp | 4 +- apps/openmw/mwgui/confirmationdialog.cpp | 4 +- apps/openmw/mwgui/confirmationdialog.hpp | 4 +- apps/openmw/mwgui/console.cpp | 14 +-- apps/openmw/mwgui/console.hpp | 14 +-- apps/openmw/mwgui/container.cpp | 6 +- apps/openmw/mwgui/container.hpp | 4 +- apps/openmw/mwgui/controllers.cpp | 6 +- apps/openmw/mwgui/controllers.hpp | 5 +- apps/openmw/mwgui/countdialog.cpp | 12 +- apps/openmw/mwgui/countdialog.hpp | 8 +- apps/openmw/mwgui/cursor.cpp | 14 +-- apps/openmw/mwgui/cursor.hpp | 6 +- apps/openmw/mwgui/dialogue.cpp | 14 +-- apps/openmw/mwgui/dialogue.hpp | 6 +- apps/openmw/mwgui/enchantingdialog.cpp | 10 +- apps/openmw/mwgui/exposedwindow.cpp | 6 +- apps/openmw/mwgui/exposedwindow.hpp | 2 +- apps/openmw/mwgui/hud.cpp | 14 +-- apps/openmw/mwgui/hud.hpp | 14 +-- apps/openmw/mwgui/inventorywindow.cpp | 32 +++--- apps/openmw/mwgui/inventorywindow.hpp | 8 +- apps/openmw/mwgui/itemselection.cpp | 2 +- apps/openmw/mwgui/itemview.cpp | 20 ++-- apps/openmw/mwgui/itemview.hpp | 6 +- apps/openmw/mwgui/journalbooks.cpp | 30 ++--- apps/openmw/mwgui/journalwindow.cpp | 38 +++---- apps/openmw/mwgui/layout.cpp | 10 +- apps/openmw/mwgui/layout.hpp | 6 +- apps/openmw/mwgui/levelupdialog.cpp | 2 +- apps/openmw/mwgui/mapwindow.cpp | 30 ++--- apps/openmw/mwgui/mapwindow.hpp | 6 +- apps/openmw/mwgui/merchantrepair.cpp | 8 +- apps/openmw/mwgui/merchantrepair.hpp | 2 +- apps/openmw/mwgui/messagebox.cpp | 8 +- apps/openmw/mwgui/messagebox.hpp | 4 +- apps/openmw/mwgui/postprocessorhud.cpp | 12 +- apps/openmw/mwgui/quickkeysmenu.cpp | 12 +- apps/openmw/mwgui/race.cpp | 22 ++-- apps/openmw/mwgui/race.hpp | 24 ++-- apps/openmw/mwgui/recharge.cpp | 6 +- apps/openmw/mwgui/recharge.hpp | 2 +- apps/openmw/mwgui/repair.cpp | 2 +- apps/openmw/mwgui/resourceskin.cpp | 107 +++++++++--------- apps/openmw/mwgui/resourceskin.hpp | 2 +- apps/openmw/mwgui/review.cpp | 18 +-- apps/openmw/mwgui/review.hpp | 14 +-- apps/openmw/mwgui/savegamedialog.cpp | 8 +- apps/openmw/mwgui/savegamedialog.hpp | 2 +- apps/openmw/mwgui/scrollwindow.cpp | 6 +- apps/openmw/mwgui/scrollwindow.hpp | 4 +- apps/openmw/mwgui/settingswindow.cpp | 66 +++++------ apps/openmw/mwgui/settingswindow.hpp | 48 ++++---- apps/openmw/mwgui/spellbuyingwindow.cpp | 14 +-- apps/openmw/mwgui/spellbuyingwindow.hpp | 6 +- apps/openmw/mwgui/spellcreationdialog.cpp | 12 +- apps/openmw/mwgui/spellview.cpp | 22 ++-- apps/openmw/mwgui/spellview.hpp | 10 +- apps/openmw/mwgui/statswindow.cpp | 6 +- apps/openmw/mwgui/statswindow.hpp | 2 +- apps/openmw/mwgui/textinput.cpp | 6 +- apps/openmw/mwgui/textinput.hpp | 4 +- apps/openmw/mwgui/tradewindow.cpp | 38 +++---- apps/openmw/mwgui/tradewindow.hpp | 18 +-- apps/openmw/mwgui/trainingwindow.cpp | 2 +- apps/openmw/mwgui/travelwindow.cpp | 18 +-- apps/openmw/mwgui/travelwindow.hpp | 6 +- apps/openmw/mwgui/waitdialog.cpp | 8 +- apps/openmw/mwgui/widgets.cpp | 4 +- apps/openmw/mwgui/widgets.hpp | 8 +- apps/openmw/mwgui/windowbase.cpp | 2 +- apps/openmw/mwgui/windowbase.hpp | 2 +- apps/openmw/mwgui/windowmanagerimp.cpp | 62 +++++----- apps/openmw/mwgui/windowmanagerimp.hpp | 12 +- apps/openmw/mwgui/windowpinnablebase.cpp | 2 +- apps/openmw/mwgui/windowpinnablebase.hpp | 2 +- apps/openmw/mwinput/bindingsmanager.cpp | 24 ++-- apps/openmw/mwlua/types/types.cpp | 8 +- apps/openmw/mwlua/types/types.hpp | 6 +- apps/openmw/mwphysics/trace.cpp | 4 +- apps/openmw/mwphysics/trace.h | 2 +- apps/openmw/mwrender/bulletdebugdraw.hpp | 4 +- apps/openmw/mwrender/localmap.cpp | 6 +- apps/openmw/mwrender/localmap.hpp | 2 +- apps/openmw/mwrender/postprocessor.cpp | 18 +-- apps/openmw/mwsound/ffmpegdecoder.cpp | 10 +- apps/openmw/mwsound/ffmpegdecoder.hpp | 8 +- apps/openmw/mwworld/esmstore.cpp | 4 +- apps/openmw/mwworld/esmstore.hpp | 2 +- apps/openmw/mwworld/manualref.cpp | 6 +- apps/openmw/mwworld/manualref.hpp | 4 +- apps/openmw/mwworld/worldmodel.hpp | 4 +- apps/openmw_tests/mwworld/teststore.cpp | 4 +- apps/wizard/existinginstallationpage.cpp | 4 +- apps/wizard/existinginstallationpage.hpp | 2 +- components/compiler/exprparser.cpp | 8 +- components/compiler/exprparser.hpp | 2 +- components/esm/defs.hpp | 4 +- components/esm/esmterrain.hpp | 4 +- components/files/configurationmanager.cpp | 10 +- components/files/configurationmanager.hpp | 2 +- components/files/linuxpath.cpp | 4 +- components/files/linuxpath.hpp | 2 +- components/fontloader/fontloader.cpp | 6 +- components/fontloader/fontloader.hpp | 2 +- components/fx/widgets.cpp | 4 +- components/fx/widgets.hpp | 6 +- components/lua/asyncpackage.cpp | 10 +- components/lua/asyncpackage.hpp | 4 +- components/lua/l10n.cpp | 4 +- components/lua/l10n.hpp | 2 +- components/lua/luastate.cpp | 8 +- components/lua/luastate.hpp | 16 +-- components/lua/storage.cpp | 35 +++--- components/lua/storage.hpp | 23 ++-- components/lua/utf8.cpp | 8 +- components/lua/utilpackage.cpp | 4 +- components/lua/utilpackage.hpp | 2 +- components/lua_ui/image.cpp | 2 +- components/lua_ui/image.hpp | 2 +- components/lua_ui/widget.cpp | 4 +- components/lua_ui/window.cpp | 2 +- components/lua_ui/window.hpp | 4 +- components/myguiplatform/additivelayer.cpp | 4 +- components/myguiplatform/additivelayer.hpp | 2 +- components/myguiplatform/myguidatamanager.cpp | 2 +- components/myguiplatform/myguidatamanager.hpp | 20 ++-- components/myguiplatform/myguiloglistener.cpp | 12 +- components/myguiplatform/myguiloglistener.hpp | 4 +- .../myguiplatform/myguirendermanager.cpp | 6 +- .../myguiplatform/myguirendermanager.hpp | 8 +- components/myguiplatform/myguitexture.cpp | 2 +- components/myguiplatform/myguitexture.hpp | 2 +- components/myguiplatform/scalinglayer.cpp | 50 ++++---- components/myguiplatform/scalinglayer.hpp | 14 +-- components/platform/file.hpp | 2 +- components/resource/bulletshapemanager.cpp | 2 +- components/sceneutil/screencapture.cpp | 6 +- components/sceneutil/screencapture.hpp | 4 +- components/sdlutil/sdlcursormanager.cpp | 10 +- components/sdlutil/sdlcursormanager.hpp | 8 +- components/shader/shadermanager.cpp | 20 ++-- components/widgets/box.cpp | 86 +++++++------- components/widgets/box.hpp | 30 ++--- components/widgets/imagebutton.cpp | 46 ++++---- components/widgets/imagebutton.hpp | 14 +-- components/widgets/list.cpp | 22 ++-- components/widgets/list.hpp | 6 +- components/widgets/numericeditbox.cpp | 4 +- components/widgets/numericeditbox.hpp | 2 +- components/widgets/sharedstatebutton.cpp | 26 ++--- components/widgets/sharedstatebutton.hpp | 12 +- components/widgets/windowcaption.cpp | 12 +- components/widgets/windowcaption.hpp | 6 +- 184 files changed, 1042 insertions(+), 1035 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 656c10fb99..91a1af88c7 100644 --- a/.clang-tidy +++ b/.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 diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp index 39396f1273..0f42825b0a 100644 --- a/apps/launcher/settingspage.cpp +++ b/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(CellSizeInUnits * CellGridRadius); + return static_cast(cellSizeInUnits * cellGridRadius); } } diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp index 21e5ab306b..536a5c0d2d 100644 --- a/apps/opencs/model/doc/document.cpp +++ b/apps/opencs/model/doc/document.cpp @@ -293,11 +293,11 @@ void CSMDoc::Document::createBase() } CSMDoc::Document::Document(const Files::ConfigurationManager& configuration, std::vector 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& 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")) diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp index ac8f06712c..24dbeec094 100644 --- a/apps/opencs/model/doc/document.hpp +++ b/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 files, bool new_, + Document(const Files::ConfigurationManager& configuration, std::vector files, bool isNew, const std::filesystem::path& savePath, const std::filesystem::path& resDir, ToUTF8::FromType encoding, const Files::PathContainer& dataPaths, const std::vector& archives); diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp index 72c315b004..b74c3220d5 100644 --- a/apps/opencs/model/doc/documentmanager.cpp +++ b/apps/opencs/model/doc/documentmanager.cpp @@ -52,16 +52,16 @@ bool CSMDoc::DocumentManager::isEmpty() } void CSMDoc::DocumentManager::addDocument( - const std::vector& files, const std::filesystem::path& savePath, bool new_) + const std::vector& 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& files, const std::filesystem::path& savePath, bool new_) + const std::vector& 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) diff --git a/apps/opencs/model/doc/documentmanager.hpp b/apps/opencs/model/doc/documentmanager.hpp index 53caf04a0a..b43676b7a5 100644 --- a/apps/opencs/model/doc/documentmanager.hpp +++ b/apps/opencs/model/doc/documentmanager.hpp @@ -46,18 +46,18 @@ namespace CSMDoc ~DocumentManager(); void addDocument( - const std::vector& files, const std::filesystem::path& savePath, bool new_); - ///< \param new_ Do not load the last content file in \a files and instead create in an + const std::vector& files, const std::filesystem::path& savePath, bool isNew); + ///< \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& files, const std::filesystem::path& savePath, bool new_); + const std::vector& files, const std::filesystem::path& savePath, bool isNew); void setResourceDir(const std::filesystem::path& parResDir); diff --git a/apps/opencs/model/doc/messages.cpp b/apps/opencs/model/doc/messages.cpp index bf28ac1c9f..a3577e0e49 100644 --- a/apps/opencs/model/doc/messages.cpp +++ b/apps/opencs/model/doc/messages.cpp @@ -35,8 +35,8 @@ std::string CSMDoc::Message::toString(Severity severity) return ""; } -CSMDoc::Messages::Messages(Message::Severity default_) - : mDefault(default_) +CSMDoc::Messages::Messages(Message::Severity defaultSeverity) + : mDefault(defaultSeverity) { } diff --git a/apps/opencs/model/doc/messages.hpp b/apps/opencs/model/doc/messages.hpp index 7715a89b33..5c85c8eef7 100644 --- a/apps/opencs/model/doc/messages.hpp +++ b/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); diff --git a/apps/opencs/model/filter/booleannode.cpp b/apps/opencs/model/filter/booleannode.cpp index 793709b8f5..7f93b0b3b5 100644 --- a/apps/opencs/model/filter/booleannode.cpp +++ b/apps/opencs/model/filter/booleannode.cpp @@ -5,8 +5,8 @@ namespace CSMWorld class IdTableBase; } -CSMFilter::BooleanNode::BooleanNode(bool true_) - : mTrue(true_) +CSMFilter::BooleanNode::BooleanNode(bool value) + : mTrue(value) { } diff --git a/apps/opencs/model/filter/booleannode.hpp b/apps/opencs/model/filter/booleannode.hpp index 331899553e..275cbf4e55 100644 --- a/apps/opencs/model/filter/booleannode.hpp +++ b/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& columns) const override; ///< \return Can the specified table row pass through to filter? diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp index b211477caf..da42a3bd2e 100644 --- a/apps/opencs/model/world/commanddispatcher.cpp +++ b/apps/opencs/model/world/commanddispatcher.cpp @@ -152,7 +152,7 @@ std::vector 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(model); @@ -194,7 +194,7 @@ void CSMWorld::CommandDispatcher::executeModify( } } - auto modifyData = std::make_unique(*model, index, new_); + auto modifyData = std::make_unique(*model, index, newValue); if (modifyCell.get()) { diff --git a/apps/opencs/model/world/commanddispatcher.hpp b/apps/opencs/model/world/commanddispatcher.hpp index 46faa4524f..dd5ef1d040 100644 --- a/apps/opencs/model/world/commanddispatcher.hpp +++ b/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: diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp index 168049641a..2e888682d0 100644 --- a/apps/opencs/model/world/commands.cpp +++ b/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) { diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp index f6b0caeb1a..980af9d7e5 100644 --- a/apps/opencs/model/world/commands.hpp +++ b/apps/opencs/model/world/commands.hpp @@ -125,8 +125,8 @@ namespace CSMWorld CSMWorld::RecordBase::State mOldRecordState; public: - ModifyCommand( - QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_, QUndoCommand* parent = nullptr); + explicit ModifyCommand(QAbstractItemModel& model, const QModelIndex& index, const QVariant& newValue, + QUndoCommand* parent = nullptr); void redo() override; @@ -169,7 +169,7 @@ namespace CSMWorld std::vector> 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; diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp index 2783fd21d5..3a7c84c384 100644 --- a/apps/openmw/mwbase/windowmanager.hpp +++ b/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>& changed) = 0; diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp index 66461e6e6a..58ba8ae8f2 100644 --- a/apps/openmw/mwgui/alchemywindow.cpp +++ b/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(); + auto* button = sender->castType(); 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) - applyFilter(_sender->getItemNameAt(_index)); + if (index != MyGUI::ITEM_NONE) + 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)); - if (_sender->getUserData()->isEmpty()) // if this apparatus slot is empty + size_t i = std::distance(mApparatus.begin(), std::find(mApparatus.begin(), mApparatus.end(), sender)); + if (sender->getUserData()->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) diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp index 4c5faa86d4..cdf0192cce 100644 --- a/apps/openmw/mwgui/alchemywindow.hpp +++ b/apps/openmw/mwgui/alchemywindow.hpp @@ -63,22 +63,22 @@ namespace MWGui MyGUI::EditBox* mNameEdit; Gui::NumericEditBox* mBrewCountEdit; - void onCancelButtonClicked(MyGUI::Widget* _sender); - void onCreateButtonClicked(MyGUI::Widget* _sender); - void onIngredientSelected(MyGUI::Widget* _sender); - void onApparatusSelected(MyGUI::Widget* _sender); + void onCancelButtonClicked(MyGUI::Widget* sender); + void onCreateButtonClicked(MyGUI::Widget* sender); + void onIngredientSelected(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 onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id); - void onCountButtonReleased(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 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 onFilterEdited(MyGUI::EditBox* _sender); - void switchFilterType(MyGUI::Widget* _sender); + void onFilterChanged(MyGUI::ComboBox* sender, size_t index); + void onFilterEdited(MyGUI::EditBox* sender); + void switchFilterType(MyGUI::Widget* sender); void updateFilters(); void addRepeatController(MyGUI::Widget* widget); diff --git a/apps/openmw/mwgui/backgroundimage.cpp b/apps/openmw/mwgui/backgroundimage.cpp index e2e2c62cd1..df703fbc3f 100644 --- a/apps/openmw/mwgui/backgroundimage.cpp +++ b/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(); } diff --git a/apps/openmw/mwgui/backgroundimage.hpp b/apps/openmw/mwgui/backgroundimage.hpp index b151a26e27..5a9f75252c 100644 --- a/apps/openmw/mwgui/backgroundimage.hpp +++ b/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 setCoord(const MyGUI::IntCoord& _value) override; + void setSize(const MyGUI::IntSize& value) override; + void setCoord(const MyGUI::IntCoord& value) override; private: MyGUI::ImageBox* mChild; diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp index 97405e7cc0..80b9fc7da2 100644 --- a/apps/openmw/mwgui/birth.cpp +++ b/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(_index); + const ESM::RefId& birthId = *mBirthList->getItemDataAt(index); if (mCurrentBirthId == birthId) return; diff --git a/apps/openmw/mwgui/birth.hpp b/apps/openmw/mwgui/birth.hpp index b41b1fbb9a..4e87d90400 100644 --- a/apps/openmw/mwgui/birth.hpp +++ b/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 onOkClicked(MyGUI::Widget* _sender); - void onBackClicked(MyGUI::Widget* _sender); + void onAccept(MyGUI::ListBox* sender, size_t index); + void onOkClicked(MyGUI::Widget* sender); + void onBackClicked(MyGUI::Widget* sender); private: void updateBirths(); diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp index a0b2cb5626..008c935c73 100644 --- a/apps/openmw/mwgui/bookpage.cpp +++ b/apps/openmw/mwgui/bookpage.cpp @@ -137,7 +137,7 @@ namespace MWGui } template - 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. diff --git a/apps/openmw/mwgui/bookpage.hpp b/apps/openmw/mwgui/bookpage.hpp index bb85130b7f..92e169e0e4 100644 --- a/apps/openmw/mwgui/bookpage.hpp +++ b/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, - const Colour& ActiveColour, InteractiveId Id, bool Unique = true) + virtual Style* createHotStyle(Style* baseStyle, const Colour& normalColour, const Colour& hoverColour, + 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 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; diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp index 056f1abc89..d1d6e4562d 100644 --- a/apps/openmw/mwgui/bookwindow.cpp +++ b/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(); } diff --git a/apps/openmw/mwgui/bookwindow.hpp b/apps/openmw/mwgui/bookwindow.hpp index 7d3a0e30c7..eb2c6b2ead 100644 --- a/apps/openmw/mwgui/bookwindow.hpp +++ b/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); diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp index be2d22ae84..61d1132a28 100644 --- a/apps/openmw/mwgui/charactercreation.cpp +++ b/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) diff --git a/apps/openmw/mwgui/charactercreation.hpp b/apps/openmw/mwgui/charactercreation.hpp index b5bd35b49c..b92e3c2f5b 100644 --- a/apps/openmw/mwgui/charactercreation.hpp +++ b/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(); diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp index b60e0e3116..3f1ce46ca0 100644 --- a/apps/openmw/mwgui/class.cpp +++ b/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(_index); + const ESM::RefId& classId = *mClassList->getItemDataAt(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(); 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(); - 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(); - 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(); 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); } diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp index 3755ab5f58..dad4f4dc25 100644 --- a/apps/openmw/mwgui/class.hpp +++ b/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 onBackClicked(MyGUI::Widget* _sender); + void onOkClicked(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 onAccept(MyGUI::ListBox* _sender, size_t _index); + void onSelectClass(MyGUI::ListBox* sender, size_t index); + void onAccept(MyGUI::ListBox* sender, size_t index); - void onOkClicked(MyGUI::Widget* _sender); - void onBackClicked(MyGUI::Widget* _sender); + void onOkClicked(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 onCancelClicked(MyGUI::Widget* _sender); + void onSpecializationClicked(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 onCancelClicked(MyGUI::Widget* _sender); + void onAttributeClicked(Widgets::MWAttributePtr sender); + void onCancelClicked(MyGUI::Widget* sender); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; size_t mControllerFocus = 0; std::vector mAttributeButtons; @@ -249,8 +249,8 @@ namespace MWGui EventHandle_Void eventItemSelected; protected: - void onSkillClicked(Widgets::MWSkillPtr _sender); - void onCancelClicked(MyGUI::Widget* _sender); + void onSkillClicked(Widgets::MWSkillPtr sender); + void onCancelClicked(MyGUI::Widget* sender); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; size_t mControllerFocus = 0; std::vector 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 onBackClicked(MyGUI::Widget* _sender); + void onOkClicked(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(); diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp index 0972f8e57e..38a7562ddb 100644 --- a/apps/openmw/mwgui/companionwindow.cpp +++ b/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); diff --git a/apps/openmw/mwgui/companionwindow.hpp b/apps/openmw/mwgui/companionwindow.hpp index 1b5a772684..33e003b99c 100644 --- a/apps/openmw/mwgui/companionwindow.hpp +++ b/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; diff --git a/apps/openmw/mwgui/confirmationdialog.cpp b/apps/openmw/mwgui/confirmationdialog.cpp index f23237c896..d50c87130d 100644 --- a/apps/openmw/mwgui/confirmationdialog.cpp +++ b/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); diff --git a/apps/openmw/mwgui/confirmationdialog.hpp b/apps/openmw/mwgui/confirmationdialog.hpp index 9b26e3a3c9..0f8f5644a1 100644 --- a/apps/openmw/mwgui/confirmationdialog.hpp +++ b/apps/openmw/mwgui/confirmationdialog.hpp @@ -25,8 +25,8 @@ namespace MWGui MyGUI::Button* mOkButton; MyGUI::Button* mCancelButton; - void onCancelButtonClicked(MyGUI::Widget* _sender); - void onOkButtonClicked(MyGUI::Widget* _sender); + void onCancelButtonClicked(MyGUI::Widget* sender); + void onOkButtonClicked(MyGUI::Widget* sender); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; bool mOkButtonFocus = true; diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp index a4463a1133..886b4d381e 100644 --- a/apps/openmw/mwgui/console.cpp +++ b/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); } diff --git a/apps/openmw/mwgui/console.hpp b/apps/openmw/mwgui/console.hpp index 2b6ecfc8ad..f64b40635e 100644 --- a/apps/openmw/mwgui/console.hpp +++ b/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 acceptCommand(MyGUI::EditBox* _sender); + void commandBoxKeyPress(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char value); + void acceptCommand(MyGUI::EditBox* sender); enum class SearchDirection; - void toggleCaseSensitiveSearch(MyGUI::Widget* _sender); - void toggleRegExSearch(MyGUI::Widget* _sender); - void acceptSearchTerm(MyGUI::EditBox* _sender); - void findNextOccurrence(MyGUI::Widget* _sender); - void findPreviousOccurrence(MyGUI::Widget* _sender); + void toggleCaseSensitiveSearch(MyGUI::Widget* sender); + void toggleRegExSearch(MyGUI::Widget* sender); + void acceptSearchTerm(MyGUI::EditBox* sender); + void findNextOccurrence(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); diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index 126b6ea1d3..bfda06d827 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/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) { diff --git a/apps/openmw/mwgui/container.hpp b/apps/openmw/mwgui/container.hpp index d40507bd82..f32bc7ba89 100644 --- a/apps/openmw/mwgui/container.hpp +++ b/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 onTakeAllButtonClicked(MyGUI::Widget* _sender); + void onCloseButtonClicked(MyGUI::Widget* sender); + void onTakeAllButtonClicked(MyGUI::Widget* sender); void onDisposeCorpseButtonClicked(MyGUI::Widget* sender); void onReferenceUnavailable() override; diff --git a/apps/openmw/mwgui/controllers.cpp b/apps/openmw/mwgui/controllers.cpp index f024def39b..969834d639 100644 --- a/apps/openmw/mwgui/controllers.cpp +++ b/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; } diff --git a/apps/openmw/mwgui/controllers.hpp b/apps/openmw/mwgui/controllers.hpp index a9e5565187..33948a7228 100644 --- a/apps/openmw/mwgui/controllers.hpp +++ b/apps/openmw/mwgui/controllers.hpp @@ -2,7 +2,6 @@ #define MWGUI_CONTROLLERS_H #include -#include namespace MyGUI { @@ -17,8 +16,8 @@ namespace MWGui::Controllers MYGUI_RTTI_DERIVED(ControllerFollowMouse) private: - bool addTime(MyGUI::Widget* _widget, float _time) override; - void prepareItem(MyGUI::Widget* _widget) override; + bool addTime(MyGUI::Widget* widget, float time) override; + void prepareItem(MyGUI::Widget* widget) override; }; } diff --git a/apps/openmw/mwgui/countdialog.cpp b/apps/openmw/mwgui/countdialog.cpp index 0214d34e8a..608257a0e7 100644 --- a/apps/openmw/mwgui/countdialog.cpp +++ b/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) diff --git a/apps/openmw/mwgui/countdialog.hpp b/apps/openmw/mwgui/countdialog.hpp index 0b1e53d167..d56d53d5f2 100644 --- a/apps/openmw/mwgui/countdialog.hpp +++ b/apps/openmw/mwgui/countdialog.hpp @@ -30,11 +30,11 @@ namespace MWGui MyGUI::Button* mOkButton; MyGUI::Button* mCancelButton; - void onCancelButtonClicked(MyGUI::Widget* _sender); - void onOkButtonClicked(MyGUI::Widget* _sender); + void onCancelButtonClicked(MyGUI::Widget* sender); + void onOkButtonClicked(MyGUI::Widget* sender); void onEditValueChanged(int value); - void onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position); - void onEnterKeyPressed(MyGUI::EditBox* _sender); + void onSliderMoved(MyGUI::ScrollBar* sender, size_t position); + void onEnterKeyPressed(MyGUI::EditBox* sender); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; }; diff --git a/apps/openmw/mwgui/cursor.cpp b/apps/openmw/mwgui/cursor.cpp index 1b6431f0fb..b5b7a45e4b 100644 --- a/apps/openmw/mwgui/cursor.cpp +++ b/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() diff --git a/apps/openmw/mwgui/cursor.hpp b/apps/openmw/mwgui/cursor.hpp index b25db0ce06..b885ec4eec 100644 --- a/apps/openmw/mwgui/cursor.hpp +++ b/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 setPosition(MyGUI::ImageBox* _image, const MyGUI::IntPoint& _point) override; + void setImage(MyGUI::ImageBox* image) 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. diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 48f7d18ff8..3d2bcc1e86 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/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(mScrollBar->getScrollPosition() - _rel * 0.3, 0, mScrollBar->getScrollRange() - 1)); + std::clamp(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()) { diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp index 6f03076e92..bb0fcd6f0e 100644 --- a/apps/openmw/mwgui/dialogue.hpp +++ b/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 onMouseWheel(MyGUI::Widget* _sender, int _rel); - void onWindowResize(MyGUI::Window* _sender); + void onByeClicked(MyGUI::Widget* sender); + void onMouseWheel(MyGUI::Widget* sender, int rel); + void onWindowResize(MyGUI::Window* sender); void onTopicActivated(const std::string& topicId); void onChoiceActivated(int id); void onGoodbyeActivated(); diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp index d6a42f8ea0..b91928473b 100644 --- a/apps/openmw/mwgui/enchantingdialog.cpp +++ b/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) { diff --git a/apps/openmw/mwgui/exposedwindow.cpp b/apps/openmw/mwgui/exposedwindow.cpp index 36b47d98f2..ad407a0644 100644 --- a/apps/openmw/mwgui/exposedwindow.cpp +++ b/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 diff --git a/apps/openmw/mwgui/exposedwindow.hpp b/apps/openmw/mwgui/exposedwindow.hpp index d192a3db01..50f7955937 100644 --- a/apps/openmw/mwgui/exposedwindow.hpp +++ b/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. }; diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp index 4983836551..56f18e9b0e 100644 --- a/apps/openmw/mwgui/hud.cpp +++ b/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()) diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp index 1a1076ff68..9e9fa4e597 100644 --- a/apps/openmw/mwgui/hud.hpp +++ b/apps/openmw/mwgui/hud.hpp @@ -106,13 +106,13 @@ namespace MWGui bool mIsDrowning; float mDrowningFlashTheta; - void onWorldClicked(MyGUI::Widget* _sender); - void onWorldMouseOver(MyGUI::Widget* _sender, int x, int y); - void onWorldMouseLostFocus(MyGUI::Widget* _sender, MyGUI::Widget* _new); - void onHMSClicked(MyGUI::Widget* _sender); - void onWeaponClicked(MyGUI::Widget* _sender); - void onMagicClicked(MyGUI::Widget* _sender); - void onMapClicked(MyGUI::Widget* _sender); + void onWorldClicked(MyGUI::Widget* sender); + void onWorldMouseOver(MyGUI::Widget* sender, int x, int y); + void onWorldMouseLostFocus(MyGUI::Widget* sender, MyGUI::Widget* newWidget); + void onHMSClicked(MyGUI::Widget* sender); + void onWeaponClicked(MyGUI::Widget* sender); + void onMagicClicked(MyGUI::Widget* sender); + void onMapClicked(MyGUI::Widget* sender); // LocalMapBase void customMarkerCreated(MyGUI::Widget* marker) override; diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index f1b4a8d837..93fae2ea96 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/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(viewSize.width)); - settings.mRegular.mY.set(_sender->getPosition().top / static_cast(viewSize.height)); - settings.mRegular.mW.set(_sender->getSize().width / static_cast(viewSize.width)); - settings.mRegular.mH.set(_sender->getSize().height / static_cast(viewSize.height)); + settings.mRegular.mX.set(sender->getPosition().left / static_cast(viewSize.width)); + settings.mRegular.mY.set(sender->getPosition().top / static_cast(viewSize.height)); + settings.mRegular.mW.set(sender->getSize().width / static_cast(viewSize.width)); + settings.mRegular.mH.set(sender->getSize().height / static_cast(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()->setStateSelected(true); + sender->castType()->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) { diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp index ce02a83c1b..1b0392d28b 100644 --- a/apps/openmw/mwgui/inventorywindow.hpp +++ b/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 onFilterChanged(MyGUI::Widget* _sender); - void onNameFilterChanged(MyGUI::EditBox* _sender); - void onAvatarClicked(MyGUI::Widget* _sender); + void onWindowResize(MyGUI::Window* sender); + void onFilterChanged(MyGUI::Widget* sender); + void onNameFilterChanged(MyGUI::EditBox* sender); + void onAvatarClicked(MyGUI::Widget* sender); void onPinToggled() override; void updateEncumbranceBar(); diff --git a/apps/openmw/mwgui/itemselection.cpp b/apps/openmw/mwgui/itemselection.cpp index 30d8dbfb60..5d06b685d6 100644 --- a/apps/openmw/mwgui/itemselection.cpp +++ b/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(); } diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp index 243837bb65..ba43082d42 100644 --- a/apps/openmw/mwgui/itemview.cpp +++ b/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(mScrollView->getViewOffset().left + _rel * 0.3f), 0)); + MyGUI::IntPoint(static_cast(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()); - Base::setSize(_value); + bool changed = (value.width != getWidth() || value.height != getHeight()); + 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()); - Base::setCoord(_value); + bool changed = (value.width != getWidth() || value.height != getHeight()); + Base::setCoord(value); if (changed) layoutWidgets(); } diff --git a/apps/openmw/mwgui/itemview.hpp b/apps/openmw/mwgui/itemview.hpp index 1e2ab8817f..69d0f885bb 100644 --- a/apps/openmw/mwgui/itemview.hpp +++ b/apps/openmw/mwgui/itemview.hpp @@ -43,12 +43,12 @@ namespace MWGui void layoutWidgets(); - void setSize(const MyGUI::IntSize& _value) override; - void setCoord(const MyGUI::IntCoord& _value) override; + void setSize(const MyGUI::IntSize& 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 mModel; MyGUI::ScrollView* mScrollView; diff --git a/apps/openmw/mwgui/journalbooks.cpp b/apps/openmw/mwgui/journalbooks.cpp index c698fd84d6..3e9916c345 100644 --- a/apps/openmw/mwgui/journalbooks.cpp +++ b/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) - : AddContent(std::move(typesetter), body_style) + explicit AddSpan(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* bodyStyle) + : 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, - MWGui::BookTypesetter::Style* header_style, bool add_header) - : AddEntry(std::move(typesetter), body_style) - , mAddHeader(add_header) - , mHeaderStyle(header_style) + explicit AddJournalEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* bodyStyle, + MWGui::BookTypesetter::Style* headerStyle, bool addHeader) + : AddEntry(std::move(typesetter), bodyStyle) + , mAddHeader(addHeader) + , mHeaderStyle(headerStyle) { } @@ -93,11 +93,11 @@ namespace intptr_t mContentId; MWGui::BookTypesetter::Style* mHeaderStyle; - AddTopicEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* body_style, - MWGui::BookTypesetter::Style* header_style, intptr_t contentId) - : AddEntry(std::move(typesetter), body_style) + explicit AddTopicEntry(MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* bodyStyle, + MWGui::BookTypesetter::Style* headerStyle, intptr_t contentId) + : AddEntry(std::move(typesetter), bodyStyle) , mContentId(contentId) - , mHeaderStyle(header_style) + , mHeaderStyle(headerStyle) { } diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp index afab1637c5..4d60d90101 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/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::create( - JournalViewModel::Ptr Model, bool questList, ToUTF8::FromType encoding) + JournalViewModel::Ptr model, bool questList, ToUTF8::FromType encoding) { - return std::make_unique(Model, questList, encoding); + return std::make_unique(model, questList, encoding); } MWGui::JournalWindow::JournalWindow() diff --git a/apps/openmw/mwgui/layout.cpp b/apps/openmw/mwgui/layout.cpp index c1d2e474c2..9a5f0af7b3 100644 --- a/apps/openmw/mwgui/layout.cpp +++ b/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."); } } diff --git a/apps/openmw/mwgui/layout.hpp b/apps/openmw/mwgui/layout.hpp index 07a3d1e66b..8f890a68f9 100644 --- a/apps/openmw/mwgui/layout.hpp +++ b/apps/openmw/mwgui/layout.hpp @@ -38,9 +38,9 @@ namespace MWGui MyGUI::Widget* getWidget(std::string_view name); template - 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(false); if (!cast) { @@ -49,7 +49,7 @@ namespace MWGui << "' in layout '" << mLayoutName << "'"); } else - _widget = cast; + widget = cast; } private: diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp index 708fc7b02f..160906a11f 100644 --- a/apps/openmw/mwgui/levelupdialog.cpp +++ b/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); diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp index 90a690242f..8b2871dfcb 100644 --- a/apps/openmw/mwgui/mapwindow.cpp +++ b/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(); } diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp index 379141fb61..eb49f8673e 100644 --- a/apps/openmw/mwgui/mapwindow.hpp +++ b/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 onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id); - void onWorldButtonClicked(MyGUI::Widget* _sender); + 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 onWorldButtonClicked(MyGUI::Widget* sender); void onMapDoubleClicked(MyGUI::Widget* sender); void onMapZoomed(MyGUI::Widget* sender, int rel); void zoomOnCursor(float speedDiff); diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp index 87cda0b4db..5e0a889a0f 100644 --- a/apps/openmw/mwgui/merchantrepair.cpp +++ b/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(mList->getViewOffset().top + _rel * 0.3f))); + mList->setViewOffset(MyGUI::IntPoint(0, static_cast(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); } diff --git a/apps/openmw/mwgui/merchantrepair.hpp b/apps/openmw/mwgui/merchantrepair.hpp index 119258f7ad..88fd19d7ff 100644 --- a/apps/openmw/mwgui/merchantrepair.hpp +++ b/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; diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp index d705d66bb6..1e2c7aa0d7 100644 --- a/apps/openmw/mwgui/messagebox.cpp +++ b/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); diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp index d48223d1a4..c591125d50 100644 --- a/apps/openmw/mwgui/messagebox.hpp +++ b/apps/openmw/mwgui/messagebox.hpp @@ -94,7 +94,7 @@ namespace MWGui public: InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector& 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; diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp index f6b2966e7f..401770179d 100644 --- a/apps/openmw/mwgui/postprocessorhud.cpp +++ b/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) diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp index ab735fd1e6..09d869169b 100644 --- a/apps/openmw/mwgui/quickkeysmenu.cpp +++ b/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(); } diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp index 193c409ab7..6f5f9ef061 100644 --- a/apps/openmw/mwgui/race.cpp +++ b/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(_index); + ESM::RefId& raceId = *mRaceList->getItemDataAt(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); diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp index 0b00de40c0..e825bc4f72 100644 --- a/apps/openmw/mwgui/race.hpp +++ b/apps/openmw/mwgui/race.hpp @@ -65,23 +65,23 @@ namespace MWGui EventHandle_WindowBase eventDone; protected: - void onPreviewScroll(MyGUI::Widget* _sender, int _delta); - void onHeadRotate(MyGUI::ScrollBar* _sender, size_t _position); + void onPreviewScroll(MyGUI::Widget* sender, int delta); + void onHeadRotate(MyGUI::ScrollBar* sender, size_t position); - void onSelectPreviousGender(MyGUI::Widget* _sender); - void onSelectNextGender(MyGUI::Widget* _sender); + void onSelectPreviousGender(MyGUI::Widget* sender); + void onSelectNextGender(MyGUI::Widget* sender); - void onSelectPreviousFace(MyGUI::Widget* _sender); - void onSelectNextFace(MyGUI::Widget* _sender); + void onSelectPreviousFace(MyGUI::Widget* sender); + void onSelectNextFace(MyGUI::Widget* sender); - void onSelectPreviousHair(MyGUI::Widget* _sender); - void onSelectNextHair(MyGUI::Widget* _sender); + void onSelectPreviousHair(MyGUI::Widget* sender); + void onSelectNextHair(MyGUI::Widget* sender); - void onSelectRace(MyGUI::ListBox* _sender, size_t _index); - void onAccept(MyGUI::ListBox* _sender, size_t _index); + void onSelectRace(MyGUI::ListBox* sender, size_t index); + void onAccept(MyGUI::ListBox* sender, size_t index); - void onOkClicked(MyGUI::Widget* _sender); - void onBackClicked(MyGUI::Widget* _sender); + void onOkClicked(MyGUI::Widget* sender); + void onBackClicked(MyGUI::Widget* sender); private: void updateRaces(); diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp index b6354c1d70..bbb26c29ac 100644 --- a/apps/openmw/mwgui/recharge.cpp +++ b/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("#{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(); if (!MWMechanics::rechargeItem(item, gem)) diff --git a/apps/openmw/mwgui/recharge.hpp b/apps/openmw/mwgui/recharge.hpp index c10f96e71e..95ffee0698 100644 --- a/apps/openmw/mwgui/recharge.hpp +++ b/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; }; diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp index cb3f6be8bb..6064fcfd94 100644 --- a/apps/openmw/mwgui/repair.cpp +++ b/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("#{sRepair}"); mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &Repair::onItemSelected); diff --git a/apps/openmw/mwgui/resourceskin.cpp b/apps/openmw/mwgui/resourceskin.cpp index 3d9f09952e..af17a8cd53 100644 --- a/apps/openmw/mwgui/resourceskin.cpp +++ b/apps/openmw/mwgui/resourceskin.cpp @@ -6,65 +6,68 @@ namespace MWGui { - void resizeSkin(MyGUI::xml::ElementPtr _node) + namespace { - _node->setAttribute("type", "ResourceSkin"); - 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()) + void resizeSkin(MyGUI::xml::ElementPtr node) { - if (basis->getName() != "BasisSkin") - continue; + node->setAttribute("type", "ResourceSkin"); + if (!node->findAttribute("size").empty()) + return; - auto basisSkinType = basis->findAttribute("type"); - if (Misc::StringUtils::ciEqual(basisSkinType, "SimpleText")) - continue; - bool isTileRect = Misc::StringUtils::ciEqual(basisSkinType, "TileRect"); + auto textureName = node->findAttribute("texture"); + if (textureName.empty()) + return; - if (!basis->findAttribute("offset").empty()) - continue; + MyGUI::ITexture* texture = MyGUI::RenderManager::getInstance().getTexture(std::string{ textureName }); + if (!texture) + return; - basis->addAttribute("offset", coord); - - MyGUI::xml::ElementEnumerator state = basis->getElementEnumerator(); - while (state.next()) + 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 (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()) - continue; - - state->addAttribute("offset", coord); - if (isTileRect) + if (state->getName() == "State") { - MyGUI::xml::ElementEnumerator property = state->getElementEnumerator(); - bool hasTileSize = false; - while (property.next("Property")) - { - if (property->findAttribute("key") != "TileSize") - continue; + if (!state->findAttribute("offset").empty()) + continue; - hasTileSize = true; - } - - if (!hasTileSize) + state->addAttribute("offset", coord); + if (isTileRect) { - MyGUI::xml::ElementPtr tileSizeProperty = state->createChild("Property"); - tileSizeProperty->addAttribute("key", "TileSize"); - tileSizeProperty->addAttribute("value", textureSize); + MyGUI::xml::ElementEnumerator property = state->getElementEnumerator(); + bool hasTileSize = false; + 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); - Base::deserialization(_node, _version); + resizeSkin(node); + Base::deserialization(node, version); } } diff --git a/apps/openmw/mwgui/resourceskin.hpp b/apps/openmw/mwgui/resourceskin.hpp index 1b66c22fb2..070342cff7 100644 --- a/apps/openmw/mwgui/resourceskin.hpp +++ b/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; }; } diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp index 66b48aa2ee..1f51fa869f 100644 --- a/apps/openmw/mwgui/review.cpp +++ b/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(mSkillView->getViewOffset().top + _rel * 0.3))); + MyGUI::IntPoint(0, static_cast(mSkillView->getViewOffset().top + rel * 0.3))); } bool ReviewDialog::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp index 78d88887db..c3912606bc 100644 --- a/apps/openmw/mwgui/review.hpp +++ b/apps/openmw/mwgui/review.hpp @@ -63,15 +63,15 @@ namespace MWGui EventHandle_Int eventActivateDialog; protected: - void onOkClicked(MyGUI::Widget* _sender); - void onBackClicked(MyGUI::Widget* _sender); + void onOkClicked(MyGUI::Widget* sender); + void onBackClicked(MyGUI::Widget* sender); - void onNameClicked(MyGUI::Widget* _sender); - void onRaceClicked(MyGUI::Widget* _sender); - void onClassClicked(MyGUI::Widget* _sender); - void onBirthSignClicked(MyGUI::Widget* _sender); + void onNameClicked(MyGUI::Widget* sender); + void onRaceClicked(MyGUI::Widget* sender); + void onClassClicked(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: diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp index eb83d82444..ef6f41ded9 100644 --- a/apps/openmw/mwgui/savegamedialog.cpp +++ b/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(); } diff --git a/apps/openmw/mwgui/savegamedialog.hpp b/apps/openmw/mwgui/savegamedialog.hpp index 2b5b163044..7263bec537 100644 --- a/apps/openmw/mwgui/savegamedialog.hpp +++ b/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); diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp index 5b5f4a4ec4..80534d9b83 100644 --- a/apps/openmw/mwgui/scrollwindow.cpp +++ b/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")); diff --git a/apps/openmw/mwgui/scrollwindow.hpp b/apps/openmw/mwgui/scrollwindow.hpp index 398843f824..ee9118bdb1 100644 --- a/apps/openmw/mwgui/scrollwindow.hpp +++ b/apps/openmw/mwgui/scrollwindow.hpp @@ -28,8 +28,8 @@ namespace MWGui ControllerButtons* getControllerButtons() override; protected: - void onCloseButtonClicked(MyGUI::Widget* _sender); - void onTakeButtonClicked(MyGUI::Widget* _sender); + void onCloseButtonClicked(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; diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp index 70a067899a..4ae96f982a 100644 --- a/apps/openmw/mwgui/settingswindow.cpp +++ b/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(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(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(pos))); + Settings::parseLightingMethod(*sender->getItemDataAt(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(pos); + const auto& languageCode = *sender->getItemDataAt(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 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()->getCaption() == on) + if (sender->castType()->getCaption() == on) { - _sender->castType()->setCaption(MyGUI::UString(off)); + sender->castType()->setCaption(MyGUI::UString(off)); newState = false; } else { - _sender->castType()->setCaption(MyGUI::UString(on)); + sender->castType()->setCaption(MyGUI::UString(on)); newState = true; } - if (getSettingType(_sender) == checkButtonType) + if (getSettingType(sender) == checkButtonType) { - Settings::get(getSettingCategory(_sender), getSettingName(_sender)).set(newState); + Settings::get(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 actionId = *sender->getUserData(); - _sender->castType()->setCaptionWithReplacing("#{Interface:None}"); + sender->castType()->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(mControlsBox->getViewOffset().top + _rel * 0.3f))); + MyGUI::IntPoint(0, static_cast(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(); } diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp index 0cc1c13fb4..d13d23e43b 100644 --- a/apps/openmw/mwgui/settingswindow.hpp +++ b/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 onOkButtonClicked(MyGUI::Widget* _sender); - void onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos); + void onTabChanged(MyGUI::TabControl* sender, size_t index); + void onOkButtonClicked(MyGUI::Widget* sender); + void onTextureFilteringChanged(MyGUI::ComboBox* sender, size_t pos); void onSliderChangePosition(MyGUI::ScrollBar* scroller, size_t pos); - void onButtonToggled(MyGUI::Widget* _sender); - void onResolutionSelected(MyGUI::ListBox* _sender, size_t index); + void onButtonToggled(MyGUI::Widget* sender); + void onResolutionSelected(MyGUI::ListBox* sender, size_t index); void onResolutionAccept(); void onResolutionCancel(); void highlightCurrentResolution(); - void onRefractionButtonClicked(MyGUI::Widget* _sender); - void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos); - void onWaterReflectionDetailChanged(MyGUI::ComboBox* _sender, size_t pos); - void onWaterRainRippleDetailChanged(MyGUI::ComboBox* _sender, size_t pos); + void onRefractionButtonClicked(MyGUI::Widget* sender); + void onWaterTextureSizeChanged(MyGUI::ComboBox* sender, size_t pos); + void onWaterReflectionDetailChanged(MyGUI::ComboBox* sender, size_t pos); + void onWaterRainRippleDetailChanged(MyGUI::ComboBox* sender, size_t pos); - void onLightingMethodButtonChanged(MyGUI::ComboBox* _sender, size_t pos); - void onLightsResetButtonClicked(MyGUI::Widget* _sender); - void onMaxLightsChanged(MyGUI::ComboBox* _sender, size_t pos); + void onLightingMethodButtonChanged(MyGUI::ComboBox* sender, size_t pos); + void onLightsResetButtonClicked(MyGUI::Widget* sender); + void onMaxLightsChanged(MyGUI::ComboBox* sender, size_t 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 onLanguageChanged(size_t langPriority, MyGUI::ComboBox* _sender, size_t pos); - void onGmstOverridesL10nChanged(MyGUI::Widget* _sender); + 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 onLanguageChanged(size_t langPriority, MyGUI::ComboBox* sender, size_t pos); + void onGmstOverridesL10nChanged(MyGUI::Widget* sender); - void onWindowModeChanged(MyGUI::ComboBox* _sender, size_t pos); - void onVSyncModeChanged(MyGUI::ComboBox* _sender, size_t pos); + void onWindowModeChanged(MyGUI::ComboBox* sender, size_t pos); + void onVSyncModeChanged(MyGUI::ComboBox* sender, size_t pos); - void onRebindAction(MyGUI::Widget* _sender); - void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel); - void onResetDefaultBindings(MyGUI::Widget* _sender); + void onRebindAction(MyGUI::Widget* sender); + void onInputTabMouseWheel(MyGUI::Widget* sender, int rel); + void onResetDefaultBindings(MyGUI::Widget* sender); void onResetDefaultBindingsAccept(); - void onKeyboardSwitchClicked(MyGUI::Widget* _sender); - void onControllerSwitchClicked(MyGUI::Widget* _sender); + void onKeyboardSwitchClicked(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); diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp index bdd4525c24..70648a7477 100644 --- a/apps/openmw/mwgui/spellbuyingwindow.cpp +++ b/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 price = *sender->getUserData(); 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(mSpellsView->getViewOffset().top + _rel * 0.3f))); + MyGUI::IntPoint(0, static_cast(mSpellsView->getViewOffset().top + rel * 0.3f))); } bool SpellBuyingWindow::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) diff --git a/apps/openmw/mwgui/spellbuyingwindow.hpp b/apps/openmw/mwgui/spellbuyingwindow.hpp index ad47749228..fccdb6dd8c 100644 --- a/apps/openmw/mwgui/spellbuyingwindow.hpp +++ b/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> mSpellButtons; - void onCancelButtonClicked(MyGUI::Widget* _sender); - void onSpellButtonClick(MyGUI::Widget* _sender); - void onMouseWheel(MyGUI::Widget* _sender, int _rel); + void onCancelButtonClicked(MyGUI::Widget* sender); + void onSpellButtonClick(MyGUI::Widget* sender); + void onMouseWheel(MyGUI::Widget* sender, int rel); void addSpell(const ESM::Spell& spell); void clearSpells(); int mCurrentY; diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp index 5684e9ef2d..994bd09b38 100644 --- a/apps/openmw/mwgui/spellcreationdialog.cpp +++ b/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) { diff --git a/apps/openmw/mwgui/spellview.cpp b/apps/openmw/mwgui/spellview.cpp index ff77284bdf..ac923586dd 100644 --- a/apps/openmw/mwgui/spellview.cpp +++ b/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()); - Base::setSize(_value); + bool changed = (value.width != getWidth() || value.height != getHeight()); + 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()); - Base::setCoord(_value); + bool changed = (value.width != getWidth() || value.height != getHeight()); + 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(mScrollView->getViewOffset().top + _rel * 0.3f))); + MyGUI::IntPoint(0, static_cast(mScrollView->getViewOffset().top + rel * 0.3f))); } void SpellView::resetScrollbars() diff --git a/apps/openmw/mwgui/spellview.hpp b/apps/openmw/mwgui/spellview.hpp index 7895b86ec8..d1b9b53f7d 100644 --- a/apps/openmw/mwgui/spellview.hpp +++ b/apps/openmw/mwgui/spellview.hpp @@ -54,8 +54,8 @@ namespace MWGui void initialiseOverride() override; - void setSize(const MyGUI::IntSize& _value) override; - void setCoord(const MyGUI::IntCoord& _value) override; + void setSize(const MyGUI::IntSize& 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 onMouseWheelMoved(MyGUI::Widget* _sender, int _rel); + void onSpellSelected(MyGUI::Widget* sender); + void onMouseWheelMoved(MyGUI::Widget* sender, int rel); - SpellModel::ModelIndex getSpellModelIndex(MyGUI::Widget* _sender); + SpellModel::ModelIndex getSpellModelIndex(MyGUI::Widget* sender); static const char* sSpellModelIndex; }; diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp index 1af158aa76..4cd85834f1 100644 --- a/apps/openmw/mwgui/statswindow.cpp +++ b/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(mSkillView->getViewOffset().top + _rel * 0.3))); + MyGUI::IntPoint(0, static_cast(mSkillView->getViewOffset().top + rel * 0.3))); } void StatsWindow::onWindowResize(MyGUI::Window* window) diff --git a/apps/openmw/mwgui/statswindow.hpp b/apps/openmw/mwgui/statswindow.hpp index c1564498c2..0d81901eb1 100644 --- a/apps/openmw/mwgui/statswindow.hpp +++ b/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; diff --git a/apps/openmw/mwgui/textinput.cpp b/apps/openmw/mwgui/textinput.cpp index d059ac9603..e98b20914a 100644 --- a/apps/openmw/mwgui/textinput.cpp +++ b/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); diff --git a/apps/openmw/mwgui/textinput.hpp b/apps/openmw/mwgui/textinput.hpp index ad7896ff27..7561f1a1b2 100644 --- a/apps/openmw/mwgui/textinput.hpp +++ b/apps/openmw/mwgui/textinput.hpp @@ -25,8 +25,8 @@ namespace MWGui EventHandle_WindowBase eventDone; protected: - void onOkClicked(MyGUI::Widget* _sender); - void onTextAccepted(MyGUI::EditBox* _sender); + void onOkClicked(MyGUI::Widget* sender); + void onTextAccepted(MyGUI::EditBox* sender); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; private: diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp index 0422162eae..bf73ad9398 100644 --- a/apps/openmw/mwgui/tradewindow.cpp +++ b/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()->setStateSelected(true); + sender->castType()->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) diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp index 2e7628b13f..938246a345 100644 --- a/apps/openmw/mwgui/tradewindow.hpp +++ b/apps/openmw/mwgui/tradewindow.hpp @@ -105,18 +105,18 @@ namespace MWGui int getMerchantServices(); - void onFilterChanged(MyGUI::Widget* _sender); - void onNameFilterChanged(MyGUI::EditBox* _sender); - void onOfferButtonClicked(MyGUI::Widget* _sender); + void onFilterChanged(MyGUI::Widget* sender); + void onNameFilterChanged(MyGUI::EditBox* sender); + void onOfferButtonClicked(MyGUI::Widget* sender); void onAccept(MyGUI::EditBox* sender); - void onCancelButtonClicked(MyGUI::Widget* _sender); - void onMaxSaleButtonClicked(MyGUI::Widget* _sender); - 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 onBalanceButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id); + void onCancelButtonClicked(MyGUI::Widget* sender); + void onMaxSaleButtonClicked(MyGUI::Widget* sender); + 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 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); diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp index 0bb8dbf9ba..60fc0b4621 100644 --- a/apps/openmw/mwgui/trainingwindow.cpp +++ b/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); } diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp index 347eef6cbd..b5d9fd317b 100644 --- a/apps/openmw/mwgui/travelwindow.cpp +++ b/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(_sender->getUserString("price"), 0); + const int price = Misc::StringUtils::toNumeric(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(); - std::string_view cellname = _sender->getUserString("Destination"); - bool interior = _sender->getUserString("interior") == "y"; + ESM::Position pos = *sender->getUserData(); + std::string_view cellname = sender->getUserString("Destination"); + 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(mDestinationsView->getViewOffset().top + _rel * 0.3f))); + MyGUI::IntPoint(0, static_cast(mDestinationsView->getViewOffset().top + rel * 0.3f))); } bool TravelWindow::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) diff --git a/apps/openmw/mwgui/travelwindow.hpp b/apps/openmw/mwgui/travelwindow.hpp index 4b155e4535..f917b25834 100644 --- a/apps/openmw/mwgui/travelwindow.hpp +++ b/apps/openmw/mwgui/travelwindow.hpp @@ -29,9 +29,9 @@ namespace MWGui MyGUI::ScrollView* mDestinationsView; - void onCancelButtonClicked(MyGUI::Widget* _sender); - void onTravelButtonClick(MyGUI::Widget* _sender); - void onMouseWheel(MyGUI::Widget* _sender, int _rel); + void onCancelButtonClicked(MyGUI::Widget* sender); + void onTravelButtonClick(MyGUI::Widget* sender); + void onMouseWheel(MyGUI::Widget* sender, int rel); void addDestination(const ESM::RefId& name, const ESM::Position& pos, bool interior); void clearDestinations(); int mCurrentY; diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp index 95219cb521..7d5fb0503e 100644 --- a/apps/openmw/mwgui/waitdialog.cpp +++ b/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( diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp index 8995f04b92..496fa2ea50 100644 --- a/apps/openmw/mwgui/widgets.cpp +++ b/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); } diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp index c51846d9df..d5dc2abc50 100644 --- a/apps/openmw/mwgui/widgets.hpp +++ b/apps/openmw/mwgui/widgets.hpp @@ -106,7 +106,7 @@ namespace MWGui typedef MyGUI::delegates::MultiDelegate 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 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(); diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp index d6a5cb9086..89a27c5eef 100644 --- a/apps/openmw/mwgui/windowbase.cpp +++ b/apps/openmw/mwgui/windowbase.cpp @@ -58,7 +58,7 @@ void WindowBase::onTitleDoubleClicked() MWBase::Environment::get().getWindowManager()->toggleMaximized(this); } -void WindowBase::onDoubleClick(MyGUI::Widget* _sender) +void WindowBase::onDoubleClick(MyGUI::Widget* /*sender*/) { onTitleDoubleClicked(); } diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp index 5a84db4a5c..2a091c303d 100644 --- a/apps/openmw/mwgui/windowbase.hpp +++ b/apps/openmw/mwgui/windowbase.hpp @@ -94,7 +94,7 @@ namespace MWGui MyGUI::Widget* mControllerScrollWidget = nullptr; private: - void onDoubleClick(MyGUI::Widget* _sender); + void onDoubleClick(MyGUI::Widget* sender); bool mDisabledByLua = false; }; diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 8d02dabff0..960933ed51 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -849,14 +849,14 @@ namespace MWGui return mMessageBoxManager->readPressedButton(); } - std::string_view WindowManager::getGameSettingString(std::string_view id, std::string_view default_) + std::string_view WindowManager::getGameSettingString(std::string_view id, std::string_view defaultValue) { const ESM::GameSetting* setting = mStore->get().search(id); if (setting && setting->mValue.getType() == ESM::VT_String) return setting->mValue.getString(); - return default_; + return defaultValue; } void WindowManager::updateMap() @@ -1222,47 +1222,47 @@ namespace MWGui mCursorActive = active; } - void WindowManager::onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result) + void WindowManager::onRetrieveTag(const MyGUI::UString& tag, MyGUI::UString& result) { - std::string_view tag = _tag; + std::string_view tagView = tag; constexpr std::string_view myGuiPrefix = "setting="; constexpr std::string_view tokenToFind = "sCell="; - if (tag.starts_with(myGuiPrefix)) + if (tagView.starts_with(myGuiPrefix)) { - tag = tag.substr(myGuiPrefix.length()); - const size_t commaPos = tag.find(','); + tagView = tagView.substr(myGuiPrefix.length()); + const size_t commaPos = tagView.find(','); if (commaPos == std::string_view::npos) - throw std::runtime_error("Invalid setting tag (expected comma): " + std::string(tag)); + throw std::runtime_error("Invalid setting tag (expected comma): " + std::string(tagView)); - std::string_view settingSection = tag.substr(0, commaPos); - std::string_view settingTag = tag.substr(commaPos + 1, tag.length()); + std::string_view settingSection = tagView.substr(0, commaPos); + std::string_view settingTag = tagView.substr(commaPos + 1, tagView.length()); - _result = Settings::get(settingSection, settingTag).get().print(); + result = Settings::get(settingSection, settingTag).get().print(); } - else if (tag.starts_with(tokenToFind)) + else if (tagView.starts_with(tokenToFind)) { - std::string_view cellName = mTranslationDataStorage.translateCellName(tag.substr(tokenToFind.length())); - _result.assign(cellName.data(), cellName.size()); - _result = MyGUI::TextIterator::toTagsString(_result); + std::string_view cellName = mTranslationDataStorage.translateCellName(tagView.substr(tokenToFind.length())); + result.assign(cellName.data(), cellName.size()); + result = MyGUI::TextIterator::toTagsString(result); } - else if (Gui::replaceTag(tag, _result)) + else if (Gui::replaceTag(tagView, result)) { return; } else { std::vector split; - Misc::StringUtils::split(tag, split, ":"); + Misc::StringUtils::split(tagView, split, ":"); L10n::Manager& l10nManager = *MWBase::Environment::get().getL10nManager(); // If a key has a "Context:KeyName" format, use YAML to translate data if (split.size() == 2) { - _result = l10nManager.getContext(split[0])->formatMessage(split[1], {}, {}); + result = l10nManager.getContext(split[0])->formatMessage(split[1], {}, {}); return; } @@ -1270,16 +1270,16 @@ namespace MWGui if (!mStore) { Log(Debug::Error) << "Error: WindowManager::onRetrieveTag: no Store set up yet, can not replace '" - << tag << "'"; - _result.assign(tag.data(), tag.size()); + << tagView << "'"; + result.assign(tagView.data(), tagView.size()); return; } - const ESM::GameSetting* setting = mStore->get().search(tag); + const ESM::GameSetting* setting = mStore->get().search(tagView); if (setting && setting->mValue.getType() == ESM::VT_String) - _result = setting->mValue.getString(); + result = setting->mValue.getString(); else - _result.assign(tag.data(), tag.size()); + result.assign(tagView.data(), tagView.size()); } } @@ -2173,9 +2173,9 @@ namespace MWGui mKeyboardNavigation->setModalWindow(mCurrentModals.back()->mMainWidget); } - void WindowManager::onVideoKeyPressed(MyGUI::Widget* _sender, MyGUI::KeyCode _key, MyGUI::Char _char) + void WindowManager::onVideoKeyPressed(MyGUI::Widget* /*sender*/, MyGUI::KeyCode key, MyGUI::Char value) { - if (_key == MyGUI::KeyCode::Escape) + if (key == MyGUI::KeyCode::Escape) mVideoWidget->stop(); } @@ -2279,20 +2279,20 @@ namespace MWGui mWerewolfFader->notifyAlphaChanged(set ? 1.0f : 0.0f); } - void WindowManager::onClipboardChanged(std::string_view _type, std::string_view _data) + void WindowManager::onClipboardChanged(std::string_view type, std::string_view data) { - if (_type == "Text") - SDL_SetClipboardText(MyGUI::TextIterator::getOnlyText(MyGUI::UString(_data)).asUTF8().c_str()); + if (type == "Text") + SDL_SetClipboardText(MyGUI::TextIterator::getOnlyText(MyGUI::UString(data)).asUTF8().c_str()); } - void WindowManager::onClipboardRequested(std::string_view _type, std::string& _data) + void WindowManager::onClipboardRequested(std::string_view type, std::string& data) { - if (_type != "Text") + if (type != "Text") return; char* text = nullptr; text = SDL_GetClipboardText(); if (text) - _data = MyGUI::TextIterator::toTagsString(text); + data = MyGUI::TextIterator::toTagsString(text); SDL_free(text); } diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp index 991e3c1c00..a62432e687 100644 --- a/apps/openmw/mwgui/windowmanagerimp.hpp +++ b/apps/openmw/mwgui/windowmanagerimp.hpp @@ -287,7 +287,7 @@ namespace MWGui * @param id Identifier for the GMST setting, e.g. "aName" * @param default Default value if the GMST setting cannot be used. */ - std::string_view getGameSettingString(std::string_view id, std::string_view default_) override; + std::string_view getGameSettingString(std::string_view id, std::string_view defaultValue) override; void processChangedSettings(const Settings::CategorySettingVector& changed) override; @@ -424,7 +424,7 @@ namespace MWGui std::map mTrackedWindows; void trackWindow(Layout* layout, const WindowSettingValues& settings); - void onWindowChangeCoord(MyGUI::Window* _sender); + void onWindowChangeCoord(MyGUI::Window* sender); ESM::RefId mSelectedSpell; MWWorld::Ptr mSelectedEnchantItem; @@ -579,18 +579,18 @@ namespace MWGui * "FontColor_color_" from openmw.cfg, in the format "#xxxxxx" where x are hexadecimal numbers. * Useful in an EditBox's caption to change the color of following text. */ - void onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result); + void onRetrieveTag(const MyGUI::UString& tag, MyGUI::UString& result); void onCursorChange(std::string_view name); void onKeyFocusChanged(MyGUI::Widget* widget); // Key pressed while playing a video - void onVideoKeyPressed(MyGUI::Widget* _sender, MyGUI::KeyCode _key, MyGUI::Char _char); + void onVideoKeyPressed(MyGUI::Widget* sender, MyGUI::KeyCode key, MyGUI::Char value); void sizeVideo(int screenWidth, int screenHeight); - void onClipboardChanged(std::string_view _type, std::string_view _data); - void onClipboardRequested(std::string_view _type, std::string& _data); + void onClipboardChanged(std::string_view type, std::string_view data); + void onClipboardRequested(std::string_view type, std::string& data); void createTextures(); void createCursors(); diff --git a/apps/openmw/mwgui/windowpinnablebase.cpp b/apps/openmw/mwgui/windowpinnablebase.cpp index 1b3bd1d2d8..66d66f733d 100644 --- a/apps/openmw/mwgui/windowpinnablebase.cpp +++ b/apps/openmw/mwgui/windowpinnablebase.cpp @@ -14,7 +14,7 @@ namespace MWGui mPinButton->eventMouseButtonPressed += MyGUI::newDelegate(this, &WindowPinnableBase::onPinButtonPressed); } - void WindowPinnableBase::onPinButtonPressed(MyGUI::Widget* _sender, int left, int top, MyGUI::MouseButton id) + void WindowPinnableBase::onPinButtonPressed(MyGUI::Widget* /*sender*/, int left, int top, MyGUI::MouseButton id) { if (id != MyGUI::MouseButton::Left) return; diff --git a/apps/openmw/mwgui/windowpinnablebase.hpp b/apps/openmw/mwgui/windowpinnablebase.hpp index ebb3e2cf05..7c78b5db68 100644 --- a/apps/openmw/mwgui/windowpinnablebase.hpp +++ b/apps/openmw/mwgui/windowpinnablebase.hpp @@ -14,7 +14,7 @@ namespace MWGui void setPinButtonVisible(bool visible); private: - void onPinButtonPressed(MyGUI::Widget* _sender, int left, int top, MyGUI::MouseButton id); + void onPinButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id); protected: virtual void onPinToggled() = 0; diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp index 1a3e612cee..9523d7ccc2 100644 --- a/apps/openmw/mwinput/bindingsmanager.cpp +++ b/apps/openmw/mwinput/bindingsmanager.cpp @@ -73,7 +73,7 @@ namespace MWInput mBindingsManager->actionValueChanged(action, currentValue, previousValue); } - void keyBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control, SDL_Scancode key, + void keyBindingDetected(ICS::InputControlSystem* ics, ICS::Control* control, SDL_Scancode key, ICS::Control::ControlChangingDirection direction) override { // Disallow binding escape key @@ -100,40 +100,40 @@ namespace MWInput clearAllKeyBindings(mInputBinder, control); control->setInitialValue(0.0f); - ICS::DetectingBindingListener::keyBindingDetected(ICS, control, key, direction); + ICS::DetectingBindingListener::keyBindingDetected(ics, control, key, direction); MWBase::Environment::get().getWindowManager()->notifyInputActionBound(); } - void mouseAxisBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control, - ICS::InputControlSystem::NamedAxis axis, ICS::Control::ControlChangingDirection direction) override + void mouseAxisBindingDetected(ICS::InputControlSystem* /*ics*/, ICS::Control* /*control*/, + ICS::InputControlSystem::NamedAxis /*axis*/, ICS::Control::ControlChangingDirection /*direction*/) override { // we don't want mouse movement bindings return; } - void mouseButtonBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control, unsigned int button, + void mouseButtonBindingDetected(ICS::InputControlSystem* ics, ICS::Control* control, unsigned int button, ICS::Control::ControlChangingDirection direction) override { if (!mDetectingKeyboard) return; clearAllKeyBindings(mInputBinder, control); control->setInitialValue(0.0f); - ICS::DetectingBindingListener::mouseButtonBindingDetected(ICS, control, button, direction); + ICS::DetectingBindingListener::mouseButtonBindingDetected(ics, control, button, direction); MWBase::Environment::get().getWindowManager()->notifyInputActionBound(); } - void mouseWheelBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control, + void mouseWheelBindingDetected(ICS::InputControlSystem* ics, ICS::Control* control, ICS::InputControlSystem::MouseWheelClick click, ICS::Control::ControlChangingDirection direction) override { if (!mDetectingKeyboard) return; clearAllKeyBindings(mInputBinder, control); control->setInitialValue(0.0f); - ICS::DetectingBindingListener::mouseWheelBindingDetected(ICS, control, click, direction); + ICS::DetectingBindingListener::mouseWheelBindingDetected(ics, control, click, direction); MWBase::Environment::get().getWindowManager()->notifyInputActionBound(); } - void joystickAxisBindingDetected(ICS::InputControlSystem* ICS, int deviceID, ICS::Control* control, int axis, + void joystickAxisBindingDetected(ICS::InputControlSystem* ics, int deviceID, ICS::Control* control, int axis, ICS::Control::ControlChangingDirection direction) override { // only allow binding to the trigers @@ -145,18 +145,18 @@ namespace MWInput clearAllControllerBindings(mInputBinder, control); control->setValue(0.5f); // axis bindings must start at 0.5 control->setInitialValue(0.5f); - ICS::DetectingBindingListener::joystickAxisBindingDetected(ICS, deviceID, control, axis, direction); + ICS::DetectingBindingListener::joystickAxisBindingDetected(ics, deviceID, control, axis, direction); MWBase::Environment::get().getWindowManager()->notifyInputActionBound(); } - void joystickButtonBindingDetected(ICS::InputControlSystem* ICS, int deviceID, ICS::Control* control, + void joystickButtonBindingDetected(ICS::InputControlSystem* ics, int deviceID, ICS::Control* control, unsigned int button, ICS::Control::ControlChangingDirection direction) override { if (mDetectingKeyboard) return; clearAllControllerBindings(mInputBinder, control); control->setInitialValue(0.0f); - ICS::DetectingBindingListener::joystickButtonBindingDetected(ICS, deviceID, control, button, direction); + ICS::DetectingBindingListener::joystickButtonBindingDetected(ics, deviceID, control, button, direction); MWBase::Environment::get().getWindowManager()->notifyInputActionBound(); } diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp index 037b9c742e..99fdde6028 100644 --- a/apps/openmw/mwlua/types/types.cpp +++ b/apps/openmw/mwlua/types/types.cpp @@ -145,19 +145,19 @@ namespace MWLua return ptr; } - sol::table getTypeToPackageTable(lua_State* L) + sol::table getTypeToPackageTable(lua_State* state) { constexpr std::string_view key = "typeToPackage"; - sol::state_view lua(L); + sol::state_view lua(state); if (lua[key] == sol::nil) lua[key] = sol::table(lua, sol::create); return lua[key]; } - sol::table getPackageToTypeTable(lua_State* L) + sol::table getPackageToTypeTable(lua_State* state) { constexpr std::string_view key = "packageToType"; - sol::state_view lua(L); + sol::state_view lua(state); if (lua[key] == sol::nil) lua[key] = sol::table(lua, sol::create); return lua[key]; diff --git a/apps/openmw/mwlua/types/types.hpp b/apps/openmw/mwlua/types/types.hpp index 76bd2848e0..8038ce47ff 100644 --- a/apps/openmw/mwlua/types/types.hpp +++ b/apps/openmw/mwlua/types/types.hpp @@ -22,8 +22,8 @@ namespace MWLua std::string_view getLuaObjectTypeName(const MWWorld::Ptr& ptr); const MWWorld::Ptr& verifyType(ESM::RecNameInts type, const MWWorld::Ptr& ptr); - sol::table getTypeToPackageTable(lua_State* L); - sol::table getPackageToTypeTable(lua_State* L); + sol::table getTypeToPackageTable(lua_State* state); + sol::table getPackageToTypeTable(lua_State* state); sol::table initTypesPackage(const Context& context); @@ -44,7 +44,7 @@ namespace MWLua void addRepairBindings(sol::table repair, const Context& context); void addMiscellaneousBindings(sol::table miscellaneous, const Context& context); void addPotionBindings(sol::table potion, const Context& context); - void addIngredientBindings(sol::table Ingredient, const Context& context); + void addIngredientBindings(sol::table ingredient, const Context& context); void addArmorBindings(sol::table armor, const Context& context); void addLockableBindings(sol::table lockable); void addClothingBindings(sol::table clothing, const Context& context); diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp index 3927580624..93aa5086ba 100644 --- a/apps/openmw/mwphysics/trace.cpp +++ b/apps/openmw/mwphysics/trace.cpp @@ -38,7 +38,7 @@ namespace MWPhysics } void ActorTracer::doTrace(const btCollisionObject* actor, const osg::Vec3f& start, const osg::Vec3f& end, - const btCollisionWorld* world, bool attempt_short_trace) + const btCollisionWorld* world, bool attemptShortTrace) { const btVector3 btstart = Misc::Convert::toBullet(start); btVector3 btend = Misc::Convert::toBullet(end); @@ -56,7 +56,7 @@ namespace MWPhysics // test. (Multiplying by 2 in 'square distance' units gives us about 1.4x the threshold length. In benchmarks // this was // slightly better for the performance of normal scenes than 4.0, and just plain better than 1.0.) - if (attempt_short_trace && (btend - btstart).length2() > fallbackLength * fallbackLength * 2.0) + if (attemptShortTrace && (btend - btstart).length2() > fallbackLength * fallbackLength * 2.0) { btend = btstart + (btend - btstart).normalized() * fallbackLength; doingShortTrace = true; diff --git a/apps/openmw/mwphysics/trace.h b/apps/openmw/mwphysics/trace.h index 71475e793c..ea2b19e152 100644 --- a/apps/openmw/mwphysics/trace.h +++ b/apps/openmw/mwphysics/trace.h @@ -20,7 +20,7 @@ namespace MWPhysics float mFraction; void doTrace(const btCollisionObject* actor, const osg::Vec3f& start, const osg::Vec3f& end, - const btCollisionWorld* world, bool attempt_short_trace = false); + const btCollisionWorld* world, bool attemptShortTrace = false); void findGround( const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world); }; diff --git a/apps/openmw/mwrender/bulletdebugdraw.hpp b/apps/openmw/mwrender/bulletdebugdraw.hpp index 662fc9f14e..891045be19 100644 --- a/apps/openmw/mwrender/bulletdebugdraw.hpp +++ b/apps/openmw/mwrender/bulletdebugdraw.hpp @@ -70,8 +70,8 @@ namespace MWRender void showCollisions(); - void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, - const btVector3& color) override + void drawContactPoint(const btVector3& /*pointOnB*/, const btVector3& /*normalOnB*/, btScalar /*distance*/, + int /*lifeTime*/, const btVector3& /*color*/) override { } void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) override; diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index e582bb76ee..86999d753c 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -161,15 +161,15 @@ namespace MWRender } void LocalMap::setupRenderToTexture( - int segment_x, int segment_y, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax) + int segmentX, int segmentY, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax) { mLocalMapRTTs.emplace_back( new LocalMapRenderToTexture(mSceneRoot, mMapResolution, mMapWorldSize, left, top, upVector, zmin, zmax)); mRoot->addChild(mLocalMapRTTs.back()); - MapSegment& segment = mInterior ? mInteriorSegments[std::make_pair(segment_x, segment_y)] - : mExteriorSegments[std::make_pair(segment_x, segment_y)]; + MapSegment& segment = mInterior ? mInteriorSegments[std::make_pair(segmentX, segmentY)] + : mExteriorSegments[std::make_pair(segmentX, segmentY)]; segment.mMapTexture = static_cast(mLocalMapRTTs.back()->getColorTexture(nullptr)); } diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp index 3ba07ff2ee..bf7844f2c1 100644 --- a/apps/openmw/mwrender/localmap.hpp +++ b/apps/openmw/mwrender/localmap.hpp @@ -155,7 +155,7 @@ namespace MWRender void requestInteriorMap(const MWWorld::CellStore* cell); void setupRenderToTexture( - int segment_x, int segment_y, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax); + int segmentX, int segmentY, float left, float top, const osg::Vec3d& upVector, float zmin, float zmax); osg::BoundingBox mBounds; osg::Vec2f mCenter; diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp index 930bcece65..a06b9a83de 100644 --- a/apps/openmw/mwrender/postprocessor.cpp +++ b/apps/openmw/mwrender/postprocessor.cpp @@ -87,23 +87,23 @@ namespace }; static osg::FrameBufferAttachment createFrameBufferAttachmentFromTemplate( - Usage usage, int width, int height, osg::Texture* template_, int samples) + Usage usage, int width, int height, osg::Texture* textureTemplate, int samples) { if (usage == Usage::RENDER_BUFFER && !Stereo::getMultiview()) { osg::ref_ptr attachment - = new osg::RenderBuffer(width, height, template_->getInternalFormat(), samples); + = new osg::RenderBuffer(width, height, textureTemplate->getInternalFormat(), samples); return osg::FrameBufferAttachment(attachment); } auto texture = Stereo::createMultiviewCompatibleTexture(width, height, samples); - texture->setSourceFormat(template_->getSourceFormat()); - texture->setSourceType(template_->getSourceType()); - texture->setInternalFormat(template_->getInternalFormat()); - texture->setFilter(osg::Texture2D::MIN_FILTER, template_->getFilter(osg::Texture2D::MIN_FILTER)); - texture->setFilter(osg::Texture2D::MAG_FILTER, template_->getFilter(osg::Texture2D::MAG_FILTER)); - texture->setWrap(osg::Texture::WRAP_S, template_->getWrap(osg::Texture2D::WRAP_S)); - texture->setWrap(osg::Texture::WRAP_T, template_->getWrap(osg::Texture2D::WRAP_T)); + texture->setSourceFormat(textureTemplate->getSourceFormat()); + texture->setSourceType(textureTemplate->getSourceType()); + texture->setInternalFormat(textureTemplate->getInternalFormat()); + texture->setFilter(osg::Texture2D::MIN_FILTER, textureTemplate->getFilter(osg::Texture2D::MIN_FILTER)); + texture->setFilter(osg::Texture2D::MAG_FILTER, textureTemplate->getFilter(osg::Texture2D::MAG_FILTER)); + texture->setWrap(osg::Texture::WRAP_S, textureTemplate->getWrap(osg::Texture2D::WRAP_S)); + texture->setWrap(osg::Texture::WRAP_T, textureTemplate->getWrap(osg::Texture2D::WRAP_T)); return Stereo::createMultiviewCompatibleAttachment(texture); } diff --git a/apps/openmw/mwsound/ffmpegdecoder.cpp b/apps/openmw/mwsound/ffmpegdecoder.cpp index 051f16c27e..df0f42bd7d 100644 --- a/apps/openmw/mwsound/ffmpegdecoder.cpp +++ b/apps/openmw/mwsound/ffmpegdecoder.cpp @@ -44,13 +44,13 @@ namespace MWSound av_frame_free(&ptr); } - int FFmpegDecoder::readPacket(void* user_data, uint8_t* buf, int buf_size) + int FFmpegDecoder::readPacket(void* userData, uint8_t* buf, int bufSize) { try { - std::istream& stream = *static_cast(user_data)->mDataStream; + std::istream& stream = *static_cast(userData)->mDataStream; stream.clear(); - stream.read((char*)buf, buf_size); + stream.read((char*)buf, bufSize); std::streamsize count = stream.gcount(); if (count == 0) return AVERROR_EOF; @@ -74,9 +74,9 @@ namespace MWSound return -1; } - int64_t FFmpegDecoder::seek(void* user_data, int64_t offset, int whence) + int64_t FFmpegDecoder::seek(void* userData, int64_t offset, int whence) { - std::istream& stream = *static_cast(user_data)->mDataStream; + std::istream& stream = *static_cast(userData)->mDataStream; whence &= ~AVSEEK_FORCE; diff --git a/apps/openmw/mwsound/ffmpegdecoder.hpp b/apps/openmw/mwsound/ffmpegdecoder.hpp index c71b935bc4..519d160cd2 100644 --- a/apps/openmw/mwsound/ffmpegdecoder.hpp +++ b/apps/openmw/mwsound/ffmpegdecoder.hpp @@ -93,13 +93,13 @@ namespace MWSound Files::IStreamPtr mDataStream; - static int readPacket(void* user_data, uint8_t* buf, int buf_size); + static int readPacket(void* userData, uint8_t* buf, int bufSize); #if OPENMW_FFMPEG_CONST_WRITEPACKET - static int writePacket(void* user_data, const uint8_t* buf, int buf_size); + static int writePacket(void* userData, const uint8_t* buf, int bufSize); #else - static int writePacket(void* user_data, uint8_t* buf, int buf_size); + static int writePacket(void* userData, uint8_t* buf, int bufSize); #endif - static int64_t seek(void* user_data, int64_t offset, int whence); + static int64_t seek(void* userData, int64_t offset, int whence); bool getAVAudioData(); size_t readAVAudioData(void* data, size_t length); diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp index ab476cddcc..91d30c91d1 100644 --- a/apps/openmw/mwworld/esmstore.cpp +++ b/apps/openmw/mwworld/esmstore.cpp @@ -720,9 +720,9 @@ namespace MWWorld get().write(writer, progress); } - bool ESMStore::readRecord(ESM::ESMReader& reader, uint32_t type_id) + bool ESMStore::readRecord(ESM::ESMReader& reader, uint32_t typeId) { - ESM::RecNameInts type = (ESM::RecNameInts)type_id; + ESM::RecNameInts type = static_cast(typeId); switch (type) { case ESM::REC_ALCH: diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp index fc4ef2713b..56a8e57bcc 100644 --- a/apps/openmw/mwworld/esmstore.hpp +++ b/apps/openmw/mwworld/esmstore.hpp @@ -290,7 +290,7 @@ namespace MWWorld void write(ESM::ESMWriter& writer, Loading::Listener& progress) const; - bool readRecord(ESM::ESMReader& reader, uint32_t type); + bool readRecord(ESM::ESMReader& reader, uint32_t typeId); ///< \return Known type? // To be called when we are done with dynamic record loading diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp index ba24e7d160..80b3571730 100644 --- a/apps/openmw/mwworld/manualref.cpp +++ b/apps/openmw/mwworld/manualref.cpp @@ -98,10 +98,10 @@ MWWorld::ManualRef::ManualRef(const MWWorld::ESMStore& store, const ESM::RefId& mPtr.getCellRef().setCount(count); } -MWWorld::ManualRef::ManualRef(const ESMStore& store, const Ptr& template_, const int count) +MWWorld::ManualRef::ManualRef(const ESMStore& store, const Ptr& templatePtr, const int count) { - auto cb = [&](const auto& typedStore) { create(typedStore, template_, mRef, mPtr); }; - visitRefStore(store, template_.getCellRef().getRefId(), cb); + auto cb = [&](const auto& typedStore) { create(typedStore, templatePtr, mRef, mPtr); }; + visitRefStore(store, templatePtr.getCellRef().getRefId(), cb); mPtr.getCellRef().setCount(count); mPtr.getCellRef().unsetRefNum(); diff --git a/apps/openmw/mwworld/manualref.hpp b/apps/openmw/mwworld/manualref.hpp index f7d85928d1..a2dafbce7a 100644 --- a/apps/openmw/mwworld/manualref.hpp +++ b/apps/openmw/mwworld/manualref.hpp @@ -16,8 +16,8 @@ namespace MWWorld Ptr mPtr; public: - ManualRef(const MWWorld::ESMStore& store, const ESM::RefId& name, const int count = 1); - ManualRef(const MWWorld::ESMStore& store, const MWWorld::Ptr& template_, const int count = 1); + explicit ManualRef(const MWWorld::ESMStore& store, const ESM::RefId& name, const int count = 1); + explicit ManualRef(const MWWorld::ESMStore& store, const MWWorld::Ptr& templatePtr, const int count = 1); ManualRef(const ManualRef&) = delete; ManualRef& operator=(const ManualRef&) = delete; diff --git a/apps/openmw/mwworld/worldmodel.hpp b/apps/openmw/mwworld/worldmodel.hpp index e4b161d16e..0b555c4b9e 100644 --- a/apps/openmw/mwworld/worldmodel.hpp +++ b/apps/openmw/mwworld/worldmodel.hpp @@ -49,9 +49,9 @@ namespace MWWorld CellStore& getExterior(ESM::ExteriorCellLocation location, bool forceLoad = true) const; - CellStore* findCell(ESM::RefId Id, bool forceLoad = true) const; + CellStore* findCell(ESM::RefId id, bool forceLoad = true) const; - CellStore& getCell(ESM::RefId Id, bool forceLoad = true) const; + CellStore& getCell(ESM::RefId id, bool forceLoad = true) const; // Returns a special cell that is never active. Can be used for creating objects // without adding them to the scene. diff --git a/apps/openmw_tests/mwworld/teststore.cpp b/apps/openmw_tests/mwworld/teststore.cpp index ba48193836..70f094379a 100644 --- a/apps/openmw_tests/mwworld/teststore.cpp +++ b/apps/openmw_tests/mwworld/teststore.cpp @@ -343,11 +343,11 @@ TYPED_TEST_P(StoreTest, delete_test) } template -static unsigned int hasSameRecordId(const MWWorld::Store& store, ESM::RecNameInts RecName) +static unsigned int hasSameRecordId(const MWWorld::Store& store, ESM::RecNameInts recName) { if constexpr (MWWorld::HasRecordId::value) { - return T::sRecordId == RecName ? 1 : 0; + return T::sRecordId == recName ? 1 : 0; } else { diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp index 0129be9ccf..31d38aaadf 100644 --- a/apps/wizard/existinginstallationpage.cpp +++ b/apps/wizard/existinginstallationpage.cpp @@ -171,9 +171,9 @@ int Wizard::ExistingInstallationPage::nextId() const return MainWizard::Page_LanguageSelection; } -bool Wizard::ExistingInstallationPage::versionIsOK(QString directory_name) +bool Wizard::ExistingInstallationPage::versionIsOK(QString directoryName) { - QDir directory = QDir(directory_name); + QDir directory = QDir(directoryName); QFileInfoList infoList = directory.entryInfoList(QStringList(QString("Morrowind.bsa"))); if (infoList.size() == 1) { diff --git a/apps/wizard/existinginstallationpage.hpp b/apps/wizard/existinginstallationpage.hpp index a5ed77f9d4..51f33c5970 100644 --- a/apps/wizard/existinginstallationpage.hpp +++ b/apps/wizard/existinginstallationpage.hpp @@ -24,7 +24,7 @@ namespace Wizard private: MainWizard* mWizard; - bool versionIsOK(QString directory_name); + bool versionIsOK(QString directoryName); protected: void initializePage() override; diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp index b41bd0eb13..714ab5c3b4 100644 --- a/components/compiler/exprparser.cpp +++ b/components/compiler/exprparser.cpp @@ -57,12 +57,12 @@ namespace Compiler return 0; } - char ExprParser::getOperandType(int Index) const + char ExprParser::getOperandType(int index) const { assert(!mOperands.empty()); - assert(Index >= 0); - assert(Index < static_cast(mOperands.size())); - return mOperands[mOperands.size() - 1 - Index]; + assert(index >= 0); + assert(index < static_cast(mOperands.size())); + return mOperands[mOperands.size() - 1 - index]; } char ExprParser::getOperator() const diff --git a/components/compiler/exprparser.hpp b/components/compiler/exprparser.hpp index d71fd2e305..5228d7d7fd 100644 --- a/components/compiler/exprparser.hpp +++ b/components/compiler/exprparser.hpp @@ -30,7 +30,7 @@ namespace Compiler static int getPriority(char op); - char getOperandType(int Index = 0) const; + char getOperandType(int index = 0) const; char getOperator() const; diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp index 52b2afb8de..26fcd1de1a 100644 --- a/components/esm/defs.hpp +++ b/components/esm/defs.hpp @@ -288,9 +288,9 @@ namespace ESM REC_MSET4 = esm4Recname(ESM4::REC_MSET) // Media Set }; - constexpr bool isESM4Rec(RecNameInts RecName) + constexpr bool isESM4Rec(RecNameInts value) { - return RecName & sEsm4RecnameFlag; + return value & sEsm4RecnameFlag; } constexpr inline FixedString<6> getRecNameString(ESM::RecNameInts recName) diff --git a/components/esm/esmterrain.hpp b/components/esm/esmterrain.hpp index 73652b2e35..c64aac245b 100644 --- a/components/esm/esmterrain.hpp +++ b/components/esm/esmterrain.hpp @@ -18,8 +18,8 @@ namespace ESM { public: LandData(); - LandData(const ESM::Land& Land, int loadFlags); - LandData(const ESM4::Land& Land, int loadFlags); + explicit LandData(const ESM::Land& land, int loadFlags); + explicit LandData(const ESM4::Land& land, int loadFlags); ~LandData(); diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp index 174920fc0d..7676d4d386 100644 --- a/components/files/configurationmanager.cpp +++ b/components/files/configurationmanager.cpp @@ -440,7 +440,7 @@ namespace Files bpo::store(Files::parse_config_file(stream, description, true), variables); } - std::istream& operator>>(std::istream& istream, MaybeQuotedPath& MaybeQuotedPath) + std::istream& operator>>(std::istream& istream, MaybeQuotedPath& value) { // If the stream starts with a double quote, read from stream using boost::filesystem::path rules (which are not // the same as std::filesystem::path rules), then discard anything remaining. This prevents @@ -459,18 +459,18 @@ namespace Files // ampersands, and because it's backwards-compatible with the previous format, which used // boost::filesystem::path's operator>>. istream >> std::quoted(intermediate, '"', '&'); - static_cast(MaybeQuotedPath) = Misc::StringUtils::stringToU8String(intermediate); + static_cast(value) = Misc::StringUtils::stringToU8String(intermediate); if (istream && !istream.eof() && istream.peek() != EOF) { std::string remainder{ std::istreambuf_iterator(istream), {} }; - Log(Debug::Warning) << "Trailing data in path setting. Used '" << MaybeQuotedPath << "' but '" - << remainder << "' remained"; + Log(Debug::Warning) << "Trailing data in path setting. Used '" << value << "' but '" << remainder + << "' remained"; } } else { std::string intermediate{ std::istreambuf_iterator(istream), {} }; - static_cast(MaybeQuotedPath) = Misc::StringUtils::stringToU8String(intermediate); + static_cast(value) = Misc::StringUtils::stringToU8String(intermediate); } return istream; } diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp index ed97bc1951..3ef1563893 100644 --- a/components/files/configurationmanager.hpp +++ b/components/files/configurationmanager.hpp @@ -93,7 +93,7 @@ namespace Files { }; - std::istream& operator>>(std::istream& istream, MaybeQuotedPath& MaybeQuotedPath); + std::istream& operator>>(std::istream& istream, MaybeQuotedPath& value); typedef std::vector MaybeQuotedPathContainer; diff --git a/components/files/linuxpath.cpp b/components/files/linuxpath.cpp index 2e74948fff..bbb72a76b9 100644 --- a/components/files/linuxpath.cpp +++ b/components/files/linuxpath.cpp @@ -47,8 +47,8 @@ namespace namespace Files { - LinuxPath::LinuxPath(const std::string& application_name) - : mName(application_name) + LinuxPath::LinuxPath(const std::string& applicationName) + : mName(applicationName) { } diff --git a/components/files/linuxpath.hpp b/components/files/linuxpath.hpp index 36bbb47bf2..2adea40670 100644 --- a/components/files/linuxpath.hpp +++ b/components/files/linuxpath.hpp @@ -16,7 +16,7 @@ namespace Files */ struct LinuxPath { - LinuxPath(const std::string& application_name); + explicit LinuxPath(const std::string& applicationName); /** * \brief Return path to the user directory. diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp index d2bc7359b9..14a3baa2e9 100644 --- a/components/fontloader/fontloader.cpp +++ b/components/fontloader/fontloader.cpp @@ -662,10 +662,10 @@ namespace Gui MyGUI::ResourceManager::getInstance().addResource(bookFont); } - void FontLoader::overrideLineHeight(MyGUI::xml::ElementPtr _node, std::string_view _file, MyGUI::Version _version) + void FontLoader::overrideLineHeight(MyGUI::xml::ElementPtr node, std::string_view file, MyGUI::Version version) { // We should adjust line height for MyGUI widgets depending on font size - MyGUI::xml::ElementEnumerator resourceNode = _node->getElementEnumerator(); + MyGUI::xml::ElementEnumerator resourceNode = node->getElementEnumerator(); while (resourceNode.next("Resource")) { auto type = resourceNode->findAttribute("type"); @@ -687,7 +687,7 @@ namespace Gui } } - MyGUI::ResourceManager::getInstance().loadFromXmlNode(_node, _file, _version); + MyGUI::ResourceManager::getInstance().loadFromXmlNode(node, file, version); } std::string_view FontLoader::getFontForFace(std::string_view face) diff --git a/components/fontloader/fontloader.hpp b/components/fontloader/fontloader.hpp index d0511659a0..b36b3db9a9 100644 --- a/components/fontloader/fontloader.hpp +++ b/components/fontloader/fontloader.hpp @@ -28,7 +28,7 @@ namespace Gui /// @param exportFonts export the converted fonts (Images and XML with glyph metrics) to files? FontLoader(ToUTF8::FromType encoding, const VFS::Manager* vfs, float scalingFactor, bool exportFonts); - void overrideLineHeight(MyGUI::xml::ElementPtr _node, std::string_view _file, MyGUI::Version _version); + void overrideLineHeight(MyGUI::xml::ElementPtr node, std::string_view file, MyGUI::Version version); static std::string_view getFontForFace(std::string_view face); diff --git a/components/fx/widgets.cpp b/components/fx/widgets.cpp index 087e071b96..dfae2379a7 100644 --- a/components/fx/widgets.cpp +++ b/components/fx/widgets.cpp @@ -54,7 +54,7 @@ namespace Fx mCheckbutton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditBool::notifyMouseButtonClick); } - void EditBool::notifyMouseButtonClick(MyGUI::Widget* sender) + void EditBool::notifyMouseButtonClick(MyGUI::Widget* /*sender*/) { setValue(!mUniform->getValue()); } @@ -215,7 +215,7 @@ namespace Fx } } - void UniformBase::notifyResetClicked(MyGUI::Widget* sender) + void UniformBase::notifyResetClicked(MyGUI::Widget* /*sender*/) { toDefault(); } diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp index ca1b76f2e1..dd7b9343bf 100644 --- a/components/fx/widgets.hpp +++ b/components/fx/widgets.hpp @@ -152,7 +152,7 @@ namespace Fx mDragger->eventMouseWheel += MyGUI::newDelegate(this, &EditNumber::notifyMouseWheel); } - void notifyMouseWheel(MyGUI::Widget* sender, int rel) + void notifyMouseWheel(MyGUI::Widget* /*sender*/, int rel) { if (rel > 0) increment(mUniform->mStep); @@ -160,7 +160,7 @@ namespace Fx increment(-mUniform->mStep); } - void notifyMouseButtonDragged(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id) + void notifyMouseButtonDragged(MyGUI::Widget* /*sender*/, int left, int top, MyGUI::MouseButton id) { if (id != MyGUI::MouseButton::Left) return; @@ -188,7 +188,7 @@ namespace Fx mLastPointerX = left; } - void notifyMouseButtonPressed(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id) + void notifyMouseButtonPressed(MyGUI::Widget* /*sender*/, int left, int top, MyGUI::MouseButton id) { if (id != MyGUI::MouseButton::Left) return; diff --git a/components/lua/asyncpackage.cpp b/components/lua/asyncpackage.cpp index 5d563e6276..353b92f43a 100644 --- a/components/lua/asyncpackage.cpp +++ b/components/lua/asyncpackage.cpp @@ -31,9 +31,9 @@ namespace LuaUtil return Callback{ function.as(), asyncPackageId.as().mHiddenData }; } - sol::table Callback::makeMetatable(lua_State* L) + sol::table Callback::makeMetatable(lua_State* state) { - sol::table callbackMeta = sol::table::create(L); + sol::table callbackMeta = sol::table::create(state); callbackMeta[sol::meta_function::call] = [](const sol::table& callback, sol::variadic_args va) { return Callback::fromLua(callback).call(sol::as_args(va)); }; @@ -61,9 +61,9 @@ namespace LuaUtil } sol::function getAsyncPackageInitializer( - lua_State* L, std::function simulationTimeFn, std::function gameTimeFn) + lua_State* state, std::function simulationTimeFn, std::function gameTimeFn) { - sol::state_view lua(L); + sol::state_view lua(state); using TimerType = ScriptsContainer::TimerType; sol::usertype api = lua.new_usertype("AsyncPackage"); api["registerTimerCallback"] @@ -92,7 +92,7 @@ namespace LuaUtil TimerType::GAME_TIME, gameTimeFn() + delay, asyncId.mScriptId, std::move(callback)); }; - sol::table callbackMeta = Callback::makeMetatable(L); + sol::table callbackMeta = Callback::makeMetatable(state); api["callback"] = [callbackMeta](const AsyncPackageId& asyncId, sol::main_protected_function fn) -> sol::table { return Callback::make(asyncId, std::move(fn), callbackMeta); }; diff --git a/components/lua/asyncpackage.hpp b/components/lua/asyncpackage.hpp index 7e9c36de09..18fd59a84f 100644 --- a/components/lua/asyncpackage.hpp +++ b/components/lua/asyncpackage.hpp @@ -12,7 +12,7 @@ namespace LuaUtil sol::table mHiddenData; }; sol::function getAsyncPackageInitializer( - lua_State* L, std::function simulationTimeFn, std::function gameTimeFn); + lua_State* state, std::function simulationTimeFn, std::function gameTimeFn); // Wrapper for a Lua function. // Holds information about the script the function belongs to. @@ -24,7 +24,7 @@ namespace LuaUtil static bool isLuaCallback(const sol::object&); static Callback fromLua(const sol::table&); - static sol::table makeMetatable(lua_State* L); + static sol::table makeMetatable(lua_State* state); static sol::table make(const AsyncPackageId& asyncId, sol::main_protected_function fn, sol::table metatable); bool isValid() const { return mHiddenData[ScriptsContainer::sScriptIdKey] != sol::nil; } diff --git a/components/lua/l10n.cpp b/components/lua/l10n.cpp index 856ab8a808..554c503ba7 100644 --- a/components/lua/l10n.cpp +++ b/components/lua/l10n.cpp @@ -52,9 +52,9 @@ namespace sol namespace LuaUtil { - sol::function initL10nLoader(lua_State* L, L10n::Manager* manager) + sol::function initL10nLoader(lua_State* state, L10n::Manager* manager) { - sol::state_view lua(L); + sol::state_view lua(state); sol::usertype ctxDef = lua.new_usertype("L10nContext"); ctxDef[sol::meta_function::call] = [](const L10nContext& ctx, std::string_view key, sol::optional args) { diff --git a/components/lua/l10n.hpp b/components/lua/l10n.hpp index 2abe7f56f2..100bda6e7f 100644 --- a/components/lua/l10n.hpp +++ b/components/lua/l10n.hpp @@ -10,7 +10,7 @@ namespace L10n namespace LuaUtil { - sol::function initL10nLoader(lua_State*, L10n::Manager* manager); + sol::function initL10nLoader(lua_State* state, L10n::Manager* manager); } #endif // COMPONENTS_LUA_L10N_H diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp index b83415e58d..b705dc0f5f 100644 --- a/components/lua/luastate.cpp +++ b/components/lua/luastate.cpp @@ -59,10 +59,10 @@ namespace LuaUtil bool LuaState::sProfilerEnabled = true; - void LuaState::countHook(lua_State* L, lua_Debug* ar) + void LuaState::countHook(lua_State* state, lua_Debug* /*ar*/) { LuaState* self; - (void)lua_getallocf(L, reinterpret_cast(&self)); + (void)lua_getallocf(state, reinterpret_cast(&self)); if (self->mActiveScriptIdStack.empty()) return; const ScriptId& activeScript = self->mActiveScriptIdStack.back(); @@ -71,10 +71,10 @@ namespace LuaUtil if (self->mSettings.mInstructionLimit > 0 && self->mWatchdogInstructionCounter > self->mSettings.mInstructionLimit) { - lua_pushstring(L, + lua_pushstring(state, "Lua instruction count exceeded, probably an infinite loop in a script. " "To change the limit set \"[Lua] instruction limit per call\" in settings.cfg"); - lua_error(L); + lua_error(state); } } diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp index f4ce9d4f0c..178d19aef2 100644 --- a/components/lua/luastate.hpp +++ b/components/lua/luastate.hpp @@ -44,8 +44,8 @@ namespace LuaUtil LuaView(const LuaView&) = delete; - LuaView(lua_State* L) - : mSol(L) + LuaView(lua_State* state) + : mSol(state) { } @@ -59,9 +59,9 @@ namespace LuaUtil }; template - sol::table tableFromPairs(lua_State* L, std::initializer_list> list) + sol::table tableFromPairs(lua_State* state, std::initializer_list> list) { - sol::table res(L, sol::create); + sol::table res(state, sol::create); for (const auto& [k, v] : list) res[k] = v; return res; @@ -94,9 +94,9 @@ namespace LuaUtil { if (!lua_checkstack(mSol.lua_state(), 2)) return LUA_ERRMEM; - lua_pushcfunction(mSol.lua_state(), [](lua_State* L) { - void* f = lua_touserdata(L, 1); - LuaView view(L); + lua_pushcfunction(mSol.lua_state(), [](lua_State* state) { + void* f = lua_touserdata(state, 1); + LuaView view(state); (*static_cast(f))(view); return 0; }); @@ -186,7 +186,7 @@ namespace LuaUtil ScriptId scriptId, const sol::protected_function& fn, Args&&... args); sol::function loadScriptAndCache(const VFS::Path::Normalized& path); - static void countHook(lua_State* L, lua_Debug* ar); + static void countHook(lua_State* state, lua_Debug* ar); static void* trackingAllocator(void* ud, void* ptr, size_t osize, size_t nsize); static LuaStatePtr createLuaRuntime(LuaState* luaState); diff --git a/components/lua/storage.cpp b/components/lua/storage.cpp index 9d3d233fb7..e8dda67bc6 100644 --- a/components/lua/storage.cpp +++ b/components/lua/storage.cpp @@ -29,15 +29,15 @@ namespace LuaUtil })); } - sol::object LuaStorage::Value::getCopy(lua_State* L) const + sol::object LuaStorage::Value::getCopy(lua_State* state) const { - return deserialize(L, mSerializedValue); + return deserialize(state, mSerializedValue); } - sol::object LuaStorage::Value::getReadOnly(lua_State* L) const + sol::object LuaStorage::Value::getReadOnly(lua_State* state) const { if (mReadOnlyValue == sol::nil && !mSerializedValue.empty()) - mReadOnlyValue = sol::main_object(deserialize(L, mSerializedValue, nullptr, true)); + mReadOnlyValue = sol::main_object(deserialize(state, mSerializedValue, nullptr, true)); return mReadOnlyValue; } @@ -115,12 +115,12 @@ namespace LuaUtil runCallbacks(sol::nullopt); } - sol::table LuaStorage::Section::asTable(lua_State* L) + sol::table LuaStorage::Section::asTable(lua_State* state) { checkIfActive(); - sol::table res(L, sol::create); + sol::table res(state, sol::create); for (const auto& [k, v] : mValues) - res[k] = v.getCopy(L); + res[k] = v.getCopy(state); return res; } @@ -241,7 +241,7 @@ namespace LuaUtil } } - void LuaStorage::load(lua_State* L, const std::filesystem::path& path) + void LuaStorage::load(lua_State* state, const std::filesystem::path& path) { assert(mData.empty()); // Shouldn't be used before loading try @@ -253,7 +253,7 @@ namespace LuaUtil std::ifstream fin(path, std::fstream::binary); std::string serializedData((std::istreambuf_iterator(fin)), std::istreambuf_iterator()); - sol::table data = deserialize(L, serializedData); + sol::table data = deserialize(state, serializedData); for (const auto& [sectionName, sectionTable] : data) { const std::shared_ptr
& section = getSection(cast(sectionName)); @@ -267,13 +267,13 @@ namespace LuaUtil } } - void LuaStorage::save(lua_State* L, const std::filesystem::path& path) const + void LuaStorage::save(lua_State* state, const std::filesystem::path& path) const { - sol::table data(L, sol::create); + sol::table data(state, sol::create); for (const auto& [sectionName, section] : mData) { if (section->mLifeTime == Section::Persistent && !section->mValues.empty()) - data[sectionName] = section->asTable(L); + data[sectionName] = section->asTable(state); } std::string serializedData = serialize(data); Log(Debug::Info) << "Saving Lua storage \"" << path << "\" (" << serializedData.size() << " bytes)"; @@ -294,19 +294,20 @@ namespace LuaUtil return newIt->second; } - sol::object LuaStorage::getSection(lua_State* L, std::string_view sectionName, bool readOnly, bool forMenuScripts) + sol::object LuaStorage::getSection( + lua_State* state, std::string_view sectionName, bool readOnly, bool forMenuScripts) { checkIfActive(); const std::shared_ptr
& section = getSection(sectionName); - return sol::make_object(L, SectionView{ section, readOnly, forMenuScripts }); + return sol::make_object(state, SectionView{ section, readOnly, forMenuScripts }); } - sol::table LuaStorage::getAllSections(lua_State* L, bool readOnly) + sol::table LuaStorage::getAllSections(lua_State* state, bool readOnly) { checkIfActive(); - sol::table res(L, sol::create); + sol::table res(state, sol::create); for (const auto& [sectionName, _] : mData) - res[sectionName] = getSection(L, sectionName, readOnly); + res[sectionName] = getSection(state, sectionName, readOnly); return res; } diff --git a/components/lua/storage.hpp b/components/lua/storage.hpp index f86feddb2d..32ad3ef1fc 100644 --- a/components/lua/storage.hpp +++ b/components/lua/storage.hpp @@ -25,19 +25,20 @@ namespace LuaUtil explicit LuaStorage() {} void clearTemporaryAndRemoveCallbacks(); - void load(lua_State* L, const std::filesystem::path& path); - void save(lua_State* L, const std::filesystem::path& path) const; + void load(lua_State* state, const std::filesystem::path& path); + void save(lua_State* state, const std::filesystem::path& path) const; - sol::object getSection(lua_State* L, std::string_view sectionName, bool readOnly, bool forMenuScripts = false); - sol::object getMutableSection(lua_State* L, std::string_view sectionName, bool forMenuScripts = false) + sol::object getSection( + lua_State* state, std::string_view sectionName, bool readOnly, bool forMenuScripts = false); + sol::object getMutableSection(lua_State* state, std::string_view sectionName, bool forMenuScripts = false) { - return getSection(L, sectionName, false, forMenuScripts); + return getSection(state, sectionName, false, forMenuScripts); } - sol::object getReadOnlySection(lua_State* L, std::string_view sectionName) + sol::object getReadOnlySection(lua_State* state, std::string_view sectionName) { - return getSection(L, sectionName, true); + return getSection(state, sectionName, true); } - sol::table getAllSections(lua_State* L, bool readOnly = false); + sol::table getAllSections(lua_State* state, bool readOnly = false); void setSingleValue(std::string_view section, std::string_view key, const sol::object& value) { @@ -69,8 +70,8 @@ namespace LuaUtil : mSerializedValue(serialize(value)) { } - sol::object getCopy(lua_State* L) const; - sol::object getReadOnly(lua_State* L) const; + sol::object getCopy(lua_State* state) const; + sol::object getReadOnly(lua_State* state) const; private: std::string mSerializedValue; @@ -94,7 +95,7 @@ namespace LuaUtil const Value& get(std::string_view key) const; void set(std::string_view key, const sol::object& value); void setAll(const sol::optional& values); - sol::table asTable(lua_State* L); + sol::table asTable(lua_State* state); void runCallbacks(sol::optional changedKey); void throwIfCallbackRecursionIsTooDeep(); diff --git a/components/lua/utf8.cpp b/components/lua/utf8.cpp index d8aa7cf295..11c4cbc1e8 100644 --- a/components/lua/utf8.cpp +++ b/components/lua/utf8.cpp @@ -65,9 +65,9 @@ namespace } // returns: first - character pos in bytes, second - character codepoint - std::pair decodeNextUTF8Character(std::string_view s, std::vector& pos_byte) + std::pair decodeNextUTF8Character(std::string_view s, std::vector& posByte) { - const int64_t pos = pos_byte.back() - 1; + const int64_t pos = posByte.back() - 1; const unsigned char ch = static_cast(s[pos]); int64_t codepoint = -1; size_t byteSize = 0; @@ -104,9 +104,9 @@ namespace codepoint = (codepoint << 6) | (static_cast(s[pos + i]) & 0b00111111); } - std::pair res = std::make_pair(pos_byte.back(), codepoint); + std::pair res = std::make_pair(posByte.back(), codepoint); - pos_byte.push_back(pos_byte.back() + byteSize); /* the next character (if exists) starts at this byte */ + posByte.push_back(posByte.back() + byteSize); /* the next character (if exists) starts at this byte */ return res; } diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp index 7e84338e40..0117934def 100644 --- a/components/lua/utilpackage.cpp +++ b/components/lua/utilpackage.cpp @@ -179,9 +179,9 @@ namespace LuaUtil } } - sol::table initUtilPackage(lua_State* L) + sol::table initUtilPackage(lua_State* state) { - sol::state_view lua(L); + sol::state_view lua(state); sol::table util(lua, sol::create); // Lua bindings for Vec2 diff --git a/components/lua/utilpackage.hpp b/components/lua/utilpackage.hpp index e0ba5288ca..5f8571904b 100644 --- a/components/lua/utilpackage.hpp +++ b/components/lua/utilpackage.hpp @@ -40,7 +40,7 @@ namespace LuaUtil return obj.is() || obj.is(); } - sol::table initUtilPackage(lua_State*); + sol::table initUtilPackage(lua_State* state); } #endif // COMPONENTS_LUA_UTILPACKAGE_H diff --git a/components/lua_ui/image.cpp b/components/lua_ui/image.cpp index ffe93a8d2d..45e7843d61 100644 --- a/components/lua_ui/image.cpp +++ b/components/lua_ui/image.cpp @@ -6,7 +6,7 @@ namespace LuaUi { - void LuaTileRect::_setAlign(const MyGUI::IntSize& _oldsize) + void LuaTileRect::_setAlign(const MyGUI::IntSize& /*oldSize*/) { mCoord.set(0, 0, mCroppedParent->getWidth(), mCroppedParent->getHeight()); mTileSize = mSetTileSize; diff --git a/components/lua_ui/image.hpp b/components/lua_ui/image.hpp index 1cc7b897bb..3fc5abe0bb 100644 --- a/components/lua_ui/image.hpp +++ b/components/lua_ui/image.hpp @@ -13,7 +13,7 @@ namespace LuaUi MYGUI_RTTI_DERIVED(LuaTileRect) public: - void _setAlign(const MyGUI::IntSize& _oldsize) override; + void _setAlign(const MyGUI::IntSize& oldSize) override; void updateSize(MyGUI::IntSize tileSize) { mSetTileSize = tileSize; } diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp index acbdbcd03a..a126fd9f7b 100644 --- a/components/lua_ui/widget.cpp +++ b/components/lua_ui/widget.cpp @@ -399,12 +399,12 @@ namespace LuaUi propagateEvent("mouseMove", [left, top, button](auto w) { return w->mouseEvent(left, top, button); }); } - void WidgetExtension::mouseClick(MyGUI::Widget* _widget) + void WidgetExtension::mouseClick(MyGUI::Widget* /*widget*/) { propagateEvent("mouseClick", [](auto) { return sol::nil; }); } - void WidgetExtension::mouseDoubleClick(MyGUI::Widget* _widget) + void WidgetExtension::mouseDoubleClick(MyGUI::Widget* /*widget*/) { propagateEvent("mouseDoubleClick", [](auto) { return sol::nil; }); } diff --git a/components/lua_ui/window.cpp b/components/lua_ui/window.cpp index 5da2ae4ca4..a06da14972 100644 --- a/components/lua_ui/window.cpp +++ b/components/lua_ui/window.cpp @@ -60,7 +60,7 @@ namespace LuaUi ext->externalValue("move", MyGUI::IntPoint(1, 1)), ext->externalValue("resize", MyGUI::IntSize(0, 0))); } - void LuaWindow::notifyMouseDrag(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id) + void LuaWindow::notifyMouseDrag(MyGUI::Widget* /*sender*/, int left, int top, MyGUI::MouseButton id) { if (id != MyGUI::MouseButton::Left) return; diff --git a/components/lua_ui/window.hpp b/components/lua_ui/window.hpp index 962607d81e..dd5ac87fe7 100644 --- a/components/lua_ui/window.hpp +++ b/components/lua_ui/window.hpp @@ -26,8 +26,8 @@ namespace LuaUi MyGUI::IntCoord mMoveResize; protected: - void notifyMousePress(MyGUI::Widget*, int, int, MyGUI::MouseButton); - void notifyMouseDrag(MyGUI::Widget*, int, int, MyGUI::MouseButton); + void notifyMousePress(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id); + void notifyMouseDrag(MyGUI::Widget* sender, int left, int top, MyGUI::MouseButton id); }; } diff --git a/components/myguiplatform/additivelayer.cpp b/components/myguiplatform/additivelayer.cpp index 9ffdc9b84e..f9792d76ea 100644 --- a/components/myguiplatform/additivelayer.cpp +++ b/components/myguiplatform/additivelayer.cpp @@ -19,13 +19,13 @@ namespace MyGUIPlatform // defined in .cpp file since we can't delete incomplete types } - void AdditiveLayer::renderToTarget(MyGUI::IRenderTarget* _target, bool _update) + void AdditiveLayer::renderToTarget(MyGUI::IRenderTarget* target, bool update) { RenderManager& renderManager = static_cast(MyGUI::RenderManager::getInstance()); renderManager.setInjectState(mStateSet.get()); - MyGUI::OverlappedLayer::renderToTarget(_target, _update); + MyGUI::OverlappedLayer::renderToTarget(target, update); renderManager.setInjectState(nullptr); } diff --git a/components/myguiplatform/additivelayer.hpp b/components/myguiplatform/additivelayer.hpp index 4b5185f97f..1e27713086 100644 --- a/components/myguiplatform/additivelayer.hpp +++ b/components/myguiplatform/additivelayer.hpp @@ -22,7 +22,7 @@ namespace MyGUIPlatform AdditiveLayer(); ~AdditiveLayer() override; - void renderToTarget(MyGUI::IRenderTarget* _target, bool _update) override; + void renderToTarget(MyGUI::IRenderTarget* target, bool update) override; private: osg::ref_ptr mStateSet; diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp index 41a2d84e80..71e963a4ba 100644 --- a/components/myguiplatform/myguidatamanager.cpp +++ b/components/myguiplatform/myguidatamanager.cpp @@ -53,7 +53,7 @@ namespace MyGUIPlatform return mVfs->exists(Files::pathToUnicodeString(mResourcePath / name)); } - const MyGUI::VectorString& DataManager::getDataListNames(const std::string& pattern) const + const MyGUI::VectorString& DataManager::getDataListNames(const std::string& /*pattern*/) const { throw std::runtime_error("DataManager::getDataListNames is not implemented - VFS is used"); } diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp index f7489f8b65..427d2aa2c4 100644 --- a/components/myguiplatform/myguidatamanager.hpp +++ b/components/myguiplatform/myguidatamanager.hpp @@ -22,30 +22,30 @@ namespace MyGUIPlatform void setResourcePath(const std::filesystem::path& path); /** Get data stream from specified resource name. - @param _name Resource name (usually file name). + @param name Resource name (usually file name). */ - MyGUI::IDataStream* getData(const std::string& _name) const override; + MyGUI::IDataStream* getData(const std::string& name) const override; /** Free data stream. - @param _data Data stream. + @param data Data stream. */ - void freeData(MyGUI::IDataStream* _data) override; + void freeData(MyGUI::IDataStream* data) override; /** Is data with specified name exist. - @param _name Resource name. + @param name Resource name. */ - bool isDataExist(const std::string& _name) const override; + bool isDataExist(const std::string& name) const override; /** Get all data names with names that matches pattern. - @param _pattern Pattern to match (for example "*.layout"). + @param pattern Pattern to match (for example "*.layout"). */ - const MyGUI::VectorString& getDataListNames(const std::string& _pattern) const override; + const MyGUI::VectorString& getDataListNames(const std::string& pattern) const override; /** Get full path to data. - @param _name Resource name. + @param name Resource name. @return Return full path to specified data. */ - std::string getDataPath(const std::string& _name) const override; + std::string getDataPath(const std::string& name) const override; private: std::filesystem::path mResourcePath; diff --git a/components/myguiplatform/myguiloglistener.cpp b/components/myguiplatform/myguiloglistener.cpp index 66b35e0961..36078e2ae6 100644 --- a/components/myguiplatform/myguiloglistener.cpp +++ b/components/myguiplatform/myguiloglistener.cpp @@ -25,16 +25,16 @@ namespace MyGUIPlatform mStream.flush(); } - void CustomLogListener::log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time, - std::string_view _message, std::string_view _file, int _line) + void CustomLogListener::log(std::string_view section, MyGUI::LogLevel level, const tm* time, + std::string_view message, std::string_view file, int line) { if (mStream.is_open()) { std::string_view separator = " | "; - mStream << std::setw(2) << std::setfill('0') << _time->tm_hour << ":" << std::setw(2) << std::setfill('0') - << _time->tm_min << ":" << std::setw(2) << std::setfill('0') << _time->tm_sec << separator - << _section << separator << _level.print() << separator << _message << separator << _file - << separator << _line << std::endl; + mStream << std::setw(2) << std::setfill('0') << time->tm_hour << ":" << std::setw(2) << std::setfill('0') + << time->tm_min << ":" << std::setw(2) << std::setfill('0') << time->tm_sec << separator << section + << separator << level.print() << separator << message << separator << file << separator << line + << std::endl; } } diff --git a/components/myguiplatform/myguiloglistener.hpp b/components/myguiplatform/myguiloglistener.hpp index 3557f56540..7d7d7c4f0e 100644 --- a/components/myguiplatform/myguiloglistener.hpp +++ b/components/myguiplatform/myguiloglistener.hpp @@ -30,8 +30,8 @@ namespace MyGUIPlatform void close() override; void flush() override; - void log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time, std::string_view _message, - std::string_view _file, int _line) override; + void log(std::string_view section, MyGUI::LogLevel level, const struct tm* time, std::string_view message, + std::string_view file, int line) override; private: std::ofstream mStream; diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp index ce043c5665..85afcde462 100644 --- a/components/myguiplatform/myguirendermanager.cpp +++ b/components/myguiplatform/myguirendermanager.cpp @@ -550,15 +550,15 @@ namespace MyGUIPlatform return &item->second; } - bool RenderManager::checkTexture(MyGUI::ITexture* _texture) + bool RenderManager::checkTexture(MyGUI::ITexture* /*texture*/) { // We support external textures that aren't registered via this manager, so can't implement this method // sensibly. return true; } - void RenderManager::registerShader( - const std::string& _shaderName, const std::string& _vertexProgramFile, const std::string& _fragmentProgramFile) + void RenderManager::registerShader(const std::string& /*shaderName*/, const std::string& /*vertexProgramFile*/, + const std::string& /*fragmentProgramFile*/) { MYGUI_PLATFORM_LOG(Warning, "osgMyGUI::RenderManager::registerShader is not implemented"); } diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp index 737a0eb21e..df0bb7d8a0 100644 --- a/components/myguiplatform/myguirendermanager.hpp +++ b/components/myguiplatform/myguirendermanager.hpp @@ -72,7 +72,7 @@ namespace MyGUIPlatform return static_cast(MyGUI::RenderManager::getInstancePtr()); } - bool checkTexture(MyGUI::ITexture* _texture) override; + bool checkTexture(MyGUI::ITexture* texture) override; /** @see RenderManager::getViewSize */ const MyGUI::IntSize& getViewSize() const override { return mViewSize; } @@ -91,7 +91,7 @@ namespace MyGUIPlatform /** @see RenderManager::createTexture */ MyGUI::ITexture* createTexture(const std::string& name) override; /** @see RenderManager::destroyTexture */ - void destroyTexture(MyGUI::ITexture* _texture) override; + void destroyTexture(MyGUI::ITexture* texture) override; /** @see RenderManager::getTexture */ MyGUI::ITexture* getTexture(const std::string& name) override; @@ -115,8 +115,8 @@ namespace MyGUIPlatform void setViewSize(int width, int height) override; - void registerShader(const std::string& _shaderName, const std::string& _vertexProgramFile, - const std::string& _fragmentProgramFile) override; + void registerShader(const std::string& shaderName, const std::string& vertexProgramFile, + const std::string& fragmentProgramFile) override; /*internal:*/ diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp index 529488beb1..65036aa3c4 100644 --- a/components/myguiplatform/myguitexture.cpp +++ b/components/myguiplatform/myguitexture.cpp @@ -161,7 +161,7 @@ namespace MyGUIPlatform return nullptr; } - void OSGTexture::setShader(const std::string& _shaderName) + void OSGTexture::setShader(const std::string& /*shaderName*/) { Log(Debug::Warning) << "OSGTexture::setShader is not implemented"; } diff --git a/components/myguiplatform/myguitexture.hpp b/components/myguiplatform/myguitexture.hpp index 3e34820069..efd46daae1 100644 --- a/components/myguiplatform/myguitexture.hpp +++ b/components/myguiplatform/myguitexture.hpp @@ -63,7 +63,7 @@ namespace MyGUIPlatform MyGUI::IRenderTarget* getRenderTarget() override; - void setShader(const std::string& _shaderName) override; + void setShader(const std::string& shaderName) override; /*internal:*/ osg::Texture2D* getTexture() const { return mTexture.get(); } diff --git a/components/myguiplatform/scalinglayer.cpp b/components/myguiplatform/scalinglayer.cpp index 1660e4f0ca..4edcf835c8 100644 --- a/components/myguiplatform/scalinglayer.cpp +++ b/components/myguiplatform/scalinglayer.cpp @@ -27,9 +27,9 @@ namespace MyGUIPlatform void end() override { mTarget->end(); } - void doRender(MyGUI::IVertexBuffer* _buffer, MyGUI::ITexture* _texture, size_t _count) override + void doRender(MyGUI::IVertexBuffer* buffer, MyGUI::ITexture* texture, size_t count) override { - mTarget->doRender(_buffer, _texture, _count); + mTarget->doRender(buffer, texture, count); } const MyGUI::RenderTargetInfo& getInfo() const override @@ -49,14 +49,14 @@ namespace MyGUIPlatform mutable MyGUI::RenderTargetInfo mInfo; }; - MyGUI::ILayerItem* ScalingLayer::getLayerItemByPoint(int _left, int _top) const + MyGUI::ILayerItem* ScalingLayer::getLayerItemByPoint(int left, int top) const { - screenToLayerCoords(_left, _top); + screenToLayerCoords(left, top); - return OverlappedLayer::getLayerItemByPoint(_left, _top); + return OverlappedLayer::getLayerItemByPoint(left, top); } - void ScalingLayer::screenToLayerCoords(int& _left, int& _top) const + void ScalingLayer::screenToLayerCoords(int& left, int& top) const { float scale = getScaleFactor(mViewSize); if (scale <= 0.f) @@ -64,34 +64,34 @@ namespace MyGUIPlatform MyGUI::IntSize globalViewSize = MyGUI::RenderManager::getInstance().getViewSize(); - _left -= globalViewSize.width / 2; - _top -= globalViewSize.height / 2; + left -= globalViewSize.width / 2; + top -= globalViewSize.height / 2; - _left = static_cast(_left / scale); - _top = static_cast(_top / scale); + left = static_cast(left / scale); + top = static_cast(top / scale); - _left += mViewSize.width / 2; - _top += mViewSize.height / 2; + left += mViewSize.width / 2; + top += mViewSize.height / 2; } - float ScalingLayer::getScaleFactor(const MyGUI::IntSize& _layerViewSize) + float ScalingLayer::getScaleFactor(const MyGUI::IntSize& layerViewSize) { MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize(); float w = static_cast(viewSize.width); float h = static_cast(viewSize.height); - float heightScale = (h / _layerViewSize.height); - float widthScale = (w / _layerViewSize.width); + float heightScale = (h / layerViewSize.height); + float widthScale = (w / layerViewSize.width); return std::min(widthScale, heightScale); } - MyGUI::IntPoint ScalingLayer::getPosition(int _left, int _top) const + MyGUI::IntPoint ScalingLayer::getPosition(int left, int top) const { - screenToLayerCoords(_left, _top); - return MyGUI::IntPoint(_left, _top); + screenToLayerCoords(left, top); + return MyGUI::IntPoint(left, top); } - void ScalingLayer::renderToTarget(MyGUI::IRenderTarget* _target, bool _update) + void ScalingLayer::renderToTarget(MyGUI::IRenderTarget* target, bool update) { MyGUI::IntSize globalViewSize = MyGUI::RenderManager::getInstance().getViewSize(); MyGUI::IntSize viewSize = globalViewSize; @@ -104,21 +104,21 @@ namespace MyGUIPlatform float voffset = (globalViewSize.height - mViewSize.height * getScaleFactor(mViewSize)) / 2.f / static_cast(globalViewSize.height); - ProxyRenderTarget proxy(_target, viewSize, hoffset, voffset); + ProxyRenderTarget proxy(target, viewSize, hoffset, voffset); - MyGUI::OverlappedLayer::renderToTarget(&proxy, _update); + MyGUI::OverlappedLayer::renderToTarget(&proxy, update); } - void ScalingLayer::resizeView(const MyGUI::IntSize& _viewSize) + void ScalingLayer::resizeView(const MyGUI::IntSize& /*viewSize*/) { // do nothing } - void ScalingLayer::deserialization(MyGUI::xml::ElementPtr _node, MyGUI::Version _version) + void ScalingLayer::deserialization(MyGUI::xml::ElementPtr node, MyGUI::Version version) { - MyGUI::OverlappedLayer::deserialization(_node, _version); + MyGUI::OverlappedLayer::deserialization(node, version); - MyGUI::xml::ElementEnumerator info = _node->getElementEnumerator(); + MyGUI::xml::ElementEnumerator info = node->getElementEnumerator(); while (info.next()) { if (info->getName() == "Property") diff --git a/components/myguiplatform/scalinglayer.hpp b/components/myguiplatform/scalinglayer.hpp index 512bb0109e..f928e55b4f 100644 --- a/components/myguiplatform/scalinglayer.hpp +++ b/components/myguiplatform/scalinglayer.hpp @@ -15,18 +15,18 @@ namespace MyGUIPlatform public: MYGUI_RTTI_DERIVED(ScalingLayer) - void deserialization(MyGUI::xml::ElementPtr _node, MyGUI::Version _version) override; + void deserialization(MyGUI::xml::ElementPtr node, MyGUI::Version version) override; - MyGUI::ILayerItem* getLayerItemByPoint(int _left, int _top) const override; - MyGUI::IntPoint getPosition(int _left, int _top) const override; - void renderToTarget(MyGUI::IRenderTarget* _target, bool _update) override; + MyGUI::ILayerItem* getLayerItemByPoint(int left, int top) const override; + MyGUI::IntPoint getPosition(int left, int top) const override; + void renderToTarget(MyGUI::IRenderTarget* target, bool update) override; - void resizeView(const MyGUI::IntSize& _viewSize) override; + void resizeView(const MyGUI::IntSize& viewSize) override; - static float getScaleFactor(const MyGUI::IntSize& _layerViewSize); + static float getScaleFactor(const MyGUI::IntSize& layerViewSize); private: - void screenToLayerCoords(int& _left, int& _top) const; + void screenToLayerCoords(int& left, int& top) const; }; } diff --git a/components/platform/file.hpp b/components/platform/file.hpp index f941f5c69d..a19aafbc73 100644 --- a/components/platform/file.hpp +++ b/components/platform/file.hpp @@ -25,7 +25,7 @@ namespace Platform::File size_t size(Handle handle); - void seek(Handle handle, size_t Position, SeekType type = SeekType::Begin); + void seek(Handle handle, size_t position, SeekType type = SeekType::Begin); size_t tell(Handle handle); size_t read(Handle handle, void* data, size_t size); diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp index 345efc7fbd..488624d2d2 100644 --- a/components/resource/bulletshapemanager.cpp +++ b/components/resource/bulletshapemanager.cpp @@ -40,7 +40,7 @@ namespace Resource inline btVector3 toBullet(const osg::Vec3f& vec) { return btVector3(vec.x(), vec.y(), vec.z()); } void inline operator()(const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3, - bool _temp = false) // Note: unused temp argument left here for OSG versions less than 3.5.6 + bool /*temp*/ = false) // Note: unused temp argument left here for OSG versions less than 3.5.6 { if (mTriMesh) mTriMesh->addTriangle( diff --git a/components/sceneutil/screencapture.cpp b/components/sceneutil/screencapture.cpp index ed90668cfb..956cc91d25 100644 --- a/components/sceneutil/screencapture.cpp +++ b/components/sceneutil/screencapture.cpp @@ -109,7 +109,7 @@ namespace SceneUtil { } - void WriteScreenshotToFileOperation::operator()(const osg::Image& image, const unsigned int /*context_id*/) + void WriteScreenshotToFileOperation::operator()(const osg::Image& image, const unsigned int /*contextId*/) { std::filesystem::path fileName; try @@ -153,9 +153,9 @@ namespace SceneUtil item->waitTillDone(); } - void AsyncScreenCaptureOperation::operator()(const osg::Image& image, const unsigned int context_id) + void AsyncScreenCaptureOperation::operator()(const osg::Image& image, const unsigned int contextId) { - osg::ref_ptr item(new ScreenCaptureWorkItem(mImpl, image, context_id)); + osg::ref_ptr item(new ScreenCaptureWorkItem(mImpl, image, contextId)); mQueue->addWorkItem(item); const auto isDone = [](const osg::ref_ptr& v) { return v->isDone(); }; const auto workItems = mWorkItems.lock(); diff --git a/components/sceneutil/screencapture.hpp b/components/sceneutil/screencapture.hpp index 1bbd13739d..4689094afe 100644 --- a/components/sceneutil/screencapture.hpp +++ b/components/sceneutil/screencapture.hpp @@ -29,7 +29,7 @@ namespace SceneUtil WriteScreenshotToFileOperation(const std::filesystem::path& screenshotPath, const std::string& screenshotFormat, std::function callback); - void operator()(const osg::Image& image, const unsigned int context_id) override; + void operator()(const osg::Image& image, unsigned int contextId) override; private: const std::filesystem::path mScreenshotPath; @@ -47,7 +47,7 @@ namespace SceneUtil void stop(); - void operator()(const osg::Image& image, const unsigned int context_id) override; + void operator()(const osg::Image& image, unsigned int contextId) override; private: const osg::ref_ptr mQueue; diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp index caeefcb1e3..6b4a980001 100644 --- a/components/sdlutil/sdlcursormanager.cpp +++ b/components/sdlutil/sdlcursormanager.cpp @@ -79,11 +79,11 @@ namespace SDLUtil SDL_SetCursor(it->second); } - void SDLCursorManager::createCursor(std::string_view name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, - Uint8 hotspot_y, int cursorWidth, int cursorHeight) + void SDLCursorManager::createCursor(std::string_view name, int rotDegrees, osg::Image* image, Uint8 hotspotX, + Uint8 hotspotY, int cursorWidth, int cursorHeight) { #ifndef ANDROID - _createCursorFromResource(name, rotDegrees, image, hotspot_x, hotspot_y, cursorWidth, cursorHeight); + _createCursorFromResource(name, rotDegrees, image, hotspotX, hotspotY, cursorWidth, cursorHeight); #endif } @@ -129,7 +129,7 @@ namespace SDLUtil } void SDLCursorManager::_createCursorFromResource(std::string_view name, int rotDegrees, osg::Image* image, - Uint8 hotspot_x, Uint8 hotspot_y, int cursorWidth, int cursorHeight) + Uint8 hotspotX, Uint8 hotspotY, int cursorWidth, int cursorHeight) { if (mCursorMap.find(name) != mCursorMap.end()) return; @@ -139,7 +139,7 @@ namespace SDLUtil auto surface = decompress(image, static_cast(rotDegrees), cursorWidth, cursorHeight); // set the cursor and store it for later - SDL_Cursor* curs = SDL_CreateColorCursor(surface.get(), hotspot_x, hotspot_y); + SDL_Cursor* curs = SDL_CreateColorCursor(surface.get(), hotspotX, hotspotY); mCursorMap.emplace(name, curs); } diff --git a/components/sdlutil/sdlcursormanager.hpp b/components/sdlutil/sdlcursormanager.hpp index 5040e85fc0..20a09495d4 100644 --- a/components/sdlutil/sdlcursormanager.hpp +++ b/components/sdlutil/sdlcursormanager.hpp @@ -29,12 +29,12 @@ namespace SDLUtil /// name of the cursor we changed to ("arrow", "ibeam", etc) virtual void cursorChanged(std::string_view name); - virtual void createCursor(std::string_view name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, - Uint8 hotspot_y, int cursorWidth, int cursorHeight); + virtual void createCursor(std::string_view name, int rotDegrees, osg::Image* image, Uint8 hotspotX, + Uint8 hotspotY, int cursorWidth, int cursorHeight); private: - void _createCursorFromResource(std::string_view name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, - Uint8 hotspot_y, int cursorWidth, int cursorHeight); + void _createCursorFromResource(std::string_view name, int rotDegrees, osg::Image* image, Uint8 hotspotX, + Uint8 hotspotY, int cursorWidth, int cursorHeight); void _putPixel(SDL_Surface* surface, int x, int y, Uint32 pixel); void _setGUICursor(std::string_view name); diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp index c22055c82c..84e53e7317 100644 --- a/components/shader/shadermanager.cpp +++ b/components/shader/shadermanager.cpp @@ -442,18 +442,18 @@ namespace Shader } } - void update(ShaderManager& Manager, osgViewer::Viewer& viewer) + void update(ShaderManager& manager, osgViewer::Viewer& viewer) { auto timeSinceLastCheckMillis = std::chrono::duration_cast( std::filesystem::file_time_type::clock::now() - mLastAutoRecompileTime); if ((mHotReloadEnabled && timeSinceLastCheckMillis.count() > 200) || mTriggerReload == true) { - reloadTouchedShaders(Manager, viewer); + reloadTouchedShaders(manager, viewer); } mTriggerReload = false; } - void reloadTouchedShaders(ShaderManager& Manager, osgViewer::Viewer& viewer) + void reloadTouchedShaders(ShaderManager& manager, osgViewer::Viewer& viewer) { bool threadsRunningToStop = false; for (auto& [pathShaderToTest, shaderKeys] : mShaderFiles) @@ -471,19 +471,19 @@ namespace Shader for (const auto& [templateName, shaderDefines] : shaderKeys) { ShaderManager::ShaderMap::iterator shaderIt - = Manager.mShaders.find(std::make_pair(templateName, shaderDefines)); - if (shaderIt == Manager.mShaders.end()) + = manager.mShaders.find(std::make_pair(templateName, shaderDefines)); + if (shaderIt == manager.mShaders.end()) { Log(Debug::Error) << "Failed to find shader " << templateName; continue; } - ShaderManager::TemplateMap::iterator templateIt = Manager.mShaderTemplates.find( + ShaderManager::TemplateMap::iterator templateIt = manager.mShaderTemplates.find( templateName); // Can't be Null, if we're here it means the template was added - assert(templateIt != Manager.mShaderTemplates.end()); + assert(templateIt != manager.mShaderTemplates.end()); std::string& shaderSource = templateIt->second; std::set insertedPaths; - std::filesystem::path path = (std::filesystem::path(Manager.mPath) / templateName); + std::filesystem::path path = (std::filesystem::path(manager.mPath) / templateName); std::ifstream stream; stream.open(path); if (stream.fail()) @@ -497,7 +497,7 @@ namespace Shader int fileNumber = 1; std::string source = buffer.str(); if (!addLineDirectivesAfterConditionalBlocks(source) - || !parseIncludes(std::filesystem::path(Manager.mPath), source, templateName, fileNumber, + || !parseIncludes(std::filesystem::path(manager.mPath), source, templateName, fileNumber, {}, insertedPaths)) { break; @@ -505,7 +505,7 @@ namespace Shader shaderSource = std::move(source); std::vector linkedShaderNames; - if (!Manager.createSourceFromTemplate( + if (!manager.createSourceFromTemplate( shaderSource, linkedShaderNames, templateName, shaderDefines)) { break; diff --git a/components/widgets/box.cpp b/components/widgets/box.cpp index 25965b7b1e..49e10b49e8 100644 --- a/components/widgets/box.cpp +++ b/components/widgets/box.cpp @@ -33,22 +33,22 @@ namespace Gui return getCaption().empty() ? MyGUI::IntSize{ 0, 0 } : getTextSize(); } - void AutoSizedTextBox::setCaption(const MyGUI::UString& _value) + void AutoSizedTextBox::setCaption(const MyGUI::UString& value) { - TextBox::setCaption(_value); + TextBox::setCaption(value); notifySizeChange(this); } - void AutoSizedTextBox::setPropertyOverride(std::string_view _key, std::string_view _value) + void AutoSizedTextBox::setPropertyOverride(std::string_view key, std::string_view value) { - if (_key == "ExpandDirection") + if (key == "ExpandDirection") { - mExpandDirection = MyGUI::Align::parse(_value); + mExpandDirection = MyGUI::Align::parse(value); } else { - Gui::TextBox::setPropertyOverride(_key, _value); + Gui::TextBox::setPropertyOverride(key, value); } } @@ -87,9 +87,9 @@ namespace Gui return MyGUI::IntSize(getWidth(), getTextSize().height); } - void AutoSizedEditBox::setCaption(const MyGUI::UString& _value) + void AutoSizedEditBox::setCaption(const MyGUI::UString& value) { - EditBox::setCaption(_value); + EditBox::setCaption(value); mWasResized = false; notifySizeChange(this); @@ -103,19 +103,19 @@ namespace Gui setEditStatic(true); } - void AutoSizedEditBox::setPropertyOverride(std::string_view _key, std::string_view _value) + void AutoSizedEditBox::setPropertyOverride(std::string_view key, std::string_view value) { - if (_key == "ExpandDirection") + if (key == "ExpandDirection") { - mExpandDirection = MyGUI::Align::parse(_value); + mExpandDirection = MyGUI::Align::parse(value); } - else if (_key == "Shrink") + else if (key == "Shrink") { - mShrink = MyGUI::utility::parseValue(_value); + mShrink = MyGUI::utility::parseValue(value); } else { - Gui::EditBox::setPropertyOverride(_key, _value); + Gui::EditBox::setPropertyOverride(key, value); } } @@ -129,22 +129,22 @@ namespace Gui return size; } - void AutoSizedButton::setCaption(const MyGUI::UString& _value) + void AutoSizedButton::setCaption(const MyGUI::UString& value) { - Button::setCaption(_value); + Button::setCaption(value); notifySizeChange(this); } - void AutoSizedButton::setPropertyOverride(std::string_view _key, std::string_view _value) + void AutoSizedButton::setPropertyOverride(std::string_view key, std::string_view value) { - if (_key == "ExpandDirection") + if (key == "ExpandDirection") { - mExpandDirection = MyGUI::Align::parse(_value); + mExpandDirection = MyGUI::Align::parse(value); } else { - Gui::Button::setPropertyOverride(_key, _value); + Gui::Button::setPropertyOverride(key, value); } } @@ -160,14 +160,14 @@ namespace Gui align(); } - bool Box::_setPropertyImpl(std::string_view _key, std::string_view _value) + bool Box::_setPropertyImpl(std::string_view key, std::string_view value) { - if (_key == "Spacing") - mSpacing = MyGUI::utility::parseValue(_value); - else if (_key == "Padding") - mPadding = MyGUI::utility::parseValue(_value); - else if (_key == "AutoResize") - mAutoResize = MyGUI::utility::parseValue(_value); + if (key == "Spacing") + mSpacing = MyGUI::utility::parseValue(value); + else if (key == "Padding") + mPadding = MyGUI::utility::parseValue(value); + else if (key == "AutoResize") + mAutoResize = MyGUI::utility::parseValue(value); else return false; @@ -260,21 +260,21 @@ namespace Gui } } - void HBox::setPropertyOverride(std::string_view _key, std::string_view _value) + void HBox::setPropertyOverride(std::string_view key, std::string_view value) { - if (!Box::_setPropertyImpl(_key, _value)) - MyGUI::Widget::setPropertyOverride(_key, _value); + if (!Box::_setPropertyImpl(key, value)) + MyGUI::Widget::setPropertyOverride(key, value); } - void HBox::setSize(const MyGUI::IntSize& _value) + void HBox::setSize(const MyGUI::IntSize& value) { - MyGUI::Widget::setSize(_value); + MyGUI::Widget::setSize(value); align(); } - void HBox::setCoord(const MyGUI::IntCoord& _value) + void HBox::setCoord(const MyGUI::IntCoord& value) { - MyGUI::Widget::setCoord(_value); + MyGUI::Widget::setCoord(value); align(); } @@ -286,7 +286,7 @@ namespace Gui setWidgetClient(client); } - void HBox::onWidgetCreated(MyGUI::Widget* _widget) + void HBox::onWidgetCreated(MyGUI::Widget* /*widget*/) { align(); } @@ -415,21 +415,21 @@ namespace Gui } } - void VBox::setPropertyOverride(std::string_view _key, std::string_view _value) + void VBox::setPropertyOverride(std::string_view key, std::string_view value) { - if (!Box::_setPropertyImpl(_key, _value)) - MyGUI::Widget::setPropertyOverride(_key, _value); + if (!Box::_setPropertyImpl(key, value)) + MyGUI::Widget::setPropertyOverride(key, value); } - void VBox::setSize(const MyGUI::IntSize& _value) + void VBox::setSize(const MyGUI::IntSize& value) { - MyGUI::Widget::setSize(_value); + MyGUI::Widget::setSize(value); align(); } - void VBox::setCoord(const MyGUI::IntCoord& _value) + void VBox::setCoord(const MyGUI::IntCoord& value) { - MyGUI::Widget::setCoord(_value); + MyGUI::Widget::setCoord(value); align(); } @@ -476,7 +476,7 @@ namespace Gui return size; } - void VBox::onWidgetCreated(MyGUI::Widget* _widget) + void VBox::onWidgetCreated(MyGUI::Widget* /*widget*/) { align(); } diff --git a/components/widgets/box.hpp b/components/widgets/box.hpp index 83cbddb3b0..a736b4b212 100644 --- a/components/widgets/box.hpp +++ b/components/widgets/box.hpp @@ -50,10 +50,10 @@ namespace Gui public: MyGUI::IntSize getRequestedSize() override; - void setCaption(const MyGUI::UString& _value) override; + void setCaption(const MyGUI::UString& value) override; protected: - void setPropertyOverride(std::string_view _key, std::string_view _value) override; + void setPropertyOverride(std::string_view key, std::string_view value) override; std::string mFontSize; }; @@ -63,12 +63,12 @@ namespace Gui public: MyGUI::IntSize getRequestedSize() override; - void setCaption(const MyGUI::UString& _value) override; + void setCaption(const MyGUI::UString& value) override; void initialiseOverride() override; protected: - void setPropertyOverride(std::string_view _key, std::string_view _value) override; + void setPropertyOverride(std::string_view key, std::string_view value) override; int getWidth(); std::string mFontSize; bool mShrink = false; @@ -82,10 +82,10 @@ namespace Gui public: MyGUI::IntSize getRequestedSize() override; - void setCaption(const MyGUI::UString& _value) override; + void setCaption(const MyGUI::UString& value) override; protected: - void setPropertyOverride(std::string_view _key, std::string_view _value) override; + void setPropertyOverride(std::string_view key, std::string_view value) override; std::string mFontSize; }; @@ -105,7 +105,7 @@ namespace Gui protected: virtual void align() = 0; - virtual bool _setPropertyImpl(std::string_view _key, std::string_view _value); + virtual bool _setPropertyImpl(std::string_view key, std::string_view value); int mSpacing; // how much space to put between elements @@ -128,8 +128,8 @@ namespace Gui MYGUI_RTTI_DERIVED(HBox) public: - void setSize(const MyGUI::IntSize& _value) override; - void setCoord(const MyGUI::IntCoord& _value) override; + void setSize(const MyGUI::IntSize& value) override; + void setCoord(const MyGUI::IntCoord& value) override; protected: void initialiseOverride() override; @@ -137,9 +137,9 @@ namespace Gui void align() override; MyGUI::IntSize getRequestedSize() override; - void setPropertyOverride(std::string_view _key, std::string_view _value) override; + void setPropertyOverride(std::string_view key, std::string_view value) override; - void onWidgetCreated(MyGUI::Widget* _widget) override; + void onWidgetCreated(MyGUI::Widget* widget) override; }; class VBox : public Box, public MyGUI::Widget @@ -147,8 +147,8 @@ namespace Gui MYGUI_RTTI_DERIVED(VBox) public: - void setSize(const MyGUI::IntSize& _value) override; - void setCoord(const MyGUI::IntCoord& _value) override; + void setSize(const MyGUI::IntSize& value) override; + void setCoord(const MyGUI::IntCoord& value) override; protected: void initialiseOverride() override; @@ -156,9 +156,9 @@ namespace Gui void align() override; MyGUI::IntSize getRequestedSize() override; - void setPropertyOverride(std::string_view _key, std::string_view _value) override; + void setPropertyOverride(std::string_view key, std::string_view value) override; - void onWidgetCreated(MyGUI::Widget* _widget) override; + void onWidgetCreated(MyGUI::Widget* widget) override; }; } diff --git a/components/widgets/imagebutton.cpp b/components/widgets/imagebutton.cpp index 01fbd66cd5..8e410dec1c 100644 --- a/components/widgets/imagebutton.cpp +++ b/components/widgets/imagebutton.cpp @@ -34,51 +34,51 @@ namespace Gui updateImage(); } - void ImageButton::setPropertyOverride(std::string_view _key, std::string_view _value) + void ImageButton::setPropertyOverride(std::string_view key, std::string_view value) { - if (_key == "ImageHighlighted") - mImageHighlighted = _value; - else if (_key == "ImagePushed") - mImagePushed = _value; - else if (_key == "ImageNormal") + if (key == "ImageHighlighted") + mImageHighlighted = value; + else if (key == "ImagePushed") + mImagePushed = value; + else if (key == "ImageNormal") { if (mImageNormal.empty()) { - setImageTexture(_value); + setImageTexture(value); } - mImageNormal = _value; + mImageNormal = value; } - else if (_key == "TextureRect") + else if (key == "TextureRect") { - mTextureRect = MyGUI::IntCoord::parse(_value); + mTextureRect = MyGUI::IntCoord::parse(value); mUseWholeTexture = (mTextureRect == MyGUI::IntCoord(0, 0, 0, 0)); } else - ImageBox::setPropertyOverride(_key, _value); + ImageBox::setPropertyOverride(key, value); } - void ImageButton::onMouseSetFocus(Widget* _old) + void ImageButton::onMouseSetFocus(MyGUI::Widget* oldWidget) { mMouseFocus = true; updateImage(); - Base::onMouseSetFocus(_old); + Base::onMouseSetFocus(oldWidget); } - void ImageButton::onMouseLostFocus(Widget* _new) + void ImageButton::onMouseLostFocus(MyGUI::Widget* newWidget) { mMouseFocus = false; updateImage(); - Base::onMouseLostFocus(_new); + Base::onMouseLostFocus(newWidget); } - void ImageButton::onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id) + void ImageButton::onMouseButtonPressed(int left, int top, MyGUI::MouseButton id) { - if (_id == MyGUI::MouseButton::Left) + if (id == MyGUI::MouseButton::Left) { mMousePress = true; updateImage(); } - Base::onMouseButtonPressed(_left, _top, _id); + Base::onMouseButtonPressed(left, top, id); } void ImageButton::updateImage() @@ -136,24 +136,24 @@ namespace Gui updateImage(); } - void ImageButton::onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id) + void ImageButton::onMouseButtonReleased(int left, int top, MyGUI::MouseButton id) { - if (_id == MyGUI::MouseButton::Left) + if (id == MyGUI::MouseButton::Left) { mMousePress = false; updateImage(); } - Base::onMouseButtonReleased(_left, _top, _id); + Base::onMouseButtonReleased(left, top, id); } - void ImageButton::onKeySetFocus(MyGUI::Widget* _old) + void ImageButton::onKeySetFocus(MyGUI::Widget* /*newWidget*/) { mKeyFocus = true; updateImage(); } - void ImageButton::onKeyLostFocus(MyGUI::Widget* _new) + void ImageButton::onKeyLostFocus(MyGUI::Widget* /*oldWidget*/) { mKeyFocus = false; updateImage(); diff --git a/components/widgets/imagebutton.hpp b/components/widgets/imagebutton.hpp index 90b5e6339e..4b9852e071 100644 --- a/components/widgets/imagebutton.hpp +++ b/components/widgets/imagebutton.hpp @@ -32,13 +32,13 @@ namespace Gui static bool sDefaultNeedKeyFocus; protected: - void setPropertyOverride(std::string_view _key, std::string_view _value) override; - void onMouseLostFocus(MyGUI::Widget* _new) override; - void onMouseSetFocus(MyGUI::Widget* _old) override; - void onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id) override; - void onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id) override; - void onKeySetFocus(MyGUI::Widget* _old) override; - void onKeyLostFocus(MyGUI::Widget* _new) override; + void setPropertyOverride(std::string_view key, std::string_view value) override; + void onMouseLostFocus(MyGUI::Widget* newWidget) override; + void onMouseSetFocus(MyGUI::Widget* oldWidget) override; + void onMouseButtonPressed(int left, int top, MyGUI::MouseButton id) override; + void onMouseButtonReleased(int left, int top, MyGUI::MouseButton id) override; + void onKeySetFocus(MyGUI::Widget* newWidget) override; + void onKeyLostFocus(MyGUI::Widget* oldWidget) override; std::string mImageHighlighted; std::string mImageNormal; diff --git a/components/widgets/list.cpp b/components/widgets/list.cpp index 33d2948408..288d246efc 100644 --- a/components/widgets/list.cpp +++ b/components/widgets/list.cpp @@ -109,12 +109,12 @@ namespace Gui mScrollView->setViewOffset(MyGUI::IntPoint(0, -viewPosition)); } - void MWList::setPropertyOverride(std::string_view _key, std::string_view _value) + void MWList::setPropertyOverride(std::string_view key, std::string_view value) { - if (_key == "ListItemSkin") - mListItemSkin = _value; + if (key == "ListItemSkin") + mListItemSkin = value; else - Base::setPropertyOverride(_key, _value); + Base::setPropertyOverride(key, value); } size_t MWList::getItemCount() @@ -147,22 +147,22 @@ namespace Gui mItems.clear(); } - void MWList::onMouseWheelMoved(MyGUI::Widget* _sender, int _rel) + void MWList::onMouseWheelMoved(MyGUI::Widget* /*sender*/, int rel) { // NB view offset is negative - 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(mScrollView->getViewOffset().top + _rel * 0.3))); + MyGUI::IntPoint(0, static_cast(mScrollView->getViewOffset().top + rel * 0.3))); } - void MWList::onItemSelected(MyGUI::Widget* _sender) + void MWList::onItemSelected(MyGUI::Widget* sender) { - std::string name = _sender->castType()->getCaption(); - int id = *_sender->getUserData(); + std::string name = sender->castType()->getCaption(); + int id = *sender->getUserData(); eventItemSelected(name, id); - eventWidgetSelected(_sender); + eventWidgetSelected(sender); } MyGUI::Button* MWList::getItemWidget(std::string_view name) diff --git a/components/widgets/list.hpp b/components/widgets/list.hpp index 94829d93df..4dc9bbade9 100644 --- a/components/widgets/list.hpp +++ b/components/widgets/list.hpp @@ -50,15 +50,15 @@ namespace Gui void scrollToTop(); void setViewOffset(int offset); - void setPropertyOverride(std::string_view _key, std::string_view _value) override; + void setPropertyOverride(std::string_view key, std::string_view value) override; protected: void initialiseOverride() override; void redraw(bool scrollbarShown = false); - void onMouseWheelMoved(MyGUI::Widget* _sender, int _rel); - void onItemSelected(MyGUI::Widget* _sender); + void onMouseWheelMoved(MyGUI::Widget* sender, int rel); + void onItemSelected(MyGUI::Widget* sender); private: MyGUI::ScrollView* mScrollView; diff --git a/components/widgets/numericeditbox.cpp b/components/widgets/numericeditbox.cpp index 6cdc13b1d6..c1020e92ba 100644 --- a/components/widgets/numericeditbox.cpp +++ b/components/widgets/numericeditbox.cpp @@ -74,9 +74,9 @@ namespace Gui mMaxValue = maxValue; } - void NumericEditBox::onKeyLostFocus(MyGUI::Widget* _new) + void NumericEditBox::onKeyLostFocus(MyGUI::Widget* newWidget) { - Base::onKeyLostFocus(_new); + Base::onKeyLostFocus(newWidget); setCaption(MyGUI::utility::toString(mValue)); } diff --git a/components/widgets/numericeditbox.hpp b/components/widgets/numericeditbox.hpp index ee8ef39a59..7e283143bf 100644 --- a/components/widgets/numericeditbox.hpp +++ b/components/widgets/numericeditbox.hpp @@ -38,7 +38,7 @@ namespace Gui private: void onEditTextChange(MyGUI::EditBox* sender); - void onKeyLostFocus(MyGUI::Widget* _new) override; + void onKeyLostFocus(MyGUI::Widget* newWidget) override; void onKeyButtonPressed(MyGUI::KeyCode key, MyGUI::Char character) override; int mValue; diff --git a/components/widgets/sharedstatebutton.cpp b/components/widgets/sharedstatebutton.cpp index 2d8070b0fb..df031f790d 100644 --- a/components/widgets/sharedstatebutton.cpp +++ b/components/widgets/sharedstatebutton.cpp @@ -23,31 +23,31 @@ namespace Gui mSharedWith = shared; } - void SharedStateButton::onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id) + void SharedStateButton::onMouseButtonPressed(int left, int top, MyGUI::MouseButton id) { mIsMousePressed = true; - Base::onMouseButtonPressed(_left, _top, _id); + Base::onMouseButtonPressed(left, top, id); updateButtonState(); } - void SharedStateButton::onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id) + void SharedStateButton::onMouseButtonReleased(int left, int top, MyGUI::MouseButton id) { mIsMousePressed = false; - Base::onMouseButtonReleased(_left, _top, _id); + Base::onMouseButtonReleased(left, top, id); updateButtonState(); } - void SharedStateButton::onMouseSetFocus(MyGUI::Widget* _old) + void SharedStateButton::onMouseSetFocus(MyGUI::Widget* oldWidget) { mIsMouseFocus = true; - Base::onMouseSetFocus(_old); + Base::onMouseSetFocus(oldWidget); updateButtonState(); } - void SharedStateButton::onMouseLostFocus(MyGUI::Widget* _new) + void SharedStateButton::onMouseLostFocus(MyGUI::Widget* newWidget) { mIsMouseFocus = false; - Base::onMouseLostFocus(_new); + Base::onMouseLostFocus(newWidget); updateButtonState(); } @@ -57,9 +57,9 @@ namespace Gui updateButtonState(); } - void SharedStateButton::setStateSelected(bool _value) + void SharedStateButton::setStateSelected(bool value) { - Base::setStateSelected(_value); + Base::setStateSelected(value); updateButtonState(); for (ButtonGroup::iterator it = mSharedWith.begin(); it != mSharedWith.end(); ++it) @@ -68,14 +68,14 @@ namespace Gui } } - bool SharedStateButton::_setState(const std::string& _value) + bool SharedStateButton::_setState(const std::string& value) { - bool ret = _setWidgetState(_value); + bool ret = _setWidgetState(value); if (ret) { for (ButtonGroup::iterator it = mSharedWith.begin(); it != mSharedWith.end(); ++it) { - (*it)->_setWidgetState(_value); + (*it)->_setWidgetState(value); } } return ret; diff --git a/components/widgets/sharedstatebutton.hpp b/components/widgets/sharedstatebutton.hpp index 1cf7364bf0..52b8dc1e25 100644 --- a/components/widgets/sharedstatebutton.hpp +++ b/components/widgets/sharedstatebutton.hpp @@ -21,19 +21,19 @@ namespace Gui public: SharedStateButton(); - void onMouseSetFocus(MyGUI::Widget* _old) override; - void onMouseLostFocus(MyGUI::Widget* _new) override; + void onMouseSetFocus(MyGUI::Widget* oldWidget) override; + void onMouseLostFocus(MyGUI::Widget* newWidget) override; protected: void updateButtonState(); - void onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id) override; - void onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id) override; + void onMouseButtonPressed(int left, int top, MyGUI::MouseButton id) override; + void onMouseButtonReleased(int left, int top, MyGUI::MouseButton id) override; void baseUpdateEnable() override; void shutdownOverride() override; - bool _setState(const std::string& _value); + bool _setState(const std::string& value); public: void shareStateWith(const ButtonGroup& shared); @@ -42,7 +42,7 @@ namespace Gui static void createButtonGroup(ButtonGroup& group); //! Set button selected state - void setStateSelected(bool _value); + void setStateSelected(bool value); private: ButtonGroup mSharedWith; diff --git a/components/widgets/windowcaption.cpp b/components/widgets/windowcaption.cpp index e7f2bb214c..4f891679a4 100644 --- a/components/widgets/windowcaption.cpp +++ b/components/widgets/windowcaption.cpp @@ -24,21 +24,21 @@ namespace Gui throw std::runtime_error("WindowCaption needs an EditBox Client widget in its skin"); } - void WindowCaption::setCaption(const MyGUI::UString& _value) + void WindowCaption::setCaption(const MyGUI::UString& value) { - EditBox::setCaption(_value); + EditBox::setCaption(value); align(); } - void WindowCaption::setSize(const MyGUI::IntSize& _value) + void WindowCaption::setSize(const MyGUI::IntSize& value) { - Base::setSize(_value); + Base::setSize(value); align(); } - void WindowCaption::setCoord(const MyGUI::IntCoord& _value) + void WindowCaption::setCoord(const MyGUI::IntCoord& value) { - Base::setCoord(_value); + Base::setCoord(value); align(); } diff --git a/components/widgets/windowcaption.hpp b/components/widgets/windowcaption.hpp index a86ca0cb87..2133f5c076 100644 --- a/components/widgets/windowcaption.hpp +++ b/components/widgets/windowcaption.hpp @@ -14,11 +14,11 @@ namespace Gui public: WindowCaption(); - void setCaption(const MyGUI::UString& _value) override; + void setCaption(const MyGUI::UString& value) override; void initialiseOverride() override; - void setSize(const MyGUI::IntSize& _value) override; - void setCoord(const MyGUI::IntCoord& _value) override; + void setSize(const MyGUI::IntSize& value) override; + void setCoord(const MyGUI::IntCoord& value) override; private: MyGUI::Widget* mLeft;