diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-02 16:13:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-02 16:13:29 +0100 |
| commit | 5d48e36440d6b4ebf4c04a413bd340b214ba8c42 (patch) | |
| tree | 8f4fafd8cdbcadac8efde0cf1ac045ab1301af19 /src/wx | |
| parent | 9fdcacab9988f4cc5d44a6fab3ab294f5005f468 (diff) | |
Use String::compose in a few places.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_editor.cc | 4 | ||||
| -rw-r--r-- | src/wx/job_manager_view.cc | 4 | ||||
| -rw-r--r-- | src/wx/job_wrapper.cc | 8 |
3 files changed, 4 insertions, 12 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 6de3af9e7..9171daa5c 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -289,9 +289,7 @@ FilmEditor::content_changed (wxCommandEvent &) _film->set_content (wx_to_std (_content->GetPath ())); } catch (std::exception& e) { _content->SetPath (std_to_wx (_film->directory ())); - stringstream m; - m << "Could not set content: " << e.what() << "."; - error_dialog (this, m.str ()); + error_dialog (this, String::compose ("Could not set content: %1", e.what ())); } _ignore_changes = Film::NONE; diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 1d5c855ea..97da3936f 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -111,9 +111,7 @@ JobManagerView::update () try { (*i)->emit_finished (); } catch (OpenFileError& e) { - stringstream s; - s << "Error: " << e.what(); - error_dialog (this, s.str ()); + error_dialog (this, String::compose ("Error: %1", e.what ())); } _job_records[*i].informed_of_finish = true; diff --git a/src/wx/job_wrapper.cc b/src/wx/job_wrapper.cc index ad83aa271..cc7507547 100644 --- a/src/wx/job_wrapper.cc +++ b/src/wx/job_wrapper.cc @@ -35,12 +35,8 @@ JobWrapper::make_dcp (wxWindow* parent, Film* film, bool transcode) try { film->make_dcp (transcode); } catch (BadSettingError& e) { - stringstream s; - s << "Bad setting for " << e.setting() << "(" << e.what() << ")"; - error_dialog (parent, s.str ()); + error_dialog (parent, String::compose ("Bad setting for %1 (%2)", e.setting(), e.what ())); } catch (std::exception& e) { - stringstream s; - s << "Could not make DCP: " << e.what () << "."; - error_dialog (parent, s.str ()); + error_dialog (parent, String::compose ("Could not make DCP: %1", e.what ())); } } |