X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.h;h=818ab4def911545f714138859779832495f436f2;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=afbe9ed2ebe81e381cb0fba1658758e191ece458;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index afbe9ed2e..818ab4def 100644
--- 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