diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-11 12:49:23 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-12 09:14:06 +0100 |
| commit | 94056bf7f8fdef32da3cd78eff68d58560b4e6be (patch) | |
| tree | 937fad363dc94d65ec20fa2ff7aa3b303310d80f /src/wx/dolby_doremi_certificate_panel.cc | |
| parent | 73654117144c6de0ec4efe39ddc88485df546cc9 (diff) | |
Replace incorrect uses of raw_convert with a new locale_convert.
Diffstat (limited to 'src/wx/dolby_doremi_certificate_panel.cc')
| -rw-r--r-- | src/wx/dolby_doremi_certificate_panel.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc index 18a0ed66e..cb1de387f 100644 --- a/src/wx/dolby_doremi_certificate_panel.cc +++ b/src/wx/dolby_doremi_certificate_panel.cc @@ -36,6 +36,7 @@ using std::cout; using std::list; using boost::function; using boost::optional; +using dcp::raw_convert; DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog) : DownloadCertificatePanel (parent, dialog) @@ -90,7 +91,7 @@ try_ims (list<string>& urls, list<string>& files, string prefix, string serial) static void try_cat862 (list<string>& urls, list<string>& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert<int> (serial); + int const serial_int = raw_convert<int> (serial); string cat862; if (serial_int <= 510999) { @@ -109,7 +110,7 @@ try_cat862 (list<string>& urls, list<string>& files, string prefix, string seria static void try_dsp100 (list<string>& urls, list<string>& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert<int> (serial); + int const serial_int = raw_convert<int> (serial); string dsp100; if (serial_int <= 999) { @@ -128,7 +129,7 @@ try_dsp100 (list<string>& urls, list<string>& files, string prefix, string seria static void try_cat745 (list<string>& urls, list<string>& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert<int> (serial.substr (1)); + int const serial_int = raw_convert<int> (serial.substr (1)); string cat745; if (serial_int <= 999) { @@ -147,7 +148,7 @@ try_cat745 (list<string>& urls, list<string>& files, string prefix, string seria static void try_cp850 (list<string>& urls, list<string>& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert<int> (serial.substr (1)); + int const serial_int = raw_convert<int> (serial.substr (1)); int const lower = serial_int - (serial_int % 1000); urls.push_back (String::compose ("%1CP850_CAT1600_F%2-F%3/cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%4.zip", prefix, lower, lower + 999, serial_int)); |