diff --git a/rpcs3/rpcs3_app.cpp b/rpcs3/rpcs3_app.cpp index 281edb0636..1e8b39beab 100644 --- a/rpcs3/rpcs3_app.cpp +++ b/rpcs3/rpcs3_app.cpp @@ -95,7 +95,7 @@ void rpcs3_app::InitializeCallbacks() }; callbacks.call_after = [=](std::function func) { - emit RequestCallAfter(std::move(func)); + RequestCallAfter(std::move(func)); }; callbacks.process_events = [this]() @@ -200,11 +200,11 @@ void rpcs3_app::InitializeCallbacks() return std::make_unique(); }; - callbacks.on_run = [=]() { emit OnEmulatorRun(); }; - callbacks.on_pause = [=]() {emit OnEmulatorPause(); }; - callbacks.on_resume = [=]() {emit OnEmulatorResume(); }; - callbacks.on_stop = [=]() {emit OnEmulatorStop(); }; - callbacks.on_ready = [=]() {emit OnEmulatorReady(); }; + callbacks.on_run = [=]() { OnEmulatorRun(); }; + callbacks.on_pause = [=]() { OnEmulatorPause(); }; + callbacks.on_resume = [=]() { OnEmulatorResume(); }; + callbacks.on_stop = [=]() { OnEmulatorStop(); }; + callbacks.on_ready = [=]() { OnEmulatorReady(); }; Emu.SetCallbacks(std::move(callbacks)); } diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index 68c18b847f..19bd582154 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -97,7 +97,7 @@ debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), pa void debugger_frame::closeEvent(QCloseEvent *event) { QDockWidget::closeEvent(event); - emit DebugFrameClosed(); + DebugFrameClosed(); } #include diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 104f9a8392..6c2116dbaa 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -198,16 +198,16 @@ game_list_frame::game_list_frame(std::shared_ptr settings, Render_ connect(m_xgrid, &QTableWidget::doubleClicked, this, &game_list_frame::doubleClickedSlot); connect(m_xgrid, &QTableWidget::customContextMenuRequested, this, &game_list_frame::ShowContextMenu); - connect(m_Slider_Size, &QSlider::valueChanged, [=](int value) { emit RequestIconSizeActSet(value); }); + connect(m_Slider_Size, &QSlider::valueChanged, [=](int value) { RequestIconSizeActSet(value); }); connect(m_modeActs, &QActionGroup::triggered, [=](QAction* act) { - emit RequestListModeActSet(act == m_modeActList.action); + RequestListModeActSet(act == m_modeActList.action); m_modeActList.action->setIcon(m_isListLayout ? m_modeActList.colored : m_modeActList.gray); m_modeActGrid.action->setIcon(m_isListLayout ? m_modeActGrid.gray : m_modeActGrid.colored); }); connect(m_categoryActs, &QActionGroup::triggered, [=](QAction* act) { - emit RequestCategoryActSet(m_categoryActs->actions().indexOf(act)); + RequestCategoryActSet(m_categoryActs->actions().indexOf(act)); }); for (int col = 0; col < columnActs.count(); ++col) @@ -504,7 +504,7 @@ void game_list_frame::doubleClickedSlot(const QModelIndex& index) if (category == category::hdd_Game || category == category::disc_Game || category == category::audio_Video) { const std::string& path = Emu.GetGameDir() + m_game_data[i].info.root; - emit RequestIconPathSet(path); + RequestIconPathSet(path); Emu.Stop(); @@ -515,7 +515,7 @@ void game_list_frame::doubleClickedSlot(const QModelIndex& index) else { LOG_SUCCESS(LOADER, "Boot from gamelist per doubleclick: done"); - emit RequestAddRecentGame(q_string_pair(qstr(path), qstr("[" + m_game_data[i].info.serial + "] " + m_game_data[i].info.name))); + RequestAddRecentGame(q_string_pair(qstr(path), qstr("[" + m_game_data[i].info.serial + "] " + m_game_data[i].info.name))); } } else @@ -632,7 +632,7 @@ void game_list_frame::ShowSpecifiedContextMenu(const QPoint &pos, int row) void game_list_frame::Boot(int row) { const std::string& path = Emu.GetGameDir() + m_game_data[row].info.root; - emit RequestIconPathSet(path); + RequestIconPathSet(path); Emu.Stop(); @@ -644,7 +644,7 @@ void game_list_frame::Boot(int row) else { LOG_SUCCESS(LOADER, "Boot from gamelist per Boot: done"); - emit RequestAddRecentGame(q_string_pair(qstr(path), qstr("[" + m_game_data[row].info.serial + "] " + m_game_data[row].info.name))); + RequestAddRecentGame(q_string_pair(qstr(path), qstr("[" + m_game_data[row].info.serial + "] " + m_game_data[row].info.name))); } } @@ -722,7 +722,7 @@ void game_list_frame::SetCategoryActIcon(const int& id, const bool& active) void game_list_frame::closeEvent(QCloseEvent *event) { QDockWidget::closeEvent(event); - emit game_list_frameClosed(); + game_list_frameClosed(); } void game_list_frame::resizeEvent(QResizeEvent *event) diff --git a/rpcs3/rpcs3qt/gui_tab.cpp b/rpcs3/rpcs3qt/gui_tab.cpp index 4def3bba06..7a83f2df9a 100644 --- a/rpcs3/rpcs3qt/gui_tab.cpp +++ b/rpcs3/rpcs3qt/gui_tab.cpp @@ -152,8 +152,8 @@ void gui_tab::OnResetDefault() { xgui_settings->Reset(true); xgui_settings->ChangeToConfig(tr("default")); - emit GuiStylesheetRequest(tr("default")); - emit GuiSettingsSyncRequest(); + GuiStylesheetRequest(tr("default")); + GuiSettingsSyncRequest(); AddConfigs(); AddStylesheets(); } @@ -185,7 +185,7 @@ void gui_tab::OnBackupCurrentConfig() QMessageBox::warning(this, tr("Error"), tr("Please choose a non-existing name")); continue; } - emit GuiSettingsSaveRequest(); + GuiSettingsSaveRequest(); xgui_settings->SaveCurrentConfig(friendlyName); combo_configs->addItem(friendlyName); combo_configs->setCurrentIndex(combo_configs->findText(friendlyName)); @@ -198,11 +198,11 @@ void gui_tab::OnApplyConfig() QString name = combo_configs->currentText(); xgui_settings->SetValue(GUI::m_currentConfig, name); xgui_settings->ChangeToConfig(name); - emit GuiSettingsSyncRequest(); + GuiSettingsSyncRequest(); } void gui_tab::OnApplyStylesheet() { xgui_settings->SetValue(GUI::m_currentStylesheet, combo_stylesheets->currentText()); - emit GuiStylesheetRequest(xgui_settings->GetCurrentStylesheetPath()); + GuiStylesheetRequest(xgui_settings->GetCurrentStylesheetPath()); } diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp index f57f2b13bd..e671f9bf49 100644 --- a/rpcs3/rpcs3qt/log_frame.cpp +++ b/rpcs3/rpcs3qt/log_frame.cpp @@ -341,5 +341,5 @@ void log_frame::UpdateUI() void log_frame::closeEvent(QCloseEvent *event) { QDockWidget::closeEvent(event); - emit log_frameClosed(); + log_frameClosed(); } diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index ff5588d016..e33c06b618 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -72,7 +72,7 @@ main_window::main_window(QWidget *parent) : QMainWindow(parent), m_sys_menu_open QTimer::singleShot(1, [=]() { // Need to have this happen fast, but not now because connects aren't created yet. // So, a tricky balance in terms of time but this works. - emit RequestGlobalStylesheetChange(guiSettings->GetCurrentStylesheetPath()); + RequestGlobalStylesheetChange(guiSettings->GetCurrentStylesheetPath()); }); }