Merge

(bzr r1794.2.2)

2 files changed, 7 insertions, 20 deletions

diff --git a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp
index baae39d40..885c811d7 100644
--- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp
+++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp
@@ -24,18 +24,10 @@
 
 COMPIZ_PLUGIN_20090315(unitymtgrabhandles, UnityMTGrabHandlesPluginVTable);
 
-unity::MT::GrabHandle::ImplFactory * unity::MT::GrabHandle::ImplFactory::mDefault = NULL;
+Unity::MT::GrabHandle::ImplFactory * Unity::MT::GrabHandle::ImplFactory::mDefault = NULL;
 
-unity::MT::GrabHandle::ImplFactory::ImplFactory ()
-{
-}
-
-unity::MT::GrabHandle::ImplFactory::~ImplFactory ()
-{
-}
-
-unity::MT::GrabHandle::ImplFactory *
-unity::MT::GrabHandle::ImplFactory::Default()
+Unity::MT::GrabHandle::ImplFactory *
+Unity::MT::GrabHandle::ImplFactory::Default()
 {
 return mDefault;
 }
@@ -57,12 +49,8 @@ unity::MT::X11ImplFactory::X11ImplFactory (Display *dpy) :
 {
 }
 
-unity::MT::X11ImplFactory::~X11ImplFactory ()
-{
-}
-
-unity::MT::GrabHandle::Impl *
-unity::MT::X11ImplFactory::create (const GrabHandle::Ptr &handle)
+Unity::MT::GrabHandle::Impl *
+Unity::MT::X11ImplFactory::create (const GrabHandle::Ptr &handle)
 {
 unity::MT::GrabHandle::Impl *impl = new X11GrabHandleImpl (mDpy, handle);
 return impl;
diff --git a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h
index ebff8ac57..303aad521 100644
--- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h
+++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h
@@ -172,7 +172,7 @@ public:
 {
 public:
 
- virtual ~ImplFactory();
+ virtual ~ImplFactory() {};
 
 static ImplFactory *
 Default();
@@ -186,7 +186,7 @@ public:
 
 static ImplFactory *mDefault;
 
- ImplFactory();
+ ImplFactory() {};
 };
 
 private:
@@ -210,7 +210,6 @@ class X11ImplFactory :
 public:
 
 X11ImplFactory (Display *dpy);
- ~X11ImplFactory ();
 
 GrabHandle::Impl * create (const GrabHandle::Ptr &h);
 private: