From 12eacfa67b843036d1f6af10c95aaa45d954b43b Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 18 Mar 2025 23:13:06 +0100 Subject: [PATCH] overlays: use std::string instead of raw path argument It will be converted to string anyway --- .../FriendsList/overlay_friends_list_dialog.cpp | 2 +- .../Overlays/Trophies/overlay_trophy_list_dialog.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_controls.cpp | 12 ++++++------ rpcs3/Emu/RSX/Overlays/overlay_controls.h | 2 +- rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp index ff6770136b..e0a2d396bb 100644 --- a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp @@ -62,7 +62,7 @@ namespace rsx if (fs::exists(avatar_path)) { - icon_data = std::make_unique(avatar_path.c_str()); + icon_data = std::make_unique(avatar_path); static_cast(image.get())->set_raw_image(icon_data.get()); } else diff --git a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp index c30a6fe878..bd8acd8446 100644 --- a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp @@ -31,7 +31,7 @@ namespace rsx if (fs::exists(icon_path)) { - icon_data = std::make_unique(icon_path.c_str(), details.hidden || locked); + icon_data = std::make_unique(icon_path, details.hidden || locked); static_cast(image.get())->set_raw_image(icon_data.get()); } else diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp index 3177a76a98..55f1f5dc84 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp @@ -12,7 +12,7 @@ namespace rsx animated_icon::animated_icon(const char* icon_name) { const std::string image_path = fmt::format("%s/Icons/ui/%s", fs::get_config_dir(), icon_name); - m_icon = std::make_unique(image_path.c_str()); + m_icon = std::make_unique(image_path); set_raw_image(m_icon.get()); } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp index db1fc704a8..ca6410e19a 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp @@ -54,7 +54,7 @@ namespace rsx return result; } - image_info::image_info(const char* filename, bool grayscaled) + image_info::image_info(const std::string& filename, bool grayscaled) { fs::file f(filename, fs::read + fs::isfile); @@ -132,7 +132,7 @@ namespace rsx { // First check the global config dir const std::string image_path = fs::get_config_dir() + "Icons/ui/" + res; - auto info = std::make_unique(image_path.c_str()); + auto info = std::make_unique(image_path); #if !defined(_WIN32) && !defined(__APPLE__) && defined(DATADIR) // Check the DATADIR if defined @@ -140,7 +140,7 @@ namespace rsx { const std::string data_dir (DATADIR); const std::string image_data = data_dir + "/Icons/ui/" + res; - info = std::make_unique(image_data.c_str()); + info = std::make_unique(image_data); } #endif @@ -148,7 +148,7 @@ namespace rsx { // Resource was not found in the DATADIR or config dir, try and grab from relative path (linux) std::string src = "Icons/ui/" + res; - info = std::make_unique(src.c_str()); + info = std::make_unique(src); #ifndef _WIN32 // Check for Icons in ../share/rpcs3 for AppImages, // in rpcs3.app/Contents/Resources for App Bundles, and /usr/bin. @@ -188,12 +188,12 @@ namespace rsx #else src = executablePath + "/../share/rpcs3/Icons/ui/" + res; #endif - info = std::make_unique(src.c_str()); + info = std::make_unique(src); // Check if the icons are in the same directory as the executable (local builds) if (info->get_data() == nullptr) { src = executablePath + "/Icons/ui/" + res; - info = std::make_unique(src.c_str()); + info = std::make_unique(src); } } } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index 6fe1b216d7..0229767af8 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -41,7 +41,7 @@ namespace rsx int bpp = 0; image_info(image_info&) = delete; - image_info(const char* filename, bool grayscaled = false); + image_info(const std::string& filename, bool grayscaled = false); image_info(const std::vector& bytes, bool grayscaled = false); ~image_info(); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp index 39d1ee4dba..2cf113243a 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp @@ -58,7 +58,7 @@ namespace rsx } } - icon_data = std::make_unique(entry.info.path.c_str()); + icon_data = std::make_unique(entry.info.path); static_cast(image.get())->set_raw_image(icon_data.get()); } else diff --git a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp index a796d62de3..186ac0ee83 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp @@ -17,7 +17,7 @@ namespace rsx if (fs::exists(avatar_path)) { - icon_data = std::make_unique(avatar_path.c_str()); + icon_data = std::make_unique(avatar_path); static_cast(image.get())->set_raw_image(icon_data.get()); } else