diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-07-22 02:34:30 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-07-22 02:34:30 +0200 |
| commit | c3e7db6c364e7d4a86a492f6d1c870717e595936 (patch) | |
| tree | 43498fe07cb01697ee6d7e69c491ae2b3c903ae5 /plugins | |
| parent | 3d0bcc72a12174f6226bca7f39a4a163bb384426 (diff) | |
LockScreenController: define lockscreen::Controller::Ptr for nicer usage
(bzr r3844.10.3)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 2 | ||||
| -rw-r--r-- | plugins/unityshell/src/unityshell.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 7f7b44e03..899b0fec5 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -3999,7 +3999,7 @@ launcher::Controller::Ptr UnityScreen::launcher_controller() return launcher_controller_; } -std::shared_ptr<lockscreen::Controller> UnityScreen::lockscreen_controller() +lockscreen::Controller::Ptr UnityScreen::lockscreen_controller() { return lockscreen_controller_; } diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h index e5864d59b..b4ab30d53 100644 --- a/plugins/unityshell/src/unityshell.h +++ b/plugins/unityshell/src/unityshell.h @@ -239,7 +239,7 @@ public: switcher::Controller::Ptr switcher_controller(); launcher::Controller::Ptr launcher_controller(); - std::shared_ptr<lockscreen::Controller> lockscreen_controller(); + lockscreen::Controller::Ptr lockscreen_controller(); bool DoesPointIntersectUnityGeos(nux::Point const& pt); @@ -348,7 +348,7 @@ private: session::DBusManager::Ptr session_dbus_manager_; session::Controller::Ptr session_controller_; lockscreen::DBusManager::Ptr screensaver_dbus_manager_; - std::shared_ptr<lockscreen::Controller> lockscreen_controller_; + lockscreen::Controller::Ptr lockscreen_controller_; debug::DebugDBusInterface debugger_; std::unique_ptr<BGHash> bghash_; spread::Filter::Ptr spread_filter_; |
