From 357361c89d4c3743ee86f9dc3a349b9e2aae658c Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 21 Sep 2018 19:05:39 +0200
Subject: Fix --no-nls (4/5), i18n include order in libs/*

"i18n.h" needs to be included last (after any includes that may indirectly
pull in getext or libintl etc)
---
 libs/surfaces/push2/canvas.cc    | 3 ++-
 libs/surfaces/push2/menu.cc      | 4 ++--
 libs/surfaces/push2/scale.cc     | 5 ++---
 libs/surfaces/push2/splash.cc    | 3 ++-
 libs/surfaces/push2/track_mix.cc | 3 ++-
 5 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'libs/surfaces/push2')

diff --git a/libs/surfaces/push2/canvas.cc b/libs/surfaces/push2/canvas.cc
index 761c9d5880..9a569d55b5 100644
--- a/libs/surfaces/push2/canvas.cc
+++ b/libs/surfaces/push2/canvas.cc
@@ -25,7 +25,6 @@
 
 #include "pbd/compose.h"
 #include "pbd/error.h"
-#include "pbd/i18n.h"
 
 #include "ardour/debug.h"
 
@@ -33,6 +32,8 @@
 #include "layout.h"
 #include "push2.h"
 
+#include "pbd/i18n.h"
+
 #ifdef __APPLE__
 #define Rect ArdourCanvas::Rect
 #endif
diff --git a/libs/surfaces/push2/menu.cc b/libs/surfaces/push2/menu.cc
index 5a70a0ebd0..e72a9fc09f 100644
--- a/libs/surfaces/push2/menu.cc
+++ b/libs/surfaces/push2/menu.cc
@@ -21,8 +21,6 @@
 #include <cairomm/region.h>
 #include <pangomm/layout.h>
 
-#include "pbd/i18n.h"
-
 #include "canvas/text.h"
 #include "canvas/types.h"
 #include "canvas/rectangle.h"
@@ -34,6 +32,8 @@
 
 #include "menu.h"
 
+#include "pbd/i18n.h"
+
 #ifdef __APPLE__
 #define Rect ArdourCanvas::Rect
 #endif
diff --git a/libs/surfaces/push2/scale.cc b/libs/surfaces/push2/scale.cc
index be7111282f..c406ac8b3c 100644
--- a/libs/surfaces/push2/scale.cc
+++ b/libs/surfaces/push2/scale.cc
@@ -15,9 +15,6 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-
-#include "pbd/i18n.h"
-
 #include "gtkmm2ext/gui_thread.h"
 
 #include "gtkmm2ext/colors.h"
@@ -29,6 +26,8 @@
 #include "push2.h"
 #include "scale.h"
 
+#include "pbd/i18n.h"
+
 #ifdef __APPLE__
 #define Rect ArdourCanvas::Rect
 #endif
diff --git a/libs/surfaces/push2/splash.cc b/libs/surfaces/push2/splash.cc
index 601f885467..c1d42d3e91 100644
--- a/libs/surfaces/push2/splash.cc
+++ b/libs/surfaces/push2/splash.cc
@@ -21,7 +21,6 @@
 #include "pbd/compose.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 #include "pbd/search_path.h"
 
 #include "ardour/debug.h"
@@ -29,6 +28,8 @@
 
 #include "splash.h"
 
+#include "pbd/i18n.h"
+
 #ifdef __APPLE__
 #define Rect ArdourCanvas::Rect
 #endif
diff --git a/libs/surfaces/push2/track_mix.cc b/libs/surfaces/push2/track_mix.cc
index fb5a5653f0..ebb3c0731c 100644
--- a/libs/surfaces/push2/track_mix.cc
+++ b/libs/surfaces/push2/track_mix.cc
@@ -24,7 +24,6 @@
 #include "pbd/debug.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 #include "pbd/search_path.h"
 #include "pbd/enumwriter.h"
 
@@ -66,6 +65,8 @@
 #include "track_mix.h"
 #include "utils.h"
 
+#include "pbd/i18n.h"
+
 #ifdef __APPLE__
 #define Rect ArdourCanvas::Rect
 #endif
-- 
cgit v1.2.3