VERY experimental Nintendo Switch 2 emulator
C++
wait_tree: Eliminate variable shadowing
Morph69cd83d3ac8c
diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cppindex 8f486a131c..0ea31cd335 100644--- a/src/yuzu/debugger/wait_tree.cpp+++ b/src/yuzu/debugger/wait_tree.cpp@@ -113,9 +113,9 @@ QString WaitTreeText::GetText() const {return text;}-WaitTreeMutexInfo::WaitTreeMutexInfo(VAddr mutex_address, const Kernel::KHandleTable& handle_table,+WaitTreeMutexInfo::WaitTreeMutexInfo(VAddr mutex_address_, const Kernel::KHandleTable& handle_table,Core::System& system_)- : mutex_address(mutex_address), system{system_} {+ : mutex_address{mutex_address_}, system{system_} {mutex_value = system.Memory().Read32(mutex_address);owner_handle = static_cast<Kernel::Handle>(mutex_value & Kernel::Svc::HandleWaitMask);owner = handle_table.GetObject<Kernel::KThread>(owner_handle).GetPointerUnsafe();@@ -140,8 +140,8 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeMutexInfo::GetChildren() consreturn list;}-WaitTreeCallstack::WaitTreeCallstack(const Kernel::KThread& thread, Core::System& system_)- : thread(thread), system{system_} {}+WaitTreeCallstack::WaitTreeCallstack(const Kernel::KThread& thread_, Core::System& system_)+ : thread{thread_}, system{system_} {}WaitTreeCallstack::~WaitTreeCallstack() = default;QString WaitTreeCallstack::GetText() const {@@ -171,8 +171,8 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeCallstack::GetChildren() cons}WaitTreeSynchronizationObject::WaitTreeSynchronizationObject(- const Kernel::KSynchronizationObject& o, Core::System& system_)- : object(o), system{system_} {}+ const Kernel::KSynchronizationObject& object_, Core::System& system_)+ : object{object_}, system{system_} {}WaitTreeSynchronizationObject::~WaitTreeSynchronizationObject() = default;WaitTreeExpandableItem::WaitTreeExpandableItem() = default;@@ -380,8 +380,8 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const {return list;}-WaitTreeEvent::WaitTreeEvent(const Kernel::KReadableEvent& object, Core::System& system_)- : WaitTreeSynchronizationObject(object, system_) {}+WaitTreeEvent::WaitTreeEvent(const Kernel::KReadableEvent& object_, Core::System& system_)+ : WaitTreeSynchronizationObject(object_, system_) {}WaitTreeEvent::~WaitTreeEvent() = default;WaitTreeThreadList::WaitTreeThreadList(std::vector<Kernel::KThread*>&& list, Core::System& system_)diff --git a/src/yuzu/debugger/wait_tree.h b/src/yuzu/debugger/wait_tree.hindex 4a36dfc486..f21b9f4679 100644--- a/src/yuzu/debugger/wait_tree.h+++ b/src/yuzu/debugger/wait_tree.h@@ -78,7 +78,7 @@ public:class WaitTreeMutexInfo : public WaitTreeExpandableItem {Q_OBJECTpublic:- explicit WaitTreeMutexInfo(VAddr mutex_address, const Kernel::KHandleTable& handle_table,+ explicit WaitTreeMutexInfo(VAddr mutex_address_, const Kernel::KHandleTable& handle_table,Core::System& system_);~WaitTreeMutexInfo() override;@@ -97,7 +97,7 @@ private:class WaitTreeCallstack : public WaitTreeExpandableItem {Q_OBJECTpublic:- explicit WaitTreeCallstack(const Kernel::KThread& thread, Core::System& system_);+ explicit WaitTreeCallstack(const Kernel::KThread& thread_, Core::System& system_);~WaitTreeCallstack() override;QString GetText() const override;@@ -112,7 +112,7 @@ private:class WaitTreeSynchronizationObject : public WaitTreeExpandableItem {Q_OBJECTpublic:- explicit WaitTreeSynchronizationObject(const Kernel::KSynchronizationObject& object,+ explicit WaitTreeSynchronizationObject(const Kernel::KSynchronizationObject& object_,Core::System& system_);~WaitTreeSynchronizationObject() override;@@ -162,7 +162,7 @@ private:class WaitTreeEvent : public WaitTreeSynchronizationObject {Q_OBJECTpublic:- explicit WaitTreeEvent(const Kernel::KReadableEvent& object, Core::System& system_);+ explicit WaitTreeEvent(const Kernel::KReadableEvent& object_, Core::System& system_);~WaitTreeEvent() override;};