diff options
author | Robin Gareus <robin@gareus.org> | 2018-09-21 19:05:57 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2018-09-21 19:05:57 +0200 |
commit | 1f0889a97a45876ac25def94e8ccad7e2ac2547c (patch) | |
tree | fe4870064553a80b28c96e1599ea62c3b927cb10 | |
parent | 357361c89d4c3743ee86f9dc3a349b9e2aae658c (diff) |
Fix --no-nls (5/5), i18n.h include order in gtk2_ardour
-rw-r--r-- | gtk2_ardour/axis_view.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/editor_snapshots.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/route_processor_selection.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/save_template_dialog.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/stripable_colorpicker.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/transport_masters_dialog.cc | 3 |
7 files changed, 14 insertions, 8 deletions
diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc index 2d96b17aa1..ebcca2a914 100644 --- 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 a416aaab94..74fd114c60 100644 --- 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 1b9ab2a2dc..50a8a75b9c 100644 --- 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 f14466500d..bf09e33343 100644 --- 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 723bb464f8..0e612be42c 100644 --- 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 66602a9f67..c2dfbbb438 100644 --- 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 ca4722fd02..a68ec10f3c 100644 --- 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; |