Merge

(bzr r1794.3.4)

4 files changed, 2 insertions, 26 deletions

diff --git a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.cpp b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.cpp
index 4c698d60d..bab7a1b3f 100644
--- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.cpp
+++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.cpp
@@ -21,14 +21,6 @@
 
 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()
 {
diff --git a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.h b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.h
index d8989e00f..1cf7b9004 100644
--- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.h
+++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.h
@@ -36,7 +36,7 @@ class GrabHandle::ImplFactory
 {
 public:
 
- virtual ~ImplFactory();
+ virtual ~ImplFactory() {};
 
 static ImplFactory *
 Default();
@@ -50,7 +50,7 @@ class GrabHandle::ImplFactory
 
 static ImplFactory *mDefault;
 
- ImplFactory();
+ ImplFactory() {};
 };
 };
 };
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 39732df66..6b1432c93 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
@@ -26,15 +26,6 @@ unsigned int unity::MT::MaximizedVertMask = CompWindowStateMaximizedVertMask;
 unsigned int unity::MT::MoveMask = CompWindowActionMoveMask;
 unsigned int unity::MT::ResizeMask = CompWindowActionResizeMask;
 
-unity::MT::X11TextureFactory::X11TextureFactory () :
- Factory ()
-{
-}
-
-unity::MT::X11TextureFactory::~X11TextureFactory ()
-{
-}
-
 void
 unity::MT::X11TextureFactory::setActiveWrap (const GLTexture::List &t)
 {
@@ -63,10 +54,6 @@ unity::MT::X11ImplFactory::X11ImplFactory (Display *dpy) :
 {
 }
 
-unity::MT::X11ImplFactory::~X11ImplFactory ()
-{
-}
-
 unity::MT::GrabHandle::Impl *
 unity::MT::X11ImplFactory::create (const GrabHandle::Ptr &handle)
 {
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 88b0a906b..e10568ce0 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
@@ -57,8 +57,6 @@ class X11TextureFactory :
 public Texture::Factory
 {
 public:
- X11TextureFactory ();
- ~X11TextureFactory ();
 
 void setActiveWrap (const GLTexture::List &);
 
@@ -91,7 +89,6 @@ class X11ImplFactory :
 public:
 
 X11ImplFactory (Display *dpy);
- ~X11ImplFactory ();
 
 GrabHandle::Impl * create (const GrabHandle::Ptr &h);
 private: