From b81241ce69a689629307832f802ac4faa6ed885f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 12 Aug 2016 09:10:08 +0100
Subject: Move locale_convert into libdcp.

---
 src/wx/audio_mapping_view.cc       | 3 ++-
 src/wx/colour_conversion_editor.cc | 3 ++-
 src/wx/config_dialog.cc            | 3 ++-
 src/wx/dcp_panel.cc                | 3 ++-
 src/wx/image_sequence_dialog.cc    | 4 +++-
 src/wx/playhead_to_frame_dialog.cc | 4 +++-
 src/wx/time_picker.cc              | 3 ++-
 src/wx/timing_panel.cc             | 3 ++-
 src/wx/video_waveform_plot.cc      | 3 ++-
 src/wx/wx_util.cc                  | 3 ++-
 10 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'src/wx')

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 866156336..0833eadde 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -27,7 +27,7 @@
 #include "audio_gain_dialog.h"
 #include "lib/audio_mapping.h"
 #include "lib/util.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
 #include <dcp/types.h>
 #include <wx/wx.h>
 #include <wx/renderer.h>
@@ -45,6 +45,7 @@ using std::vector;
 using std::pair;
 using std::make_pair;
 using boost::shared_ptr;
+using dcp::locale_convert;
 
 #define INDICATOR_SIZE 16
 #define LEFT_WIDTH 48
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index e56f30baf..d21d45fd2 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -21,7 +21,7 @@
 #include "wx_util.h"
 #include "colour_conversion_editor.h"
 #include "lib/colour_conversion.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
 #include <dcp/gamma_transfer_function.h>
 #include <dcp/modified_gamma_transfer_function.h>
 #include <wx/spinctrl.h>
@@ -32,6 +32,7 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using dcp::locale_convert;
 
 ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
 	: wxPanel (parent, wxID_ANY)
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 6006ba782..cb9f4669b 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -41,7 +41,7 @@
 #include "lib/util.h"
 #include "lib/cross.h"
 #include "lib/exceptions.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
 #include <wx/stdpaths.h>
@@ -63,6 +63,7 @@ using boost::bind;
 using boost::shared_ptr;
 using boost::function;
 using boost::optional;
+using dcp::locale_convert;
 
 class Page
 {
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 8cbd1dbb6..ea1315246 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -34,7 +34,7 @@
 #include "lib/subtitle_content.h"
 #include "lib/dcp_content.h"
 #include "lib/audio_content.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
 #include <dcp/key.h>
 #include <wx/wx.h>
 #include <wx/notebook.h>
@@ -53,6 +53,7 @@ using std::max;
 using std::make_pair;
 using boost::lexical_cast;
 using boost::shared_ptr;
+using dcp::locale_convert;
 
 DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
 	: _audio_dialog (0)
diff --git a/src/wx/image_sequence_dialog.cc b/src/wx/image_sequence_dialog.cc
index a207338a1..0484b900e 100644
--- a/src/wx/image_sequence_dialog.cc
+++ b/src/wx/image_sequence_dialog.cc
@@ -20,7 +20,9 @@
 
 #include "wx_util.h"
 #include "image_sequence_dialog.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
+
+using dcp::locale_convert;
 
 ImageSequenceDialog::ImageSequenceDialog (wxWindow* parent)
 	: TableDialog (parent, _("Add image sequence"), 2, 1, true)
diff --git a/src/wx/playhead_to_frame_dialog.cc b/src/wx/playhead_to_frame_dialog.cc
index 3f1d06d2a..137be60ae 100644
--- a/src/wx/playhead_to_frame_dialog.cc
+++ b/src/wx/playhead_to_frame_dialog.cc
@@ -19,7 +19,9 @@
 */
 
 #include "playhead_to_frame_dialog.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
+
+using dcp::locale_convert;
 
 PlayheadToFrameDialog::PlayheadToFrameDialog (wxWindow* parent, int fps)
 	: TableDialog (parent, _("Go to frame"), 2, 1, true)
diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index bddf615d0..309e5c713 100644
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -20,7 +20,7 @@
 
 #include "time_picker.h"
 #include "wx_util.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
 #include <wx/spinctrl.h>
 #include <boost/bind.hpp>
 #include <iomanip>
@@ -32,6 +32,7 @@ using std::max;
 using std::string;
 using std::cout;
 using boost::bind;
+using dcp::locale_convert;
 
 TimePicker::TimePicker (wxWindow* parent, wxDateTime time)
 	: wxPanel (parent)
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 25cf2b524..d9777834f 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -30,8 +30,8 @@
 #include "lib/dcp_subtitle_content.h"
 #include "lib/audio_content.h"
 #include "lib/text_subtitle_content.h"
-#include "lib/locale_convert.h"
 #include "lib/video_content.h"
+#include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
 #include <set>
 #include <iostream>
@@ -42,6 +42,7 @@ using std::set;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using dcp::locale_convert;
 
 TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
 	/* horrid hack for apparent lack of context support with wxWidgets i18n code */
diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index 096d340e8..794922bff 100644
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -23,7 +23,7 @@
 #include "wx_util.h"
 #include "lib/image.h"
 #include "lib/dcp_video.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <wx/rawbmp.h>
 #include <wx/graphics.h>
@@ -35,6 +35,7 @@ using std::min;
 using std::string;
 using boost::weak_ptr;
 using boost::shared_ptr;
+using dcp::locale_convert;
 
 int const VideoWaveformPlot::_vertical_margin = 8;
 
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index cb9f72a42..05f2db121 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -26,12 +26,13 @@
 #include "file_picker_ctrl.h"
 #include "lib/config.h"
 #include "lib/util.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
 #include <wx/spinctrl.h>
 #include <boost/thread.hpp>
 
 using namespace std;
 using namespace boost;
+using dcp::locale_convert;
 
 /** Add a wxStaticText to a wxSizer, aligning it at vertical centre.
  *  @param s Sizer to add to.
-- 
cgit v1.2.3