projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: use a variable we already made.
[dcpomatic.git]
/
src
/
lib
/
change_signaller.h
diff --git
a/src/lib/change_signaller.h
b/src/lib/change_signaller.h
index ec1f14ea3e0f987c7c0b2d328af1233cf83f1267..8612cf42672b2c8ca42ae270bb896925a6cd20d4 100644
(file)
--- a/
src/lib/change_signaller.h
+++ b/
src/lib/change_signaller.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,32
+18,43
@@
*/
*/
-#ifndef DCPOMATIC_CHANGE_H
-#define DCPOMATIC_CHANGE_H
-#include <boost/noncopyable.hpp>
+#ifndef DCPOMATIC_CHANGE_SIGNALLER_H
+#define DCPOMATIC_CHANGE_SIGNALLER_H
-template <class T>
-class ChangeSignaller : public boost::noncopyable
+
+enum class ChangeType
+{
+ PENDING,
+ DONE,
+ CANCELLED
+};
+
+
+template <class T, class P>
+class ChangeSignaller
{
public:
{
public:
- ChangeSignaller (T* t,
int
p)
+ ChangeSignaller (T* t,
P
p)
: _thing (t)
, _property (p)
, _done (true)
{
: _thing (t)
, _property (p)
, _done (true)
{
- _thing->signal_change (C
HANGE_TYPE_
PENDING, _property);
+ _thing->signal_change (C
hangeType::
PENDING, _property);
}
~ChangeSignaller ()
{
if (_done) {
}
~ChangeSignaller ()
{
if (_done) {
- _thing->signal_change (C
HANGE_TYPE_
DONE, _property);
+ _thing->signal_change (C
hangeType::
DONE, _property);
} else {
} else {
- _thing->signal_change (C
HANGE_TYPE_
CANCELLED, _property);
+ _thing->signal_change (C
hangeType::
CANCELLED, _property);
}
}
}
}
+ ChangeSignaller (ChangeSignaller const&) = delete;
+ ChangeSignaller& operator= (ChangeSignaller const&) = delete;
+
void abort ()
{
_done = false;
void abort ()
{
_done = false;
@@
-51,8
+62,9
@@
public:
private:
T* _thing;
private:
T* _thing;
-
int
_property;
+
P
_property;
bool _done;
};
bool _done;
};
+
#endif
#endif