diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-24 04:15:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-24 04:15:26 +0100 |
| commit | ceaf7bc52712cb60708ed5eb5c62c5e463dd8e89 (patch) | |
| tree | c55e4b85ee30138ce83263045d77d01631378b2e /src/name_format.cc | |
| parent | 6c37cc1979b2a01205a888c4c98f3334685ee8dd (diff) | |
Tidying.
Diffstat (limited to 'src/name_format.cc')
| -rw-r--r-- | src/name_format.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/name_format.cc b/src/name_format.cc index 11b68e19..e5c6556e 100644 --- a/src/name_format.cc +++ b/src/name_format.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 Carl Hetherington <cth@carlh.net> + Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net> This file is part of libdcp. @@ -31,14 +31,22 @@ files in the program, then also delete it here. */ + +/** @file src/name_format.cc + * @brief NameFormat class + */ + + #include "name_format.h" #include <boost/optional.hpp> + using std::string; using std::map; using boost::optional; using namespace dcp; + static char filter (char c) { @@ -51,6 +59,7 @@ filter (char c) return c; } + static string filter (string c) { @@ -64,13 +73,6 @@ filter (string c) } -/** @param values Values to replace our specifications with; e.g. - * if the specification contains %c it will be be replaced with the - * value corresponding to the key 'c'. - * @param suffix Suffix to add on after processing the specification. - * @param ignore Any specification characters in this string will not - * be replaced, but left as-is. - */ string NameFormat::get (Map values, string suffix, string ignore) const { @@ -79,7 +81,7 @@ NameFormat::get (Map values, string suffix, string ignore) const bool done = false; if (_specification[i] == '%' && (i < _specification.length() - 1)) { char const key = _specification[i + 1]; - Map::const_iterator j = values.find(key); + auto j = values.find(key); if (j != values.end() && ignore.find(key) == string::npos) { result += filter (j->second); ++i; @@ -95,6 +97,7 @@ NameFormat::get (Map values, string suffix, string ignore) const return result + suffix; } + bool dcp::operator== (NameFormat const & a, NameFormat const & b) { |