From 70ccdcfc30fb36675858fc8093eebf4d64dbe3a3 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 5 Apr 2020 22:57:29 +1000 Subject: [PATCH] INISettingsInterface: Make constructor parameter a std::string --- src/duckstation-sdl/sdl_host_interface.cpp | 4 ++-- src/frontend-common/ini_settings_interface.cpp | 6 +++--- src/frontend-common/ini_settings_interface.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/duckstation-sdl/sdl_host_interface.cpp b/src/duckstation-sdl/sdl_host_interface.cpp index a97e24c98..9b20d4789 100644 --- a/src/duckstation-sdl/sdl_host_interface.cpp +++ b/src/duckstation-sdl/sdl_host_interface.cpp @@ -265,7 +265,7 @@ void SDLHostInterface::RunLater(std::function callback) void SDLHostInterface::SaveSettings() { - INISettingsInterface si(GetSettingsFileName().c_str()); + INISettingsInterface si(GetSettingsFileName()); m_settings_copy.Save(si); } @@ -295,7 +295,7 @@ std::unique_ptr SDLHostInterface::Create() std::unique_ptr intf = std::make_unique(); // Settings need to be loaded prior to creating the window for OpenGL bits. - INISettingsInterface si(intf->GetSettingsFileName().c_str()); + INISettingsInterface si(intf->GetSettingsFileName()); intf->m_settings_copy.Load(si); intf->m_settings = intf->m_settings_copy; intf->m_fullscreen = intf->m_settings_copy.start_fullscreen; diff --git a/src/frontend-common/ini_settings_interface.cpp b/src/frontend-common/ini_settings_interface.cpp index 0ca5488cf..053239bf8 100644 --- a/src/frontend-common/ini_settings_interface.cpp +++ b/src/frontend-common/ini_settings_interface.cpp @@ -3,11 +3,11 @@ #include Log_SetChannel(INISettingsInterface); -INISettingsInterface::INISettingsInterface(const char* filename) : m_filename(filename), m_ini(true, true) +INISettingsInterface::INISettingsInterface(std::string filename) : m_filename(std::move(filename)), m_ini(true, true) { - SI_Error err = m_ini.LoadFile(filename); + SI_Error err = m_ini.LoadFile(m_filename.c_str()); if (err != SI_OK) - Log_WarningPrintf("Settings could not be loaded from '%s', defaults will be used.", filename); + Log_WarningPrintf("Settings could not be loaded from '%s', defaults will be used.", m_filename.c_str()); } INISettingsInterface::~INISettingsInterface() diff --git a/src/frontend-common/ini_settings_interface.h b/src/frontend-common/ini_settings_interface.h index b9d8c4c81..a1cfe1fda 100644 --- a/src/frontend-common/ini_settings_interface.h +++ b/src/frontend-common/ini_settings_interface.h @@ -6,7 +6,7 @@ class INISettingsInterface : public SettingsInterface { public: - INISettingsInterface(const char* filename); + INISettingsInterface(std::string filename); ~INISettingsInterface(); void Clear() override;