diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2012-11-22 17:35:20 +0100 |
|---|---|---|
| committer | Andrea Azzarone <azzaronea@gmail.com> | 2012-11-22 17:35:20 +0100 |
| commit | f6a9908a600c18a425952e78f7f79dc0a6fb53a4 (patch) | |
| tree | 117c8a95663b63e7f6555510f082c03b593ddbd8 /unity-standalone | |
| parent | a71793f893668c9dc0c73f64ba8d7582cf96f6a3 (diff) | |
Use std::make_shared.
(bzr r2898.4.16)
Diffstat (limited to 'unity-standalone')
| -rw-r--r-- | unity-standalone/StandaloneUnity.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unity-standalone/StandaloneUnity.cpp b/unity-standalone/StandaloneUnity.cpp index 5ddaa0dd0..593af9f61 100644 --- a/unity-standalone/StandaloneUnity.cpp +++ b/unity-standalone/StandaloneUnity.cpp @@ -87,9 +87,9 @@ UnityStandalone::~UnityStandalone () void UnityStandalone::Init () { auto xdnd_manager = std::make_shared<XdndManager>(); - launcher_controller.reset(new launcher::Controller(xdnd_manager)); - panel_controller.reset(new panel::Controller()); - dash_controller.reset(new dash::Controller()); + launcher_controller = std::make_shared<launcher::Controller>(xdnd_manager); + panel_controller = std::make_shared<panel::Controller>(); + dash_controller = std::make_shared<dash::Controller>(); dash_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1; panel_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1; @@ -121,8 +121,8 @@ UnityStandaloneTV::~UnityStandaloneTV() {}; void UnityStandaloneTV::Init() { auto xdnd_manager = std::make_shared<XdndManager>(); - launcher_controller.reset(new launcher::Controller(xdnd_manager)); - dash_controller.reset(new dash::Controller()); + launcher_controller = std::make_shared<launcher::Controller>(xdnd_manager); + dash_controller = std::make_shared<dash::Controller>(); dash_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1; UBusManager().SendMessage(UBUS_DASH_EXTERNAL_ACTIVATION, nullptr); |
