diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-16 10:40:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-16 10:40:12 +0100 |
| commit | bb949ec65adf95f4a2c7dd5ee7e97b9daaaf3d3f (patch) | |
| tree | 09153b297f7cebd3f13ab58188982366185298f6 /src/lib/ratio.h | |
| parent | 39d51cddeeea82e602ab1925430b0dfb5752ac79 (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/ratio.h')
| -rw-r--r-- | src/lib/ratio.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/ratio.h b/src/lib/ratio.h index 40f596ab8..016a22edc 100644 --- a/src/lib/ratio.h +++ b/src/lib/ratio.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,17 +18,20 @@ */ + #ifndef DCPOMATIC_RATIO_H #define DCPOMATIC_RATIO_H + #include <dcp/util.h> #include <boost/utility.hpp> #include <vector> + /** @class Ratio * @brief Description of an image ratio. */ -class Ratio : public boost::noncopyable +class Ratio { public: Ratio (float ratio, std::string id, std::string in, boost::optional<std::string> cn, std::string d) @@ -39,6 +42,9 @@ public: , _isdcf_name (d) {} + Ratio (Ratio const&) = delete; + Ratio& operator= (Ratio const&) = delete; + std::string id () const { return _id; } @@ -50,7 +56,7 @@ public: std::string container_nickname () const; bool used_for_container () const { - return static_cast<bool> (_container_nickname); + return static_cast<bool>(_container_nickname); } std::string isdcf_name () const { @@ -85,4 +91,5 @@ private: static std::vector<Ratio const *> _ratios; }; + #endif |