summaryrefslogtreecommitdiff
path: root/src/yuzu/configuration/configure_dialog.h
diff options
context:
space:
mode:
authorMai <mathew1800@gmail.com>2022-06-14 21:08:58 -0400
committerGitHub <noreply@github.com>2022-06-14 21:08:58 -0400
commit103997ee56ebec3f417e93ed42e3047d8005125b (patch)
tree18b81c112665f830371408599ae157fc83936a70 /src/yuzu/configuration/configure_dialog.h
parentc9de5474bfb7543a01337b73c33c4bf3b76e276e (diff)
parent7620e1a631781b234b17cbbf7c5f7bd14d3115f9 (diff)
Merge pull request #8383 from Morph1984/shadow-of-the-past
yuzu: Make variable shadowing a compile-time error
Diffstat (limited to 'src/yuzu/configuration/configure_dialog.h')
-rw-r--r--src/yuzu/configuration/configure_dialog.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h
index 32ddfd4e0..12cf25daf 100644
--- a/src/yuzu/configuration/configure_dialog.h
+++ b/src/yuzu/configuration/configure_dialog.h
@@ -40,7 +40,7 @@ class ConfigureDialog : public QDialog {
Q_OBJECT
public:
- explicit ConfigureDialog(QWidget* parent, HotkeyRegistry& registry,
+ explicit ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
InputCommon::InputSubsystem* input_subsystem, Core::System& system_);
~ConfigureDialog() override;