Fix --no-nls (5/5), i18n.h include order in gtk2_ardour

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index 2d96b17aa1b2d13b43254ff76b8392eb8c15515c..ebcca2a91443030d7c876da754ea8ca70da10592 100644 (file)
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -27,7 +27,6 @@
 
 #include "pbd/error.h"
 #include "pbd/convert.h"
-#include "pbd/i18n.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
@@ -40,6 +39,8 @@
 #include "axis_view.h"
 #include "utils.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;

diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc
index a416aaab948262637f0aad17f0b26aa311c62b53..74fd114c6090a93f68a866cb490b5d4da2bd2ec8 100644 (file)
--- a/gtk2_ardour/editor_snapshots.cc
+++ b/gtk2_ardour/editor_snapshots.cc
@@ -26,7 +26,6 @@
 
 #include "pbd/file_utils.h"
 #include "pbd/gstdio_compat.h"
-#include "pbd/i18n.h"
 
 #include "ardour/filename_extensions.h"
 #include "ardour/profile.h"
@@ -41,6 +40,8 @@
 #include "ardour_ui.h"
 #include "utils.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace PBD;
 using namespace Gtk;

diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc
index 1b9ab2a2dc24ecbaa4fa28e55060d3b97a1e41cc..50a8a75b9c96a490b04ba0561a32b3c7a91e5197 100644 (file)
--- a/gtk2_ardour/route_processor_selection.cc
+++ b/gtk2_ardour/route_processor_selection.cc
@@ -21,7 +21,6 @@
 #include <sigc++/bind.h>
 
 #include "pbd/error.h"
-#include "pbd/i18n.h"
 
 #include "ardour/selection.h"
 #include "ardour/session.h"
@@ -34,6 +33,8 @@
 #include "route_processor_selection.h"
 #include "route_ui.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/gtk2_ardour/save_template_dialog.cc b/gtk2_ardour/save_template_dialog.cc
index f14466500d95d34adcbd3619fee4cfe65f58a95d..bf09e3334363d9d05778a960e47e48f06bc3dc03 100644 (file)
--- a/gtk2_ardour/save_template_dialog.cc
+++ b/gtk2_ardour/save_template_dialog.cc
@@ -23,11 +23,12 @@
 #include <gtkmm/label.h>
 #include <gtkmm/stock.h>
 
-#include "pbd/i18n.h"
 #include "ardour/session.h"
 
 #include "save_template_dialog.h"
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 using namespace ARDOUR;
 

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 723bb464f85c9fbfbac3cc1309df887dec838d38..0e612be42c53c744d4f08f16120bb47f80bcd404 100644 (file)
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -21,8 +21,6 @@
 #include "gtk2ardour-config.h"
 #endif
 
-#include "pbd/i18n.h"
-
 #include <map>
 #include <cerrno>
 #include <sstream>
@@ -73,6 +71,8 @@
 
 #include "sfdb_freesound_mootcher.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace std;

diff --git a/gtk2_ardour/stripable_colorpicker.cc b/gtk2_ardour/stripable_colorpicker.cc
index 66602a9f6729d95919ae523df9f3bea60a8b1317..c2dfbbb438cf4c930bed96f69552f9bcb1b7f1ea 100644 (file)
--- a/gtk2_ardour/stripable_colorpicker.cc
+++ b/gtk2_ardour/stripable_colorpicker.cc
@@ -17,13 +17,14 @@
  */
 
 #include "pbd/compose.h"
-#include "pbd/i18n.h"
 
 #include "public_editor.h"
 #include "stripable_colorpicker.h"
 #include "ui_config.h"
 #include "utils.h"
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 using namespace ARDOUR_UI_UTILS;
 

diff --git a/gtk2_ardour/transport_masters_dialog.cc b/gtk2_ardour/transport_masters_dialog.cc
index ca4722fd02858d2f9c85a116bc744c178557b89b..a68ec10f3c315fb02b37cb073252693f6b98d108 100644 (file)
--- a/gtk2_ardour/transport_masters_dialog.cc
+++ b/gtk2_ardour/transport_masters_dialog.cc
@@ -18,7 +18,6 @@
 */
 
 #include "pbd/enumwriter.h"
-#include "pbd/i18n.h"
 
 #include "temporal/time.h"
 
@@ -35,6 +34,8 @@
 #include "ardour_ui.h"
 #include "transport_masters_dialog.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;