Add some missing override labels.

[dcpomatic.git] / src / wx / config_dialog.h

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index a698b252a89d1fd41864fe859a30e7e5869c92e3..ce5df2c5b84b43badb59a4fbcee7cd77c8c3729f 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -44,7 +44,6 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 class AudioMappingView;
@@ -55,7 +54,7 @@ public:
        Page (wxSize panel_size, int border);
        virtual ~Page () {}
 
-       wxWindow* CreateWindow (wxWindow* parent);
+       wxWindow* CreateWindow (wxWindow* parent) override;
 
 protected:
        wxWindow* create_window (wxWindow* parent);
@@ -80,19 +79,19 @@ class GeneralPage : public Page
 public:
        GeneralPage (wxSize panel_size, int border);
 
-       wxString GetName () const;
+       wxString GetName () const override;
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
-               return wxBitmap ("general", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 protected:
        void add_language_controls (wxGridBagSizer* table, int& r);
        void add_update_controls (wxGridBagSizer* table, int& r);
-       virtual void config_changed ();
+       void config_changed () override;
 
 private:
        void setup_sensitivity ();
@@ -114,9 +113,9 @@ public:
                wxWindow* parent,
                wxString title,
                int border,
-               boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> set,
-               boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> get,
-               boost::function<bool (void)> nag_alter
+               std::function<void (std::shared_ptr<dcp::CertificateChain>)> set,
+               std::function<std::shared_ptr<const dcp::CertificateChain> (void)> get,
+               std::function<bool (void)> nag_alter
                );
 
        void add_button (wxWindow* button);
@@ -145,9 +144,9 @@ private:
        wxStaticText* _private_key_bad;
        wxSizer* _sizer;
        wxBoxSizer* _button_sizer;
-       boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> _set;
-       boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> _get;
-       boost::function<bool (void)> _nag_alter;
+       std::function<void (std::shared_ptr<dcp::CertificateChain>)> _set;
+       std::function<std::shared_ptr<const dcp::CertificateChain> (void)> _get;
+       std::function<bool (void)> _nag_alter;
 };
 
 class KeysPage : public Page
@@ -157,26 +156,27 @@ public:
                : Page (panel_size, border)
        {}
 
-       wxString GetName () const;
+       wxString GetName () const override;
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
-               return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
 
-       void setup ();
+       void setup () override;
 
        void export_decryption_certificate ();
-       void config_changed () {}
+       void config_changed () override {}
        bool nag_alter_decryption_chain ();
        void decryption_advanced ();
        void signing_advanced ();
        void export_decryption_chain_and_key ();
        void import_decryption_chain_and_key ();
+       void remake_signing ();
 };
 
 
@@ -187,19 +187,19 @@ public:
                : Page (panel_size, border)
        {}
 
-       wxString GetName() const;
+       wxString GetName() const override;
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
-               return wxBitmap ("sound", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
 
-       void setup ();
-       void config_changed ();
+       void setup () override;
+       void config_changed () override;
         boost::optional<std::string> get_sound_output ();
        void sound_changed ();
        void sound_output_changed ();
@@ -219,15 +219,15 @@ class LocationsPage : public Page
 public:
        LocationsPage (wxSize panel_size, int border);
 
-       wxString GetName () const;
+       wxString GetName () const override;
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const;
+       wxBitmap GetLargeIcon () const override;
 #endif
 
 private:
-       void setup ();
-       void config_changed ();
+       void setup () override;
+       void config_changed () override;
        void content_directory_changed ();
        void playlist_directory_changed ();
        void kdm_directory_changed ();