*** NEW CODING POLICY ***

All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.

Do this:

#include "ardour/types.h"

NOT this:

#include <ardour/types.h>

Rationale:

This is best practice in general, to ensure we include the local version
and not the system version.  That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.

More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly.  That is:

!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!

Failure to comply is punishable by death by torture. :)

P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).


git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf

29 files changed, 87 insertions, 87 deletions

diff --git a/libs/midi++2/alsa_sequencer_midiport.cc b/libs/midi++2/alsa_sequencer_midiport.cc
index fc69099d0e..4a6dc6b3ea 100644
--- a/libs/midi++2/alsa_sequencer_midiport.cc
+++ b/libs/midi++2/alsa_sequencer_midiport.cc
@@ -21,12 +21,12 @@
 #include <fcntl.h>
 #include <cerrno>
 
-#include <pbd/failed_constructor.h>
-#include <pbd/error.h>
-#include <pbd/xml++.h>
+#include "pbd/failed_constructor.h"
+#include "pbd/error.h"
+#include "pbd/xml++.h"
 
-#include <midi++/types.h>
-#include <midi++/alsa_sequencer.h>
+#include "midi++/types.h"
+#include "midi++/alsa_sequencer.h"
 
 #include "i18n.h"
 
diff --git a/libs/midi++2/coremidi_midiport.cc b/libs/midi++2/coremidi_midiport.cc
index 9eacfc0cc3..e950da2949 100644
--- a/libs/midi++2/coremidi_midiport.cc
+++ b/libs/midi++2/coremidi_midiport.cc
@@ -21,11 +21,11 @@
 #include <fcntl.h>
 #include <cerrno>
 
-#include <midi++/coremidi_midiport.h>
-#include <midi++/types.h>
+#include "midi++/coremidi_midiport.h"
+#include "midi++/types.h"
 #include <mach/mach_time.h>
 
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
 
 using namespace std;
 using namespace MIDI;
diff --git a/libs/midi++2/fd_midiport.cc b/libs/midi++2/fd_midiport.cc
index 640f08686a..2e7bd004a2 100644
--- a/libs/midi++2/fd_midiport.cc
+++ b/libs/midi++2/fd_midiport.cc
@@ -22,11 +22,11 @@
 #include <cerrno>
 #include <cstring>
 
-#include <pbd/error.h>
-#include <pbd/pathscanner.h>
+#include "pbd/error.h"
+#include "pbd/pathscanner.h"
 
-#include <midi++/types.h>
-#include <midi++/fd_midiport.h>
+#include "midi++/types.h"
+#include "midi++/fd_midiport.h"
 
 using namespace std;
 using namespace MIDI;
diff --git a/libs/midi++2/fifomidi.cc b/libs/midi++2/fifomidi.cc
index a81520bb95..3bf340f3d3 100644
--- a/libs/midi++2/fifomidi.cc
+++ b/libs/midi++2/fifomidi.cc
@@ -21,8 +21,8 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <midi++/types.h>
-#include <midi++/fifomidi.h>
+#include "midi++/types.h"
+#include "midi++/fifomidi.h"
 
 using namespace MIDI;
 
diff --git a/libs/midi++2/jack_midiport.cc b/libs/midi++2/jack_midiport.cc
index 0eb867ebe7..65d7736c1b 100644
--- a/libs/midi++2/jack_midiport.cc
+++ b/libs/midi++2/jack_midiport.cc
@@ -21,10 +21,10 @@
 #include <cerrno>
 #include <cassert>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
-#include <midi++/types.h>
-#include <midi++/jack.h>
+#include "midi++/types.h"
+#include "midi++/jack.h"
 
 using namespace std;
 using namespace MIDI;
diff --git a/libs/midi++2/midi++/alsa_rawmidi.h b/libs/midi++2/midi++/alsa_rawmidi.h
index e5abc2832f..5c0c0ff0ea 100644
--- a/libs/midi++2/midi++/alsa_rawmidi.h
+++ b/libs/midi++2/midi++/alsa_rawmidi.h
@@ -25,8 +25,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <midi++/port.h>
-#include <midi++/fd_midiport.h>
+#include "midi++/port.h"
+#include "midi++/fd_midiport.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/alsa_sequencer.h b/libs/midi++2/midi++/alsa_sequencer.h
index 8938d95918..889dd972b8 100644
--- a/libs/midi++2/midi++/alsa_sequencer.h
+++ b/libs/midi++2/midi++/alsa_sequencer.h
@@ -26,7 +26,7 @@
 #include <unistd.h>
 
 #include <alsa/asoundlib.h>
-#include <midi++/port.h>
+#include "midi++/port.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/channel.h b/libs/midi++2/midi++/channel.h
index 5a4a397b9d..697f2a1e46 100644
--- a/libs/midi++2/midi++/channel.h
+++ b/libs/midi++2/midi++/channel.h
@@ -24,8 +24,8 @@
 
 #include <sigc++/sigc++.h>
 
-#include <midi++/types.h>
-#include <midi++/parser.h>
+#include "midi++/types.h"
+#include "midi++/parser.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/coremidi_midiport.h b/libs/midi++2/midi++/coremidi_midiport.h
index f9b89f3348..74207238ad 100644
--- a/libs/midi++2/midi++/coremidi_midiport.h
+++ b/libs/midi++2/midi++/coremidi_midiport.h
@@ -27,7 +27,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <midi++/port.h>
+#include "midi++/port.h"
 
 #include <CoreMIDI/CoreMIDI.h>
 
diff --git a/libs/midi++2/midi++/event.h b/libs/midi++2/midi++/event.h
index d9b5333904..70744536a8 100644
--- a/libs/midi++2/midi++/event.h
+++ b/libs/midi++2/midi++/event.h
@@ -26,9 +26,9 @@
 #include <sstream>
 #include <assert.h>
 
-#include <midi++/types.h>
-#include <midi++/events.h>
-#include <pbd/xml++.h>
+#include "midi++/types.h"
+#include "midi++/events.h"
+#include "pbd/xml++.h"
 
 /** If this is not defined, all methods of MidiEvent are RT safe
  * but MidiEvent will never deep copy and (depending on the scenario)
@@ -39,7 +39,7 @@
 /** Support serialisation of MIDI events to/from XML */
 #define EVORAL_MIDI_XML 1
 
-#include <evoral/Event.hpp>
-#include <evoral/MIDIEvent.hpp>
+#include "evoral/Event.hpp"
+#include "evoral/MIDIEvent.hpp"
 
 #endif /* __libmidipp_midi_event_h__ */
diff --git a/libs/midi++2/midi++/factory.h b/libs/midi++2/midi++/factory.h
index f3402546e9..3f130c41a7 100644
--- a/libs/midi++2/midi++/factory.h
+++ b/libs/midi++2/midi++/factory.h
@@ -22,7 +22,7 @@
 #include <vector>
 #include <string>
 
-#include <midi++/port.h>
+#include "midi++/port.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/fd_midiport.h b/libs/midi++2/midi++/fd_midiport.h
index 66c2206674..8f942cf970 100644
--- a/libs/midi++2/midi++/fd_midiport.h
+++ b/libs/midi++2/midi++/fd_midiport.h
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <midi++/port.h>
+#include "midi++/port.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/fifomidi.h b/libs/midi++2/midi++/fifomidi.h
index 3439c27dcf..022d055d92 100644
--- a/libs/midi++2/midi++/fifomidi.h
+++ b/libs/midi++2/midi++/fifomidi.h
@@ -24,8 +24,8 @@
 #include <string>
 #include <unistd.h>
 
-#include <midi++/port.h>
-#include <midi++/fd_midiport.h>
+#include "midi++/port.h"
+#include "midi++/fd_midiport.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/jack.h b/libs/midi++2/midi++/jack.h
index 255264b1d8..a449a8c554 100644
--- a/libs/midi++2/midi++/jack.h
+++ b/libs/midi++2/midi++/jack.h
@@ -30,11 +30,11 @@
 
 #include <glibmm/thread.h>
 
-#include <pbd/ringbuffer.h>
+#include "pbd/ringbuffer.h"
 #include <jack/jack.h>
 #include <jack/midiport.h>
-#include <midi++/port.h>
-#include <midi++/event.h>
+#include "midi++/port.h"
+#include "midi++/event.h"
 
 namespace MIDI
 {
diff --git a/libs/midi++2/midi++/manager.h b/libs/midi++2/midi++/manager.h
index bb3bf9b999..43da0d3fd2 100644
--- a/libs/midi++2/midi++/manager.h
+++ b/libs/midi++2/midi++/manager.h
@@ -25,8 +25,8 @@
 
 #include <string>
 
-#include <midi++/types.h>
-#include <midi++/port.h>
+#include "midi++/types.h"
+#include "midi++/port.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h
index 6abbed8207..fb8fd2449f 100644
--- a/libs/midi++2/midi++/mmc.h
+++ b/libs/midi++2/midi++/mmc.h
@@ -21,7 +21,7 @@
 #define __midipp_mmc_h_h__
 
 #include <sigc++/sigc++.h>
-#include <midi++/types.h>
+#include "midi++/types.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/nullmidi.h b/libs/midi++2/midi++/nullmidi.h
index 05efacf786..0ed221a78d 100644
--- a/libs/midi++2/midi++/nullmidi.h
+++ b/libs/midi++2/midi++/nullmidi.h
@@ -23,7 +23,7 @@
 #include <vector>
 #include <string>
 
-#include <midi++/port.h>
+#include "midi++/port.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h
index 2b3412cc00..5baa3af4b6 100644
--- a/libs/midi++2/midi++/parser.h
+++ b/libs/midi++2/midi++/parser.h
@@ -25,7 +25,7 @@
 
 #include <sigc++/sigc++.h>
 
-#include <midi++/types.h>
+#include "midi++/types.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h
index 7522bc520f..e7d5531bf9 100644
--- a/libs/midi++2/midi++/port.h
+++ b/libs/midi++2/midi++/port.h
@@ -23,10 +23,10 @@
 #include <iostream>
 
 #include <sigc++/sigc++.h>
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
 
-#include <midi++/types.h>
-#include <midi++/parser.h>
+#include "midi++/types.h"
+#include "midi++/parser.h"
 
 namespace MIDI {
 
diff --git a/libs/midi++2/midi.cc b/libs/midi++2/midi.cc
index 89d74b1b31..eacd85bf28 100644
--- a/libs/midi++2/midi.cc
+++ b/libs/midi++2/midi.cc
@@ -20,7 +20,7 @@
 
 #include <cstring>
 #include <cstdlib>
-#include <midi++/types.h>
+#include "midi++/types.h"
 
 const char *MIDI::controller_names[] = {
 	"bank (0)",
diff --git a/libs/midi++2/midichannel.cc b/libs/midi++2/midichannel.cc
index c8a18f2ee2..0a43b9c900 100644
--- a/libs/midi++2/midichannel.cc
+++ b/libs/midi++2/midichannel.cc
@@ -19,9 +19,9 @@
 */
 
 #include <cstring>
-#include <midi++/types.h>
-#include <midi++/port.h>
-#include <midi++/channel.h>
+#include "midi++/types.h"
+#include "midi++/port.h"
+#include "midi++/channel.h"
 
 using namespace sigc;
 using namespace MIDI;
diff --git a/libs/midi++2/midifactory.cc b/libs/midi++2/midifactory.cc
index d893cc9f47..dbf6d47f52 100644
--- a/libs/midi++2/midifactory.cc
+++ b/libs/midi++2/midifactory.cc
@@ -19,15 +19,15 @@
 
 #include <cassert>
 
-#include <pbd/error.h>
-#include <pbd/convert.h>
+#include "pbd/error.h"
+#include "pbd/convert.h"
 
-#include <midi++/types.h>
-#include <midi++/factory.h>
-#include <midi++/fifomidi.h>
+#include "midi++/types.h"
+#include "midi++/factory.h"
+#include "midi++/fifomidi.h"
 
 #ifdef WITH_JACK_MIDI
-#include <midi++/jack.h>
+#include "midi++/jack.h"
 
 std::string MIDI::JACK_MidiPort::typestring = "jack";
 #endif // WITH_JACK_MIDI
@@ -35,8 +35,8 @@ std::string MIDI::JACK_MidiPort::typestring = "jack";
 std::string MIDI::FIFO_MidiPort::typestring = "fifo";
 
 #ifdef WITH_ALSA
-#include <midi++/alsa_sequencer.h>
-#include <midi++/alsa_rawmidi.h>
+#include "midi++/alsa_sequencer.h"
+#include "midi++/alsa_rawmidi.h"
 
 std::string MIDI::ALSA_SequencerMidiPort::typestring = "alsa/sequencer";
 std::string MIDI::ALSA_RawMidiPort::typestring = "alsa/raw";
@@ -44,7 +44,7 @@ std::string MIDI::ALSA_RawMidiPort::typestring = "alsa/raw";
 #endif // WITH_ALSA
 
 #ifdef WITH_COREMIDI
-#include <midi++/coremidi_midiport.h>
+#include "midi++/coremidi_midiport.h"
 
 std::string MIDI::CoreMidi_MidiPort::typestring = "coremidi";
 
diff --git a/libs/midi++2/midimanager.cc b/libs/midi++2/midimanager.cc
index 14c9d43793..ab03688e49 100644
--- a/libs/midi++2/midimanager.cc
+++ b/libs/midi++2/midimanager.cc
@@ -21,12 +21,12 @@
 
 #include <glib.h>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
-#include <midi++/types.h>
-#include <midi++/manager.h>
-#include <midi++/factory.h>
-#include <midi++/channel.h>
+#include "midi++/types.h"
+#include "midi++/manager.h"
+#include "midi++/factory.h"
+#include "midi++/channel.h"
 
 using namespace std;
 using namespace MIDI;
diff --git a/libs/midi++2/midiparser.cc b/libs/midi++2/midiparser.cc
index 4cbcd27694..2222575678 100644
--- a/libs/midi++2/midiparser.cc
+++ b/libs/midi++2/midiparser.cc
@@ -28,11 +28,11 @@
 #include <iostream>
 #include <iterator>
 
-#include <midi++/types.h>
-#include <midi++/parser.h>
-#include <midi++/port.h>
-#include <midi++/mmc.h>
-#include <pbd/transmitter.h>
+#include "midi++/types.h"
+#include "midi++/parser.h"
+#include "midi++/port.h"
+#include "midi++/mmc.h"
+#include "pbd/transmitter.h"
 
 using namespace std;
 using namespace sigc;
diff --git a/libs/midi++2/midiport.cc b/libs/midi++2/midiport.cc
index 8f4a6fb3d2..9df6e7e7d9 100644
--- a/libs/midi++2/midiport.cc
+++ b/libs/midi++2/midiport.cc
@@ -22,14 +22,14 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <pbd/xml++.h>
-#include <pbd/error.h>
-#include <pbd/failed_constructor.h>
-
-#include <midi++/types.h>
-#include <midi++/port.h>
-#include <midi++/channel.h>
-#include <midi++/factory.h>
+#include "pbd/xml++.h"
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
+
+#include "midi++/types.h"
+#include "midi++/port.h"
+#include "midi++/channel.h"
+#include "midi++/factory.h"
 
 using namespace MIDI;
 using namespace std;
diff --git a/libs/midi++2/miditrace.cc b/libs/midi++2/miditrace.cc
index fafe822f82..b5a66cafa9 100644
--- a/libs/midi++2/miditrace.cc
+++ b/libs/midi++2/miditrace.cc
@@ -1,8 +1,8 @@
 #include <cstdio>
 #include <fcntl.h>
 
-#include <pbd/error.h>
-#include <pbd/textreceiver.h>
+#include "pbd/error.h"
+#include "pbd/textreceiver.h"
 
 Transmitter error (Transmitter::Error);
 Transmitter info (Transmitter::Info);
diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc
index 1ede281c28..5ec1acd5d9 100644
--- a/libs/midi++2/mmc.cc
+++ b/libs/midi++2/mmc.cc
@@ -20,10 +20,10 @@
 
 #include <map>
 
-#include <pbd/error.h>
-#include <midi++/mmc.h>
-#include <midi++/port.h>
-#include <midi++/parser.h>
+#include "pbd/error.h"
+#include "midi++/mmc.h"
+#include "midi++/port.h"
+#include "midi++/parser.h"
 
 using namespace std;
 using namespace MIDI;
diff --git a/libs/midi++2/mmctest.cc b/libs/midi++2/mmctest.cc
index 062f6e8d32..527e1491ea 100644
--- a/libs/midi++2/mmctest.cc
+++ b/libs/midi++2/mmctest.cc
@@ -1,8 +1,8 @@
 #include <cstdio>
 #include <fcntl.h>
 
-#include <pbd/error.h>
-#include <pbd/textreceiver.h>
+#include "pbd/error.h"
+#include "pbd/textreceiver.h"
 
 Transmitter error (Transmitter::Error);
 Transmitter info (Transmitter::Info);
diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc
index 9d62c7354c..1dd023a2f2 100644
--- a/libs/midi++2/mtc.cc
+++ b/libs/midi++2/mtc.cc
@@ -23,11 +23,11 @@
 #include <cstring>
 #include <iostream>
 
-#include <midi++/types.h>
-#include <midi++/parser.h>
-#include <midi++/port.h>
-#include <midi++/mmc.h>
-#include <pbd/transmitter.h>
+#include "midi++/types.h"
+#include "midi++/parser.h"
+#include "midi++/port.h"
+#include "midi++/mmc.h"
+#include "pbd/transmitter.h"
 
 using namespace std;
 using namespace sigc;