From cf52d6e4b40111eb04b244ec054055a4ec15dbe0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 14 Jul 2016 14:44:52 -0400 Subject: enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h --- libs/surfaces/mackie/device_info.cc | 2 +- libs/surfaces/mackie/device_profile.cc | 2 +- libs/surfaces/mackie/gui.cc | 2 +- libs/surfaces/mackie/gui.h | 2 +- libs/surfaces/mackie/mackie_control_protocol.cc | 2 +- libs/surfaces/mackie/mackie_control_protocol_poll.cc | 2 +- libs/surfaces/mackie/mcp_buttons.cc | 2 +- libs/surfaces/mackie/surface.cc | 2 +- libs/surfaces/mackie/surface_port.cc | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libs/surfaces/mackie') diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index d46937aff5..dfac991cca 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -31,7 +31,7 @@ #include "device_info.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace ARDOUR; diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc index f67aa3cddd..ca3f146803 100644 --- a/libs/surfaces/mackie/device_profile.cc +++ b/libs/surfaces/mackie/device_profile.cc @@ -33,7 +33,7 @@ #include "mackie_control_protocol.h" #include "device_profile.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace ARDOUR; diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc index 6283a5469d..06786197e2 100644 --- a/libs/surfaces/mackie/gui.cc +++ b/libs/surfaces/mackie/gui.cc @@ -48,7 +48,7 @@ #include "surface.h" #include "surface_port.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/libs/surfaces/mackie/gui.h b/libs/surfaces/mackie/gui.h index 754c4ac5aa..15d266634c 100644 --- a/libs/surfaces/mackie/gui.h +++ b/libs/surfaces/mackie/gui.h @@ -33,7 +33,7 @@ namespace Gtk { #include "button.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace ArdourSurface { diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 224590aa54..2ea61cc9f0 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -83,7 +83,7 @@ using namespace Glib; using namespace ArdourSurface; using namespace Mackie; -#include "i18n.h" +#include "pbd/i18n.h" #include "pbd/abstract_ui.cc" // instantiate template diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc index c04eb52614..3fcf2458b8 100644 --- a/libs/surfaces/mackie/mackie_control_protocol_poll.cc +++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc @@ -9,7 +9,7 @@ #include "midi++/types.h" #include "midi++/port.h" #include "midi++/manager.h" -#include "i18n.h" +#include "pbd/i18n.h" #include #include diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index f26c92c869..4733327d2c 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -32,7 +32,7 @@ #include "surface.h" #include "fader.h" -#include "i18n.h" +#include "pbd/i18n.h" /* handlers for all buttons, broken into a separate file to avoid clutter in * mackie_control_protocol.cc diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index 494418a090..ec8192f91d 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -57,7 +57,7 @@ #include "jog.h" #include "meter.h" -#include "i18n.h" +#include "pbd/i18n.h" #ifdef PLATFORM_WINDOWS #define random() rand() diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc index 6f6500ffa3..ddc5a7b037 100644 --- a/libs/surfaces/mackie/surface_port.cc +++ b/libs/surfaces/mackie/surface_port.cc @@ -41,7 +41,7 @@ #include "surface.h" #include "surface_port.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; -- cgit v1.2.3