BOOST_FOREACH.

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

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index afbe9ed2ebe81e381cb0fba1658758e191ece458..818ab4def911545f714138859779832495f436f2 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;
@@ -114,8 +113,8 @@ 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<void (std::shared_ptr<dcp::CertificateChain>)> set,
+               boost::function<std::shared_ptr<const dcp::CertificateChain> (void)> get,
                boost::function<bool (void)> nag_alter
                );
 
@@ -145,8 +144,8 @@ 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<void (std::shared_ptr<dcp::CertificateChain>)> _set;
+       boost::function<std::shared_ptr<const dcp::CertificateChain> (void)> _get;
        boost::function<bool (void)> _nag_alter;
 };
 
@@ -232,15 +231,8 @@ private:
        void playlist_directory_changed ();
        void kdm_directory_changed ();
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       void background_image_changed ();
-#endif
-
        wxDirPickerCtrl* _content_directory;
        wxDirPickerCtrl* _playlist_directory;
        wxDirPickerCtrl* _kdm_directory;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       FilePickerCtrl* _background_image;
-#endif
 };
 #endif