From c4282e63fb5272f4ae68688b66eb328ead7a0291 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 24 Sep 2024 02:37:34 +0200 Subject: [PATCH] Qt: Simplify some string conversion bloat --- rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp | 6 ++---- rpcs3/rpcs3qt/breakpoint_list.cpp | 4 +--- rpcs3/rpcs3qt/call_stack_list.cpp | 4 +--- rpcs3/rpcs3qt/input_dialog.cpp | 4 +--- rpcs3/rpcs3qt/log_frame.cpp | 4 +--- rpcs3/rpcs3qt/main_window.cpp | 2 +- rpcs3/rpcs3qt/osk_dialog_frame.cpp | 4 +--- rpcs3/rpcs3qt/patch_creator_dialog.cpp | 6 ++---- rpcs3/rpcs3qt/save_data_info_dialog.cpp | 10 ++++------ rpcs3/rpcs3qt/trophy_manager_dialog.cpp | 9 ++------- 10 files changed, 16 insertions(+), 37 deletions(-) diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp index 65fe8a2b5c..26cbfc96b7 100644 --- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp @@ -13,8 +13,6 @@ LOG_CHANNEL(autopause_log, "AutoPause"); -constexpr auto qstr = QString::fromStdString; - auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialog(parent) { QLabel *description = new QLabel(tr("To use auto pause: enter the ID(s) of a function or a system call.\nRestart of the game is required to apply. You can enable/disable this in the settings."), this); @@ -127,7 +125,7 @@ void auto_pause_settings_dialog::UpdateList() typeItem->setFlags(typeItem->flags() & ~Qt::ItemIsEditable); if (m_entries[i] != 0xFFFFFFFF) { - callItem->setData(Qt::DisplayRole, qstr(fmt::format("%08x", m_entries[i]))); + callItem->setData(Qt::DisplayRole, QString::fromStdString(fmt::format("%08x", m_entries[i]))); } else { @@ -230,7 +228,7 @@ AutoPauseConfigDialog::AutoPauseConfigDialog(QWidget* parent, auto_pause_setting m_current_converted->setWordWrap(true); m_id = new QLineEdit(this); - m_id->setText(qstr(fmt::format("%08x", m_entry))); + m_id->setText(QString::fromStdString(fmt::format("%08x", m_entry))); m_id->setPlaceholderText("ffffffff"); m_id->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)); m_id->setMaxLength(8); diff --git a/rpcs3/rpcs3qt/breakpoint_list.cpp b/rpcs3/rpcs3qt/breakpoint_list.cpp index 7438028fa3..03fc4105ea 100644 --- a/rpcs3/rpcs3qt/breakpoint_list.cpp +++ b/rpcs3/rpcs3qt/breakpoint_list.cpp @@ -9,8 +9,6 @@ #include #include -constexpr auto qstr = QString::fromStdString; - extern bool is_using_interpreter(thread_class t_class); breakpoint_list::breakpoint_list(QWidget* parent, breakpoint_handler* handler) : QListWidget(parent), m_ppu_breakpoint_handler(handler) @@ -83,7 +81,7 @@ bool breakpoint_list::AddBreakpoint(u32 pc) m_disasm->disasm(pc); - QString text = qstr(m_disasm->last_opcode); + QString text = QString::fromStdString(m_disasm->last_opcode); text.remove(10, 13); QListWidgetItem* breakpoint_item = new QListWidgetItem(text); diff --git a/rpcs3/rpcs3qt/call_stack_list.cpp b/rpcs3/rpcs3qt/call_stack_list.cpp index 47d32a8cb9..6c761ed164 100644 --- a/rpcs3/rpcs3qt/call_stack_list.cpp +++ b/rpcs3/rpcs3qt/call_stack_list.cpp @@ -5,8 +5,6 @@ #include #include -constexpr auto qstr = QString::fromStdString; - call_stack_list::call_stack_list(QWidget* parent) : QListWidget(parent) { setEditTriggers(QAbstractItemView::NoEditTriggers); @@ -37,7 +35,7 @@ void call_stack_list::HandleUpdate(const std::vector>& call_ for (const auto& addr : call_stack) { - const QString text = qstr(fmt::format("0x%08llx (sp=0x%08llx)", addr.first, addr.second)); + const QString text = QString::fromStdString(fmt::format("0x%08llx (sp=0x%08llx)", addr.first, addr.second)); QListWidgetItem* call_stack_item = new QListWidgetItem(text); call_stack_item->setData(Qt::UserRole, { addr.first }); addItem(call_stack_item); diff --git a/rpcs3/rpcs3qt/input_dialog.cpp b/rpcs3/rpcs3qt/input_dialog.cpp index 532c8ea3bb..25008bc0fb 100644 --- a/rpcs3/rpcs3qt/input_dialog.cpp +++ b/rpcs3/rpcs3qt/input_dialog.cpp @@ -8,8 +8,6 @@ #include #include -constexpr auto qstr = QString::fromStdString; - input_dialog::input_dialog(int max_length, const QString& text, const QString& title, const QString& label, const QString& placeholder, QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) { @@ -50,7 +48,7 @@ void input_dialog::set_input_font(const QFont& font, bool fix_width, char sample { if (const int max = m_input->maxLength(); max > 0 && fix_width && std::isprint(static_cast(sample))) { - const QString str = qstr(std::string(static_cast(max), sample)); + const QString str = QString(max, sample); m_input->setFixedWidth(gui::utils::get_label_width(str, &font)); } diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp index 004eb32a84..42d9a315bc 100644 --- a/rpcs3/rpcs3qt/log_frame.cpp +++ b/rpcs3/rpcs3qt/log_frame.cpp @@ -24,8 +24,6 @@ extern std::array, 16> g_tty_input; extern std::mutex g_tty_mutex; extern bool g_log_all_errors; -constexpr auto qstr = QString::fromStdString; - struct gui_listener : logs::listener { atomic_t enabled{logs::level{0xff}}; @@ -891,7 +889,7 @@ void log_frame::UpdateUI() } // Print UTF-8 text. - m_log_text += escaped(qstr(packet->msg), QString{}); + m_log_text += escaped(QString::fromStdString(packet->msg), QString{}); if (m_stack_log) { diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index ade4cf5c80..b63b2194a8 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -2157,7 +2157,7 @@ QAction* main_window::CreateRecentAction(const q_string_pair& entry, const uint& { if (m_rg_entries.contains(entry)) { - gui_log.warning("Recent Game not valid, removing from Boot Recent list: %s", sstr(entry.first)); + gui_log.warning("Recent Game not valid, removing from Boot Recent list: %s", entry.first); const int idx = m_rg_entries.indexOf(entry); m_rg_entries.removeAt(idx); diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.cpp b/rpcs3/rpcs3qt/osk_dialog_frame.cpp index 32336f44c5..8e9b385278 100644 --- a/rpcs3/rpcs3qt/osk_dialog_frame.cpp +++ b/rpcs3/rpcs3qt/osk_dialog_frame.cpp @@ -12,8 +12,6 @@ #include #include -constexpr auto qstr = QString::fromStdString; - osk_dialog_frame::~osk_dialog_frame() { if (m_dialog) @@ -38,7 +36,7 @@ void osk_dialog_frame::Create(const osk_params& params) m_dialog->setModal(true); // Title - m_dialog->setWindowTitle(qstr(params.title)); + m_dialog->setWindowTitle(QString::fromStdString(params.title)); // Message QLabel* message_label = new QLabel(QString::fromStdU16String(params.message)); diff --git a/rpcs3/rpcs3qt/patch_creator_dialog.cpp b/rpcs3/rpcs3qt/patch_creator_dialog.cpp index 94bdf59436..b94fd65421 100644 --- a/rpcs3/rpcs3qt/patch_creator_dialog.cpp +++ b/rpcs3/rpcs3qt/patch_creator_dialog.cpp @@ -16,8 +16,6 @@ LOG_CHANNEL(patch_log, "PAT"); -constexpr auto qstr = QString::fromStdString; - Q_DECLARE_METATYPE(patch_type) enum patch_column : int @@ -96,7 +94,7 @@ void patch_creator_dialog::init_patch_type_bombo_box(QComboBox* combo_box, patch { if (const patch_type t = patch_engine::get_patch_type(type); t != patch_type::invalid) { - types << qstr(type); + types << QString::fromStdString(type); combo_box->addItem(types.last(), QVariant::fromValue(t)); @@ -459,7 +457,7 @@ void patch_creator_dialog::export_patch() return; } - const QString file_path = QFileDialog::getSaveFileName(this, tr("Select Patch File"), qstr(patch_engine::get_patches_path()), tr("patch.yml files (*.yml);;All files (*.*)")); + const QString file_path = QFileDialog::getSaveFileName(this, tr("Select Patch File"), QString::fromStdString(patch_engine::get_patches_path()), tr("patch.yml files (*.yml);;All files (*.*)")); if (file_path.isEmpty()) { return; diff --git a/rpcs3/rpcs3qt/save_data_info_dialog.cpp b/rpcs3/rpcs3qt/save_data_info_dialog.cpp index 50f7a8e2ea..45a566ef30 100644 --- a/rpcs3/rpcs3qt/save_data_info_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_info_dialog.cpp @@ -5,8 +5,6 @@ #include #include "Emu/System.h" -constexpr auto qstr = QString::fromStdString; - save_data_info_dialog::save_data_info_dialog(SaveDataEntry save, QWidget* parent) : QDialog(parent) , m_entry(std::move(save)) @@ -62,16 +60,16 @@ void save_data_info_dialog::UpdateData() //Maybe there should be more details of save data. m_list->setItem(0, 0, new QTableWidgetItem(tr("User ID"))); - m_list->setItem(0, 1, new QTableWidgetItem(qstr(Emu.GetUsr()))); + m_list->setItem(0, 1, new QTableWidgetItem(QString::fromStdString(Emu.GetUsr()))); m_list->setItem(1, 0, new QTableWidgetItem(tr("Title"))); - m_list->setItem(1, 1, new QTableWidgetItem(qstr(m_entry.title))); + m_list->setItem(1, 1, new QTableWidgetItem(QString::fromStdString(m_entry.title))); m_list->setItem(2, 0, new QTableWidgetItem(tr("Subtitle"))); - m_list->setItem(2, 1, new QTableWidgetItem(qstr(m_entry.subtitle))); + m_list->setItem(2, 1, new QTableWidgetItem(QString::fromStdString(m_entry.subtitle))); m_list->setItem(3, 0, new QTableWidgetItem(tr("Detail"))); - m_list->setItem(3, 1, new QTableWidgetItem(qstr(m_entry.details))); + m_list->setItem(3, 1, new QTableWidgetItem(QString::fromStdString(m_entry.details))); QImage img; if (!m_entry.iconBuf.empty() && img.loadFromData(m_entry.iconBuf.data(), static_cast(m_entry.iconBuf.size()), "PNG")) diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp index 8150b7f042..a140daebd5 100644 --- a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp @@ -36,11 +36,6 @@ LOG_CHANNEL(gui_log, "GUI"); -namespace -{ - inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); } -} - enum GameUserRole { GameIndex = Qt::UserRole, @@ -705,7 +700,7 @@ void trophy_manager_dialog::ResizeTrophyIcons() } else { - gui_log.error("Failed to load trophy icon for trophy %d (icon='%s')", trophy_id, sstr(path)); + gui_log.error("Failed to load trophy icon for trophy %d (icon='%s')", trophy_id, path); } } } @@ -1027,7 +1022,7 @@ void trophy_manager_dialog::StartTrophyLoadThreads() atomic_t error_count{}; futureWatcher.setFuture(QtConcurrent::map(indices, [this, &error_count, &folder_list](const int& i) { - const std::string dir_name = sstr(folder_list.value(i)); + const std::string dir_name = folder_list.value(i).toStdString(); gui_log.trace("Loading trophy dir: %s", dir_name); if (!LoadTrophyFolderToDB(dir_name))