From cf8b1726df9685b66ee8912ca2156c8a792a726c Mon Sep 17 00:00:00 2001 From: fearlessTobi Date: Wed, 29 Aug 2018 16:30:33 +0200 Subject: [PATCH] Address review comments --- src/citra/emu_window/emu_window_sdl2.cpp | 1 - src/citra_qt/bootmanager.cpp | 2 -- src/citra_qt/game_list.cpp | 1 - src/citra_qt/main.cpp | 1 - src/common/timer.cpp | 3 --- src/core/file_sys/archive_extsavedata.cpp | 1 - src/core/file_sys/archive_source_sd_savedata.cpp | 1 - src/core/file_sys/archive_systemsavedata.cpp | 1 - src/core/gdbstub/gdbstub.cpp | 1 - src/core/hle/kernel/svc.cpp | 9 ++++----- src/core/hle/service/service.cpp | 1 - 11 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 247554c98..75140f11f 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -12,7 +12,6 @@ #include "citra/emu_window/emu_window_sdl2.h" #include "common/logging/log.h" #include "common/scm_rev.h" -#include "common/string_util.h" #include "core/3ds.h" #include "core/settings.h" #include "input_common/keyboard.h" diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index fa04f535e..17868da69 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -3,13 +3,11 @@ #include #include #include - #include #include "citra_qt/bootmanager.h" #include "common/microprofile.h" #include "common/scm_rev.h" -#include "common/string_util.h" #include "core/3ds.h" #include "core/core.h" #include "core/settings.h" diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index 1aecb4fc4..390d0c7e5 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -27,7 +27,6 @@ #include "citra_qt/ui_settings.h" #include "common/common_paths.h" #include "common/logging/log.h" -#include "common/string_util.h" #include "core/hle/service/fs/archive.h" #include "core/loader/loader.h" diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 4cb59c915..ac4daa09a 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -50,7 +50,6 @@ #include "common/microprofile.h" #include "common/scm_rev.h" #include "common/scope_exit.h" -#include "common/string_util.h" #include "core/core.h" #include "core/file_sys/archive_source_sd_savedata.h" #include "core/frontend/applets/default_applets.h" diff --git a/src/common/timer.cpp b/src/common/timer.cpp index e2cf704cf..50c859cca 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -3,11 +3,8 @@ // Refer to the license.txt file included. #include - #include - #include "common/common_types.h" -#include "common/string_util.h" #include "common/timer.h" namespace Common { diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 48dae3e8f..a6ce23883 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -9,7 +9,6 @@ #include "common/common_types.h" #include "common/file_util.h" #include "common/logging/log.h" -#include "common/string_util.h" #include "core/file_sys/archive_extsavedata.h" #include "core/file_sys/disk_archive.h" #include "core/file_sys/errors.h" diff --git a/src/core/file_sys/archive_source_sd_savedata.cpp b/src/core/file_sys/archive_source_sd_savedata.cpp index b9e8895bb..0b8072b96 100644 --- a/src/core/file_sys/archive_source_sd_savedata.cpp +++ b/src/core/file_sys/archive_source_sd_savedata.cpp @@ -5,7 +5,6 @@ #include #include "common/file_util.h" #include "common/logging/log.h" -#include "common/string_util.h" #include "core/file_sys/archive_source_sd_savedata.h" #include "core/file_sys/errors.h" #include "core/file_sys/savedata_archive.h" diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp index 1e6a41166..9e823c332 100644 --- a/src/core/file_sys/archive_systemsavedata.cpp +++ b/src/core/file_sys/archive_systemsavedata.cpp @@ -9,7 +9,6 @@ #include #include "common/common_types.h" #include "common/file_util.h" -#include "common/string_util.h" #include "core/file_sys/archive_systemsavedata.h" #include "core/file_sys/errors.h" #include "core/file_sys/savedata_archive.h" diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index 72e6e4f16..c1a875c08 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp @@ -32,7 +32,6 @@ #endif #include "common/logging/log.h" -#include "common/string_util.h" #include "core/arm/arm_interface.h" #include "core/core.h" #include "core/gdbstub/gdbstub.h" diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index c07e09b9a..fb78a2cc4 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -9,7 +9,6 @@ #include "common/logging/log.h" #include "common/microprofile.h" #include "common/scope_exit.h" -#include "common/string_util.h" #include "core/arm/arm_interface.h" #include "core/core_timing.h" #include "core/hle/function_wrappers.h" @@ -826,7 +825,7 @@ static ResultCode SetThreadPriority(Handle handle, u32 priority) { /// Create a mutex static ResultCode CreateMutex(Handle* out_handle, u32 initial_locked) { SharedPtr mutex = Mutex::Create(initial_locked != 0); - mutex->name = fmt::format("mutex-{:08X}", Core::CPU().GetReg(14)); + mutex->name = fmt::format("mutex-{:08x}", Core::CPU().GetReg(14)); CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(mutex))); LOG_TRACE(Kernel_SVC, "called initial_locked={} : created handle=0x{:08X}", @@ -889,7 +888,7 @@ static ResultCode GetThreadId(u32* thread_id, Handle handle) { /// Creates a semaphore static ResultCode CreateSemaphore(Handle* out_handle, s32 initial_count, s32 max_count) { CASCADE_RESULT(SharedPtr semaphore, Semaphore::Create(initial_count, max_count)); - semaphore->name = fmt::format("semaphore-{:08X}", Core::CPU().GetReg(14)); + semaphore->name = fmt::format("semaphore-{:08x}", Core::CPU().GetReg(14)); CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(semaphore))); LOG_TRACE(Kernel_SVC, "called initial_count={}, max_count={}, created handle=0x{:08X}", @@ -940,7 +939,7 @@ static ResultCode QueryMemory(MemoryInfo* memory_info, PageInfo* page_info, u32 /// Create an event static ResultCode CreateEvent(Handle* out_handle, u32 reset_type) { SharedPtr evt = Event::Create(static_cast(reset_type), - fmt::format("event-{:08X}", Core::CPU().GetReg(14))); + fmt::format("event-{:08x}", Core::CPU().GetReg(14))); CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(evt))); LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, @@ -983,7 +982,7 @@ static ResultCode ClearEvent(Handle handle) { /// Creates a timer static ResultCode CreateTimer(Handle* out_handle, u32 reset_type) { SharedPtr timer = Timer::Create(static_cast(reset_type), - fmt ::format("timer-{:08X}", Core::CPU().GetReg(14))); + fmt ::format("timer-{:08x}", Core::CPU().GetReg(14))); CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(timer))); LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 4f3478c7e..b30efb620 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -6,7 +6,6 @@ #include #include "common/assert.h" #include "common/logging/log.h" -#include "common/string_util.h" #include "core/core.h" #include "core/hle/ipc.h" #include "core/hle/kernel/client_port.h"