summaryrefslogtreecommitdiff
path: root/src/lib/ratio.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-12 22:27:11 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-12 22:27:11 +0100
commit4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad (patch)
tree06db8731e77dfeaf537f2814d73c7a599035b95c /src/lib/ratio.h
parent8102046b2f29e0c7b234c29bf204b056cb30e64f (diff)
parent66162217d93baa3fd50594bb013a44bbd779d02a (diff)
Merge master.
Diffstat (limited to 'src/lib/ratio.h')
-rw-r--r--src/lib/ratio.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ratio.h b/src/lib/ratio.h
index cd7d0d6e4..22fc7662c 100644
--- a/src/lib/ratio.h
+++ b/src/lib/ratio.h
@@ -31,7 +31,7 @@ public:
: _ratio (ratio)
, _id (id)
, _nickname (n)
- , _dci_name (d)
+ , _isdcf_name (d)
{}
std::string id () const {
@@ -42,8 +42,8 @@ public:
return _nickname;
}
- std::string dci_name () const {
- return _dci_name;
+ std::string isdcf_name () const {
+ return _isdcf_name;
}
float ratio () const {
@@ -62,7 +62,7 @@ private:
std::string _id;
/** nickname (e.g. Flat, Scope) */
std::string _nickname;
- std::string _dci_name;
+ std::string _isdcf_name;
static std::vector<Ratio const *> _ratios;
};