Merge lp:~alan-griffiths/compiz-core/fix-leaks into lp:compiz-core/0.9.5

[Alan Griffiths]

Fix a couple of memory leaks

[Alan Griffiths (alan-griffiths)]

Oh, and remove spurious file: src/pluginclasshandler/src/valueholder.h

=== modified file 'plugins/composite/tests/paintscheduler/test-paintscheduler.cpp'
--- plugins/composite/tests/paintscheduler/test-paintscheduler.cpp	2012-01-25 07:33:33 +0000
+++ plugins/composite/tests/paintscheduler/test-paintscheduler.cpp	2012-02-03 18:13:21 +0000
@@ -727,8 +727,7 @@
 
     gettimeofday (&SleepVBlankWaiter::start_time, NULL);
 
-    TimeoutHandler     *th = new TimeoutHandler ();
-    TimeoutHandler::SetDefault (th);
+    TimeoutHandler::SetDefault (new TimeoutHandler ());
 
     Glib::RefPtr <Glib::MainContext> ctx = Glib::MainContext::get_default ();
     Glib::RefPtr <Glib::MainLoop> mainloop = Glib::MainLoop::create (ctx, false);
@@ -749,7 +748,6 @@
     doTest ("vsync 100 Hz refresh rate", 100, 2.8f, true, mainloop);
 
     delete timeout;
-    delete th;
 
     return 0;
 }

=== modified file 'plugins/regex/src/regexplugin.h'
--- plugins/regex/src/regexplugin.h	2012-01-18 16:26:45 +0000
+++ plugins/regex/src/regexplugin.h	2012-02-03 18:13:21 +0000
@@ -26,8 +26,9 @@
 #ifndef COMPIZ_REGEXPLUGIN_H
 #define COMPIZ_REGEXPLUGIN_H
 
-#include <core/screen.h>
-#include <core/pluginclasshandler.h>
+#include "core/screen.h"
+#include "core/timer.h"
+#include "core/pluginclasshandler.h"
 
 #include <X11/Xatom.h>
 

=== modified file 'src/pluginclasshandler/include/core/valueholder.h'
--- src/pluginclasshandler/include/core/valueholder.h	2012-01-12 06:48:58 +0000
+++ src/pluginclasshandler/include/core/valueholder.h	2012-02-03 18:13:21 +0000
@@ -30,13 +30,16 @@
 #include <core/logmessage.h>
 #include <core/privateunion.h>
 
+#include <boost/noncopyable.hpp>
+
 class PrivateValueHolder;
 
-class ValueHolder
+class ValueHolder : boost::noncopyable
 {
     public:
 
 	ValueHolder ();
+	~ValueHolder ();
 
 	void eraseValue (CompString key);
 	bool hasValue (CompString key);

=== modified file 'src/pluginclasshandler/src/valueholder.cpp'
--- src/pluginclasshandler/src/valueholder.cpp	2012-01-12 06:48:58 +0000
+++ src/pluginclasshandler/src/valueholder.cpp	2012-02-03 18:13:21 +0000
@@ -43,6 +43,11 @@
 {
 }
 
+ValueHolder::~ValueHolder ()
+{
+    delete priv;
+}
+
 ValueHolder *
 ValueHolder::Default ()
 {

=== removed file 'src/pluginclasshandler/src/valueholder.h'
--- src/pluginclasshandler/src/valueholder.h	2012-01-12 06:48:58 +0000
+++ src/pluginclasshandler/src/valueholder.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright © 2010 Canonical Ltd.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Canonical Ltd. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Canonical Ltd. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authored by: Sam Spilsbury <[e-mail]>
- */
-
-class PrivateValueHolder;
-
-class ValueHolder
-{
-    public:
-
-	ValueHolder ();
-
-	void hasValue (CompString key);
-	void storeValue (CompString key, CompPrivate value);
-	CompPrivate getValue (CompString key);
-
-    private:
-
-	PrivateValueHolder *priv;
-};

=== modified file 'src/timer/include/core/timeouthandler.h'
--- src/timer/include/core/timeouthandler.h	2012-01-12 06:48:58 +0000
+++ src/timer/include/core/timeouthandler.h	2012-02-03 18:13:21 +0000
@@ -26,12 +26,13 @@
 #ifndef _COMPIZ_TIMEOUTHANDLER_H
 #define _COMPIZ_TIMEOUTHANDLER_H
 
-#include <core/timer.h>
+#include <boost/noncopyable.hpp>
+#include <list>
 
 class PrivateTimeoutHandler;
 class CompTimer;
 
-class TimeoutHandler
+class TimeoutHandler : boost::noncopyable
 {
     public:
 

=== modified file 'src/timer/src/timeouthandler.cpp'
--- src/timer/src/timeouthandler.cpp	2012-01-12 06:48:58 +0000
+++ src/timer/src/timeouthandler.cpp	2012-02-03 18:13:21 +0000
@@ -25,10 +25,14 @@
  */
 
 #include "privatetimeouthandler.h"
+#include "core/timer.h"
+
+#include <boost/scoped_ptr.hpp>
+#include <algorithm>
 
 namespace
 {
-  static TimeoutHandler *gDefault;
+  static boost::scoped_ptr<TimeoutHandler> gDefault;
 }
 
 TimeoutHandler::TimeoutHandler () :
@@ -84,11 +88,11 @@
 TimeoutHandler *
 TimeoutHandler::Default ()
 {
-    return gDefault;
+    return gDefault.get();
 }
 
 void
 TimeoutHandler::SetDefault (TimeoutHandler *instance)
 {
-    gDefault = instance;
+    gDefault.reset(instance);
 }