X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fname_format_editor.h;h=b4fe5691ea08b8bfa47d40f81fb55d5764cd88d7;hb=865316f0129c85cdd0248b87502fe97dec94b3f0;hp=e3728615fcf818e14bce5c92336c99a1addaca63;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h index e3728615f..b4fe5691e 100644 --- a/src/wx/name_format_editor.h +++ b/src/wx/name_format_editor.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 Carl Hetherington + Copyright (C) 2016-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,17 +18,20 @@ */ + #ifndef DCPOMATIC_NAME_FORMAT_EDITOR_H #define DCPOMATIC_NAME_FORMAT_EDITOR_H + #include "lib/compose.hpp" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include + class NameFormatEditor { public: @@ -59,4 +62,5 @@ private: std::string _suffix; }; + #endif