Assorted C++11/formatting cleanups.

[dcpomatic.git] / src / lib / content_part.h

diff --git a/src/lib/content_part.h b/src/lib/content_part.h
index eb96b13710e210593ca47c8911225362d5bfb084..443c356b19ab45c883adc8d01e16417cd84fc72e 100644 (file)
--- a/src/lib/content_part.h
+++ b/src/lib/content_part.h
@@ -24,7 +24,6 @@
 
 #include "content.h"
 #include "change_signaller.h"
-#include <boost/weak_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 
 class Content;
@@ -42,7 +41,7 @@ protected:
        void
        maybe_set (T& member, T new_value, int property) const
        {
-               ChangeSignaller<Content> cc (_parent, property);
+               ContentChangeSignaller cc (_parent, property);
                {
                        boost::mutex::scoped_lock lm (_mutex);
                        if (member == new_value) {
@@ -57,7 +56,7 @@ protected:
        void
        maybe_set (boost::optional<T>& member, T new_value, int property) const
        {
-               ChangeSignaller<Content> cc (_parent, property);
+               ContentChangeSignaller cc (_parent, property);
                {
                        boost::mutex::scoped_lock lm (_mutex);
                        if (member && member.get() == new_value) {