No-op: remove all trailing whitespace.

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

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index a4a3d26c449f895a3aa24a2422b2373833cdc75f..092faf9e6c0e96cb2de50daf41aabd56696b9deb 100644 (file)
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -25,6 +25,7 @@
 
 using std::list;
 using std::string;
+using std::cout;
 using boost::shared_ptr;
 
 FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<SubtitleContent> content)
@@ -40,7 +41,7 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<SubtitleContent> content)
                ip.SetWidth (100);
                _fonts->InsertColumn (0, ip);
        }
-       
+
        {
                wxListItem ip;
                ip.SetId (1);
@@ -84,7 +85,7 @@ FontsDialog::setup ()
        if (!content) {
                return;
        }
-       
+
        _fonts->DeleteAllItems ();
        list<shared_ptr<Font> > fonts = content->fonts ();
        size_t n = 0;
@@ -92,9 +93,9 @@ FontsDialog::setup ()
                wxListItem item;
                item.SetId (n);
                _fonts->InsertItem (item);
-               _fonts->SetItem (n, 0, std_to_wx ((*i)->id));
-               if ((*i)->file) {
-                       _fonts->SetItem (n, 1, (*i)->file.get().leaf().string ());
+               _fonts->SetItem (n, 0, std_to_wx ((*i)->id ()));
+               if ((*i)->file ()) {
+                       _fonts->SetItem (n, 1, (*i)->file().get().leaf().string ());
                }
                ++n;
        }
@@ -112,7 +113,7 @@ FontsDialog::set_file_clicked ()
        if (item == -1) {
                return;
        }
-       
+
        /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
           non-Latin filenames or paths.
        */
@@ -128,8 +129,8 @@ FontsDialog::set_file_clicked ()
 
        list<shared_ptr<Font> > fonts = content->fonts ();
        for (list<shared_ptr<Font> >::iterator i = fonts.begin(); i != fonts.end(); ++i) {
-               if ((*i)->id == id) {
-                       (*i)->file = wx_to_std (d->GetPath ());
+               if ((*i)->id() == id) {
+                       (*i)->set_file (wx_to_std (d->GetPath ()));
                }
        }