projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[libdcp.git]
/
src
/
object.h
diff --git
a/src/object.h
b/src/object.h
index aa0fe6b34c11e0a0fa08214f5babfb0f55135266..d1d476c8caba7fb332702927048943cc813b1923 100644
(file)
--- a/
src/object.h
+++ b/
src/object.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2021
Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
This file is part of libdcp.
@@
-31,16
+31,19
@@
files in the program, then also delete it here.
*/
files in the program, then also delete it here.
*/
+
/** @file src/object.h
/** @file src/object.h
- * @brief Object class
.
+ * @brief Object class
*/
*/
+
#ifndef LIBDCP_OBJECT_H
#define LIBDCP_OBJECT_H
#ifndef LIBDCP_OBJECT_H
#define LIBDCP_OBJECT_H
-#include <boost/noncopyable.hpp>
+
#include <string>
#include <string>
+
struct write_interop_subtitle_test;
struct write_interop_subtitle_test2;
struct write_interop_subtitle_test3;
struct write_interop_subtitle_test;
struct write_interop_subtitle_test2;
struct write_interop_subtitle_test3;
@@
-49,19
+52,29
@@
struct write_smpte_subtitle_test2;
struct write_smpte_subtitle_test3;
struct sync_test2;
struct write_smpte_subtitle_test3;
struct sync_test2;
+
namespace dcp {
namespace dcp {
+
/** @class Object
/** @class Object
- * @brief Some part of a DCP that has a UUID
.
+ * @brief Some part of a DCP that has a UUID
*/
*/
-class Object
: public boost::noncopyable
+class Object
{
public:
{
public:
+ /** Create an Object with a random ID */
Object ();
Object ();
+
+ /** Create an Object with a given ID.
+ * @param id ID to use.
+ */
explicit Object (std::string id);
explicit Object (std::string id);
+
+ Object (Object const&) = delete;
+ Object& operator= (Object const&) = delete;
+
virtual ~Object () {}
virtual ~Object () {}
- /** @return ID */
std::string id () const {
return _id;
}
std::string id () const {
return _id;
}
@@
-75,7
+88,6
@@
protected:
friend struct ::write_smpte_subtitle_test3;
friend struct ::sync_test2;
friend struct ::write_smpte_subtitle_test3;
friend struct ::sync_test2;
- /** ID */
std::string _id;
};
std::string _id;
};