summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/yuzu/configuration/configure_audio.h5
-rw-r--r--src/yuzu/configuration/configure_debug.h3
-rw-r--r--src/yuzu/configuration/configure_dialog.h3
-rw-r--r--src/yuzu/configuration/configure_gamelist.h2
-rw-r--r--src/yuzu/configuration/configure_general.h2
-rw-r--r--src/yuzu/configuration/configure_graphics.h3
-rw-r--r--src/yuzu/configuration/configure_input.cpp2
-rw-r--r--src/yuzu/configuration/configure_input.h1
-rw-r--r--src/yuzu/configuration/configure_web.h5
9 files changed, 12 insertions, 14 deletions
diff --git a/src/yuzu/configuration/configure_audio.h b/src/yuzu/configuration/configure_audio.h
index 207f9dfb3..8771421c0 100644
--- a/src/yuzu/configuration/configure_audio.h
+++ b/src/yuzu/configuration/configure_audio.h
@@ -16,15 +16,14 @@ class ConfigureAudio : public QWidget {
16 16
17public: 17public:
18 explicit ConfigureAudio(QWidget* parent = nullptr); 18 explicit ConfigureAudio(QWidget* parent = nullptr);
19 ~ConfigureAudio(); 19 ~ConfigureAudio() override;
20 20
21 void applyConfiguration(); 21 void applyConfiguration();
22 void retranslateUi(); 22 void retranslateUi();
23 23
24public slots: 24private:
25 void updateAudioDevices(int sink_index); 25 void updateAudioDevices(int sink_index);
26 26
27private:
28 void setConfiguration(); 27 void setConfiguration();
29 void setOutputSinkFromSinkID(); 28 void setOutputSinkFromSinkID();
30 void setAudioDeviceFromDeviceID(); 29 void setAudioDeviceFromDeviceID();
diff --git a/src/yuzu/configuration/configure_debug.h b/src/yuzu/configuration/configure_debug.h
index d167eb996..c6420b18c 100644
--- a/src/yuzu/configuration/configure_debug.h
+++ b/src/yuzu/configuration/configure_debug.h
@@ -16,13 +16,12 @@ class ConfigureDebug : public QWidget {
16 16
17public: 17public:
18 explicit ConfigureDebug(QWidget* parent = nullptr); 18 explicit ConfigureDebug(QWidget* parent = nullptr);
19 ~ConfigureDebug(); 19 ~ConfigureDebug() override;
20 20
21 void applyConfiguration(); 21 void applyConfiguration();
22 22
23private: 23private:
24 void setConfiguration(); 24 void setConfiguration();
25 25
26private:
27 std::unique_ptr<Ui::ConfigureDebug> ui; 26 std::unique_ptr<Ui::ConfigureDebug> ui;
28}; 27};
diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h
index bbbdacc29..f6df7b827 100644
--- a/src/yuzu/configuration/configure_dialog.h
+++ b/src/yuzu/configuration/configure_dialog.h
@@ -18,13 +18,12 @@ class ConfigureDialog : public QDialog {
18 18
19public: 19public:
20 explicit ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry); 20 explicit ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry);
21 ~ConfigureDialog(); 21 ~ConfigureDialog() override;
22 22
23 void applyConfiguration(); 23 void applyConfiguration();
24 24
25private: 25private:
26 void setConfiguration(); 26 void setConfiguration();
27 27
28private:
29 std::unique_ptr<Ui::ConfigureDialog> ui; 28 std::unique_ptr<Ui::ConfigureDialog> ui;
30}; 29};
diff --git a/src/yuzu/configuration/configure_gamelist.h b/src/yuzu/configuration/configure_gamelist.h
index bbf7e25f1..bf3f1cdfa 100644
--- a/src/yuzu/configuration/configure_gamelist.h
+++ b/src/yuzu/configuration/configure_gamelist.h
@@ -16,7 +16,7 @@ class ConfigureGameList : public QWidget {
16 16
17public: 17public:
18 explicit ConfigureGameList(QWidget* parent = nullptr); 18 explicit ConfigureGameList(QWidget* parent = nullptr);
19 ~ConfigureGameList(); 19 ~ConfigureGameList() override;
20 20
21 void applyConfiguration(); 21 void applyConfiguration();
22 22
diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h
index 4770034cc..59738af40 100644
--- a/src/yuzu/configuration/configure_general.h
+++ b/src/yuzu/configuration/configure_general.h
@@ -18,7 +18,7 @@ class ConfigureGeneral : public QWidget {
18 18
19public: 19public:
20 explicit ConfigureGeneral(QWidget* parent = nullptr); 20 explicit ConfigureGeneral(QWidget* parent = nullptr);
21 ~ConfigureGeneral(); 21 ~ConfigureGeneral() override;
22 22
23 void PopulateHotkeyList(const HotkeyRegistry& registry); 23 void PopulateHotkeyList(const HotkeyRegistry& registry);
24 void applyConfiguration(); 24 void applyConfiguration();
diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h
index 9bda26fd6..d6ffc6fde 100644
--- a/src/yuzu/configuration/configure_graphics.h
+++ b/src/yuzu/configuration/configure_graphics.h
@@ -16,14 +16,13 @@ class ConfigureGraphics : public QWidget {
16 16
17public: 17public:
18 explicit ConfigureGraphics(QWidget* parent = nullptr); 18 explicit ConfigureGraphics(QWidget* parent = nullptr);
19 ~ConfigureGraphics(); 19 ~ConfigureGraphics() override;
20 20
21 void applyConfiguration(); 21 void applyConfiguration();
22 22
23private: 23private:
24 void setConfiguration(); 24 void setConfiguration();
25 25
26private:
27 std::unique_ptr<Ui::ConfigureGraphics> ui; 26 std::unique_ptr<Ui::ConfigureGraphics> ui;
28 QColor bg_color; 27 QColor bg_color;
29}; 28};
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index 0527d098c..830d26115 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -88,6 +88,8 @@ ConfigureInput::ConfigureInput(QWidget* parent)
88 [this] { CallConfigureDialog<ConfigureTouchscreenAdvanced>(*this); }); 88 [this] { CallConfigureDialog<ConfigureTouchscreenAdvanced>(*this); });
89} 89}
90 90
91ConfigureInput::~ConfigureInput() = default;
92
91void ConfigureInput::OnDockedModeChanged(bool last_state, bool new_state) { 93void ConfigureInput::OnDockedModeChanged(bool last_state, bool new_state) {
92 if (ui->use_docked_mode->isChecked() && ui->handheld_connected->isChecked()) { 94 if (ui->use_docked_mode->isChecked() && ui->handheld_connected->isChecked()) {
93 ui->handheld_connected->setChecked(false); 95 ui->handheld_connected->setChecked(false);
diff --git a/src/yuzu/configuration/configure_input.h b/src/yuzu/configuration/configure_input.h
index e8723dfcb..1649e4c0b 100644
--- a/src/yuzu/configuration/configure_input.h
+++ b/src/yuzu/configuration/configure_input.h
@@ -25,6 +25,7 @@ class ConfigureInput : public QWidget {
25 25
26public: 26public:
27 explicit ConfigureInput(QWidget* parent = nullptr); 27 explicit ConfigureInput(QWidget* parent = nullptr);
28 ~ConfigureInput() override;
28 29
29 /// Save all button configurations to settings file 30 /// Save all button configurations to settings file
30 void applyConfiguration(); 31 void applyConfiguration();
diff --git a/src/yuzu/configuration/configure_web.h b/src/yuzu/configuration/configure_web.h
index 7741ab95d..7752ae4a1 100644
--- a/src/yuzu/configuration/configure_web.h
+++ b/src/yuzu/configuration/configure_web.h
@@ -17,18 +17,17 @@ class ConfigureWeb : public QWidget {
17 17
18public: 18public:
19 explicit ConfigureWeb(QWidget* parent = nullptr); 19 explicit ConfigureWeb(QWidget* parent = nullptr);
20 ~ConfigureWeb(); 20 ~ConfigureWeb() override;
21 21
22 void applyConfiguration(); 22 void applyConfiguration();
23 void retranslateUi(); 23 void retranslateUi();
24 24
25public slots: 25private:
26 void RefreshTelemetryID(); 26 void RefreshTelemetryID();
27 void OnLoginChanged(); 27 void OnLoginChanged();
28 void VerifyLogin(); 28 void VerifyLogin();
29 void OnLoginVerified(); 29 void OnLoginVerified();
30 30
31private:
32 void setConfiguration(); 31 void setConfiguration();
33 32
34 bool user_verified = true; 33 bool user_verified = true;