diff --git a/rpcs3/rpcs3qt/about_dialog.cpp b/rpcs3/rpcs3qt/about_dialog.cpp index 1186f308ec..88c1de051b 100644 --- a/rpcs3/rpcs3qt/about_dialog.cpp +++ b/rpcs3/rpcs3qt/about_dialog.cpp @@ -6,7 +6,7 @@ #include #include -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; about_dialog::about_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::about_dialog) { diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp index fa43c168fb..6a548bfb62 100644 --- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp @@ -1,7 +1,7 @@ #include "auto_pause_settings_dialog.h" -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialog(parent) { diff --git a/rpcs3/rpcs3qt/cg_disasm_window.cpp b/rpcs3/rpcs3qt/cg_disasm_window.cpp index fab57decce..e4e29a8cc0 100644 --- a/rpcs3/rpcs3qt/cg_disasm_window.cpp +++ b/rpcs3/rpcs3qt/cg_disasm_window.cpp @@ -16,7 +16,7 @@ #include "Emu/RSX/CgBinaryProgram.h" -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); } cg_disasm_window::cg_disasm_window(std::shared_ptr xSettings, QWidget* parent): QWidget(parent), xgui_settings(xSettings) diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index a797b9d30c..87584f6cd4 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -5,7 +5,7 @@ #include #include -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; extern bool user_asked_for_frame_capture; debugger_frame::debugger_frame(std::shared_ptr settings, QWidget *parent) diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h index d83a7694e0..653f430606 100644 --- a/rpcs3/rpcs3qt/emu_settings.h +++ b/rpcs3/rpcs3qt/emu_settings.h @@ -11,7 +11,7 @@ #include #include -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; struct Render_Creator { diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index de3d7a1034..88764dcd12 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -8,7 +8,7 @@ #include #include -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; gs_frame::gs_frame(const QString& title, int w, int h, QIcon appIcon, bool disableMouse) : QWindow(), m_windowTitle(title), m_disable_mouse(disableMouse) diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp index 9757c233bd..3d987adb96 100644 --- a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp +++ b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp @@ -2,7 +2,7 @@ #include "instruction_editor_dialog.h" #include -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, const std::shared_ptr& _cpu, CPUDisAsm* _disasm) : QDialog(parent) diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp index 9d53f5adbe..535d0fd043 100644 --- a/rpcs3/rpcs3qt/kernel_explorer.cpp +++ b/rpcs3/rpcs3qt/kernel_explorer.cpp @@ -60,7 +60,7 @@ kernel_explorer::kernel_explorer(QWidget* parent) : QDialog(parent) Update(); }; -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; void kernel_explorer::Update() { diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp index 966480aa67..cc9c3f20ad 100644 --- a/rpcs3/rpcs3qt/log_frame.cpp +++ b/rpcs3/rpcs3qt/log_frame.cpp @@ -8,7 +8,7 @@ #include #include -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; struct gui_listener : logs::listener { diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp index 754b192e39..d296dbafb7 100644 --- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp +++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp @@ -3,7 +3,7 @@ #include "memory_viewer_panel.h" -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; memory_viewer_panel::memory_viewer_panel(QWidget* parent) : QDialog(parent) diff --git a/rpcs3/rpcs3qt/msg_dialog_frame.cpp b/rpcs3/rpcs3qt/msg_dialog_frame.cpp index acce009d72..f5bc09670e 100644 --- a/rpcs3/rpcs3qt/msg_dialog_frame.cpp +++ b/rpcs3/rpcs3qt/msg_dialog_frame.cpp @@ -5,7 +5,7 @@ #include #include -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), _in.size()); } +constexpr auto qstr = QString::fromStdString; void msg_dialog_frame::Create(const std::string& msg) { diff --git a/rpcs3/rpcs3qt/register_editor_dialog.cpp b/rpcs3/rpcs3qt/register_editor_dialog.cpp index 222e799658..5a6647a764 100644 --- a/rpcs3/rpcs3qt/register_editor_dialog.cpp +++ b/rpcs3/rpcs3qt/register_editor_dialog.cpp @@ -1,7 +1,7 @@ #include "register_editor_dialog.h" -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); } inline std::string sstr(const QVariant& _in) { return sstr(_in.toString()); } diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3qt/rsx_debugger.cpp index ed90f5d0f1..e931ee788d 100644 --- a/rpcs3/rpcs3qt/rsx_debugger.cpp +++ b/rpcs3/rpcs3qt/rsx_debugger.cpp @@ -7,7 +7,7 @@ enum GCMEnumTypes CELL_GCM_PRIMITIVE_ENUM, }; -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), static_cast(_in.size())); } +constexpr auto qstr = QString::fromStdString; rsx_debugger::rsx_debugger(QWidget* parent) : QDialog(parent) diff --git a/rpcs3/rpcs3qt/save_data_info_dialog.cpp b/rpcs3/rpcs3qt/save_data_info_dialog.cpp index 18dcc5d5e8..69234d76f6 100644 --- a/rpcs3/rpcs3qt/save_data_info_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_info_dialog.cpp @@ -4,7 +4,7 @@ #include #include -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), _in.size()); } +constexpr auto qstr = QString::fromStdString; save_data_info_dialog::save_data_info_dialog(const SaveDataEntry& save, QWidget* parent) : QDialog(parent), m_entry(save) diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.cpp b/rpcs3/rpcs3qt/save_data_list_dialog.cpp index a90727be0f..4b5766eb83 100644 --- a/rpcs3/rpcs3qt/save_data_list_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_list_dialog.cpp @@ -8,7 +8,7 @@ #include #include -inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), _in.size()); } +constexpr auto qstr = QString::fromStdString; //Show up the savedata list, either to choose one to save/load or to manage saves. //I suggest to use function callbacks to give save data list or get save data entry. (Not implemented or stubbed)