Remove use of boost::noncopyable.

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

diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index 5607475c07b26d3b5e19ab0022e11eed0438c7ca..f45bbb9f87808bed7a8fe5a0d5241943dedb81fe 100644 (file)
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -18,25 +18,32 @@
 
 */
 
+
 #ifndef DCPOMATIC_DCP_CONTENT_TYPE_H
 #define DCPOMATIC_DCP_CONTENT_TYPE_H
 
+
 /** @file src/dcp_content_type.h
  *  @brief DCPContentType class.
  */
 
+
 #include <dcp/dcp.h>
 #include <string>
 #include <vector>
 
+
 /** @class DCPContentType
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
  */
-class DCPContentType : public boost::noncopyable
+class DCPContentType
 {
 public:
        DCPContentType (std::string, dcp::ContentKind, std::string);
 
+       DCPContentType (DCPContentType const&) = delete;
+       DCPContentType& operator= (DCPContentType const&) = delete;
+
        /** @return user-visible `pretty' name */
        std::string pretty_name () const {
                return _pretty_name;
@@ -50,8 +57,8 @@ public:
                return _isdcf_name;
        }
 
-       static DCPContentType const * from_pretty_name (std::string);
        static DCPContentType const * from_isdcf_name (std::string);
+       static DCPContentType const * from_libdcp_kind (dcp::ContentKind);
        static DCPContentType const * from_index (int);
        static int as_index (DCPContentType const *);
        static std::vector<DCPContentType const *> all ();
@@ -66,4 +73,5 @@ private:
        static std::vector<DCPContentType const *> _dcp_content_types;
 };
 
+
 #endif