diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-22 10:06:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-22 10:06:10 +0100 |
| commit | 422be0eece2bf6ee80db1d3c21553cd82efff789 (patch) | |
| tree | 57604c446361be99eb092f35e703445260ada84a /src/wx | |
| parent | e34db1b3cdb5bce5ddcb112ee03664a4e463032a (diff) | |
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/colour_conversion_editor.cc | 10 | ||||
| -rw-r--r-- | src/wx/dolby_doremi_certificate_panel.cc | 2 | ||||
| -rw-r--r-- | src/wx/time_picker.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index 01b1ca056..79365bf88 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -19,10 +19,10 @@ */ #include "lib/colour_conversion.h" -#include "lib/safe_stringstream.h" #include "lib/raw_convert.h" #include "wx_util.h" #include "colour_conversion_editor.h" +#include <locked_sstream.h> #include <dcp/gamma_transfer_function.h> #include <dcp/modified_gamma_transfer_function.h> #include <wx/spinctrl.h> @@ -247,7 +247,7 @@ ColourConversionEditor::set (ColourConversion conversion) _ignore_chromaticity_changed = true; - SafeStringStream s; + locked_stringstream s; s.setf (std::ios::fixed, std::ios::floatfield); s.precision (6); @@ -394,7 +394,7 @@ ColourConversionEditor::update_bradford () boost::numeric::ublas::matrix<double> m = get().bradford (); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { - SafeStringStream s; + locked_stringstream s; s.setf (std::ios::fixed, std::ios::floatfield); s.precision (7); s << m (i, j); @@ -409,7 +409,7 @@ ColourConversionEditor::update_rgb_to_xyz () boost::numeric::ublas::matrix<double> m = get().rgb_to_xyz (); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { - SafeStringStream s; + locked_stringstream s; s.setf (std::ios::fixed, std::ios::floatfield); s.precision (7); s << m (i, j); @@ -442,7 +442,7 @@ ColourConversionEditor::set_spin_ctrl (wxSpinCtrlDouble* control, double value) void ColourConversionEditor::set_text_ctrl (wxTextCtrl* control, double value) { - SafeStringStream s; + locked_stringstream s; s.precision (7); s << value; control->SetValue (std_to_wx (s.str ())); diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc index c4238319c..fcff93a06 100644 --- a/src/wx/dolby_doremi_certificate_panel.cc +++ b/src/wx/dolby_doremi_certificate_panel.cc @@ -205,7 +205,7 @@ DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* messa } else { message->SetLabel (wxT ("")); - SafeStringStream s; + locked_stringstream s; BOOST_FOREACH (string e, errors) { s << e << "\n"; } diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc index 0853e4fcb..a18182138 100644 --- a/src/wx/time_picker.cc +++ b/src/wx/time_picker.cc @@ -82,7 +82,7 @@ TimePicker::update_text () _hours->SetValue (std_to_wx (raw_convert<string> (_hours_spin->GetValue ()))); - SafeStringStream m; + locked_stringstream m; m << setfill('0') << setw(2) << _minutes_spin->GetValue(); _minutes->SetValue (std_to_wx (m.str())); |