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

This commit is contained in:
Robin Gareus 2018-09-21 19:05:57 +02:00
parent 357361c89d
commit 1f0889a97a
7 changed files with 14 additions and 8 deletions

View file

@ -27,7 +27,6 @@
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/convert.h" #include "pbd/convert.h"
#include "pbd/i18n.h"
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/gtk_ui.h>
@ -40,6 +39,8 @@
#include "axis_view.h" #include "axis_view.h"
#include "utils.h" #include "utils.h"
#include "pbd/i18n.h"
using namespace std; using namespace std;
using namespace Gtk; using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;

View file

@ -26,7 +26,6 @@
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
#include "pbd/gstdio_compat.h" #include "pbd/gstdio_compat.h"
#include "pbd/i18n.h"
#include "ardour/filename_extensions.h" #include "ardour/filename_extensions.h"
#include "ardour/profile.h" #include "ardour/profile.h"
@ -41,6 +40,8 @@
#include "ardour_ui.h" #include "ardour_ui.h"
#include "utils.h" #include "utils.h"
#include "pbd/i18n.h"
using namespace std; using namespace std;
using namespace PBD; using namespace PBD;
using namespace Gtk; using namespace Gtk;

View file

@ -21,7 +21,6 @@
#include <sigc++/bind.h> #include <sigc++/bind.h>
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/i18n.h"
#include "ardour/selection.h" #include "ardour/selection.h"
#include "ardour/session.h" #include "ardour/session.h"
@ -34,6 +33,8 @@
#include "route_processor_selection.h" #include "route_processor_selection.h"
#include "route_ui.h" #include "route_ui.h"
#include "pbd/i18n.h"
using namespace std; using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;

View file

@ -23,11 +23,12 @@
#include <gtkmm/label.h> #include <gtkmm/label.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include "pbd/i18n.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "save_template_dialog.h" #include "save_template_dialog.h"
#include "pbd/i18n.h"
using namespace Gtk; using namespace Gtk;
using namespace ARDOUR; using namespace ARDOUR;

View file

@ -21,8 +21,6 @@
#include "gtk2ardour-config.h" #include "gtk2ardour-config.h"
#endif #endif
#include "pbd/i18n.h"
#include <map> #include <map>
#include <cerrno> #include <cerrno>
#include <sstream> #include <sstream>
@ -73,6 +71,8 @@
#include "sfdb_freesound_mootcher.h" #include "sfdb_freesound_mootcher.h"
#include "pbd/i18n.h"
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
using namespace std; using namespace std;

View file

@ -17,13 +17,14 @@
*/ */
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/i18n.h"
#include "public_editor.h" #include "public_editor.h"
#include "stripable_colorpicker.h" #include "stripable_colorpicker.h"
#include "ui_config.h" #include "ui_config.h"
#include "utils.h" #include "utils.h"
#include "pbd/i18n.h"
using namespace Gtk; using namespace Gtk;
using namespace ARDOUR_UI_UTILS; using namespace ARDOUR_UI_UTILS;

View file

@ -18,7 +18,6 @@
*/ */
#include "pbd/enumwriter.h" #include "pbd/enumwriter.h"
#include "pbd/i18n.h"
#include "temporal/time.h" #include "temporal/time.h"
@ -35,6 +34,8 @@
#include "ardour_ui.h" #include "ardour_ui.h"
#include "transport_masters_dialog.h" #include "transport_masters_dialog.h"
#include "pbd/i18n.h"
using namespace std; using namespace std;
using namespace Gtk; using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;