From 357361c89d4c3743ee86f9dc3a349b9e2aae658c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 21 Sep 2018 19:05:39 +0200 Subject: Fix --no-nls (4/5), i18n include order in libs/* "i18n.h" needs to be included last (after any includes that may indirectly pull in getext or libintl etc) --- libs/ardour/ardour/selection.h | 1 - libs/ardour/engine_slave.cc | 4 ++-- libs/ardour/selection.cc | 2 ++ libs/ardour/slavable_automation_control.cc | 3 ++- libs/ardour/transport_master.cc | 3 ++- libs/ardour/transport_master_manager.cc | 4 ++-- libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 1 - libs/surfaces/push2/canvas.cc | 3 ++- libs/surfaces/push2/menu.cc | 4 ++-- libs/surfaces/push2/scale.cc | 5 ++--- libs/surfaces/push2/splash.cc | 3 ++- libs/surfaces/push2/track_mix.cc | 3 ++- 12 files changed, 20 insertions(+), 16 deletions(-) diff --git a/libs/ardour/ardour/selection.h b/libs/ardour/ardour/selection.h index 36f2d48b23..745b4c96f9 100644 --- a/libs/ardour/ardour/selection.h +++ b/libs/ardour/ardour/selection.h @@ -27,7 +27,6 @@ #include #include "pbd/stateful.h" -#include "pbd/i18n.h" #include "ardour/presentation_info.h" #include "ardour/types.h" diff --git a/libs/ardour/engine_slave.cc b/libs/ardour/engine_slave.cc index 062b957ff3..12b7d313a2 100644 --- a/libs/ardour/engine_slave.cc +++ b/libs/ardour/engine_slave.cc @@ -20,13 +20,13 @@ #include #include -#include "pbd/i18n.h" - #include "ardour/audioengine.h" #include "ardour/audio_backend.h" #include "ardour/session.h" #include "ardour/transport_master.h" +#include "pbd/i18n.h" + using namespace std; using namespace ARDOUR; diff --git a/libs/ardour/selection.cc b/libs/ardour/selection.cc index 10dc50003c..b41b387e69 100644 --- a/libs/ardour/selection.cc +++ b/libs/ardour/selection.cc @@ -30,6 +30,8 @@ #include "ardour/session.h" #include "ardour/stripable.h" +#include "pbd/i18n.h" + using namespace ARDOUR; using namespace PBD; diff --git a/libs/ardour/slavable_automation_control.cc b/libs/ardour/slavable_automation_control.cc index 7d4d822529..0bfa2b7249 100644 --- a/libs/ardour/slavable_automation_control.cc +++ b/libs/ardour/slavable_automation_control.cc @@ -23,7 +23,6 @@ #include "pbd/error.h" #include "pbd/memento_command.h" #include "pbd/types_convert.h" -#include "pbd/i18n.h" #include "evoral/Curve.hpp" @@ -32,6 +31,8 @@ #include "ardour/slavable_automation_control.h" #include "ardour/session.h" +#include "pbd/i18n.h" + using namespace std; using namespace ARDOUR; using namespace PBD; diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc index f3aad266fe..4f7e69eaec 100644 --- a/libs/ardour/transport_master.cc +++ b/libs/ardour/transport_master.cc @@ -20,7 +20,6 @@ #include #include "pbd/debug.h" -#include "pbd/i18n.h" #include "ardour/audioengine.h" #include "ardour/midi_port.h" @@ -30,6 +29,8 @@ #include "ardour/types_convert.h" #include "ardour/utils.h" +#include "pbd/i18n.h" + namespace ARDOUR { namespace Properties { PBD::PropertyDescriptor fr2997; diff --git a/libs/ardour/transport_master_manager.cc b/libs/ardour/transport_master_manager.cc index ff567799dc..80d62b3adc 100644 --- a/libs/ardour/transport_master_manager.cc +++ b/libs/ardour/transport_master_manager.cc @@ -16,14 +16,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "pbd/i18n.h" - #include "ardour/audioengine.h" #include "ardour/debug.h" #include "ardour/disk_reader.h" #include "ardour/session.h" #include "ardour/transport_master_manager.h" +#include "pbd/i18n.h" + #if __cplusplus > 199711L #define local_signbit(x) std::signbit (x) #else diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index fb644a9aea..4d931b8fe0 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -37,7 +37,6 @@ #include "pbd/error.h" #include "pbd/failed_constructor.h" #include "pbd/file_utils.h" -#include "pbd/i18n.h" #include "pbd/strsplit.h" #include "pbd/types_convert.h" #include "pbd/xml++.h" diff --git a/libs/surfaces/push2/canvas.cc b/libs/surfaces/push2/canvas.cc index 761c9d5880..9a569d55b5 100644 --- a/libs/surfaces/push2/canvas.cc +++ b/libs/surfaces/push2/canvas.cc @@ -25,7 +25,6 @@ #include "pbd/compose.h" #include "pbd/error.h" -#include "pbd/i18n.h" #include "ardour/debug.h" @@ -33,6 +32,8 @@ #include "layout.h" #include "push2.h" +#include "pbd/i18n.h" + #ifdef __APPLE__ #define Rect ArdourCanvas::Rect #endif diff --git a/libs/surfaces/push2/menu.cc b/libs/surfaces/push2/menu.cc index 5a70a0ebd0..e72a9fc09f 100644 --- a/libs/surfaces/push2/menu.cc +++ b/libs/surfaces/push2/menu.cc @@ -21,8 +21,6 @@ #include #include -#include "pbd/i18n.h" - #include "canvas/text.h" #include "canvas/types.h" #include "canvas/rectangle.h" @@ -34,6 +32,8 @@ #include "menu.h" +#include "pbd/i18n.h" + #ifdef __APPLE__ #define Rect ArdourCanvas::Rect #endif diff --git a/libs/surfaces/push2/scale.cc b/libs/surfaces/push2/scale.cc index be7111282f..c406ac8b3c 100644 --- a/libs/surfaces/push2/scale.cc +++ b/libs/surfaces/push2/scale.cc @@ -15,9 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#include "pbd/i18n.h" - #include "gtkmm2ext/gui_thread.h" #include "gtkmm2ext/colors.h" @@ -29,6 +26,8 @@ #include "push2.h" #include "scale.h" +#include "pbd/i18n.h" + #ifdef __APPLE__ #define Rect ArdourCanvas::Rect #endif diff --git a/libs/surfaces/push2/splash.cc b/libs/surfaces/push2/splash.cc index 601f885467..c1d42d3e91 100644 --- a/libs/surfaces/push2/splash.cc +++ b/libs/surfaces/push2/splash.cc @@ -21,7 +21,6 @@ #include "pbd/compose.h" #include "pbd/failed_constructor.h" #include "pbd/file_utils.h" -#include "pbd/i18n.h" #include "pbd/search_path.h" #include "ardour/debug.h" @@ -29,6 +28,8 @@ #include "splash.h" +#include "pbd/i18n.h" + #ifdef __APPLE__ #define Rect ArdourCanvas::Rect #endif diff --git a/libs/surfaces/push2/track_mix.cc b/libs/surfaces/push2/track_mix.cc index fb5a5653f0..ebb3c0731c 100644 --- a/libs/surfaces/push2/track_mix.cc +++ b/libs/surfaces/push2/track_mix.cc @@ -24,7 +24,6 @@ #include "pbd/debug.h" #include "pbd/failed_constructor.h" #include "pbd/file_utils.h" -#include "pbd/i18n.h" #include "pbd/search_path.h" #include "pbd/enumwriter.h" @@ -66,6 +65,8 @@ #include "track_mix.h" #include "utils.h" +#include "pbd/i18n.h" + #ifdef __APPLE__ #define Rect ArdourCanvas::Rect #endif -- cgit v1.2.3