summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Morph2021-01-02 09:00:05 -0500
committerGravatar Morph2021-01-02 10:23:41 -0500
commita745d87971b2c9795e1b2c587bfe30b849b522fa (patch)
tree61fb7dc24ebbf6e679deeba05278c5380cb35025 /src
parentMerge pull request #5209 from Morph1984/refactor-controller-connect (diff)
downloadyuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar.gz
yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.tar.xz
yuzu-a745d87971b2c9795e1b2c587bfe30b849b522fa.zip
general: Fix various spelling errors
Diffstat (limited to 'src')
-rw-r--r--src/common/page_table.h2
-rw-r--r--src/common/swap.h4
-rw-r--r--src/core/hle/kernel/memory/memory_block.h14
-rw-r--r--src/core/hle/kernel/memory/page_table.cpp12
-rw-r--r--src/core/hle/kernel/svc_types.h4
-rw-r--r--src/core/hle/service/am/am.cpp6
-rw-r--r--src/core/hle/service/am/am.h2
-rw-r--r--src/core/settings.h2
-rw-r--r--src/input_common/gcadapter/gc_adapter.h6
-rw-r--r--src/input_common/motion_input.cpp2
-rw-r--r--src/input_common/mouse/mouse_input.h2
-rw-r--r--src/input_common/udp/udp.cpp8
-rw-r--r--src/tests/common/fibers.cpp4
-rw-r--r--src/video_core/command_classes/vic.cpp2
-rw-r--r--src/video_core/renderer_vulkan/vk_device.cpp2
-rw-r--r--src/yuzu/applets/error.cpp6
-rw-r--r--src/yuzu/compatdb.cpp2
-rw-r--r--src/yuzu/main.cpp2
-rw-r--r--src/yuzu_cmd/yuzu.cpp2
-rw-r--r--src/yuzu_tester/yuzu.cpp2
20 files changed, 43 insertions, 43 deletions
diff --git a/src/common/page_table.h b/src/common/page_table.h
index 0c14e6433..61c5552e0 100644
--- a/src/common/page_table.h
+++ b/src/common/page_table.h
@@ -90,7 +90,7 @@ struct PageTable {
90 PageTable& operator=(PageTable&&) noexcept = default; 90 PageTable& operator=(PageTable&&) noexcept = default;
91 91
92 /** 92 /**
93 * Resizes the page table to be able to accomodate enough pages within 93 * Resizes the page table to be able to accommodate enough pages within
94 * a given address space. 94 * a given address space.
95 * 95 *
96 * @param address_space_width_in_bits The address size width in bits. 96 * @param address_space_width_in_bits The address size width in bits.
diff --git a/src/common/swap.h b/src/common/swap.h
index 7665942a2..a80e191dc 100644
--- a/src/common/swap.h
+++ b/src/common/swap.h
@@ -394,7 +394,7 @@ public:
394 template <typename S, typename T2, typename F2> 394 template <typename S, typename T2, typename F2>
395 friend S operator%(const S& p, const swapped_t v); 395 friend S operator%(const S& p, const swapped_t v);
396 396
397 // Arithmetics + assignements 397 // Arithmetics + assignments
398 template <typename S, typename T2, typename F2> 398 template <typename S, typename T2, typename F2>
399 friend S operator+=(const S& p, const swapped_t v); 399 friend S operator+=(const S& p, const swapped_t v);
400 400
@@ -451,7 +451,7 @@ S operator%(const S& i, const swap_struct_t<T, F> v) {
451 return i % v.swap(); 451 return i % v.swap();
452} 452}
453 453
454// Arithmetics + assignements 454// Arithmetics + assignments
455template <typename S, typename T, typename F> 455template <typename S, typename T, typename F>
456S& operator+=(S& i, const swap_struct_t<T, F> v) { 456S& operator+=(S& i, const swap_struct_t<T, F> v) {
457 i += v.swap(); 457 i += v.swap();
diff --git a/src/core/hle/kernel/memory/memory_block.h b/src/core/hle/kernel/memory/memory_block.h
index 37fe19916..83acece1e 100644
--- a/src/core/hle/kernel/memory/memory_block.h
+++ b/src/core/hle/kernel/memory/memory_block.h
@@ -73,12 +73,12 @@ enum class MemoryState : u32 {
73 ThreadLocal = 73 ThreadLocal =
74 static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagMapped | FlagReferenceCounted, 74 static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagMapped | FlagReferenceCounted,
75 75
76 Transfered = static_cast<u32>(Svc::MemoryState::Transfered) | FlagsMisc | 76 Transferred = static_cast<u32>(Svc::MemoryState::Transferred) | FlagsMisc |
77 FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc | 77 FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc |
78 FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, 78 FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
79 79
80 SharedTransfered = static_cast<u32>(Svc::MemoryState::SharedTransfered) | FlagsMisc | 80 SharedTransferred = static_cast<u32>(Svc::MemoryState::SharedTransferred) | FlagsMisc |
81 FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, 81 FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
82 82
83 SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped | 83 SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped |
84 FlagReferenceCounted | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, 84 FlagReferenceCounted | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,
@@ -111,8 +111,8 @@ static_assert(static_cast<u32>(MemoryState::AliasCodeData) == 0x03FFBD09);
111static_assert(static_cast<u32>(MemoryState::Ipc) == 0x005C3C0A); 111static_assert(static_cast<u32>(MemoryState::Ipc) == 0x005C3C0A);
112static_assert(static_cast<u32>(MemoryState::Stack) == 0x005C3C0B); 112static_assert(static_cast<u32>(MemoryState::Stack) == 0x005C3C0B);
113static_assert(static_cast<u32>(MemoryState::ThreadLocal) == 0x0040200C); 113static_assert(static_cast<u32>(MemoryState::ThreadLocal) == 0x0040200C);
114static_assert(static_cast<u32>(MemoryState::Transfered) == 0x015C3C0D); 114static_assert(static_cast<u32>(MemoryState::Transferred) == 0x015C3C0D);
115static_assert(static_cast<u32>(MemoryState::SharedTransfered) == 0x005C380E); 115static_assert(static_cast<u32>(MemoryState::SharedTransferred) == 0x005C380E);
116static_assert(static_cast<u32>(MemoryState::SharedCode) == 0x0040380F); 116static_assert(static_cast<u32>(MemoryState::SharedCode) == 0x0040380F);
117static_assert(static_cast<u32>(MemoryState::Inaccessible) == 0x00000010); 117static_assert(static_cast<u32>(MemoryState::Inaccessible) == 0x00000010);
118static_assert(static_cast<u32>(MemoryState::NonSecureIpc) == 0x005C3811); 118static_assert(static_cast<u32>(MemoryState::NonSecureIpc) == 0x005C3811);
diff --git a/src/core/hle/kernel/memory/page_table.cpp b/src/core/hle/kernel/memory/page_table.cpp
index f3e8bc333..080886554 100644
--- a/src/core/hle/kernel/memory/page_table.cpp
+++ b/src/core/hle/kernel/memory/page_table.cpp
@@ -1007,8 +1007,8 @@ constexpr VAddr PageTable::GetRegionAddress(MemoryState state) const {
1007 case MemoryState::Shared: 1007 case MemoryState::Shared:
1008 case MemoryState::AliasCode: 1008 case MemoryState::AliasCode:
1009 case MemoryState::AliasCodeData: 1009 case MemoryState::AliasCodeData:
1010 case MemoryState::Transfered: 1010 case MemoryState::Transferred:
1011 case MemoryState::SharedTransfered: 1011 case MemoryState::SharedTransferred:
1012 case MemoryState::SharedCode: 1012 case MemoryState::SharedCode:
1013 case MemoryState::GeneratedCode: 1013 case MemoryState::GeneratedCode:
1014 case MemoryState::CodeOut: 1014 case MemoryState::CodeOut:
@@ -1042,8 +1042,8 @@ constexpr std::size_t PageTable::GetRegionSize(MemoryState state) const {
1042 case MemoryState::Shared: 1042 case MemoryState::Shared:
1043 case MemoryState::AliasCode: 1043 case MemoryState::AliasCode:
1044 case MemoryState::AliasCodeData: 1044 case MemoryState::AliasCodeData:
1045 case MemoryState::Transfered: 1045 case MemoryState::Transferred:
1046 case MemoryState::SharedTransfered: 1046 case MemoryState::SharedTransferred:
1047 case MemoryState::SharedCode: 1047 case MemoryState::SharedCode:
1048 case MemoryState::GeneratedCode: 1048 case MemoryState::GeneratedCode:
1049 case MemoryState::CodeOut: 1049 case MemoryState::CodeOut:
@@ -1080,8 +1080,8 @@ constexpr bool PageTable::CanContain(VAddr addr, std::size_t size, MemoryState s
1080 case MemoryState::AliasCodeData: 1080 case MemoryState::AliasCodeData:
1081 case MemoryState::Stack: 1081 case MemoryState::Stack:
1082 case MemoryState::ThreadLocal: 1082 case MemoryState::ThreadLocal:
1083 case MemoryState::Transfered: 1083 case MemoryState::Transferred:
1084 case MemoryState::SharedTransfered: 1084 case MemoryState::SharedTransferred:
1085 case MemoryState::SharedCode: 1085 case MemoryState::SharedCode:
1086 case MemoryState::GeneratedCode: 1086 case MemoryState::GeneratedCode:
1087 case MemoryState::CodeOut: 1087 case MemoryState::CodeOut:
diff --git a/src/core/hle/kernel/svc_types.h b/src/core/hle/kernel/svc_types.h
index 986724beb..11e1d8e2d 100644
--- a/src/core/hle/kernel/svc_types.h
+++ b/src/core/hle/kernel/svc_types.h
@@ -23,8 +23,8 @@ enum class MemoryState : u32 {
23 Ipc = 0x0A, 23 Ipc = 0x0A,
24 Stack = 0x0B, 24 Stack = 0x0B,
25 ThreadLocal = 0x0C, 25 ThreadLocal = 0x0C,
26 Transfered = 0x0D, 26 Transferred = 0x0D,
27 SharedTransfered = 0x0E, 27 SharedTransferred = 0x0E,
28 SharedCode = 0x0F, 28 SharedCode = 0x0F,
29 Inaccessible = 0x10, 29 Inaccessible = 0x10,
30 NonSecureIpc = 0x11, 30 NonSecureIpc = 0x11,
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index cb13210e5..c9808060a 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -560,14 +560,14 @@ void ISelfController::GetAccumulatedSuspendedTickChangedEvent(Kernel::HLERequest
560 560
561AppletMessageQueue::AppletMessageQueue(Kernel::KernelCore& kernel) { 561AppletMessageQueue::AppletMessageQueue(Kernel::KernelCore& kernel) {
562 on_new_message = 562 on_new_message =
563 Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OnMessageRecieved"); 563 Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OnMessageReceived");
564 on_operation_mode_changed = 564 on_operation_mode_changed =
565 Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OperationModeChanged"); 565 Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OperationModeChanged");
566} 566}
567 567
568AppletMessageQueue::~AppletMessageQueue() = default; 568AppletMessageQueue::~AppletMessageQueue() = default;
569 569
570const std::shared_ptr<Kernel::ReadableEvent>& AppletMessageQueue::GetMesssageRecieveEvent() const { 570const std::shared_ptr<Kernel::ReadableEvent>& AppletMessageQueue::GetMessageReceiveEvent() const {
571 return on_new_message.readable; 571 return on_new_message.readable;
572} 572}
573 573
@@ -675,7 +675,7 @@ void ICommonStateGetter::GetEventHandle(Kernel::HLERequestContext& ctx) {
675 675
676 IPC::ResponseBuilder rb{ctx, 2, 1}; 676 IPC::ResponseBuilder rb{ctx, 2, 1};
677 rb.Push(RESULT_SUCCESS); 677 rb.Push(RESULT_SUCCESS);
678 rb.PushCopyObjects(msg_queue->GetMesssageRecieveEvent()); 678 rb.PushCopyObjects(msg_queue->GetMessageReceiveEvent());
679} 679}
680 680
681void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) { 681void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
index b1da0d081..f51aca1af 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -55,7 +55,7 @@ public:
55 explicit AppletMessageQueue(Kernel::KernelCore& kernel); 55 explicit AppletMessageQueue(Kernel::KernelCore& kernel);
56 ~AppletMessageQueue(); 56 ~AppletMessageQueue();
57 57
58 const std::shared_ptr<Kernel::ReadableEvent>& GetMesssageRecieveEvent() const; 58 const std::shared_ptr<Kernel::ReadableEvent>& GetMessageReceiveEvent() const;
59 const std::shared_ptr<Kernel::ReadableEvent>& GetOperationModeChangedEvent() const; 59 const std::shared_ptr<Kernel::ReadableEvent>& GetOperationModeChangedEvent() const;
60 void PushMessage(AppletMessage msg); 60 void PushMessage(AppletMessage msg);
61 AppletMessage PopMessage(); 61 AppletMessage PopMessage();
diff --git a/src/core/settings.h b/src/core/settings.h
index 0cd3c0c84..1cb7ff7f5 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -221,7 +221,7 @@ struct Values {
221 bool disable_macro_jit; 221 bool disable_macro_jit;
222 bool extended_logging; 222 bool extended_logging;
223 223
224 // Misceallaneous 224 // Miscellaneous
225 std::string log_filter; 225 std::string log_filter;
226 bool use_dev_keys; 226 bool use_dev_keys;
227 227
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h
index f1256c9da..7a6c545bd 100644
--- a/src/input_common/gcadapter/gc_adapter.h
+++ b/src/input_common/gcadapter/gc_adapter.h
@@ -120,17 +120,17 @@ private:
120 /// For use in initialization, querying devices to find the adapter 120 /// For use in initialization, querying devices to find the adapter
121 void Setup(); 121 void Setup();
122 122
123 /// Resets status of all GC controller devices to a disconected state 123 /// Resets status of all GC controller devices to a disconnected state
124 void ResetDevices(); 124 void ResetDevices();
125 125
126 /// Resets status of device connected to a disconected state 126 /// Resets status of device connected to a disconnected state
127 void ResetDevice(std::size_t port); 127 void ResetDevice(std::size_t port);
128 128
129 /// Returns true if we successfully gain access to GC Adapter 129 /// Returns true if we successfully gain access to GC Adapter
130 bool CheckDeviceAccess(); 130 bool CheckDeviceAccess();
131 131
132 /// Captures GC Adapter endpoint address 132 /// Captures GC Adapter endpoint address
133 /// Returns true if the endpoind was set correctly 133 /// Returns true if the endpoint was set correctly
134 bool GetGCEndpoint(libusb_device* device); 134 bool GetGCEndpoint(libusb_device* device);
135 135
136 /// For shutting down, clear all data, join all threads, release usb 136 /// For shutting down, clear all data, join all threads, release usb
diff --git a/src/input_common/motion_input.cpp b/src/input_common/motion_input.cpp
index f77ba535d..6a65f175e 100644
--- a/src/input_common/motion_input.cpp
+++ b/src/input_common/motion_input.cpp
@@ -129,7 +129,7 @@ void MotionInput::UpdateOrientation(u64 elapsed_time) {
129 rad_gyro += ki * integral_error; 129 rad_gyro += ki * integral_error;
130 rad_gyro += kd * derivative_error; 130 rad_gyro += kd * derivative_error;
131 } else { 131 } else {
132 // Give more weight to acelerometer values to compensate for the lack of gyro 132 // Give more weight to accelerometer values to compensate for the lack of gyro
133 rad_gyro += 35.0f * kp * real_error; 133 rad_gyro += 35.0f * kp * real_error;
134 rad_gyro += 10.0f * ki * integral_error; 134 rad_gyro += 10.0f * ki * integral_error;
135 rad_gyro += 10.0f * kd * derivative_error; 135 rad_gyro += 10.0f * kd * derivative_error;
diff --git a/src/input_common/mouse/mouse_input.h b/src/input_common/mouse/mouse_input.h
index 65e64bee7..58803c1bf 100644
--- a/src/input_common/mouse/mouse_input.h
+++ b/src/input_common/mouse/mouse_input.h
@@ -20,7 +20,7 @@ enum class MouseButton {
20 Left, 20 Left,
21 Wheel, 21 Wheel,
22 Right, 22 Right,
23 Foward, 23 Forward,
24 Backward, 24 Backward,
25 Undefined, 25 Undefined,
26}; 26};
diff --git a/src/input_common/udp/udp.cpp b/src/input_common/udp/udp.cpp
index 8686a059c..c5da27a38 100644
--- a/src/input_common/udp/udp.cpp
+++ b/src/input_common/udp/udp.cpp
@@ -28,14 +28,14 @@ private:
28 mutable std::mutex mutex; 28 mutable std::mutex mutex;
29}; 29};
30 30
31/// A motion device factory that creates motion devices from JC Adapter 31/// A motion device factory that creates motion devices from a UDP client
32UDPMotionFactory::UDPMotionFactory(std::shared_ptr<CemuhookUDP::Client> client_) 32UDPMotionFactory::UDPMotionFactory(std::shared_ptr<CemuhookUDP::Client> client_)
33 : client(std::move(client_)) {} 33 : client(std::move(client_)) {}
34 34
35/** 35/**
36 * Creates motion device 36 * Creates motion device
37 * @param params contains parameters for creating the device: 37 * @param params contains parameters for creating the device:
38 * - "port": the nth jcpad on the adapter 38 * - "port": the UDP port number
39 */ 39 */
40std::unique_ptr<Input::MotionDevice> UDPMotionFactory::Create(const Common::ParamPackage& params) { 40std::unique_ptr<Input::MotionDevice> UDPMotionFactory::Create(const Common::ParamPackage& params) {
41 auto ip = params.Get("ip", "127.0.0.1"); 41 auto ip = params.Get("ip", "127.0.0.1");
@@ -90,14 +90,14 @@ private:
90 mutable std::mutex mutex; 90 mutable std::mutex mutex;
91}; 91};
92 92
93/// A motion device factory that creates motion devices from JC Adapter 93/// A motion device factory that creates motion devices from a UDP client
94UDPTouchFactory::UDPTouchFactory(std::shared_ptr<CemuhookUDP::Client> client_) 94UDPTouchFactory::UDPTouchFactory(std::shared_ptr<CemuhookUDP::Client> client_)
95 : client(std::move(client_)) {} 95 : client(std::move(client_)) {}
96 96
97/** 97/**
98 * Creates motion device 98 * Creates motion device
99 * @param params contains parameters for creating the device: 99 * @param params contains parameters for creating the device:
100 * - "port": the nth jcpad on the adapter 100 * - "port": the UDP port number
101 */ 101 */
102std::unique_ptr<Input::TouchDevice> UDPTouchFactory::Create(const Common::ParamPackage& params) { 102std::unique_ptr<Input::TouchDevice> UDPTouchFactory::Create(const Common::ParamPackage& params) {
103 auto ip = params.Get("ip", "127.0.0.1"); 103 auto ip = params.Get("ip", "127.0.0.1");
diff --git a/src/tests/common/fibers.cpp b/src/tests/common/fibers.cpp
index 4757dd2b4..d94492fc6 100644
--- a/src/tests/common/fibers.cpp
+++ b/src/tests/common/fibers.cpp
@@ -207,7 +207,7 @@ static void ThreadStart2_2(u32 id, TestControl2& test_control) {
207} 207}
208 208
209/** This test checks for fiber thread exchange configuration and validates that fibers are 209/** This test checks for fiber thread exchange configuration and validates that fibers are
210 * that a fiber has been succesfully transfered from one thread to another and that the TLS 210 * that a fiber has been successfully transferred from one thread to another and that the TLS
211 * region of the thread is kept while changing fibers. 211 * region of the thread is kept while changing fibers.
212 */ 212 */
213TEST_CASE("Fibers::InterExchange", "[common]") { 213TEST_CASE("Fibers::InterExchange", "[common]") {
@@ -299,7 +299,7 @@ static void ThreadStart3(u32 id, TestControl3& test_control) {
299} 299}
300 300
301/** This test checks for one two threads racing for starting the same fiber. 301/** This test checks for one two threads racing for starting the same fiber.
302 * It checks execution occured in an ordered manner and by no time there were 302 * It checks execution occurred in an ordered manner and by no time there were
303 * two contexts at the same time. 303 * two contexts at the same time.
304 */ 304 */
305TEST_CASE("Fibers::StartRace", "[common]") { 305TEST_CASE("Fibers::StartRace", "[common]") {
diff --git a/src/video_core/command_classes/vic.cpp b/src/video_core/command_classes/vic.cpp
index aa8c9f9de..55e632346 100644
--- a/src/video_core/command_classes/vic.cpp
+++ b/src/video_core/command_classes/vic.cpp
@@ -53,7 +53,7 @@ void Vic::ProcessMethod(Method method, const std::vector<u32>& arguments) {
53 53
54void Vic::Execute() { 54void Vic::Execute() {
55 if (output_surface_luma_address == 0) { 55 if (output_surface_luma_address == 0) {
56 LOG_ERROR(Service_NVDRV, "VIC Luma address not set. Recieved 0x{:X}", 56 LOG_ERROR(Service_NVDRV, "VIC Luma address not set. Received 0x{:X}",
57 vic_state.output_surface.luma_offset); 57 vic_state.output_surface.luma_offset);
58 return; 58 return;
59 } 59 }
diff --git a/src/video_core/renderer_vulkan/vk_device.cpp b/src/video_core/renderer_vulkan/vk_device.cpp
index 370a63f74..85b4f0dff 100644
--- a/src/video_core/renderer_vulkan/vk_device.cpp
+++ b/src/video_core/renderer_vulkan/vk_device.cpp
@@ -491,7 +491,7 @@ VkFormat VKDevice::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFla
491} 491}
492 492
493void VKDevice::ReportLoss() const { 493void VKDevice::ReportLoss() const {
494 LOG_CRITICAL(Render_Vulkan, "Device loss occured!"); 494 LOG_CRITICAL(Render_Vulkan, "Device loss occurred!");
495 495
496 // Wait for the log to flush and for Nsight Aftermath to dump the results 496 // Wait for the log to flush and for Nsight Aftermath to dump the results
497 std::this_thread::sleep_for(std::chrono::seconds{15}); 497 std::this_thread::sleep_for(std::chrono::seconds{15});
diff --git a/src/yuzu/applets/error.cpp b/src/yuzu/applets/error.cpp
index 53a993cf6..8ee03ddb3 100644
--- a/src/yuzu/applets/error.cpp
+++ b/src/yuzu/applets/error.cpp
@@ -19,7 +19,7 @@ QtErrorDisplay::~QtErrorDisplay() = default;
19void QtErrorDisplay::ShowError(ResultCode error, std::function<void()> finished) const { 19void QtErrorDisplay::ShowError(ResultCode error, std::function<void()> finished) const {
20 callback = std::move(finished); 20 callback = std::move(finished);
21 emit MainWindowDisplayError( 21 emit MainWindowDisplayError(
22 tr("An error has occured.\nPlease try again or contact the developer of the " 22 tr("An error has occurred.\nPlease try again or contact the developer of the "
23 "software.\n\nError Code: %1-%2 (0x%3)") 23 "software.\n\nError Code: %1-%2 (0x%3)")
24 .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0')) 24 .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
25 .arg(error.description, 4, 10, QChar::fromLatin1('0')) 25 .arg(error.description, 4, 10, QChar::fromLatin1('0'))
@@ -32,7 +32,7 @@ void QtErrorDisplay::ShowErrorWithTimestamp(ResultCode error, std::chrono::secon
32 32
33 const QDateTime date_time = QDateTime::fromSecsSinceEpoch(time.count()); 33 const QDateTime date_time = QDateTime::fromSecsSinceEpoch(time.count());
34 emit MainWindowDisplayError( 34 emit MainWindowDisplayError(
35 tr("An error occured on %1 at %2.\nPlease try again or contact the " 35 tr("An error occurred on %1 at %2.\nPlease try again or contact the "
36 "developer of the software.\n\nError Code: %3-%4 (0x%5)") 36 "developer of the software.\n\nError Code: %3-%4 (0x%5)")
37 .arg(date_time.toString(QStringLiteral("dddd, MMMM d, yyyy"))) 37 .arg(date_time.toString(QStringLiteral("dddd, MMMM d, yyyy")))
38 .arg(date_time.toString(QStringLiteral("h:mm:ss A"))) 38 .arg(date_time.toString(QStringLiteral("h:mm:ss A")))
@@ -46,7 +46,7 @@ void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_te
46 std::function<void()> finished) const { 46 std::function<void()> finished) const {
47 callback = std::move(finished); 47 callback = std::move(finished);
48 emit MainWindowDisplayError( 48 emit MainWindowDisplayError(
49 tr("An error has occured.\nError Code: %1-%2 (0x%3)\n\n%4\n\n%5") 49 tr("An error has occurred.\nError Code: %1-%2 (0x%3)\n\n%4\n\n%5")
50 .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0')) 50 .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
51 .arg(error.description, 4, 10, QChar::fromLatin1('0')) 51 .arg(error.description, 4, 10, QChar::fromLatin1('0'))
52 .arg(error.raw, 8, 16, QChar::fromLatin1('0')) 52 .arg(error.raw, 8, 16, QChar::fromLatin1('0'))
diff --git a/src/yuzu/compatdb.cpp b/src/yuzu/compatdb.cpp
index 649912557..a470056ef 100644
--- a/src/yuzu/compatdb.cpp
+++ b/src/yuzu/compatdb.cpp
@@ -72,7 +72,7 @@ void CompatDB::Submit() {
72void CompatDB::OnTestcaseSubmitted() { 72void CompatDB::OnTestcaseSubmitted() {
73 if (!testcase_watcher.result()) { 73 if (!testcase_watcher.result()) {
74 QMessageBox::critical(this, tr("Communication error"), 74 QMessageBox::critical(this, tr("Communication error"),
75 tr("An error occured while sending the Testcase")); 75 tr("An error occurred while sending the Testcase"));
76 button(NextButton)->setEnabled(true); 76 button(NextButton)->setEnabled(true);
77 button(NextButton)->setText(tr("Next")); 77 button(NextButton)->setText(tr("Next"));
78 button(CancelButton)->setVisible(true); 78 button(CancelButton)->setVisible(true);
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index ab66d7f93..f39da90ba 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -142,7 +142,7 @@ constexpr int default_mouse_timeout = 2500;
142/** 142/**
143 * "Callouts" are one-time instructional messages shown to the user. In the config settings, there 143 * "Callouts" are one-time instructional messages shown to the user. In the config settings, there
144 * is a bitfield "callout_flags" options, used to track if a message has already been shown to the 144 * is a bitfield "callout_flags" options, used to track if a message has already been shown to the
145 * user. This is 32-bits - if we have more than 32 callouts, we should retire and recyle old ones. 145 * user. This is 32-bits - if we have more than 32 callouts, we should retire and recycle old ones.
146 */ 146 */
147enum class CalloutFlag : uint32_t { 147enum class CalloutFlag : uint32_t {
148 Telemetry = 0x1, 148 Telemetry = 0x1,
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index 2497c71ae..39e0d35aa 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -202,7 +202,7 @@ int main(int argc, char** argv) {
202 const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader); 202 const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);
203 const u16 error_id = static_cast<u16>(load_result) - loader_id; 203 const u16 error_id = static_cast<u16>(load_result) - loader_id;
204 LOG_CRITICAL(Frontend, 204 LOG_CRITICAL(Frontend,
205 "While attempting to load the ROM requested, an error occured. Please " 205 "While attempting to load the ROM requested, an error occurred. Please "
206 "refer to the yuzu wiki for more information or the yuzu discord for " 206 "refer to the yuzu wiki for more information or the yuzu discord for "
207 "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}", 207 "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
208 loader_id, error_id, static_cast<Loader::ResultStatus>(error_id)); 208 loader_id, error_id, static_cast<Loader::ResultStatus>(error_id));
diff --git a/src/yuzu_tester/yuzu.cpp b/src/yuzu_tester/yuzu.cpp
index 6435ffabb..09cf2ad77 100644
--- a/src/yuzu_tester/yuzu.cpp
+++ b/src/yuzu_tester/yuzu.cpp
@@ -242,7 +242,7 @@ int main(int argc, char** argv) {
242 const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader); 242 const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);
243 const u16 error_id = static_cast<u16>(load_result) - loader_id; 243 const u16 error_id = static_cast<u16>(load_result) - loader_id;
244 LOG_CRITICAL(Frontend, 244 LOG_CRITICAL(Frontend,
245 "While attempting to load the ROM requested, an error occured. Please " 245 "While attempting to load the ROM requested, an error occurred. Please "
246 "refer to the yuzu wiki for more information or the yuzu discord for " 246 "refer to the yuzu wiki for more information or the yuzu discord for "
247 "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}", 247 "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
248 loader_id, error_id, static_cast<Loader::ResultStatus>(error_id)); 248 loader_id, error_id, static_cast<Loader::ResultStatus>(error_id));