Fix --no-nls compilation 1/2 -- #8802

pbd/i18n.h MUST NEVER be included from header files and always be
the last include. This is because `_` is declared other headers
notably boost and some apple headers.

leading to issues like
../libs/pbd/gettext.h:58:27: error: expected unqualified-id before ‘const’
   58 | # define gettext(Msgid) ((const char *) (Msgid))
This commit is contained in:
Robin Gareus 2021-09-27 15:49:41 +02:00
parent 2000bc6ea0
commit ed3d374f47
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
9 changed files with 17 additions and 10 deletions

View File

@ -24,6 +24,8 @@
#include "ardour/triggerbox.h"
#include "ardour/types_convert.h"
#include "pbd/i18n.h"
using namespace PBD;
using namespace ARDOUR;
using std::string;

View File

@ -46,11 +46,12 @@
#define NO_OLDNAMES // no backwards compat _pid_t, conflict with w64 pthread/sched
#endif
#include "../ardour/filesystem_paths.cc"
#include "../ardour/vst3_scan.cc"
#include "../ardour/vst3_host.cc"
#include "../ardour/vst3_module.cc"
#include "../ardour/filesystem_paths.cc"
using namespace PBD;
class LogReceiver : public Receiver

View File

@ -24,7 +24,6 @@
#include "pbd/compose.h"
#include "pbd/error.h"
#include "pbd/i18n.h"
#include "canvas.h"
#include "layout.h"
@ -32,6 +31,8 @@
#include "maschine2.h"
#include "m2device.h"
#include "pbd/i18n.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif

View File

@ -25,8 +25,6 @@
#include "pbd/compose.h"
#include "pbd/error.h"
#include "pbd/i18n.h"
#include "pbd/abstract_ui.cc" // instantiate template
#include "ardour/async_midi_port.h"
#include "ardour/audioengine.h"
@ -44,6 +42,8 @@
#include "canvas.h"
#include "pbd/abstract_ui.cc" // instantiate template, includes i18n
using namespace ARDOUR;
using namespace PBD;
using namespace ArdourSurface;

View File

@ -21,8 +21,6 @@
#include <cairomm/region.h>
#include <pangomm/layout.h>
#include "pbd/i18n.h"
#include "gtkmm2ext/colors.h"
#include "canvas/text.h"
@ -35,6 +33,8 @@
#include "canvas.h"
#include "ui_menu.h"
#include "pbd/i18n.h"
#ifdef __APPLE__
#define Rect ArdourCanvas::Rect
#endif

View File

@ -24,6 +24,8 @@
#include "temporal/debug.h"
#include "temporal/tempo.h"
#include "pbd/i18n.h"
using namespace PBD;
using namespace Temporal;

View File

@ -22,7 +22,6 @@
#include <inttypes.h>
#include "pbd/error.h"
#include "pbd/i18n.h"
#include "pbd/compose.h"
#include "pbd/enumwriter.h"
#include "pbd/failed_constructor.h"
@ -31,6 +30,8 @@
#include "temporal/debug.h"
#include "temporal/tempo.h"
#include "pbd/i18n.h"
using namespace PBD;
using namespace Temporal;
using std::cerr;

View File

@ -30,7 +30,6 @@
#include <glibmm/threads.h>
#include "pbd/enum_convert.h"
#include "pbd/i18n.h"
#include "pbd/integer_division.h"
#include "pbd/memento_command.h"
#include "pbd/rcu.h"
@ -810,7 +809,7 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
LIBTEMPORAL_API MementoBinder () {}
LIBTEMPORAL_API void set_state (XMLNode const & node, int version) const;
LIBTEMPORAL_API XMLNode& get_state () const { return TempoMap::use()->get_state(); }
LIBTEMPORAL_API std::string type_name() const { return X_("Temporal::TempoMap"); }
LIBTEMPORAL_API std::string type_name() const { return "Temporal::TempoMap"; }
LIBTEMPORAL_API void add_state (XMLNode*) {}
};

View File

@ -24,12 +24,13 @@
#include "pbd/enumwriter.h"
#include "pbd/error.h"
#include "pbd/compose.h"
#include "pbd/i18n.h"
#include "temporal/debug.h"
#include "temporal/timeline.h"
#include "temporal/tempo.h"
#include "pbd/i18n.h"
using namespace PBD;
using namespace Temporal;