Unity: just create one MenuManager on creation and share with Panel

Also this allows testability without relying on actual dbus indicators. (bzr r3652.3.4)

3 files changed, 9 insertions, 9 deletions

diff --git a/unity-shared/GnomeKeyGrabber.cpp b/unity-shared/GnomeKeyGrabber.cpp
index 2d8cb350d..4cfbb079f 100644
--- a/unity-shared/GnomeKeyGrabber.cpp
+++ b/unity-shared/GnomeKeyGrabber.cpp
@@ -248,17 +248,17 @@ GnomeGrabber::GnomeGrabber(TestMode const& dummy)
 GnomeGrabber::~GnomeGrabber()
 {}
 
-CompAction::Vector& GnomeGrabber::getActions()
+CompAction::Vector& GnomeGrabber::GetActions()
 {
 return impl_->actions_;
 }
 
-void GnomeGrabber::addAction(CompAction const& action)
+void GnomeGrabber::AddAction(CompAction const& action)
 {
 impl_->addAction(action);
 }
 
-void GnomeGrabber::removeAction(CompAction const& action)
+void GnomeGrabber::RemoveAction(CompAction const& action)
 {
 impl_->removeAction(action);
 }
diff --git a/unity-shared/GnomeKeyGrabber.h b/unity-shared/GnomeKeyGrabber.h
index d90cc83c8..cae4e610c 100644
--- a/unity-shared/GnomeKeyGrabber.h
+++ b/unity-shared/GnomeKeyGrabber.h
@@ -32,9 +32,9 @@ public:
 GnomeGrabber();
 virtual ~GnomeGrabber();
 
- CompAction::Vector& getActions();
- void addAction(CompAction const&);
- void removeAction(CompAction const&);
+ void AddAction(CompAction const&);
+ void RemoveAction(CompAction const&);
+ CompAction::Vector& GetActions();
 
 protected:
 struct TestMode {};
diff --git a/unity-shared/KeyGrabber.h b/unity-shared/KeyGrabber.h
index 86ba6e16c..895090a20 100644
--- a/unity-shared/KeyGrabber.h
+++ b/unity-shared/KeyGrabber.h
@@ -32,9 +32,9 @@ public:
 typedef std::shared_ptr<Grabber> Ptr;
 virtual ~Grabber() = default;
 
- virtual CompAction::Vector& getActions() = 0;
- virtual void addAction(CompAction const&) = 0;
- virtual void removeAction(CompAction const&) = 0;
+ virtual void AddAction(CompAction const&) = 0;
+ virtual void RemoveAction(CompAction const&) = 0;
+ virtual CompAction::Vector& GetActions() = 0;
 };
 
 } // namespace key