From a7a20e03ffc61e444c188411da0d3afa1d14548a Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 19 Aug 2020 17:40:02 +0200
Subject: [PATCH] Fix --no-nls, i18n include order in UI -- #8361

---
 gtk2_ardour/ardour_ui_access_web.cc | 3 ++-
 gtk2_ardour/ardour_ui_dependents.cc | 3 ++-
 gtk2_ardour/pt_import_selector.cc   | 3 ++-
 gtk2_ardour/startup_fsm.cc          | 3 ++-
 gtk2_ardour/template_dialog.cc      | 4 ++--
 gtk2_ardour/transport_control.cc    | 4 ++--
 session_utils/fix_bbtppq.cc         | 3 ++-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gtk2_ardour/ardour_ui_access_web.cc b/gtk2_ardour/ardour_ui_access_web.cc
index 7986e2ca3e..781b652627 100644
--- a/gtk2_ardour/ardour_ui_access_web.cc
+++ b/gtk2_ardour/ardour_ui_access_web.cc
@@ -36,12 +36,13 @@
 #include "gtk2ardour-version.h"
 #endif
 
-#include "pbd/i18n.h"
 #include "pbd/openuri.h"
 
 #include "ardour_message.h"
 #include "ardour_ui.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index d28ae7c14e..24810d3e7d 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -33,7 +33,6 @@
 #include <cstdio>
 
 #include "pbd/error.h"
-#include "pbd/i18n.h"
 
 #include "ardour/session.h"
 #include "ardour/lv2_plugin.h"
@@ -62,6 +61,8 @@
 #include <gdk/gdkx.h>
 #endif
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 using namespace PBD;
 
diff --git a/gtk2_ardour/pt_import_selector.cc b/gtk2_ardour/pt_import_selector.cc
index da65bcb723..318da1e355 100644
--- a/gtk2_ardour/pt_import_selector.cc
+++ b/gtk2_ardour/pt_import_selector.cc
@@ -22,7 +22,6 @@
 #include <iostream>
 
 #include "pbd/gstdio_compat.h"
-#include "pbd/i18n.h"
 #include "pbd/file_utils.h"
 
 #include "ptformat/ptformat.h"
@@ -33,6 +32,8 @@
 
 #include "pt_import_selector.h"
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc
index c52b0ecea8..dfdd01ce44 100644
--- a/gtk2_ardour/startup_fsm.cc
+++ b/gtk2_ardour/startup_fsm.cc
@@ -26,7 +26,6 @@
 #include "pbd/basename.h"
 #include "pbd/file_archive.h"
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 
 #include "ardour/audioengine.h"
 #include "ardour/filename_extensions.h"
@@ -58,6 +57,8 @@
 #include "gtk2ardour-version.h"
 #endif
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace Gtk;
 using namespace Gtkmm2ext;
diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc
index e0c5590eef..c9c37d00ed 100644
--- a/gtk2_ardour/template_dialog.cc
+++ b/gtk2_ardour/template_dialog.cc
@@ -40,7 +40,6 @@
 #include "pbd/error.h"
 #include "pbd/file_archive.h"
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 #include "pbd/xml++.h"
 
 #include "gtkmm2ext/gui_thread.h"
@@ -52,9 +51,10 @@
 #include "ardour/template_utils.h"
 
 #include "progress_reporter.h"
-
 #include "template_dialog.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace Gtk;
 using namespace PBD;
diff --git a/gtk2_ardour/transport_control.cc b/gtk2_ardour/transport_control.cc
index a7be5903d7..0828febb6b 100644
--- a/gtk2_ardour/transport_control.cc
+++ b/gtk2_ardour/transport_control.cc
@@ -16,8 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "pbd/i18n.h"
-
 #include "ardour/location.h"
 #include "ardour/session.h"
 
@@ -25,6 +23,8 @@
 #include "ardour_ui.h"
 #include "transport_control.h"
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 
 TransportControlProvider::TransportControlProvider ()
diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc
index e3767c8cda..81b148bcc6 100644
--- a/session_utils/fix_bbtppq.cc
+++ b/session_utils/fix_bbtppq.cc
@@ -25,7 +25,6 @@
 #include <glibmm.h>
 
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 #include "pbd/stateful.h"
 
 #include "ardour/region_factory.h"
@@ -44,6 +43,8 @@
 
 #include "common.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace SessionUtils;