summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lat9nq2021-07-30 10:07:32 -0400
committerGravatar Morph2021-10-07 13:50:13 -0400
commit493905665c2e9ea200301b44dcee599933f5b62c (patch)
tree518db9c4a45df4c89d3cc07a341cb52b8aeaee21
parentyuzu qt: Remove global system instances from config, WaitTree, main (diff)
downloadyuzu-493905665c2e9ea200301b44dcee599933f5b62c.tar.gz
yuzu-493905665c2e9ea200301b44dcee599933f5b62c.tar.xz
yuzu-493905665c2e9ea200301b44dcee599933f5b62c.zip
configuration: Add const qualifier where able
-rw-r--r--src/yuzu/configuration/configure_audio.cpp4
-rw-r--r--src/yuzu/configuration/configure_audio.h4
-rw-r--r--src/yuzu/configuration/configure_cpu.cpp2
-rw-r--r--src/yuzu/configuration/configure_cpu.h4
-rw-r--r--src/yuzu/configuration/configure_cpu_debug.cpp2
-rw-r--r--src/yuzu/configuration/configure_cpu_debug.h4
-rw-r--r--src/yuzu/configuration/configure_debug.cpp2
-rw-r--r--src/yuzu/configuration/configure_debug.h4
-rw-r--r--src/yuzu/configuration/configure_debug_tab.cpp5
-rw-r--r--src/yuzu/configuration/configure_debug_tab.h4
-rw-r--r--src/yuzu/configuration/configure_general.cpp2
-rw-r--r--src/yuzu/configuration/configure_general.h4
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp2
-rw-r--r--src/yuzu/configuration/configure_graphics.h4
-rw-r--r--src/yuzu/configuration/configure_graphics_advanced.cpp2
-rw-r--r--src/yuzu/configuration/configure_graphics_advanced.h4
-rw-r--r--src/yuzu/configuration/configure_profile_manager.cpp2
-rw-r--r--src/yuzu/configuration/configure_profile_manager.h4
18 files changed, 28 insertions, 31 deletions
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index 7ddfd822b..c33488718 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -14,7 +14,7 @@
14#include "yuzu/configuration/configuration_shared.h" 14#include "yuzu/configuration/configuration_shared.h"
15#include "yuzu/configuration/configure_audio.h" 15#include "yuzu/configuration/configure_audio.h"
16 16
17ConfigureAudio::ConfigureAudio(Core::System& system_, QWidget* parent) 17ConfigureAudio::ConfigureAudio(const Core::System& system_, QWidget* parent)
18 : QWidget(parent), ui(std::make_unique<Ui::ConfigureAudio>()), system{system_} { 18 : QWidget(parent), ui(std::make_unique<Ui::ConfigureAudio>()), system{system_} {
19 ui->setupUi(this); 19 ui->setupUi(this);
20 20
@@ -32,7 +32,7 @@ ConfigureAudio::ConfigureAudio(Core::System& system_, QWidget* parent)
32 32
33 SetConfiguration(); 33 SetConfiguration();
34 34
35 const bool is_powered_on = system.IsPoweredOn(); 35 const bool is_powered_on = system_.IsPoweredOn();
36 ui->output_sink_combo_box->setEnabled(!is_powered_on); 36 ui->output_sink_combo_box->setEnabled(!is_powered_on);
37 ui->audio_device_combo_box->setEnabled(!is_powered_on); 37 ui->audio_device_combo_box->setEnabled(!is_powered_on);
38} 38}
diff --git a/src/yuzu/configuration/configure_audio.h b/src/yuzu/configuration/configure_audio.h
index 7b503ff48..5d2d05e47 100644
--- a/src/yuzu/configuration/configure_audio.h
+++ b/src/yuzu/configuration/configure_audio.h
@@ -23,7 +23,7 @@ class ConfigureAudio : public QWidget {
23 Q_OBJECT 23 Q_OBJECT
24 24
25public: 25public:
26 explicit ConfigureAudio(Core::System& system_, QWidget* parent = nullptr); 26 explicit ConfigureAudio(const Core::System& system_, QWidget* parent = nullptr);
27 ~ConfigureAudio() override; 27 ~ConfigureAudio() override;
28 28
29 void ApplyConfiguration(); 29 void ApplyConfiguration();
@@ -46,5 +46,5 @@ private:
46 46
47 std::unique_ptr<Ui::ConfigureAudio> ui; 47 std::unique_ptr<Ui::ConfigureAudio> ui;
48 48
49 Core::System& system; 49 const Core::System& system;
50}; 50};
diff --git a/src/yuzu/configuration/configure_cpu.cpp b/src/yuzu/configuration/configure_cpu.cpp
index a232e8970..27fabef38 100644
--- a/src/yuzu/configuration/configure_cpu.cpp
+++ b/src/yuzu/configuration/configure_cpu.cpp
@@ -13,7 +13,7 @@
13#include "yuzu/configuration/configuration_shared.h" 13#include "yuzu/configuration/configuration_shared.h"
14#include "yuzu/configuration/configure_cpu.h" 14#include "yuzu/configuration/configure_cpu.h"
15 15
16ConfigureCpu::ConfigureCpu(Core::System& system_, QWidget* parent) 16ConfigureCpu::ConfigureCpu(const Core::System& system_, QWidget* parent)
17 : QWidget(parent), ui(new Ui::ConfigureCpu), system{system_} { 17 : QWidget(parent), ui(new Ui::ConfigureCpu), system{system_} {
18 ui->setupUi(this); 18 ui->setupUi(this);
19 19
diff --git a/src/yuzu/configuration/configure_cpu.h b/src/yuzu/configuration/configure_cpu.h
index ae4e389f6..ed9af0e9f 100644
--- a/src/yuzu/configuration/configure_cpu.h
+++ b/src/yuzu/configuration/configure_cpu.h
@@ -24,7 +24,7 @@ class ConfigureCpu : public QWidget {
24 Q_OBJECT 24 Q_OBJECT
25 25
26public: 26public:
27 explicit ConfigureCpu(Core::System& system_, QWidget* parent = nullptr); 27 explicit ConfigureCpu(const Core::System& system_, QWidget* parent = nullptr);
28 ~ConfigureCpu() override; 28 ~ConfigureCpu() override;
29 29
30 void ApplyConfiguration(); 30 void ApplyConfiguration();
@@ -46,5 +46,5 @@ private:
46 ConfigurationShared::CheckState cpuopt_unsafe_inaccurate_nan; 46 ConfigurationShared::CheckState cpuopt_unsafe_inaccurate_nan;
47 ConfigurationShared::CheckState cpuopt_unsafe_fastmem_check; 47 ConfigurationShared::CheckState cpuopt_unsafe_fastmem_check;
48 48
49 Core::System& system; 49 const Core::System& system;
50}; 50};
diff --git a/src/yuzu/configuration/configure_cpu_debug.cpp b/src/yuzu/configuration/configure_cpu_debug.cpp
index e22f6166c..6e910e33e 100644
--- a/src/yuzu/configuration/configure_cpu_debug.cpp
+++ b/src/yuzu/configuration/configure_cpu_debug.cpp
@@ -11,7 +11,7 @@
11#include "ui_configure_cpu_debug.h" 11#include "ui_configure_cpu_debug.h"
12#include "yuzu/configuration/configure_cpu_debug.h" 12#include "yuzu/configuration/configure_cpu_debug.h"
13 13
14ConfigureCpuDebug::ConfigureCpuDebug(Core::System& system_, QWidget* parent) 14ConfigureCpuDebug::ConfigureCpuDebug(const Core::System& system_, QWidget* parent)
15 : QWidget(parent), ui(new Ui::ConfigureCpuDebug), system{system_} { 15 : QWidget(parent), ui(new Ui::ConfigureCpuDebug), system{system_} {
16 ui->setupUi(this); 16 ui->setupUi(this);
17 17
diff --git a/src/yuzu/configuration/configure_cpu_debug.h b/src/yuzu/configuration/configure_cpu_debug.h
index 3811fd602..d06c4c63f 100644
--- a/src/yuzu/configuration/configure_cpu_debug.h
+++ b/src/yuzu/configuration/configure_cpu_debug.h
@@ -19,7 +19,7 @@ class ConfigureCpuDebug : public QWidget {
19 Q_OBJECT 19 Q_OBJECT
20 20
21public: 21public:
22 explicit ConfigureCpuDebug(Core::System& system_, QWidget* parent = nullptr); 22 explicit ConfigureCpuDebug(const Core::System& system_, QWidget* parent = nullptr);
23 ~ConfigureCpuDebug() override; 23 ~ConfigureCpuDebug() override;
24 24
25 void ApplyConfiguration(); 25 void ApplyConfiguration();
@@ -32,5 +32,5 @@ private:
32 32
33 std::unique_ptr<Ui::ConfigureCpuDebug> ui; 33 std::unique_ptr<Ui::ConfigureCpuDebug> ui;
34 34
35 Core::System& system; 35 const Core::System& system;
36}; 36};
diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp
index f67a3d723..40447093e 100644
--- a/src/yuzu/configuration/configure_debug.cpp
+++ b/src/yuzu/configuration/configure_debug.cpp
@@ -14,7 +14,7 @@
14#include "yuzu/debugger/console.h" 14#include "yuzu/debugger/console.h"
15#include "yuzu/uisettings.h" 15#include "yuzu/uisettings.h"
16 16
17ConfigureDebug::ConfigureDebug(Core::System& system_, QWidget* parent) 17ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent)
18 : QWidget(parent), ui(new Ui::ConfigureDebug), system{system_} { 18 : QWidget(parent), ui(new Ui::ConfigureDebug), system{system_} {
19 ui->setupUi(this); 19 ui->setupUi(this);
20 SetConfiguration(); 20 SetConfiguration();
diff --git a/src/yuzu/configuration/configure_debug.h b/src/yuzu/configuration/configure_debug.h
index 89eb9d76c..73f71c9e3 100644
--- a/src/yuzu/configuration/configure_debug.h
+++ b/src/yuzu/configuration/configure_debug.h
@@ -19,7 +19,7 @@ class ConfigureDebug : public QWidget {
19 Q_OBJECT 19 Q_OBJECT
20 20
21public: 21public:
22 explicit ConfigureDebug(Core::System& system_, QWidget* parent = nullptr); 22 explicit ConfigureDebug(const Core::System& system_, QWidget* parent = nullptr);
23 ~ConfigureDebug() override; 23 ~ConfigureDebug() override;
24 24
25 void ApplyConfiguration(); 25 void ApplyConfiguration();
@@ -32,5 +32,5 @@ private:
32 32
33 std::unique_ptr<Ui::ConfigureDebug> ui; 33 std::unique_ptr<Ui::ConfigureDebug> ui;
34 34
35 Core::System& system; 35 const Core::System& system;
36}; 36};
diff --git a/src/yuzu/configuration/configure_debug_tab.cpp b/src/yuzu/configuration/configure_debug_tab.cpp
index 03f266adf..e126eeea9 100644
--- a/src/yuzu/configuration/configure_debug_tab.cpp
+++ b/src/yuzu/configuration/configure_debug_tab.cpp
@@ -8,10 +8,9 @@
8#include "yuzu/configuration/configure_debug.h" 8#include "yuzu/configuration/configure_debug.h"
9#include "yuzu/configuration/configure_debug_tab.h" 9#include "yuzu/configuration/configure_debug_tab.h"
10 10
11ConfigureDebugTab::ConfigureDebugTab(Core::System& system_, QWidget* parent) 11ConfigureDebugTab::ConfigureDebugTab(const Core::System& system_, QWidget* parent)
12 : QWidget(parent), 12 : QWidget(parent),
13 ui(new Ui::ConfigureDebugTab), system{system_}, debug_tab{std::make_unique<ConfigureDebug>( 13 ui(new Ui::ConfigureDebugTab), debug_tab{std::make_unique<ConfigureDebug>(system_, this)},
14 system_, this)},
15 cpu_debug_tab{std::make_unique<ConfigureCpuDebug>(system_, this)} { 14 cpu_debug_tab{std::make_unique<ConfigureCpuDebug>(system_, this)} {
16 ui->setupUi(this); 15 ui->setupUi(this);
17 16
diff --git a/src/yuzu/configuration/configure_debug_tab.h b/src/yuzu/configuration/configure_debug_tab.h
index 9cf309a83..4f68260aa 100644
--- a/src/yuzu/configuration/configure_debug_tab.h
+++ b/src/yuzu/configuration/configure_debug_tab.h
@@ -22,7 +22,7 @@ class ConfigureDebugTab : public QWidget {
22 Q_OBJECT 22 Q_OBJECT
23 23
24public: 24public:
25 explicit ConfigureDebugTab(Core::System& system_, QWidget* parent = nullptr); 25 explicit ConfigureDebugTab(const Core::System& system_, QWidget* parent = nullptr);
26 ~ConfigureDebugTab() override; 26 ~ConfigureDebugTab() override;
27 27
28 void ApplyConfiguration(); 28 void ApplyConfiguration();
@@ -37,8 +37,6 @@ private:
37 37
38 std::unique_ptr<Ui::ConfigureDebugTab> ui; 38 std::unique_ptr<Ui::ConfigureDebugTab> ui;
39 39
40 Core::System& system;
41
42 std::unique_ptr<ConfigureDebug> debug_tab; 40 std::unique_ptr<ConfigureDebug> debug_tab;
43 std::unique_ptr<ConfigureCpuDebug> cpu_debug_tab; 41 std::unique_ptr<ConfigureCpuDebug> cpu_debug_tab;
44}; 42};
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 70f067ea7..e562e89e5 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -15,7 +15,7 @@
15#include "yuzu/configuration/configure_general.h" 15#include "yuzu/configuration/configure_general.h"
16#include "yuzu/uisettings.h" 16#include "yuzu/uisettings.h"
17 17
18ConfigureGeneral::ConfigureGeneral(Core::System& system_, QWidget* parent) 18ConfigureGeneral::ConfigureGeneral(const Core::System& system_, QWidget* parent)
19 : QWidget(parent), ui(new Ui::ConfigureGeneral), system{system_} { 19 : QWidget(parent), ui(new Ui::ConfigureGeneral), system{system_} {
20 ui->setupUi(this); 20 ui->setupUi(this);
21 21
diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h
index 6f8957280..85c1dd4a8 100644
--- a/src/yuzu/configuration/configure_general.h
+++ b/src/yuzu/configuration/configure_general.h
@@ -28,7 +28,7 @@ class ConfigureGeneral : public QWidget {
28 Q_OBJECT 28 Q_OBJECT
29 29
30public: 30public:
31 explicit ConfigureGeneral(Core::System& system_, QWidget* parent = nullptr); 31 explicit ConfigureGeneral(const Core::System& system_, QWidget* parent = nullptr);
32 ~ConfigureGeneral() override; 32 ~ConfigureGeneral() override;
33 33
34 void SetResetCallback(std::function<void()> callback); 34 void SetResetCallback(std::function<void()> callback);
@@ -49,5 +49,5 @@ private:
49 ConfigurationShared::CheckState use_speed_limit; 49 ConfigurationShared::CheckState use_speed_limit;
50 ConfigurationShared::CheckState use_multi_core; 50 ConfigurationShared::CheckState use_multi_core;
51 51
52 Core::System& system; 52 const Core::System& system;
53}; 53};
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index cb4df429c..be4e7997b 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -19,7 +19,7 @@
19#include "yuzu/configuration/configuration_shared.h" 19#include "yuzu/configuration/configuration_shared.h"
20#include "yuzu/configuration/configure_graphics.h" 20#include "yuzu/configuration/configure_graphics.h"
21 21
22ConfigureGraphics::ConfigureGraphics(Core::System& system_, QWidget* parent) 22ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* parent)
23 : QWidget(parent), ui(new Ui::ConfigureGraphics), system{system_} { 23 : QWidget(parent), ui(new Ui::ConfigureGraphics), system{system_} {
24 vulkan_device = Settings::values.vulkan_device.GetValue(); 24 vulkan_device = Settings::values.vulkan_device.GetValue();
25 RetrieveVulkanDevices(); 25 RetrieveVulkanDevices();
diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h
index d0dddf864..1b101c940 100644
--- a/src/yuzu/configuration/configure_graphics.h
+++ b/src/yuzu/configuration/configure_graphics.h
@@ -26,7 +26,7 @@ class ConfigureGraphics : public QWidget {
26 Q_OBJECT 26 Q_OBJECT
27 27
28public: 28public:
29 explicit ConfigureGraphics(Core::System& system_, QWidget* parent = nullptr); 29 explicit ConfigureGraphics(const Core::System& system_, QWidget* parent = nullptr);
30 ~ConfigureGraphics() override; 30 ~ConfigureGraphics() override;
31 31
32 void ApplyConfiguration(); 32 void ApplyConfiguration();
@@ -60,5 +60,5 @@ private:
60 u32 vulkan_device{}; 60 u32 vulkan_device{};
61 Settings::ShaderBackend shader_backend{}; 61 Settings::ShaderBackend shader_backend{};
62 62
63 Core::System& system; 63 const Core::System& system;
64}; 64};
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index de2d669b4..4407e65d3 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -8,7 +8,7 @@
8#include "yuzu/configuration/configuration_shared.h" 8#include "yuzu/configuration/configuration_shared.h"
9#include "yuzu/configuration/configure_graphics_advanced.h" 9#include "yuzu/configuration/configure_graphics_advanced.h"
10 10
11ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(Core::System& system_, QWidget* parent) 11ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(const Core::System& system_, QWidget* parent)
12 : QWidget(parent), ui(new Ui::ConfigureGraphicsAdvanced), system{system_} { 12 : QWidget(parent), ui(new Ui::ConfigureGraphicsAdvanced), system{system_} {
13 13
14 ui->setupUi(this); 14 ui->setupUi(this);
diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h
index eee5343fb..0a1724ce4 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.h
+++ b/src/yuzu/configuration/configure_graphics_advanced.h
@@ -23,7 +23,7 @@ class ConfigureGraphicsAdvanced : public QWidget {
23 Q_OBJECT 23 Q_OBJECT
24 24
25public: 25public:
26 explicit ConfigureGraphicsAdvanced(Core::System& system_, QWidget* parent = nullptr); 26 explicit ConfigureGraphicsAdvanced(const Core::System& system_, QWidget* parent = nullptr);
27 ~ConfigureGraphicsAdvanced() override; 27 ~ConfigureGraphicsAdvanced() override;
28 28
29 void ApplyConfiguration(); 29 void ApplyConfiguration();
@@ -41,5 +41,5 @@ private:
41 ConfigurationShared::CheckState use_asynchronous_shaders; 41 ConfigurationShared::CheckState use_asynchronous_shaders;
42 ConfigurationShared::CheckState use_fast_gpu_time; 42 ConfigurationShared::CheckState use_fast_gpu_time;
43 43
44 Core::System& system; 44 const Core::System& system;
45}; 45};
diff --git a/src/yuzu/configuration/configure_profile_manager.cpp b/src/yuzu/configuration/configure_profile_manager.cpp
index 2ba65c638..9feec37ff 100644
--- a/src/yuzu/configuration/configure_profile_manager.cpp
+++ b/src/yuzu/configuration/configure_profile_manager.cpp
@@ -76,7 +76,7 @@ QString GetProfileUsernameFromUser(QWidget* parent, const QString& description_t
76} 76}
77} // Anonymous namespace 77} // Anonymous namespace
78 78
79ConfigureProfileManager::ConfigureProfileManager(Core::System& system_, QWidget* parent) 79ConfigureProfileManager::ConfigureProfileManager(const Core::System& system_, QWidget* parent)
80 : QWidget(parent), ui(new Ui::ConfigureProfileManager), 80 : QWidget(parent), ui(new Ui::ConfigureProfileManager),
81 profile_manager(std::make_unique<Service::Account::ProfileManager>()), system{system_} { 81 profile_manager(std::make_unique<Service::Account::ProfileManager>()), system{system_} {
82 ui->setupUi(this); 82 ui->setupUi(this);
diff --git a/src/yuzu/configuration/configure_profile_manager.h b/src/yuzu/configuration/configure_profile_manager.h
index afd9b3679..575cb89d5 100644
--- a/src/yuzu/configuration/configure_profile_manager.h
+++ b/src/yuzu/configuration/configure_profile_manager.h
@@ -31,7 +31,7 @@ class ConfigureProfileManager : public QWidget {
31 Q_OBJECT 31 Q_OBJECT
32 32
33public: 33public:
34 explicit ConfigureProfileManager(Core::System& system_, QWidget* parent = nullptr); 34 explicit ConfigureProfileManager(const Core::System& system_, QWidget* parent = nullptr);
35 ~ConfigureProfileManager() override; 35 ~ConfigureProfileManager() override;
36 36
37 void ApplyConfiguration(); 37 void ApplyConfiguration();
@@ -63,5 +63,5 @@ private:
63 63
64 std::unique_ptr<Service::Account::ProfileManager> profile_manager; 64 std::unique_ptr<Service::Account::ProfileManager> profile_manager;
65 65
66 Core::System& system; 66 const Core::System& system;
67}; 67};