diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-12-18 19:44:35 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-12-18 19:44:35 +0100 |
| commit | 5e37c0157864ae6482ef0806d7fa93526c8f7839 (patch) | |
| tree | 94bf44f7fec7781f3125b15a8f76ffb4c6723ce9 /unity-shared | |
| parent | d925d2afdcb49942603236d3a21484471711c079 (diff) | |
MenuManager: use the proper type to return the AppMenu indicator
(bzr r3884.9.6)
Diffstat (limited to 'unity-shared')
| -rw-r--r-- | unity-shared/MenuManager.cpp | 6 | ||||
| -rw-r--r-- | unity-shared/MenuManager.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/unity-shared/MenuManager.cpp b/unity-shared/MenuManager.cpp index 0a4fd84ae..b652030bb 100644 --- a/unity-shared/MenuManager.cpp +++ b/unity-shared/MenuManager.cpp @@ -63,7 +63,7 @@ struct Manager::Impl : sigc::trackable return; appmenu_connections_.Clear(); - appmenu_ = indicator; + appmenu_ = std::static_pointer_cast<AppmenuIndicator>(indicator); for (auto const& entry : appmenu_->GetEntries()) GrabEntryMnemonics(entry); @@ -149,7 +149,7 @@ struct Manager::Impl : sigc::trackable Manager* parent_; Indicators::Ptr indicators_; - Indicator::Ptr appmenu_; + AppmenuIndicator::Ptr appmenu_; key::Grabber::Ptr key_grabber_; connection::Manager appmenu_connections_; std::unordered_map<std::string, std::shared_ptr<CompAction>> entry_actions_; @@ -178,7 +178,7 @@ Indicators::Ptr const& Manager::Indicators() const return impl_->indicators_; } -Indicator::Ptr const& Manager::AppMenu() const +AppmenuIndicator::Ptr const& Manager::AppMenu() const { return impl_->appmenu_; } diff --git a/unity-shared/MenuManager.h b/unity-shared/MenuManager.h index 9f81ec711..61eb413fc 100644 --- a/unity-shared/MenuManager.h +++ b/unity-shared/MenuManager.h @@ -22,6 +22,7 @@ #include <NuxCore/Property.h> #include <UnityCore/Indicators.h> +#include <UnityCore/AppmenuIndicator.h> #include "KeyGrabber.h" namespace unity @@ -58,7 +59,7 @@ public: bool HasAppMenu() const; indicator::Indicators::Ptr const& Indicators() const; - indicator::Indicator::Ptr const& AppMenu() const; + indicator::AppmenuIndicator::Ptr const& AppMenu() const; key::Grabber::Ptr const& KeyGrabber() const; |