Skip to content

Commit

Permalink
Merge pull request #7140 from lioncash/move
Browse files Browse the repository at this point in the history
DolphinQt2/RegisterWidget: std::move std::function instances in AddRegister()
  • Loading branch information
leoetlino committed Jun 19, 2018
2 parents 18c3e03 + 6066ca3 commit a2bc62d
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions Source/Core/DolphinQt2/Debugger/RegisterWidget.cpp
Expand Up @@ -4,18 +4,20 @@


#include "DolphinQt2/Debugger/RegisterWidget.h" #include "DolphinQt2/Debugger/RegisterWidget.h"


#include <utility>

#include <QHeaderView>
#include <QMenu>
#include <QTableWidget>
#include <QVBoxLayout>

#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/ProcessorInterface.h" #include "Core/HW/ProcessorInterface.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "DolphinQt2/Host.h" #include "DolphinQt2/Host.h"
#include "DolphinQt2/QtUtils/ActionHelper.h" #include "DolphinQt2/QtUtils/ActionHelper.h"
#include "DolphinQt2/Settings.h" #include "DolphinQt2/Settings.h"


#include <QHeaderView>
#include <QMenu>
#include <QTableWidget>
#include <QVBoxLayout>

RegisterWidget::RegisterWidget(QWidget* parent) : QDockWidget(parent) RegisterWidget::RegisterWidget(QWidget* parent) : QDockWidget(parent)
{ {
setWindowTitle(tr("Registers")); setWindowTitle(tr("Registers"));
Expand Down Expand Up @@ -335,7 +337,7 @@ void RegisterWidget::PopulateTable()
void RegisterWidget::AddRegister(int row, int column, RegisterType type, std::string register_name, void RegisterWidget::AddRegister(int row, int column, RegisterType type, std::string register_name,
std::function<u64()> get_reg, std::function<void(u64)> set_reg) std::function<u64()> get_reg, std::function<void(u64)> set_reg)
{ {
auto* value = new RegisterColumn(type, get_reg, set_reg); auto* value = new RegisterColumn(type, std::move(get_reg), std::move(set_reg));


if (m_table->rowCount() <= row) if (m_table->rowCount() <= row)
m_table->setRowCount(row + 1); m_table->setRowCount(row + 1);
Expand Down

0 comments on commit a2bc62d

Please sign in to comment.