No-op; rename a whole load of wx constants to their shorter equivalents.

[dcpomatic.git] / src / wx / dolby_doremi_certificate_panel.cc

diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index c4238319c94430106f6e31defd8bbe19737fb83a..6f59b91477d4b1719e6e19a4709054c03be1129b 100644 (file)
--- 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)
@@ -44,7 +45,7 @@ DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (wxWindow* parent, Down
        _serial = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1));
        _table->Add (_serial, 1, wxEXPAND);
 
-       _serial->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DownloadCertificateDialog::setup_sensitivity, _dialog));
+       _serial->Bind (wxEVT_TEXT, boost::bind (&DownloadCertificateDialog::setup_sensitivity, _dialog));
 
        layout ();
 }
@@ -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));
@@ -205,12 +206,12 @@ DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* messa
        } else {
                message->SetLabel (wxT (""));
 
-               SafeStringStream s;
+               string s;
                BOOST_FOREACH (string e, errors) {
-                       s << e << "\n";
+                       s += e + "\n";
                }
 
-               error_dialog (this, std_to_wx (s.str ()));
+               error_dialog (this, std_to_wx (s));
        }
 }