mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Merge pull request #4892 from lioncash/control
Control: Convert raw pointer parameter into unique_ptr
This commit is contained in:
@ -3,11 +3,14 @@
|
|||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "InputCommon/ControllerEmu/Control/Control.h"
|
#include "InputCommon/ControllerEmu/Control/Control.h"
|
||||||
|
|
||||||
|
#include <utility>
|
||||||
#include "InputCommon/ControlReference/ControlReference.h"
|
#include "InputCommon/ControlReference/ControlReference.h"
|
||||||
|
|
||||||
namespace ControllerEmu
|
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_)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,6 +20,6 @@ public:
|
|||||||
const std::string name;
|
const std::string name;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Control(ControlReference* ref, const std::string& name);
|
Control(std::unique_ptr<ControlReference> ref, const std::string& name);
|
||||||
};
|
};
|
||||||
} // namespace ControllerEmu
|
} // namespace ControllerEmu
|
||||||
|
@ -4,12 +4,13 @@
|
|||||||
|
|
||||||
#include "InputCommon/ControllerEmu/Control/Input.h"
|
#include "InputCommon/ControllerEmu/Control/Input.h"
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "InputCommon/ControlReference/ControlReference.h"
|
#include "InputCommon/ControlReference/ControlReference.h"
|
||||||
|
|
||||||
namespace ControllerEmu
|
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
|
} // namespace ControllerEmu
|
||||||
|
@ -4,12 +4,13 @@
|
|||||||
|
|
||||||
#include "InputCommon/ControllerEmu/Control/Output.h"
|
#include "InputCommon/ControllerEmu/Control/Output.h"
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "InputCommon/ControlReference/ControlReference.h"
|
#include "InputCommon/ControlReference/ControlReference.h"
|
||||||
|
|
||||||
namespace ControllerEmu
|
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
|
} // namespace ControllerEmu
|
||||||
|
Reference in New Issue
Block a user