ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4892 from lioncash/control 

Control: Convert raw pointer parameter into unique_ptr
This commit is contained in:
Mat M 2017-02-15 11:26:53 -05:00 committed by GitHub
parent 3d1f00e98d d07d9f3110
commit 5a53763c1a
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
View File

@ -3,11 +3,14 @@
// Refer to the license.txt file included.
#include "InputCommon/ControllerEmu/Control/Control.h"
#include <utility>
#include "InputCommon/ControlReference/ControlReference.h"
namespace ControllerEmu
{
Control::Control(ControlReference* ref, const std::string& name_) : control_ref(ref), name(name_)
Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_)
: control_ref(std::move(ref)), name(name_)
{
}

2
Source/Core/InputCommon/ControllerEmu/Control/Control.h
View File

@ -20,6 +20,6 @@ public:
const std::string name;
protected:
Control(ControlReference* ref, const std::string& name);
Control(std::unique_ptr<ControlReference> ref, const std::string& name);
};
} // namespace ControllerEmu

3
Source/Core/InputCommon/ControllerEmu/Control/Input.cpp
View File

@ -4,12 +4,13 @@
#include "InputCommon/ControllerEmu/Control/Input.h"
#include <memory>
#include <string>
#include "InputCommon/ControlReference/ControlReference.h"
namespace ControllerEmu
{
Input::Input(const std::string& name_) : Control(new InputReference, name_)
Input::Input(const std::string& name_) : Control(std::make_unique<InputReference>(), name_)
{
}
} // namespace ControllerEmu

3
Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
View File

@ -4,12 +4,13 @@
#include "InputCommon/ControllerEmu/Control/Output.h"
#include <memory>
#include <string>
#include "InputCommon/ControlReference/ControlReference.h"
namespace ControllerEmu
{
Output::Output(const std::string& name_) : Control(new OutputReference, name_)
Output::Output(const std::string& name_) : Control(std::make_unique<OutputReference>(), name_)
{
}
} // namespace ControllerEmu