diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-01-02 09:00:05 -0500 | 
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-01-02 10:23:41 -0500 | 
| commit | a745d87971b2c9795e1b2c587bfe30b849b522fa (patch) | |
| tree | 61fb7dc24ebbf6e679deeba05278c5380cb35025 | |
| parent | 1ff341f3dc66622478d699d4e4ba21b210608783 (diff) | |
general: Fix various spelling errors
| -rw-r--r-- | src/common/page_table.h | 2 | ||||
| -rw-r--r-- | src/common/swap.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/memory/memory_block.h | 14 | ||||
| -rw-r--r-- | src/core/hle/kernel/memory/page_table.cpp | 12 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc_types.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/am/am.h | 2 | ||||
| -rw-r--r-- | src/core/settings.h | 2 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.h | 6 | ||||
| -rw-r--r-- | src/input_common/motion_input.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/mouse/mouse_input.h | 2 | ||||
| -rw-r--r-- | src/input_common/udp/udp.cpp | 8 | ||||
| -rw-r--r-- | src/tests/common/fibers.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/command_classes/vic.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_device.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/applets/error.cpp | 6 | ||||
| -rw-r--r-- | src/yuzu/compatdb.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_tester/yuzu.cpp | 2 | 
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 {      PageTable& operator=(PageTable&&) noexcept = default;      /** -     * Resizes the page table to be able to accomodate enough pages within +     * Resizes the page table to be able to accommodate enough pages within       * a given address space.       *       * @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:      template <typename S, typename T2, typename F2>      friend S operator%(const S& p, const swapped_t v); -    // Arithmetics + assignements +    // Arithmetics + assignments      template <typename S, typename T2, typename F2>      friend S operator+=(const S& p, const swapped_t v); @@ -451,7 +451,7 @@ S operator%(const S& i, const swap_struct_t<T, F> v) {      return i % v.swap();  } -// Arithmetics + assignements +// Arithmetics + assignments  template <typename S, typename T, typename F>  S& operator+=(S& i, const swap_struct_t<T, F> v) {      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 {      ThreadLocal =          static_cast<u32>(Svc::MemoryState::ThreadLocal) | FlagMapped | FlagReferenceCounted, -    Transfered = static_cast<u32>(Svc::MemoryState::Transfered) | FlagsMisc | -                 FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc | -                 FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, +    Transferred = static_cast<u32>(Svc::MemoryState::Transferred) | FlagsMisc | +                  FlagCanAlignedDeviceMap | FlagCanChangeAttribute | FlagCanUseIpc | +                  FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, -    SharedTransfered = static_cast<u32>(Svc::MemoryState::SharedTransfered) | FlagsMisc | -                       FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, +    SharedTransferred = static_cast<u32>(Svc::MemoryState::SharedTransferred) | FlagsMisc | +                        FlagCanAlignedDeviceMap | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc,      SharedCode = static_cast<u32>(Svc::MemoryState::SharedCode) | FlagMapped |                   FlagReferenceCounted | FlagCanUseNonSecureIpc | FlagCanUseNonDeviceIpc, @@ -111,8 +111,8 @@ static_assert(static_cast<u32>(MemoryState::AliasCodeData) == 0x03FFBD09);  static_assert(static_cast<u32>(MemoryState::Ipc) == 0x005C3C0A);  static_assert(static_cast<u32>(MemoryState::Stack) == 0x005C3C0B);  static_assert(static_cast<u32>(MemoryState::ThreadLocal) == 0x0040200C); -static_assert(static_cast<u32>(MemoryState::Transfered) == 0x015C3C0D); -static_assert(static_cast<u32>(MemoryState::SharedTransfered) == 0x005C380E); +static_assert(static_cast<u32>(MemoryState::Transferred) == 0x015C3C0D); +static_assert(static_cast<u32>(MemoryState::SharedTransferred) == 0x005C380E);  static_assert(static_cast<u32>(MemoryState::SharedCode) == 0x0040380F);  static_assert(static_cast<u32>(MemoryState::Inaccessible) == 0x00000010);  static_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 {      case MemoryState::Shared:      case MemoryState::AliasCode:      case MemoryState::AliasCodeData: -    case MemoryState::Transfered: -    case MemoryState::SharedTransfered: +    case MemoryState::Transferred: +    case MemoryState::SharedTransferred:      case MemoryState::SharedCode:      case MemoryState::GeneratedCode:      case MemoryState::CodeOut: @@ -1042,8 +1042,8 @@ constexpr std::size_t PageTable::GetRegionSize(MemoryState state) const {      case MemoryState::Shared:      case MemoryState::AliasCode:      case MemoryState::AliasCodeData: -    case MemoryState::Transfered: -    case MemoryState::SharedTransfered: +    case MemoryState::Transferred: +    case MemoryState::SharedTransferred:      case MemoryState::SharedCode:      case MemoryState::GeneratedCode:      case MemoryState::CodeOut: @@ -1080,8 +1080,8 @@ constexpr bool PageTable::CanContain(VAddr addr, std::size_t size, MemoryState s      case MemoryState::AliasCodeData:      case MemoryState::Stack:      case MemoryState::ThreadLocal: -    case MemoryState::Transfered: -    case MemoryState::SharedTransfered: +    case MemoryState::Transferred: +    case MemoryState::SharedTransferred:      case MemoryState::SharedCode:      case MemoryState::GeneratedCode:      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 {      Ipc = 0x0A,      Stack = 0x0B,      ThreadLocal = 0x0C, -    Transfered = 0x0D, -    SharedTransfered = 0x0E, +    Transferred = 0x0D, +    SharedTransferred = 0x0E,      SharedCode = 0x0F,      Inaccessible = 0x10,      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  AppletMessageQueue::AppletMessageQueue(Kernel::KernelCore& kernel) {      on_new_message = -        Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OnMessageRecieved"); +        Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OnMessageReceived");      on_operation_mode_changed =          Kernel::WritableEvent::CreateEventPair(kernel, "AMMessageQueue:OperationModeChanged");  }  AppletMessageQueue::~AppletMessageQueue() = default; -const std::shared_ptr<Kernel::ReadableEvent>& AppletMessageQueue::GetMesssageRecieveEvent() const { +const std::shared_ptr<Kernel::ReadableEvent>& AppletMessageQueue::GetMessageReceiveEvent() const {      return on_new_message.readable;  } @@ -675,7 +675,7 @@ void ICommonStateGetter::GetEventHandle(Kernel::HLERequestContext& ctx) {      IPC::ResponseBuilder rb{ctx, 2, 1};      rb.Push(RESULT_SUCCESS); -    rb.PushCopyObjects(msg_queue->GetMesssageRecieveEvent()); +    rb.PushCopyObjects(msg_queue->GetMessageReceiveEvent());  }  void 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:      explicit AppletMessageQueue(Kernel::KernelCore& kernel);      ~AppletMessageQueue(); -    const std::shared_ptr<Kernel::ReadableEvent>& GetMesssageRecieveEvent() const; +    const std::shared_ptr<Kernel::ReadableEvent>& GetMessageReceiveEvent() const;      const std::shared_ptr<Kernel::ReadableEvent>& GetOperationModeChangedEvent() const;      void PushMessage(AppletMessage msg);      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 {      bool disable_macro_jit;      bool extended_logging; -    // Misceallaneous +    // Miscellaneous      std::string log_filter;      bool use_dev_keys; 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:      /// For use in initialization, querying devices to find the adapter      void Setup(); -    /// Resets status of all GC controller devices to a disconected state +    /// Resets status of all GC controller devices to a disconnected state      void ResetDevices(); -    /// Resets status of device connected to a disconected state +    /// Resets status of device connected to a disconnected state      void ResetDevice(std::size_t port);      /// Returns true if we successfully gain access to GC Adapter      bool CheckDeviceAccess();      /// Captures GC Adapter endpoint address -    /// Returns true if the endpoind was set correctly +    /// Returns true if the endpoint was set correctly      bool GetGCEndpoint(libusb_device* device);      /// 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) {              rad_gyro += ki * integral_error;              rad_gyro += kd * derivative_error;          } else { -            // Give more weight to acelerometer values to compensate for the lack of gyro +            // Give more weight to accelerometer values to compensate for the lack of gyro              rad_gyro += 35.0f * kp * real_error;              rad_gyro += 10.0f * ki * integral_error;              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 {      Left,      Wheel,      Right, -    Foward, +    Forward,      Backward,      Undefined,  }; 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:      mutable std::mutex mutex;  }; -/// A motion device factory that creates motion devices from JC Adapter +/// A motion device factory that creates motion devices from a UDP client  UDPMotionFactory::UDPMotionFactory(std::shared_ptr<CemuhookUDP::Client> client_)      : client(std::move(client_)) {}  /**   * Creates motion device   * @param params contains parameters for creating the device: - *     - "port": the nth jcpad on the adapter + *     - "port": the UDP port number   */  std::unique_ptr<Input::MotionDevice> UDPMotionFactory::Create(const Common::ParamPackage& params) {      auto ip = params.Get("ip", "127.0.0.1"); @@ -90,14 +90,14 @@ private:      mutable std::mutex mutex;  }; -/// A motion device factory that creates motion devices from JC Adapter +/// A motion device factory that creates motion devices from a UDP client  UDPTouchFactory::UDPTouchFactory(std::shared_ptr<CemuhookUDP::Client> client_)      : client(std::move(client_)) {}  /**   * Creates motion device   * @param params contains parameters for creating the device: - *     - "port": the nth jcpad on the adapter + *     - "port": the UDP port number   */  std::unique_ptr<Input::TouchDevice> UDPTouchFactory::Create(const Common::ParamPackage& params) {      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) {  }  /** This test checks for fiber thread exchange configuration and validates that fibers are - *  that a fiber has been succesfully transfered from one thread to another and that the TLS + *  that a fiber has been successfully transferred from one thread to another and that the TLS   *  region of the thread is kept while changing fibers.   */  TEST_CASE("Fibers::InterExchange", "[common]") { @@ -299,7 +299,7 @@ static void ThreadStart3(u32 id, TestControl3& test_control) {  }  /** This test checks for one two threads racing for starting the same fiber. - *  It checks execution occured in an ordered manner and by no time there were + *  It checks execution occurred in an ordered manner and by no time there were   *  two contexts at the same time.   */  TEST_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) {  void Vic::Execute() {      if (output_surface_luma_address == 0) { -        LOG_ERROR(Service_NVDRV, "VIC Luma address not set. Recieved 0x{:X}", +        LOG_ERROR(Service_NVDRV, "VIC Luma address not set. Received 0x{:X}",                    vic_state.output_surface.luma_offset);          return;      } 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  }  void VKDevice::ReportLoss() const { -    LOG_CRITICAL(Render_Vulkan, "Device loss occured!"); +    LOG_CRITICAL(Render_Vulkan, "Device loss occurred!");      // Wait for the log to flush and for Nsight Aftermath to dump the results      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;  void QtErrorDisplay::ShowError(ResultCode error, std::function<void()> finished) const {      callback = std::move(finished);      emit MainWindowDisplayError( -        tr("An error has occured.\nPlease try again or contact the developer of the " +        tr("An error has occurred.\nPlease try again or contact the developer of the "             "software.\n\nError Code: %1-%2 (0x%3)")              .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))              .arg(error.description, 4, 10, QChar::fromLatin1('0')) @@ -32,7 +32,7 @@ void QtErrorDisplay::ShowErrorWithTimestamp(ResultCode error, std::chrono::secon      const QDateTime date_time = QDateTime::fromSecsSinceEpoch(time.count());      emit MainWindowDisplayError( -        tr("An error occured on %1 at %2.\nPlease try again or contact the " +        tr("An error occurred on %1 at %2.\nPlease try again or contact the "             "developer of the software.\n\nError Code: %3-%4 (0x%5)")              .arg(date_time.toString(QStringLiteral("dddd, MMMM d, yyyy")))              .arg(date_time.toString(QStringLiteral("h:mm:ss A"))) @@ -46,7 +46,7 @@ void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_te                                           std::function<void()> finished) const {      callback = std::move(finished);      emit MainWindowDisplayError( -        tr("An error has occured.\nError Code: %1-%2 (0x%3)\n\n%4\n\n%5") +        tr("An error has occurred.\nError Code: %1-%2 (0x%3)\n\n%4\n\n%5")              .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))              .arg(error.description, 4, 10, QChar::fromLatin1('0'))              .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() {  void CompatDB::OnTestcaseSubmitted() {      if (!testcase_watcher.result()) {          QMessageBox::critical(this, tr("Communication error"), -                              tr("An error occured while sending the Testcase")); +                              tr("An error occurred while sending the Testcase"));          button(NextButton)->setEnabled(true);          button(NextButton)->setText(tr("Next"));          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;  /**   * "Callouts" are one-time instructional messages shown to the user. In the config settings, there   * is a bitfield "callout_flags" options, used to track if a message has already been shown to the - * user. This is 32-bits - if we have more than 32 callouts, we should retire and recyle old ones. + * user. This is 32-bits - if we have more than 32 callouts, we should retire and recycle old ones.   */  enum class CalloutFlag : uint32_t {      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) {              const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);              const u16 error_id = static_cast<u16>(load_result) - loader_id;              LOG_CRITICAL(Frontend, -                         "While attempting to load the ROM requested, an error occured. Please " +                         "While attempting to load the ROM requested, an error occurred. Please "                           "refer to the yuzu wiki for more information or the yuzu discord for "                           "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",                           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) {              const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);              const u16 error_id = static_cast<u16>(load_result) - loader_id;              LOG_CRITICAL(Frontend, -                         "While attempting to load the ROM requested, an error occured. Please " +                         "While attempting to load the ROM requested, an error occurred. Please "                           "refer to the yuzu wiki for more information or the yuzu discord for "                           "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",                           loader_id, error_id, static_cast<Loader::ResultStatus>(error_id)); | 
