diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-29 16:29:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-29 16:29:34 +0100 |
| commit | f4964573a60155545e02cbbebc47199f7480cf14 (patch) | |
| tree | 6fd65f01a844fdd839722bc5957425293b5ed29a /src/wx | |
| parent | fbe2784c136fa1550815babfce89589f66b35a29 (diff) | |
Rename KDMNameFormat.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/kdm_dialog.h | 2 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.cc | 4 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h index bae2fc16b..07b998224 100644 --- a/src/wx/kdm_dialog.h +++ b/src/wx/kdm_dialog.h @@ -19,7 +19,7 @@ */ #include "wx_util.h" -#include "lib/kdm_name_format.h" +#include "lib/kdm_filename_format.h" #include <dcp/types.h> #include <wx/wx.h> #include <boost/shared_ptr.hpp> diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 4efb9fb27..2808357d4 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -68,7 +68,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) ex['s'] = "Screen 1"; ex['b'] = "2012/03/15 12:30"; ex['e'] = "2012/03/22 02:30"; - _filename_format = new NameFormatEditor<KDMNameFormat> (this, Config::instance()->kdm_filename_format(), titles, ex); + _filename_format = new NameFormatEditor<KDMFilenameFormat> (this, Config::instance()->kdm_filename_format(), titles, ex); table->Add (_filename_format->panel(), 1, wxEXPAND); _write_to = new wxRadioButton (this, wxID_ANY, _("Write to")); @@ -126,7 +126,7 @@ KDMOutputPanel::save_kdm_name_format () const Config::instance()->set_kdm_filename_format (name_format ()); } -KDMNameFormat +KDMFilenameFormat KDMOutputPanel::name_format () const { return _filename_format->get (); diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 002b189f5..ee6a94e68 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -20,7 +20,7 @@ #include "wx_util.h" #include "name_format_editor.h" -#include "lib/kdm_name_format.h" +#include "lib/kdm_filename_format.h" #include <dcp/types.h> #include <wx/wx.h> #include <boost/filesystem.hpp> @@ -36,14 +36,14 @@ public: boost::filesystem::path directory () const; bool write_to () const; dcp::Formulation formulation () const; - KDMNameFormat name_format () const; + KDMFilenameFormat name_format () const; void setup_sensitivity (); void save_kdm_name_format () const; private: wxChoice* _type; - NameFormatEditor<KDMNameFormat>* _filename_format; + NameFormatEditor<KDMFilenameFormat>* _filename_format; wxRadioButton* _write_to; #ifdef DCPOMATIC_USE_OWN_PICKER DirPickerCtrl* _folder; |