Cleanup: replace some list with vector.
[dcpomatic.git] / src / wx / markers_dialog.h
index 7d713bd59fbf4f60ff723c1399de7b333b7877c7..e962d44631e9fc28193b3b06f567db5f26485579 100644 (file)
 */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 #include <memory>
 
@@ -34,7 +34,7 @@ class FilmViewer;
 class MarkersDialog : public wxDialog
 {
 public:
-       MarkersDialog (wxWindow* parent, std::weak_ptr<Film> film, std::weak_ptr<FilmViewer> viewer);
+       MarkersDialog (wxWindow* parent, std::weak_ptr<Film> film, FilmViewer const& viewer);
 
 private:
        std::list<std::shared_ptr<Marker>> _markers;