summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2019-09-26 06:11:30 +0200
committerRobin Gareus <robin@gareus.org>2019-09-26 06:11:30 +0200
commit6987196ea18cbf171e22ed62760962576ccb54da (patch)
treee15e86cd2b2e7738b8b8c7d2683eadc1e7cdeb10
parente8981602f403cbf97c60dcbd73664a365e8c2534 (diff)
More i18n include order fixes
-rw-r--r--gtk2_ardour/ardour_http.cc3
-rw-r--r--gtk2_ardour/ardour_ui3.cc4
-rw-r--r--gtk2_ardour/ardour_ui_engine.cc3
-rw-r--r--gtk2_ardour/ardour_ui_plugins.cc4
-rw-r--r--gtk2_ardour/ardour_ui_startup.cc3
-rw-r--r--gtk2_ardour/ardour_ui_video.cc3
6 files changed, 12 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour_http.cc b/gtk2_ardour/ardour_http.cc
index ebd2016f13..880d36578e 100644
--- a/gtk2_ardour/ardour_http.cc
+++ b/gtk2_ardour/ardour_http.cc
@@ -27,11 +27,12 @@
#include <glibmm.h>
#include "pbd/compose.h"
-#include "pbd/i18n.h"
#include "pbd/error.h"
#include "ardour_http.h"
+#include "pbd/i18n.h"
+
#ifdef WAF_BUILD
#include "gtk2ardour-version.h"
#endif
diff --git a/gtk2_ardour/ardour_ui3.cc b/gtk2_ardour/ardour_ui3.cc
index dc5716711c..7f81f88ab3 100644
--- a/gtk2_ardour/ardour_ui3.cc
+++ b/gtk2_ardour/ardour_ui3.cc
@@ -36,8 +36,6 @@
#include "gtk2ardour-version.h"
#endif
-#include "pbd/i18n.h"
-
#include "ardour/monitor_processor.h"
#include "ardour/session.h"
#include "ardour/route.h"
@@ -50,6 +48,8 @@
#include "public_editor.h"
#include "ui_config.h"
+#include "pbd/i18n.h"
+
using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;
diff --git a/gtk2_ardour/ardour_ui_engine.cc b/gtk2_ardour/ardour_ui_engine.cc
index 2ee03c13c0..01e10205c0 100644
--- a/gtk2_ardour/ardour_ui_engine.cc
+++ b/gtk2_ardour/ardour_ui_engine.cc
@@ -36,7 +36,6 @@
#include "gtk2ardour-version.h"
#endif
-#include "pbd/i18n.h"
#include "pbd/openuri.h"
#include "ardour/audioengine.h"
@@ -45,6 +44,8 @@
#include "engine_dialog.h"
#include "gui_thread.h"
+#include "pbd/i18n.h"
+
using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;
diff --git a/gtk2_ardour/ardour_ui_plugins.cc b/gtk2_ardour/ardour_ui_plugins.cc
index b9c75ac0bd..002ec535c9 100644
--- a/gtk2_ardour/ardour_ui_plugins.cc
+++ b/gtk2_ardour/ardour_ui_plugins.cc
@@ -38,13 +38,13 @@
#include <gtkmm/progressbar.h>
-#include "pbd/i18n.h"
-
#include "ardour/plugin_manager.h"
#include "ardour_ui.h"
#include "ui_config.h"
+#include "pbd/i18n.h"
+
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc
index 9ce89841fa..e9875e9338 100644
--- a/gtk2_ardour/ardour_ui_startup.cc
+++ b/gtk2_ardour/ardour_ui_startup.cc
@@ -52,7 +52,6 @@
#include "pbd/basename.h"
#include "pbd/file_utils.h"
-#include "pbd/i18n.h"
#include "ardour/audioengine.h"
#include "ardour/filename_extensions.h"
@@ -74,6 +73,8 @@
#include "splash.h"
#include "startup.h"
+#include "pbd/i18n.h"
+
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
diff --git a/gtk2_ardour/ardour_ui_video.cc b/gtk2_ardour/ardour_ui_video.cc
index e6e251a176..37418f6cae 100644
--- a/gtk2_ardour/ardour_ui_video.cc
+++ b/gtk2_ardour/ardour_ui_video.cc
@@ -41,7 +41,6 @@
#include <gtkmm/stock.h>
#include "pbd/error.h"
-#include "pbd/i18n.h"
#include "pbd/openuri.h"
#include "ardour/ltc_file_reader.h"
@@ -56,6 +55,8 @@
#include "transcode_video_dialog.h"
#include "video_server_dialog.h"
+#include "pbd/i18n.h"
+
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;