From f5f0a5aa194d1dfc9312e0da0a3662392aba1903 Mon Sep 17 00:00:00 2001 From: Silent Date: Sun, 21 Jul 2019 09:44:03 +0200 Subject: [PATCH] Use move semantics with several shared pointers in vfs_dialog, they need not be copied --- rpcs3/rpcs3qt/vfs_dialog.cpp | 2 +- rpcs3/rpcs3qt/vfs_dialog_tab.cpp | 4 ++-- rpcs3/rpcs3qt/vfs_dialog_tab.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/rpcs3qt/vfs_dialog.cpp b/rpcs3/rpcs3qt/vfs_dialog.cpp index 4c03932470..79198df38f 100644 --- a/rpcs3/rpcs3qt/vfs_dialog.cpp +++ b/rpcs3/rpcs3qt/vfs_dialog.cpp @@ -5,7 +5,7 @@ inline std::string sstr(const QString& _in) { return _in.toStdString(); } vfs_dialog::vfs_dialog(std::shared_ptr guiSettings, std::shared_ptr emuSettings, QWidget* parent) - : QDialog(parent), m_gui_settings(guiSettings), m_emu_settings(emuSettings) + : QDialog(parent), m_gui_settings(std::move(guiSettings)), m_emu_settings(std::move(emuSettings)) { QTabWidget* tabs = new QTabWidget(); tabs->setUsesScrollButtons(false); diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp index 89a3d27387..d0cade1cf2 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp +++ b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp @@ -5,8 +5,8 @@ inline std::string sstr(const QString& _in) { return _in.toStdString(); } -vfs_dialog_tab::vfs_dialog_tab(const vfs_settings_info& settingsInfo, std::shared_ptr guiSettings, std::shared_ptr emuSettings, QWidget* parent) - : QWidget(parent), m_info(settingsInfo), m_gui_settings(guiSettings), m_emu_settings(emuSettings) +vfs_dialog_tab::vfs_dialog_tab(vfs_settings_info settingsInfo, std::shared_ptr guiSettings, std::shared_ptr emuSettings, QWidget* parent) + : QWidget(parent), m_info(std::move(settingsInfo)), m_gui_settings(std::move(guiSettings)), m_emu_settings(std::move(emuSettings)) { m_dirList = new QListWidget(this); diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.h b/rpcs3/rpcs3qt/vfs_dialog_tab.h index 2afbac73a8..850614b5b0 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_tab.h +++ b/rpcs3/rpcs3qt/vfs_dialog_tab.h @@ -23,7 +23,7 @@ class vfs_dialog_tab : public QWidget Q_OBJECT public: - explicit vfs_dialog_tab(const vfs_settings_info& info, std::shared_ptr guiSettings, std::shared_ptr emuSettings, QWidget* parent = nullptr); + explicit vfs_dialog_tab(vfs_settings_info info, std::shared_ptr guiSettings, std::shared_ptr emuSettings, QWidget* parent = nullptr); void SetSettings(); void AddNewDirectory();