Don't use grabber namespace.

(bzr r3608.4.16)

3 files changed, 4 insertions, 12 deletions

diff --git a/unity-shared/GnomeKeyGrabber.cpp b/unity-shared/GnomeKeyGrabber.cpp
index 975626d3f..e1b7ab4ad 100644
--- a/unity-shared/GnomeKeyGrabber.cpp
+++ b/unity-shared/GnomeKeyGrabber.cpp
@@ -23,9 +23,7 @@
 
 namespace unity
 {
-namespace grabber
-{
-DECLARE_LOGGER(logger, "unity.grabber.gnome");
+DECLARE_LOGGER(logger, "unity.gnome");
 
 // Private implementation
 namespace shell
@@ -283,5 +281,4 @@ void GnomeKeyGrabber::removeAction(CompAction const& action)
 impl_->removeAction(action);
 }
 
-} // namespace grabber
 } // namespace unity
diff --git a/unity-shared/GnomeKeyGrabber.h b/unity-shared/GnomeKeyGrabber.h
index 37cf2d378..5b4ec6f62 100644
--- a/unity-shared/GnomeKeyGrabber.h
+++ b/unity-shared/GnomeKeyGrabber.h
@@ -24,13 +24,13 @@
 
 namespace unity
 {
-namespace grabber
-{
 
 class GnomeKeyGrabber
 {
 public:
 
+ typedef std::shared_ptr<GnomeKeyGrabber> Ptr;
+
 explicit GnomeKeyGrabber(CompScreen* screen);
 virtual ~GnomeKeyGrabber();
 
@@ -38,8 +38,6 @@ public:
 void addAction(CompAction const& action);
 void removeAction(CompAction const& action);
 
- struct Impl;
-
 protected:
 
 struct TestMode {};
@@ -47,10 +45,10 @@ protected:
 
 private:
 
+ struct Impl;
 std::unique_ptr<Impl> impl_;
 };
 
-} // namespace grabber
 } // namespace unity
 
 #endif // __GNOME_KEY_GRABBER_H__
diff --git a/unity-shared/GnomeKeyGrabberImpl.h b/unity-shared/GnomeKeyGrabberImpl.h
index 0333a9909..6032cffff 100644
--- a/unity-shared/GnomeKeyGrabberImpl.h
+++ b/unity-shared/GnomeKeyGrabberImpl.h
@@ -27,8 +27,6 @@
 
 namespace unity
 {
-namespace grabber
-{
 
 struct GnomeKeyGrabber::Impl
 {
@@ -67,7 +65,6 @@ struct GnomeKeyGrabber::Impl
 bool isActionPostponed(CompAction const& action) const;
 };
 
-} // namespace grabber
 } // namespace unity
 
 #endif // __GNOME_KEY_GRABBER_IMPL_H__