summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-02-01 19:06:23 +0000
committerDavid Robillard <d@drobilla.net>2010-02-01 19:06:23 +0000
commitfeb7439d70871aa9663e7c4218671a3c26717fbb (patch)
tree50257d9478959e1c4101ac1914942da12a0fefb9 /src
parent0fdb802920e1fce6ed64d9fe7d54f39ee0adbc90 (diff)
downloadingen-feb7439d70871aa9663e7c4218671a3c26717fbb.tar.gz
ingen-feb7439d70871aa9663e7c4218671a3c26717fbb.tar.bz2
ingen-feb7439d70871aa9663e7c4218671a3c26717fbb.zip
Use consistent and more globally unique inclusion guards.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2398 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/client/ClientStore.hpp6
-rw-r--r--src/client/ConnectionModel.hpp6
-rw-r--r--src/client/DeprecatedLoader.hpp6
-rw-r--r--src/client/HTTPClientReceiver.hpp6
-rw-r--r--src/client/HTTPEngineSender.hpp6
-rw-r--r--src/client/NodeModel.hpp6
-rw-r--r--src/client/OSCClientReceiver.hpp6
-rw-r--r--src/client/OSCEngineSender.hpp6
-rw-r--r--src/client/ObjectModel.hpp6
-rw-r--r--src/client/PatchModel.hpp6
-rw-r--r--src/client/PluginModel.hpp6
-rw-r--r--src/client/PluginUI.hpp6
-rw-r--r--src/client/PortModel.hpp6
-rw-r--r--src/client/SigClientInterface.hpp4
-rw-r--r--src/client/ThreadedSigClientInterface.hpp4
-rw-r--r--src/common/interface/ClientInterface.hpp4
-rw-r--r--src/common/interface/CommonInterface.hpp6
-rw-r--r--src/common/interface/Connection.hpp6
-rw-r--r--src/common/interface/EngineInterface.hpp6
-rw-r--r--src/common/interface/EventType.hpp6
-rw-r--r--src/common/interface/GraphObject.hpp6
-rw-r--r--src/common/interface/MessageType.hpp6
-rw-r--r--src/common/interface/Node.hpp6
-rw-r--r--src/common/interface/Patch.hpp6
-rw-r--r--src/common/interface/Plugin.hpp6
-rw-r--r--src/common/interface/PortType.hpp6
-rw-r--r--src/common/interface/Resource.hpp6
-rw-r--r--src/engine/AudioBuffer.hpp6
-rw-r--r--src/engine/AudioDriver.hpp6
-rw-r--r--src/engine/Buffer.hpp6
-rw-r--r--src/engine/BufferFactory.hpp6
-rw-r--r--src/engine/ClientBroadcaster.hpp6
-rw-r--r--src/engine/CompiledPatch.hpp6
-rw-r--r--src/engine/ConnectionImpl.hpp6
-rw-r--r--src/engine/Context.hpp6
-rw-r--r--src/engine/ControlBindings.hpp6
-rw-r--r--src/engine/Driver.hpp6
-rw-r--r--src/engine/DuplexPort.hpp6
-rw-r--r--src/engine/Engine.hpp6
-rw-r--r--src/engine/EngineStore.hpp4
-rw-r--r--src/engine/Event.hpp6
-rw-r--r--src/engine/EventBuffer.hpp6
-rw-r--r--src/engine/EventSink.hpp6
-rw-r--r--src/engine/EventSource.hpp6
-rw-r--r--src/engine/GraphObjectImpl.hpp6
-rw-r--r--src/engine/HTTPClientSender.hpp6
-rw-r--r--src/engine/HTTPEngineReceiver.hpp6
-rw-r--r--src/engine/InputPort.hpp6
-rw-r--r--src/engine/InternalPlugin.hpp6
-rw-r--r--src/engine/JackDriver.hpp6
-rw-r--r--src/engine/LADSPANode.hpp6
-rw-r--r--src/engine/LADSPAPlugin.hpp6
-rw-r--r--src/engine/LV2BlobFeature.hpp6
-rw-r--r--src/engine/LV2EventFeature.hpp6
-rw-r--r--src/engine/LV2Info.hpp6
-rw-r--r--src/engine/LV2Node.hpp6
-rw-r--r--src/engine/LV2Plugin.hpp6
-rw-r--r--src/engine/LV2ResizeFeature.hpp6
-rw-r--r--src/engine/MessageContext.hpp6
-rw-r--r--src/engine/NodeBase.hpp6
-rw-r--r--src/engine/NodeFactory.hpp6
-rw-r--r--src/engine/NodeImpl.hpp6
-rw-r--r--src/engine/OSCClientSender.hpp6
-rw-r--r--src/engine/OSCEngineReceiver.hpp6
-rw-r--r--src/engine/ObjectBuffer.hpp6
-rw-r--r--src/engine/ObjectSender.hpp6
-rw-r--r--src/engine/OutputPort.hpp6
-rw-r--r--src/engine/PatchImpl.hpp6
-rw-r--r--src/engine/PatchPlugin.hpp6
-rw-r--r--src/engine/PluginImpl.hpp6
-rw-r--r--src/engine/PortImpl.hpp6
-rw-r--r--src/engine/PostProcessor.hpp6
-rw-r--r--src/engine/ProcessContext.hpp6
-rw-r--r--src/engine/ProcessSlave.hpp6
-rw-r--r--src/engine/QueuedEngineInterface.hpp6
-rw-r--r--src/engine/QueuedEvent.hpp6
-rw-r--r--src/engine/Responder.hpp6
-rw-r--r--src/engine/ThreadManager.hpp6
-rw-r--r--src/engine/events.hpp6
-rw-r--r--src/engine/events/AllNotesOff.hpp6
-rw-r--r--src/engine/events/Connect.hpp6
-rw-r--r--src/engine/events/CreateNode.hpp6
-rw-r--r--src/engine/events/CreatePatch.hpp6
-rw-r--r--src/engine/events/CreatePort.hpp6
-rw-r--r--src/engine/events/Deactivate.hpp6
-rw-r--r--src/engine/events/Delete.hpp6
-rw-r--r--src/engine/events/Disconnect.hpp6
-rw-r--r--src/engine/events/DisconnectAll.hpp6
-rw-r--r--src/engine/events/Get.hpp6
-rw-r--r--src/engine/events/Learn.hpp6
-rw-r--r--src/engine/events/LoadPlugins.hpp6
-rw-r--r--src/engine/events/Move.hpp6
-rw-r--r--src/engine/events/Note.hpp6
-rw-r--r--src/engine/events/Ping.hpp6
-rw-r--r--src/engine/events/RegisterClient.hpp6
-rw-r--r--src/engine/events/RequestAllObjects.hpp6
-rw-r--r--src/engine/events/RequestMetadata.hpp6
-rw-r--r--src/engine/events/RequestPlugins.hpp6
-rw-r--r--src/engine/events/SendBinding.hpp6
-rw-r--r--src/engine/events/SendPortActivity.hpp6
-rw-r--r--src/engine/events/SendPortValue.hpp6
-rw-r--r--src/engine/events/SetMetadata.hpp6
-rw-r--r--src/engine/events/SetPortValue.hpp6
-rw-r--r--src/engine/events/UnregisterClient.hpp6
-rw-r--r--src/engine/internals/Controller.hpp6
-rw-r--r--src/engine/internals/Note.hpp6
-rw-r--r--src/engine/internals/Trigger.hpp6
-rw-r--r--src/engine/mix.hpp6
-rw-r--r--src/engine/tuning.hpp6
-rw-r--r--src/engine/types.hpp6
-rw-r--r--src/engine/util.hpp6
-rw-r--r--src/gui/App.hpp6
-rw-r--r--src/gui/BreadCrumbs.hpp6
-rw-r--r--src/gui/Configuration.hpp6
-rw-r--r--src/gui/ConnectWindow.hpp6
-rw-r--r--src/gui/Connection.hpp6
-rw-r--r--src/gui/ControlPanel.hpp6
-rw-r--r--src/gui/Controls.hpp6
-rw-r--r--src/gui/GladeFactory.hpp6
-rw-r--r--src/gui/LoadPatchWindow.hpp6
-rw-r--r--src/gui/LoadPluginWindow.hpp6
-rw-r--r--src/gui/LoadRemotePatchWindow.hpp6
-rw-r--r--src/gui/LoadSubpatchWindow.hpp6
-rw-r--r--src/gui/MessagesWindow.hpp6
-rw-r--r--src/gui/NewSubpatchWindow.hpp6
-rw-r--r--src/gui/NodeControlWindow.hpp6
-rw-r--r--src/gui/NodeMenu.hpp6
-rw-r--r--src/gui/NodeModule.hpp6
-rw-r--r--src/gui/ObjectMenu.hpp6
-rw-r--r--src/gui/PatchCanvas.hpp6
-rw-r--r--src/gui/PatchPortModule.hpp6
-rw-r--r--src/gui/PatchTreeWindow.hpp6
-rw-r--r--src/gui/PatchView.hpp6
-rw-r--r--src/gui/PatchWindow.hpp6
-rw-r--r--src/gui/Port.hpp6
-rw-r--r--src/gui/PortMenu.hpp6
-rw-r--r--src/gui/PortPropertiesWindow.hpp6
-rw-r--r--src/gui/PropertiesWindow.hpp6
-rw-r--r--src/gui/RenameWindow.hpp6
-rw-r--r--src/gui/SubpatchModule.hpp7
-rw-r--r--src/gui/ThreadedLoader.hpp6
-rw-r--r--src/gui/UploadPatchWindow.hpp6
-rw-r--r--src/gui/Window.hpp6
-rw-r--r--src/gui/WindowFactory.hpp6
-rw-r--r--src/module/Module.hpp6
-rw-r--r--src/module/World.hpp6
-rw-r--r--src/module/ingen_module.hpp6
-rw-r--r--src/serialisation/Parser.hpp6
-rw-r--r--src/serialisation/Serialiser.hpp6
-rw-r--r--src/shared/Builder.hpp6
-rw-r--r--src/shared/ClashAvoider.hpp6
-rw-r--r--src/shared/HTTPSender.hpp6
-rw-r--r--src/shared/LV2Features.hpp6
-rw-r--r--src/shared/LV2Object.hpp6
-rw-r--r--src/shared/LV2URIMap.hpp6
-rw-r--r--src/shared/OSCSender.hpp6
-rw-r--r--src/shared/ResourceImpl.hpp6
-rw-r--r--src/shared/Store.hpp6
-rw-r--r--src/shared/runtime_paths.hpp6
159 files changed, 473 insertions, 474 deletions
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index 63b03dae..1421ca13 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CLIENT_STORE_HPP
-#define CLIENT_STORE_HPP
+#ifndef INGEN_CLIENT_CLIENTSTORE_HPP
+#define INGEN_CLIENT_CLIENTSTORE_HPP
#include <cassert>
#include <string>
@@ -110,4 +110,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // CLIENT_STORE_HPP
+#endif // INGEN_CLIENT_CLIENTSTORE_HPP
diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp
index 9e066c65..07618ee9 100644
--- a/src/client/ConnectionModel.hpp
+++ b/src/client/ConnectionModel.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONNECTIONMODEL_H
-#define CONNECTIONMODEL_H
+#ifndef INGEN_CLIENT_CONNECTIONMODEL_HPP
+#define INGEN_CLIENT_CONNECTIONMODEL_HPP
#include <cassert>
#include <string>
@@ -73,4 +73,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // CONNECTIONMODEL_H
+#endif // INGEN_CLIENT_CONNECTIONMODEL_HPP
diff --git a/src/client/DeprecatedLoader.hpp b/src/client/DeprecatedLoader.hpp
index 18a89bb5..5ae96e2d 100644
--- a/src/client/DeprecatedLoader.hpp
+++ b/src/client/DeprecatedLoader.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCHLIBRARIAN_H
-#define PATCHLIBRARIAN_H
+#ifndef INGEN_CLIENT_DEPRECATEDLOADER_HPP
+#define INGEN_CLIENT_DEPRECATEDLOADER_HPP
#include <map>
#include <utility>
@@ -83,4 +83,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // PATCHLIBRARIAN_H
+#endif // INGEN_CLIENT_DEPRECATEDLOADER_HPP
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp
index 58896672..63727dcb 100644
--- a/src/client/HTTPClientReceiver.hpp
+++ b/src/client/HTTPClientReceiver.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef HTTPCLIENTRECEIVER_H
-#define HTTPCLIENTRECEIVER_H
+#ifndef INGEN_CLIENT_HTTPCLIENTRECEIVER_HPP
+#define INGEN_CLIENT_HTTPCLIENTRECEIVER_HPP
#include <cstdlib>
#include <boost/utility.hpp>
@@ -80,4 +80,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // HTTPCLIENTRECEIVER_H
+#endif // INGEN_CLIENT_HTTPCLIENTRECEIVER_HPP
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 971793d5..9d84fc2e 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef HTTPENGINESENDER_H
-#define HTTPENGINESENDER_H
+#ifndef INGEN_CLIENT_HTTPENGINESENDER_HPP
+#define INGEN_CLIENT_HTTPENGINESENDER_HPP
#include <inttypes.h>
#include <string>
@@ -131,5 +131,5 @@ protected:
} // namespace Client
} // namespace Ingen
-#endif // HTTPENGINESENDER_H
+#endif // INGEN_CLIENT_HTTPENGINESENDER_HPP
diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp
index 3c150700..3b0877d1 100644
--- a/src/client/NodeModel.hpp
+++ b/src/client/NodeModel.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NODEMODEL_H
-#define NODEMODEL_H
+#ifndef INGEN_CLIENT_NODEMODEL_HPP
+#define INGEN_CLIENT_NODEMODEL_HPP
#include <cstdlib>
#include <string>
@@ -99,4 +99,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // NODEMODEL_H
+#endif // INGEN_CLIENT_NODEMODEL_HPP
diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp
index d0cc4706..cd955363 100644
--- a/src/client/OSCClientReceiver.hpp
+++ b/src/client/OSCClientReceiver.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OSCCLIENTRECEIVER_H
-#define OSCCLIENTRECEIVER_H
+#ifndef INGEN_CLIENT_OSCCLIENTRECEIVER_HPP
+#define INGEN_CLIENT_OSCCLIENTRECEIVER_HPP
#include <cstdlib>
#include <boost/utility.hpp>
@@ -101,4 +101,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // OSCCLIENTRECEIVER_H
+#endif // INGEN_CLIENT_OSCCLIENTRECEIVER_HPP
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index 8311cbb1..04075e39 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OSCENGINESENDER_H
-#define OSCENGINESENDER_H
+#ifndef INGEN_CLIENT_OSCENGINESENDER_HPP
+#define INGEN_CLIENT_OSCENGINESENDER_HPP
#include <inttypes.h>
#include <string>
@@ -125,5 +125,5 @@ protected:
} // namespace Client
} // namespace Ingen
-#endif // OSCENGINESENDER_H
+#endif // INGEN_CLIENT_OSCENGINESENDER_HPP
diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp
index 79ae1fe9..7ce19e9c 100644
--- a/src/client/ObjectModel.hpp
+++ b/src/client/ObjectModel.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OBJECTMODEL_H
-#define OBJECTMODEL_H
+#ifndef INGEN_CLIENT_OBJECTMODEL_HPP
+#define INGEN_CLIENT_OBJECTMODEL_HPP
#include <cstdlib>
#include <algorithm>
@@ -97,4 +97,4 @@ protected:
} // namespace Client
} // namespace Ingen
-#endif // OBJECTMODEL_H
+#endif // INGEN_CLIENT_OBJECTMODEL_HPP
diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp
index 8245ee5a..748c2704 100644
--- a/src/client/PatchModel.hpp
+++ b/src/client/PatchModel.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCHMODEL_H
-#define PATCHMODEL_H
+#ifndef INGEN_CLIENT_PATCHMODEL_HPP
+#define INGEN_CLIENT_PATCHMODEL_HPP
#include <cassert>
#include <sigc++/sigc++.h>
@@ -98,4 +98,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // PATCHMODEL_H
+#endif // INGEN_CLIENT_PATCHMODEL_HPP
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index 01cc14dc..4d54cd53 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PLUGINMODEL_H
-#define PLUGINMODEL_H
+#ifndef INGEN_CLIENT_PLUGINMODEL_HPP
+#define INGEN_CLIENT_PLUGINMODEL_HPP
#include "ingen-config.h"
#include "raul/SharedPtr.hpp"
@@ -113,5 +113,5 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // PLUGINMODEL_H
+#endif // INGEN_CLIENT_PLUGINMODEL_HPP
diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp
index 15071433..e33f149f 100644
--- a/src/client/PluginUI.hpp
+++ b/src/client/PluginUI.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PLUGINUI_H
-#define PLUGINUI_H
+#ifndef INGEN_CLIENT_PLUGINUI_HPP
+#define INGEN_CLIENT_PLUGINUI_HPP
#include "slv2/slv2.h"
#include "raul/SharedPtr.hpp"
@@ -63,6 +63,6 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // PLUGINUI_H
+#endif // INGEN_CLIENT_PLUGINUI_HPP
diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp
index 74b15283..8cf0dccb 100644
--- a/src/client/PortModel.hpp
+++ b/src/client/PortModel.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PORTMODEL_H
-#define PORTMODEL_H
+#ifndef INGEN_CLIENT_PORTMODEL_HPP
+#define INGEN_CLIENT_PORTMODEL_HPP
#include <cstdlib>
#include <string>
@@ -112,4 +112,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // PORTMODEL_H
+#endif // INGEN_CLIENT_PORTMODEL_HPP
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 3a3ce9d4..f3f572ad 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef SIGCLIENTINTERFACE_H
-#define SIGCLIENTINTERFACE_H
+#ifndef INGEN_CLIENT_SIGCLIENTINTERFACE_HPP
+#define INGEN_CLIENT_SIGCLIENTINTERFACE_HPP
#include <inttypes.h>
#include <sigc++/sigc++.h>
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index 456aa67f..e0065fab 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef THREADEDSIGCLIENTINTERFACE_H
-#define THREADEDSIGCLIENTINTERFACE_H
+#ifndef INGEN_CLIENT_THREADEDSIGCLIENTINTERFACE_HPP
+#define INGEN_CLIENT_THREADEDSIGCLIENTINTERFACE_HPP
#include <inttypes.h>
#include <string>
diff --git a/src/common/interface/ClientInterface.hpp b/src/common/interface/ClientInterface.hpp
index 9ec875ac..676c7eb6 100644
--- a/src/common/interface/ClientInterface.hpp
+++ b/src/common/interface/ClientInterface.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CLIENTINTERFACE_H
-#define CLIENTINTERFACE_H
+#ifndef INGEN_INTERFACE_CLIENTINTERFACE_HPP
+#define INGEN_INTERFACE_CLIENTINTERFACE_HPP
#include <stdio.h>
#include <string>
diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp
index d13ef97c..aa8b404c 100644
--- a/src/common/interface/CommonInterface.hpp
+++ b/src/common/interface/CommonInterface.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef COMMONINTERFACE_H
-#define COMMONINTERFACE_H
+#ifndef INGEN_INTERFACE_COMMONINTERFACE_HPP
+#define INGEN_INTERFACE_COMMONINTERFACE_HPP
#include <inttypes.h>
#include <string>
@@ -75,5 +75,5 @@ public:
} // namespace Shared
} // namespace Ingen
-#endif // COMMONINTERFACE_H
+#endif // INGEN_INTERFACE_COMMONINTERFACE_HPP
diff --git a/src/common/interface/Connection.hpp b/src/common/interface/Connection.hpp
index 4cba7196..8daea551 100644
--- a/src/common/interface/Connection.hpp
+++ b/src/common/interface/Connection.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONNECTION_H
-#define CONNECTION_H
+#ifndef INGEN_INTERFACE_CONNECTION_HPP
+#define INGEN_INTERFACE_CONNECTION_HPP
#include "raul/Path.hpp"
@@ -40,4 +40,4 @@ public:
} // namespace Shared
} // namespace Ingen
-#endif // CONNECTION_H
+#endif // INGEN_INTERFACE_CONNECTION_HPP
diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp
index 6d99a14d..644eaea5 100644
--- a/src/common/interface/EngineInterface.hpp
+++ b/src/common/interface/EngineInterface.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef ENGINEINTERFACE_H
-#define ENGINEINTERFACE_H
+#ifndef INGEN_INTERFACE_ENGINEINTERFACE_HPP
+#define INGEN_INTERFACE_ENGINEINTERFACE_HPP
#include <inttypes.h>
#include "interface/CommonInterface.hpp"
@@ -78,5 +78,5 @@ public:
} // namespace Shared
} // namespace Ingen
-#endif // ENGINEINTERFACE_H
+#endif // INGEN_INTERFACE_ENGINEINTERFACE_HPP
diff --git a/src/common/interface/EventType.hpp b/src/common/interface/EventType.hpp
index 36f0d3dd..3f3def1d 100644
--- a/src/common/interface/EventType.hpp
+++ b/src/common/interface/EventType.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef EVENTTYPE_H
-#define EVENTTYPE_H
+#ifndef INGEN_INTERFACE_EVENTTYPE_HPP
+#define INGEN_INTERFACE_EVENTTYPE_HPP
namespace Ingen {
namespace Shared {
@@ -74,4 +74,4 @@ private:
} // namespace Shared
} // namespace Ingen
-#endif // EVENTTYPE_H
+#endif // INGEN_INTERFACE_EVENTTYPE_HPP
diff --git a/src/common/interface/GraphObject.hpp b/src/common/interface/GraphObject.hpp
index 072fbff9..68242a46 100644
--- a/src/common/interface/GraphObject.hpp
+++ b/src/common/interface/GraphObject.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GRAPHOBJECT_H
-#define GRAPHOBJECT_H
+#ifndef INGEN_INTERFACE_GRAPHOBJECT_HPP
+#define INGEN_INTERFACE_GRAPHOBJECT_HPP
#include "raul/Deletable.hpp"
#include "raul/Path.hpp"
@@ -55,4 +55,4 @@ public:
} // namespace Shared
} // namespace Ingen
-#endif // GRAPHOBJECT_H
+#endif // INGEN_INTERFACE_GRAPHOBJECT_HPP
diff --git a/src/common/interface/MessageType.hpp b/src/common/interface/MessageType.hpp
index ea6bc726..3f18aaac 100644
--- a/src/common/interface/MessageType.hpp
+++ b/src/common/interface/MessageType.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MESSAGE_TYPE_HPP
-#define MESSAGE_TYPE_HPP
+#ifndef INGEN_INTERFACE_MESSAGETYPE_HPP
+#define INGEN_INTERFACE_MESSAGETYPE_HPP
#include <cassert>
#include <iostream>
@@ -117,4 +117,4 @@ static inline std::ostream& operator<<(std::ostream& os, const Ingen::Shared::Me
return os;
}
-#endif // MESSAGE_TYPE_HPP
+#endif // INGEN_INTERFACE_MESSAGETYPE_HPP
diff --git a/src/common/interface/Node.hpp b/src/common/interface/Node.hpp
index a2586e71..4a700a12 100644
--- a/src/common/interface/Node.hpp
+++ b/src/common/interface/Node.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NODE_H
-#define NODE_H
+#ifndef INGEN_INTERFACE_NODE_HPP
+#define INGEN_INTERFACE_NODE_HPP
#include <stdint.h>
#include "GraphObject.hpp"
@@ -49,4 +49,4 @@ public:
} // namespace Shared
} // namespace Ingen
-#endif // NODE_H
+#endif // INGEN_INTERFACE_NODE_HPP
diff --git a/src/common/interface/Patch.hpp b/src/common/interface/Patch.hpp
index f00d790b..ea6a0507 100644
--- a/src/common/interface/Patch.hpp
+++ b/src/common/interface/Patch.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCH_H
-#define PATCH_H
+#ifndef INGEN_INTERFACE_PATCH_HPP
+#define INGEN_INTERFACE_PATCH_HPP
#include "raul/SharedPtr.hpp"
#include "raul/List.hpp"
@@ -47,4 +47,4 @@ public:
} // namespace Shared
} // namespace Ingen
-#endif // PATCH_H
+#endif // INGEN_INTERFACE_PATCH_HPP
diff --git a/src/common/interface/Plugin.hpp b/src/common/interface/Plugin.hpp
index b5ba3adf..d3d74970 100644
--- a/src/common/interface/Plugin.hpp
+++ b/src/common/interface/Plugin.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PLUGIN_H
-#define PLUGIN_H
+#ifndef INGEN_INTERFACE_PLUGIN_HPP
+#define INGEN_INTERFACE_PLUGIN_HPP
#include <string>
#include "interface/Resource.hpp"
@@ -59,4 +59,4 @@ public:
} // namespace Shared
} // namespace Ingen
-#endif // PLUGIN_H
+#endif // INGEN_INTERFACE_PLUGIN_HPP
diff --git a/src/common/interface/PortType.hpp b/src/common/interface/PortType.hpp
index 557d7e75..ca739cb8 100644
--- a/src/common/interface/PortType.hpp
+++ b/src/common/interface/PortType.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PORTTYPE_H
-#define PORTTYPE_H
+#ifndef INGEN_INTERFACE_PORTTYPE_HPP
+#define INGEN_INTERFACE_PORTTYPE_HPP
#include <raul/URI.hpp>
@@ -95,4 +95,4 @@ private:
} // namespace Shared
} // namespace Ingen
-#endif // PORTTYPE_H
+#endif // INGEN_INTERFACE_PORTTYPE_HPP
diff --git a/src/common/interface/Resource.hpp b/src/common/interface/Resource.hpp
index bc7ea7dd..4939d7b1 100644
--- a/src/common/interface/Resource.hpp
+++ b/src/common/interface/Resource.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RESOURCE_HPP
-#define RESOURCE_HPP
+#ifndef INGEN_INTERFACE_RESOURCE_HPP
+#define INGEN_INTERFACE_RESOURCE_HPP
#include <string>
#include <map>
@@ -52,5 +52,5 @@ public:
} // namespace Shared
} // namespace Ingen
-#endif // RESOURCE_HPP
+#endif // INGEN_INTERFACE_RESOURCE_HPP
diff --git a/src/engine/AudioBuffer.hpp b/src/engine/AudioBuffer.hpp
index 8a0ed67e..b8500537 100644
--- a/src/engine/AudioBuffer.hpp
+++ b/src/engine/AudioBuffer.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AUDIOBUFFER_H
-#define AUDIOBUFFER_H
+#ifndef INGEN_ENGINE_AUDIOBUFFER_HPP
+#define INGEN_ENGINE_AUDIOBUFFER_HPP
#include <cstddef>
#include <cassert>
@@ -77,4 +77,4 @@ private:
} // namespace Ingen
-#endif // AUDIOBUFFER_H
+#endif // INGEN_ENGINE_AUDIOBUFFER_HPP
diff --git a/src/engine/AudioDriver.hpp b/src/engine/AudioDriver.hpp
index 33c9d5ef..712715d9 100644
--- a/src/engine/AudioDriver.hpp
+++ b/src/engine/AudioDriver.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AUDIODRIVER_H
-#define AUDIODRIVER_H
+#ifndef INGEN_ENGINE_AUDIODRIVER_HPP
+#define INGEN_ENGINE_AUDIODRIVER_HPP
#include "raul/Path.hpp"
#include "Driver.hpp"
@@ -61,4 +61,4 @@ public:
} // namespace Ingen
-#endif // AUDIODRIVER_H
+#endif // INGEN_ENGINE_AUDIODRIVER_HPP
diff --git a/src/engine/Buffer.hpp b/src/engine/Buffer.hpp
index 61455603..0d2574e6 100644
--- a/src/engine/Buffer.hpp
+++ b/src/engine/Buffer.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef BUFFER_HPP
-#define BUFFER_HPP
+#ifndef INGEN_ENGINE_BUFFER_HPP
+#define INGEN_ENGINE_BUFFER_HPP
#include <cstddef>
#include <cassert>
@@ -93,4 +93,4 @@ namespace boost {
}
-#endif // BUFFER_HPP
+#endif // INGEN_ENGINE_BUFFER_HPP
diff --git a/src/engine/BufferFactory.hpp b/src/engine/BufferFactory.hpp
index 8fddb70f..1978e895 100644
--- a/src/engine/BufferFactory.hpp
+++ b/src/engine/BufferFactory.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef BUFFER_FACTORY_H
-#define BUFFER_FACTORY_H
+#ifndef INGEN_ENGINE_BUFFERFACTORY_HPP
+#define INGEN_ENGINE_BUFFERFACTORY_HPP
#include <map>
#include <boost/intrusive_ptr.hpp>
@@ -72,4 +72,4 @@ private:
} // namespace Ingen
-#endif // BUFFER_FACTORY_H
+#endif // INGEN_ENGINE_BUFFERFACTORY_HPP
diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp
index fa44bc43..096b367d 100644
--- a/src/engine/ClientBroadcaster.hpp
+++ b/src/engine/ClientBroadcaster.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CLIENTBROADCASTER_H
-#define CLIENTBROADCASTER_H
+#ifndef INGEN_ENGINE_CLIENTBROADCASTER_HPP
+#define INGEN_ENGINE_CLIENTBROADCASTER_HPP
#include <string>
#include <list>
@@ -135,5 +135,5 @@ private:
} // namespace Ingen
-#endif // CLIENTBROADCASTER_H
+#endif // INGEN_ENGINE_CLIENTBROADCASTER_HPP
diff --git a/src/engine/CompiledPatch.hpp b/src/engine/CompiledPatch.hpp
index d6a61f50..7cb713e2 100644
--- a/src/engine/CompiledPatch.hpp
+++ b/src/engine/CompiledPatch.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef COMPILED_PATCH_HPP
-#define COMPILED_PATCH_HPP
+#ifndef INGEN_ENGINE_COMPILEDPATCH_HPP
+#define INGEN_ENGINE_COMPILEDPATCH_HPP
#include <vector>
#include "raul/List.hpp"
@@ -73,4 +73,4 @@ struct CompiledPatch : public std::vector<CompiledNode>
} // namespace Ingen
-#endif // COMPILED_PATCH_HPP
+#endif // INGEN_ENGINE_COMPILEDPATCH_HPP
diff --git a/src/engine/ConnectionImpl.hpp b/src/engine/ConnectionImpl.hpp
index 00770047..bd115293 100644
--- a/src/engine/ConnectionImpl.hpp
+++ b/src/engine/ConnectionImpl.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONNECTIONIMPL_H
-#define CONNECTIONIMPL_H
+#ifndef INGEN_ENGINE_CONNECTIONIMPL_HPP
+#define INGEN_ENGINE_CONNECTIONIMPL_HPP
#include <cstdlib>
#include <boost/utility.hpp>
@@ -104,4 +104,4 @@ protected:
} // namespace Ingen
-#endif // CONNECTIONIMPL_H
+#endif // INGEN_ENGINE_CONNECTIONIMPL_HPP
diff --git a/src/engine/Context.hpp b/src/engine/Context.hpp
index 0029e00c..e0bc924e 100644
--- a/src/engine/Context.hpp
+++ b/src/engine/Context.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONTEXT_H
-#define CONTEXT_H
+#ifndef INGEN_ENGINE_CONTEXT_HPP
+#define INGEN_ENGINE_CONTEXT_HPP
#include "EventSink.hpp"
#include "tuning.hpp"
@@ -67,5 +67,5 @@ private:
} // namespace Ingen
-#endif // CONTEXT_H
+#endif // INGEN_ENGINE_CONTEXT_HPP
diff --git a/src/engine/ControlBindings.hpp b/src/engine/ControlBindings.hpp
index 8823ecb1..e9ab290f 100644
--- a/src/engine/ControlBindings.hpp
+++ b/src/engine/ControlBindings.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONTROL_BINDINGS_HPP
-#define CONTROL_BINDINGS_HPP
+#ifndef INGEN_ENGINE_CONTROLBINDINGS_HPP
+#define INGEN_ENGINE_CONTROLBINDINGS_HPP
#include <stdint.h>
#include <map>
@@ -64,4 +64,4 @@ private:
} // namespace Ingen
-#endif // CONTROL_BINDINGS_HPP
+#endif // INGEN_ENGINE_CONTROLBINDINGS_HPP
diff --git a/src/engine/Driver.hpp b/src/engine/Driver.hpp
index cc1bec6c..53db2ab1 100644
--- a/src/engine/Driver.hpp
+++ b/src/engine/Driver.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef DRIVER_H
-#define DRIVER_H
+#ifndef INGEN_ENGINE_DRIVER_HPP
+#define INGEN_ENGINE_DRIVER_HPP
#include <string>
#include <boost/utility.hpp>
@@ -122,4 +122,4 @@ public:
} // namespace Ingen
-#endif // DRIVER_H
+#endif // INGEN_ENGINE_DRIVER_HPP
diff --git a/src/engine/DuplexPort.hpp b/src/engine/DuplexPort.hpp
index 31c679b5..a5963908 100644
--- a/src/engine/DuplexPort.hpp
+++ b/src/engine/DuplexPort.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef DUPLEXPORT_H
-#define DUPLEXPORT_H
+#ifndef INGEN_ENGINE_DUPLEXPORT_HPP
+#define INGEN_ENGINE_DUPLEXPORT_HPP
#include <string>
#include "Buffer.hpp"
@@ -64,4 +64,4 @@ protected:
} // namespace Ingen
-#endif // DUPLEXPORT_H
+#endif // INGEN_ENGINE_DUPLEXPORT_HPP
diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp
index 9a665077..e7892f84 100644
--- a/src/engine/Engine.hpp
+++ b/src/engine/Engine.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef ENGINE_H
-#define ENGINE_H
+#ifndef INGEN_ENGINE_ENGINE_HPP
+#define INGEN_ENGINE_ENGINE_HPP
#include <cassert>
#include <vector>
@@ -126,4 +126,4 @@ private:
} // namespace Ingen
-#endif // ENGINE_H
+#endif // INGEN_ENGINE_ENGINE_HPP
diff --git a/src/engine/EngineStore.hpp b/src/engine/EngineStore.hpp
index 7ae5dbb7..a59af4f1 100644
--- a/src/engine/EngineStore.hpp
+++ b/src/engine/EngineStore.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OBJECTSTORE_H
-#define OBJECTSTORE_H
+#ifndef INGEN_ENGINE_OBJECTSTORE_HPP
+#define INGEN_ENGINE_OBJECTSTORE_HPP
#include <string>
#include "raul/SharedPtr.hpp"
diff --git a/src/engine/Event.hpp b/src/engine/Event.hpp
index d3bf44b4..d4ee596b 100644
--- a/src/engine/Event.hpp
+++ b/src/engine/Event.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef EVENT_H
-#define EVENT_H
+#ifndef INGEN_ENGINE_EVENT_HPP
+#define INGEN_ENGINE_EVENT_HPP
#include <cassert>
#include "raul/SharedPtr.hpp"
@@ -73,4 +73,4 @@ protected:
} // namespace Ingen
-#endif // EVENT_H
+#endif // INGEN_ENGINE_EVENT_HPP
diff --git a/src/engine/EventBuffer.hpp b/src/engine/EventBuffer.hpp
index d094e4a4..3cddf6c1 100644
--- a/src/engine/EventBuffer.hpp
+++ b/src/engine/EventBuffer.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef EVENTBUFFER_H
-#define EVENTBUFFER_H
+#ifndef INGEN_ENGINE_EVENTBUFFER_HPP
+#define INGEN_ENGINE_EVENTBUFFER_HPP
#include "event.lv2/event.h"
#include "event.lv2/event-helpers.h"
@@ -83,4 +83,4 @@ private:
} // namespace Ingen
-#endif // EVENTBUFFER_H
+#endif // INGEN_ENGINE_EVENTBUFFER_HPP
diff --git a/src/engine/EventSink.hpp b/src/engine/EventSink.hpp
index 5c2899b4..d1514901 100644
--- a/src/engine/EventSink.hpp
+++ b/src/engine/EventSink.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef EVENTSINK_H
-#define EVENTSINK_H
+#ifndef INGEN_ENGINE_EVENTSINK_HPP
+#define INGEN_ENGINE_EVENTSINK_HPP
#include <stdint.h>
#include <list>
@@ -56,5 +56,5 @@ private:
} // namespace Ingen
-#endif // EVENTSINK_H
+#endif // INGEN_ENGINE_EVENTSINK_HPP
diff --git a/src/engine/EventSource.hpp b/src/engine/EventSource.hpp
index 97dfa4cb..d3d813e0 100644
--- a/src/engine/EventSource.hpp
+++ b/src/engine/EventSource.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INGEN_EVENT_SOURCE_HPP
-#define INGEN_EVENT_SOURCE_HPP
+#ifndef INGEN_ENGINE_EVENTSOURCE_HPP
+#define INGEN_ENGINE_EVENTSOURCE_HPP
#include "raul/Semaphore.hpp"
#include "raul/Slave.hpp"
@@ -70,5 +70,5 @@ private:
} // namespace Ingen
-#endif // INGEN_EVENT_SOURCE_HPP
+#endif // INGEN_ENGINE_EVENTSOURCE_HPP
diff --git a/src/engine/GraphObjectImpl.hpp b/src/engine/GraphObjectImpl.hpp
index e855cbb9..b9e13219 100644
--- a/src/engine/GraphObjectImpl.hpp
+++ b/src/engine/GraphObjectImpl.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GRAPHOBJECTIMPL_H
-#define GRAPHOBJECTIMPL_H
+#ifndef INGEN_ENGINE_GRAPHOBJECTIMPL_HPP
+#define INGEN_ENGINE_GRAPHOBJECTIMPL_HPP
#include <string>
#include <map>
@@ -103,4 +103,4 @@ protected:
} // namespace Ingen
-#endif // GRAPHOBJECTIMPL_H
+#endif // INGEN_ENGINE_GRAPHOBJECTIMPL_HPP
diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp
index e7120e81..f25e1eeb 100644
--- a/src/engine/HTTPClientSender.hpp
+++ b/src/engine/HTTPClientSender.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef HTTPCLIENTSENDER_H
-#define HTTPCLIENTSENDER_H
+#ifndef INGEN_ENGINE_HTTPCLIENTSENDER_HPP
+#define INGEN_ENGINE_HTTPCLIENTSENDER_HPP
#include <cassert>
#include <string>
@@ -104,5 +104,5 @@ private:
} // namespace Ingen
-#endif // HTTPCLIENTSENDER_H
+#endif // INGEN_ENGINE_HTTPCLIENTSENDER_HPP
diff --git a/src/engine/HTTPEngineReceiver.hpp b/src/engine/HTTPEngineReceiver.hpp
index 79101e90..b7479314 100644
--- a/src/engine/HTTPEngineReceiver.hpp
+++ b/src/engine/HTTPEngineReceiver.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef HTTPENGINERECEIVER_H
-#define HTTPENGINERECEIVER_H
+#ifndef INGEN_ENGINE_HTTPENGINERECEIVER_HPP
+#define INGEN_ENGINE_HTTPENGINERECEIVER_HPP
#include <string>
#include <stdint.h>
@@ -57,4 +57,4 @@ private:
} // namespace Ingen
-#endif // HTTPENGINERECEIVER_H
+#endif // INGEN_ENGINE_HTTPENGINERECEIVER_HPP
diff --git a/src/engine/InputPort.hpp b/src/engine/InputPort.hpp
index b44c594e..4ed1bc0e 100644
--- a/src/engine/InputPort.hpp
+++ b/src/engine/InputPort.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INPUTPORT_H
-#define INPUTPORT_H
+#ifndef INGEN_ENGINE_INPUTPORT_HPP
+#define INGEN_ENGINE_INPUTPORT_HPP
#include <string>
#include <cstdlib>
@@ -84,4 +84,4 @@ protected:
} // namespace Ingen
-#endif // INPUTPORT_H
+#endif // INGEN_ENGINE_INPUTPORT_HPP
diff --git a/src/engine/InternalPlugin.hpp b/src/engine/InternalPlugin.hpp
index 70f1ba27..d1c0e76e 100644
--- a/src/engine/InternalPlugin.hpp
+++ b/src/engine/InternalPlugin.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INTERNALPLUGIN_H
-#define INTERNALPLUGIN_H
+#ifndef INGEN_ENGINE_INTERNALPLUGIN_HPP
+#define INGEN_ENGINE_INTERNALPLUGIN_HPP
#include "ingen-config.h"
@@ -61,5 +61,5 @@ private:
} // namespace Ingen
-#endif // INTERNALPLUGIN_H
+#endif // INGEN_ENGINE_INTERNALPLUGIN_HPP
diff --git a/src/engine/JackDriver.hpp b/src/engine/JackDriver.hpp
index 1e7165d1..6f63ff92 100644
--- a/src/engine/JackDriver.hpp
+++ b/src/engine/JackDriver.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef JACKAUDIODRIVER_H
-#define JACKAUDIODRIVER_H
+#ifndef INGEN_ENGINE_JACKAUDIODRIVER_HPP
+#define INGEN_ENGINE_JACKAUDIODRIVER_HPP
#include <jack/jack.h>
#include <jack/transport.h>
@@ -167,4 +167,4 @@ private:
} // namespace Ingen
-#endif // JACKAUDIODRIVER_H
+#endif // INGEN_ENGINE_JACKAUDIODRIVER_HPP
diff --git a/src/engine/LADSPANode.hpp b/src/engine/LADSPANode.hpp
index b241c471..6585b2ad 100644
--- a/src/engine/LADSPANode.hpp
+++ b/src/engine/LADSPANode.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LADSPANODE_H
-#define LADSPANODE_H
+#ifndef INGEN_ENGINE_LADSPANODE_HPP
+#define INGEN_ENGINE_LADSPANODE_HPP
#include <string>
#include <ladspa.h>
@@ -72,4 +72,4 @@ protected:
} // namespace Ingen
-#endif // LADSPANODE_H
+#endif // INGEN_ENGINE_LADSPANODE_HPP
diff --git a/src/engine/LADSPAPlugin.hpp b/src/engine/LADSPAPlugin.hpp
index 5c5e4faa..0d0b91ce 100644
--- a/src/engine/LADSPAPlugin.hpp
+++ b/src/engine/LADSPAPlugin.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LADSPAPLUGIN_H
-#define LADSPAPLUGIN_H
+#ifndef INGEN_ENGINE_LADSPAPLUGIN_HPP
+#define INGEN_ENGINE_LADSPAPLUGIN_HPP
#include <cstdlib>
#include <glibmm/module.h>
@@ -69,5 +69,5 @@ private:
} // namespace Ingen
-#endif // LADSPAPLUGIN_H
+#endif // INGEN_ENGINE_LADSPAPLUGIN_HPP
diff --git a/src/engine/LV2BlobFeature.hpp b/src/engine/LV2BlobFeature.hpp
index 13b6753e..e7ada0ee 100644
--- a/src/engine/LV2BlobFeature.hpp
+++ b/src/engine/LV2BlobFeature.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LV2_BLOB_FEATURE_H
-#define LV2_BLOB_FEATURE_H
+#ifndef INGEN_ENGINE_LV2BLOBFEATURE_HPP
+#define INGEN_ENGINE_LV2BLOBFEATURE_HPP
#include "shared/LV2Features.hpp"
@@ -61,4 +61,4 @@ private:
} // namespace Ingen
-#endif // LV2_BLOB_FEATURE_H
+#endif // INGEN_ENGINE_LV2BLOBFEATURE_HPP
diff --git a/src/engine/LV2EventFeature.hpp b/src/engine/LV2EventFeature.hpp
index b2baaeec..e8dde511 100644
--- a/src/engine/LV2EventFeature.hpp
+++ b/src/engine/LV2EventFeature.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LV2_EVENT_FEATURE_H
-#define LV2_EVENT_FEATURE_H
+#ifndef INGEN_ENGINE_LV2EVENTFEATURE_HPP
+#define INGEN_ENGINE_LV2EVENTFEATURE_HPP
#include "shared/LV2Features.hpp"
@@ -48,4 +48,4 @@ private:
} // namespace Ingen
-#endif // LV2_EVENT_FEATURE_H
+#endif // INGEN_ENGINE_LV2EVENTFEATURE_HPP
diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp
index 2a63f983..1044098a 100644
--- a/src/engine/LV2Info.hpp
+++ b/src/engine/LV2Info.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LV2INFO_H
-#define LV2INFO_H
+#ifndef INGEN_ENGINE_LV2INFO_HPP
+#define INGEN_ENGINE_LV2INFO_HPP
#include "ingen-config.h"
#ifndef HAVE_SLV2
@@ -63,4 +63,4 @@ private:
} // namespace Ingen
-#endif // LV2INFO_H
+#endif // INGEN_ENGINE_LV2INFO_HPP
diff --git a/src/engine/LV2Node.hpp b/src/engine/LV2Node.hpp
index 7f1714f1..3bc37dc5 100644
--- a/src/engine/LV2Node.hpp
+++ b/src/engine/LV2Node.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LV2NODE_H
-#define LV2NODE_H
+#ifndef INGEN_ENGINE_LV2NODE_HPP
+#define INGEN_ENGINE_LV2NODE_HPP
#include <string>
#include "slv2/slv2.h"
@@ -74,5 +74,5 @@ protected:
} // namespace Ingen
-#endif // LV2NODE_H
+#endif // INGEN_ENGINE_LV2NODE_HPP
diff --git a/src/engine/LV2Plugin.hpp b/src/engine/LV2Plugin.hpp
index 2a6f1996..8dc0d8bf 100644
--- a/src/engine/LV2Plugin.hpp
+++ b/src/engine/LV2Plugin.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LV2PLUGIN_H
-#define LV2PLUGIN_H
+#ifndef INGEN_ENGINE_LV2PLUGIN_HPP
+#define INGEN_ENGINE_LV2PLUGIN_HPP
#include "ingen-config.h"
@@ -70,5 +70,5 @@ private:
} // namespace Ingen
-#endif // LV2PLUGIN_H
+#endif // INGEN_ENGINE_LV2PLUGIN_HPP
diff --git a/src/engine/LV2ResizeFeature.hpp b/src/engine/LV2ResizeFeature.hpp
index 723d9447..d65ea260 100644
--- a/src/engine/LV2ResizeFeature.hpp
+++ b/src/engine/LV2ResizeFeature.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LV2_RESIZE_FEATURE_H
-#define LV2_RESIZE_FEATURE_H
+#ifndef INGEN_ENGINE_LV2RESIZEFEATURE_HPP
+#define INGEN_ENGINE_LV2RESIZEFEATURE_HPP
#include "raul/log.hpp"
#include "shared/LV2Features.hpp"
@@ -66,4 +66,4 @@ struct ResizeFeature : public Shared::LV2Features::Feature {
} // namespace Ingen
-#endif // LV2_RESIZE_FEATURE_H
+#endif // INGEN_ENGINE_LV2RESIZEFEATURE_HPP
diff --git a/src/engine/MessageContext.hpp b/src/engine/MessageContext.hpp
index a68d9927..e8067d9a 100644
--- a/src/engine/MessageContext.hpp
+++ b/src/engine/MessageContext.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MESSAGECONTEXT_H
-#define MESSAGECONTEXT_H
+#ifndef INGEN_ENGINE_MESSAGECONTEXT_HPP
+#define INGEN_ENGINE_MESSAGECONTEXT_HPP
#include <set>
#include <glibmm/thread.h>
@@ -110,5 +110,5 @@ protected:
} // namespace Ingen
-#endif // MESSAGECONTEXT_H
+#endif // INGEN_ENGINE_MESSAGECONTEXT_HPP
diff --git a/src/engine/NodeBase.hpp b/src/engine/NodeBase.hpp
index cf7ae0d6..a85d51b5 100644
--- a/src/engine/NodeBase.hpp
+++ b/src/engine/NodeBase.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NODEBASE_H
-#define NODEBASE_H
+#ifndef INGEN_ENGINE_NODEBASE_HPP
+#define INGEN_ENGINE_NODEBASE_HPP
#include "types.hpp"
#include <string>
@@ -139,4 +139,4 @@ protected:
} // namespace Ingen
-#endif // NODEBASE_H
+#endif // INGEN_ENGINE_NODEBASE_HPP
diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp
index 1c8299b2..3b1ce192 100644
--- a/src/engine/NodeFactory.hpp
+++ b/src/engine/NodeFactory.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NODEFACTORY_H
-#define NODEFACTORY_H
+#ifndef INGEN_ENGINE_NODEFACTORY_HPP
+#define INGEN_ENGINE_NODEFACTORY_HPP
#include <list>
#include <map>
@@ -88,4 +88,4 @@ private:
} // namespace Ingen
-#endif // NODEFACTORY_H
+#endif // INGEN_ENGINE_NODEFACTORY_HPP
diff --git a/src/engine/NodeImpl.hpp b/src/engine/NodeImpl.hpp
index cbb212b7..01901df9 100644
--- a/src/engine/NodeImpl.hpp
+++ b/src/engine/NodeImpl.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NODEIMPL_H
-#define NODEIMPL_H
+#ifndef INGEN_ENGINE_NODEIMPL_HPP
+#define INGEN_ENGINE_NODEIMPL_HPP
#include <string>
#include "raul/IntrusivePtr.hpp"
@@ -176,4 +176,4 @@ public:
} // namespace Ingen
-#endif // NODEIMPL_H
+#endif // INGEN_ENGINE_NODEIMPL_HPP
diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp
index 1ce58d45..38cc3187 100644
--- a/src/engine/OSCClientSender.hpp
+++ b/src/engine/OSCClientSender.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OSCCLIENTSENDER_H
-#define OSCCLIENTSENDER_H
+#ifndef INGEN_ENGINE_OSCCLIENTSENDER_HPP
+#define INGEN_ENGINE_OSCCLIENTSENDER_HPP
#include <cassert>
#include <string>
@@ -102,5 +102,5 @@ private:
} // namespace Ingen
-#endif // OSCCLIENTSENDER_H
+#endif // INGEN_ENGINE_OSCCLIENTSENDER_HPP
diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp
index 42ef1f5a..6e2ce08c 100644
--- a/src/engine/OSCEngineReceiver.hpp
+++ b/src/engine/OSCEngineReceiver.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OSCENGINERECEIVER_H
-#define OSCENGINERECEIVER_H
+#ifndef INGEN_ENGINE_OSCENGINERECEIVER_HPP
+#define INGEN_ENGINE_OSCENGINERECEIVER_HPP
#include <stdint.h>
#include <lo/lo.h>
@@ -113,4 +113,4 @@ private:
} // namespace Ingen
-#endif // OSCENGINERECEIVER_H
+#endif // INGEN_ENGINE_OSCENGINERECEIVER_HPP
diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp
index 83a2e5c1..354c6f46 100644
--- a/src/engine/ObjectBuffer.hpp
+++ b/src/engine/ObjectBuffer.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OBJECTBUFFER_H
-#define OBJECTBUFFER_H
+#ifndef INGEN_ENGINE_OBJECTBUFFER_HPP
+#define INGEN_ENGINE_OBJECTBUFFER_HPP
#include "raul/Atom.hpp"
#include "object.lv2/object.h"
@@ -50,4 +50,4 @@ private:
} // namespace Ingen
-#endif // OBJECTBUFFER_H
+#endif // INGEN_ENGINE_OBJECTBUFFER_HPP
diff --git a/src/engine/ObjectSender.hpp b/src/engine/ObjectSender.hpp
index 2645499f..54b3bbbb 100644
--- a/src/engine/ObjectSender.hpp
+++ b/src/engine/ObjectSender.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OBJECTSENDER_H
-#define OBJECTSENDER_H
+#ifndef INGEN_ENGINE_OBJECTSENDER_HPP
+#define INGEN_ENGINE_OBJECTSENDER_HPP
#include <list>
@@ -56,5 +56,5 @@ private:
} // namespace Ingen
-#endif // OBJECTSENDER_H
+#endif // INGEN_ENGINE_OBJECTSENDER_HPP
diff --git a/src/engine/OutputPort.hpp b/src/engine/OutputPort.hpp
index a5c92200..c936de29 100644
--- a/src/engine/OutputPort.hpp
+++ b/src/engine/OutputPort.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OUTPUTPORT_H
-#define OUTPUTPORT_H
+#ifndef INGEN_ENGINE_OUTPUTPORT_HPP
+#define INGEN_ENGINE_OUTPUTPORT_HPP
#include <string>
#include <cstdlib>
@@ -60,4 +60,4 @@ public:
} // namespace Ingen
-#endif // OUTPUTPORT_H
+#endif // INGEN_ENGINE_OUTPUTPORT_HPP
diff --git a/src/engine/PatchImpl.hpp b/src/engine/PatchImpl.hpp
index 4e927c0e..e86cb1bc 100644
--- a/src/engine/PatchImpl.hpp
+++ b/src/engine/PatchImpl.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCHIMPL_H
-#define PATCHIMPL_H
+#ifndef INGEN_ENGINE_PATCHIMPL_HPP
+#define INGEN_ENGINE_PATCHIMPL_HPP
#include <cstdlib>
#include <string>
@@ -160,4 +160,4 @@ PatchImpl::compile_recursive(NodeImpl* n, CompiledPatch* output) const
} // namespace Ingen
-#endif // PATCHIMPL_H
+#endif // INGEN_ENGINE_PATCHIMPL_HPP
diff --git a/src/engine/PatchPlugin.hpp b/src/engine/PatchPlugin.hpp
index 99c9359f..e4feb992 100644
--- a/src/engine/PatchPlugin.hpp
+++ b/src/engine/PatchPlugin.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCHPLUGIN_H
-#define PATCHPLUGIN_H
+#ifndef INGEN_ENGINE_PATCHPLUGIN_HPP
+#define INGEN_ENGINE_PATCHPLUGIN_HPP
#include "ingen-config.h"
@@ -61,5 +61,5 @@ private:
} // namespace Ingen
-#endif // PATCHPLUGIN_H
+#endif // INGEN_ENGINE_PATCHPLUGIN_HPP
diff --git a/src/engine/PluginImpl.hpp b/src/engine/PluginImpl.hpp
index c8fb9f82..5aea4f68 100644
--- a/src/engine/PluginImpl.hpp
+++ b/src/engine/PluginImpl.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PLUGINIMPL_H
-#define PLUGINIMPL_H
+#ifndef INGEN_ENGINE_PLUGINIMPL_HPP
+#define INGEN_ENGINE_PLUGINIMPL_HPP
#include <cstdlib>
#include <glibmm/module.h>
@@ -77,5 +77,5 @@ protected:
} // namespace Ingen
-#endif // PLUGINIMPL_H
+#endif // INGEN_ENGINE_PLUGINIMPL_HPP
diff --git a/src/engine/PortImpl.hpp b/src/engine/PortImpl.hpp
index 70e8e7ab..2210431b 100644
--- a/src/engine/PortImpl.hpp
+++ b/src/engine/PortImpl.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PORTIMPL_H
-#define PORTIMPL_H
+#ifndef INGEN_ENGINE_PORTIMPL_HPP
+#define INGEN_ENGINE_PORTIMPL_HPP
#include <cstdlib>
#include <string>
@@ -143,4 +143,4 @@ protected:
} // namespace Ingen
-#endif // PORTIMPL_H
+#endif // INGEN_ENGINE_PORTIMPL_HPP
diff --git a/src/engine/PostProcessor.hpp b/src/engine/PostProcessor.hpp
index 6d20ee24..6450d10a 100644
--- a/src/engine/PostProcessor.hpp
+++ b/src/engine/PostProcessor.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef POSTPROCESSOR_H
-#define POSTPROCESSOR_H
+#ifndef INGEN_ENGINE_POSTPROCESSOR_HPP
+#define INGEN_ENGINE_POSTPROCESSOR_HPP
#include <pthread.h>
#include "raul/SRSWQueue.hpp"
@@ -64,4 +64,4 @@ private:
} // namespace Ingen
-#endif // POSTPROCESSOR_H
+#endif // INGEN_ENGINE_POSTPROCESSOR_HPP
diff --git a/src/engine/ProcessContext.hpp b/src/engine/ProcessContext.hpp
index 4b3888d0..068b0c85 100644
--- a/src/engine/ProcessContext.hpp
+++ b/src/engine/ProcessContext.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PROCESSCONTEXT_H
-#define PROCESSCONTEXT_H
+#ifndef INGEN_ENGINE_PROCESSCONTEXT_HPP
+#define INGEN_ENGINE_PROCESSCONTEXT_HPP
#include "types.hpp"
#include "EventSink.hpp"
@@ -64,5 +64,5 @@ private:
} // namespace Ingen
-#endif // PROCESSCONTEXT_H
+#endif // INGEN_ENGINE_PROCESSCONTEXT_HPP
diff --git a/src/engine/ProcessSlave.hpp b/src/engine/ProcessSlave.hpp
index a309c232..eb876cfb 100644
--- a/src/engine/ProcessSlave.hpp
+++ b/src/engine/ProcessSlave.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PROCESS_SLAVE_HPP
-#define PROCESS_SLAVE_HPP
+#ifndef INGEN_ENGINE_PROCESSSLAVE_HPP
+#define INGEN_ENGINE_PROCESSSLAVE_HPP
#include <sstream>
#include "raul/Slave.hpp"
@@ -93,5 +93,5 @@ private:
} // namespace Ingen
-#endif // PROCESS_SLAVE_HPP
+#endif // INGEN_ENGINE_PROCESSSLAVE_HPP
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index 6c22a379..22c92efa 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef QUEUEDENGINEINTERFACE_H
-#define QUEUEDENGINEINTERFACE_H
+#ifndef INGEN_ENGINE_QUEUEDENGINEINTERFACE_HPP
+#define INGEN_ENGINE_QUEUEDENGINEINTERFACE_HPP
#include <inttypes.h>
#include <string>
@@ -124,4 +124,4 @@ private:
} // namespace Ingen
-#endif // QUEUEDENGINEINTERFACE_H
+#endif // INGEN_ENGINE_QUEUEDENGINEINTERFACE_HPP
diff --git a/src/engine/QueuedEvent.hpp b/src/engine/QueuedEvent.hpp
index eca7da03..ab82b474 100644
--- a/src/engine/QueuedEvent.hpp
+++ b/src/engine/QueuedEvent.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef QUEUEDEVENT_H
-#define QUEUEDEVENT_H
+#ifndef INGEN_ENGINE_QUEUEDEVENT_HPP
+#define INGEN_ENGINE_QUEUEDEVENT_HPP
#include "Event.hpp"
@@ -80,4 +80,4 @@ protected:
} // namespace Ingen
-#endif // QUEUEDEVENT_H
+#endif // INGEN_ENGINE_QUEUEDEVENT_HPP
diff --git a/src/engine/Responder.hpp b/src/engine/Responder.hpp
index 68a082dd..625d88e6 100644
--- a/src/engine/Responder.hpp
+++ b/src/engine/Responder.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RESPONDER_H
-#define RESPONDER_H
+#ifndef INGEN_ENGINE_RESPONDER_HPP
+#define INGEN_ENGINE_RESPONDER_HPP
#include <inttypes.h>
#include <string>
@@ -66,5 +66,5 @@ private:
} // namespace Ingen
-#endif // RESPONDER_H
+#endif // INGEN_ENGINE_RESPONDER_HPP
diff --git a/src/engine/ThreadManager.hpp b/src/engine/ThreadManager.hpp
index 26368deb..3f86ba83 100644
--- a/src/engine/ThreadManager.hpp
+++ b/src/engine/ThreadManager.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef THREADMANAGER_H
-#define THREADMANAGER_H
+#ifndef INGEN_ENGINE_THREADMANAGER_HPP
+#define INGEN_ENGINE_THREADMANAGER_HPP
#include <cassert>
#include "raul/Thread.hpp"
@@ -55,4 +55,4 @@ public:
} // namespace Ingen
-#endif // THREADMANAGER_H
+#endif // INGEN_ENGINE_THREADMANAGER_HPP
diff --git a/src/engine/events.hpp b/src/engine/events.hpp
index 501e7941..ea8d7efd 100644
--- a/src/engine/events.hpp
+++ b/src/engine/events.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef EVENTS_H
-#define EVENTS_H
+#ifndef INGEN_ENGINE_EVENTS_HPP
+#define INGEN_ENGINE_EVENTS_HPP
#include "ingen-config.h"
@@ -43,5 +43,5 @@
#include "events/SetPortValue.hpp"
#include "events/UnregisterClient.hpp"
-#endif // EVENTS_H
+#endif // INGEN_ENGINE_EVENTS_HPP
diff --git a/src/engine/events/AllNotesOff.hpp b/src/engine/events/AllNotesOff.hpp
index 77fcd651..f4c07f7d 100644
--- a/src/engine/events/AllNotesOff.hpp
+++ b/src/engine/events/AllNotesOff.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef ALLNOTESOFFEVENT_H
-#define ALLNOTESOFFEVENT_H
+#ifndef INGEN_EVENTS_ALLNOTESOFF_HPP
+#define INGEN_EVENTS_ALLNOTESOFF_HPP
#include "Event.hpp"
@@ -49,4 +49,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // ALLNOTESOFFEVENT_H
+#endif // INGEN_EVENTS_ALLNOTESOFF_HPP
diff --git a/src/engine/events/Connect.hpp b/src/engine/events/Connect.hpp
index 53b58e52..f8e2cdfa 100644
--- a/src/engine/events/Connect.hpp
+++ b/src/engine/events/Connect.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONNECTIONEVENT_H
-#define CONNECTIONEVENT_H
+#ifndef INGEN_EVENTS_CONNECT_HPP
+#define INGEN_EVENTS_CONNECT_HPP
#include "raul/Path.hpp"
#include "QueuedEvent.hpp"
@@ -90,4 +90,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // CONNECTIONEVENT_H
+#endif // INGEN_EVENTS_CONNECT_HPP
diff --git a/src/engine/events/CreateNode.hpp b/src/engine/events/CreateNode.hpp
index 8f2379b0..389c0ff5 100644
--- a/src/engine/events/CreateNode.hpp
+++ b/src/engine/events/CreateNode.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CREATENODEEVENT_H
-#define CREATENODEEVENT_H
+#ifndef INGEN_EVENTS_CREATENODE_HPP
+#define INGEN_EVENTS_CREATENODE_HPP
#include <string>
#include "QueuedEvent.hpp"
@@ -72,4 +72,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // CREATENODEEVENT_H
+#endif // INGEN_EVENTS_CREATENODE_HPP
diff --git a/src/engine/events/CreatePatch.hpp b/src/engine/events/CreatePatch.hpp
index 15dee643..a9f1281e 100644
--- a/src/engine/events/CreatePatch.hpp
+++ b/src/engine/events/CreatePatch.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CREATEPATCHEVENT_H
-#define CREATEPATCHEVENT_H
+#ifndef INGEN_EVENTS_CREATEPATCH_HPP
+#define INGEN_EVENTS_CREATEPATCH_HPP
#include "QueuedEvent.hpp"
#include "interface/Resource.hpp"
@@ -66,4 +66,4 @@ private:
} // namespace Events
-#endif // CREATEPATCHEVENT_H
+#endif // INGEN_EVENTS_CREATEPATCH_HPP
diff --git a/src/engine/events/CreatePort.hpp b/src/engine/events/CreatePort.hpp
index adda30bb..ad8ab5bf 100644
--- a/src/engine/events/CreatePort.hpp
+++ b/src/engine/events/CreatePort.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CREATEPORTEVENT_H
-#define CREATEPORTEVENT_H
+#ifndef INGEN_EVENTS_CREATEPORT_HPP
+#define INGEN_EVENTS_CREATEPORT_HPP
#include "QueuedEvent.hpp"
#include "raul/Path.hpp"
@@ -79,4 +79,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // CREATEPORTEVENT_H
+#endif // INGEN_EVENTS_CREATEPORT_HPP
diff --git a/src/engine/events/Deactivate.hpp b/src/engine/events/Deactivate.hpp
index 05d87520..609430d9 100644
--- a/src/engine/events/Deactivate.hpp
+++ b/src/engine/events/Deactivate.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef DEACTIVATEEVENT_H
-#define DEACTIVATEEVENT_H
+#ifndef INGEN_EVENTS_DEACTIVATE_HPP
+#define INGEN_EVENTS_DEACTIVATE_HPP
#include "QueuedEvent.hpp"
#include "Engine.hpp"
@@ -46,4 +46,4 @@ public:
} // namespace Ingen
} // namespace Events
-#endif // DEACTIVATEEVENT_H
+#endif // INGEN_EVENTS_DEACTIVATE_HPP
diff --git a/src/engine/events/Delete.hpp b/src/engine/events/Delete.hpp
index e4cb6732..8ad8ac12 100644
--- a/src/engine/events/Delete.hpp
+++ b/src/engine/events/Delete.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef DESTROYEVENT_H
-#define DESTROYEVENT_H
+#ifndef INGEN_EVENTS_DELETE_HPP
+#define INGEN_EVENTS_DELETE_HPP
#include "QueuedEvent.hpp"
#include "EngineStore.hpp"
@@ -92,4 +92,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // DESTROYEVENT_H
+#endif // INGEN_EVENTS_DELETE_HPP
diff --git a/src/engine/events/Disconnect.hpp b/src/engine/events/Disconnect.hpp
index 652fd4b5..e118143c 100644
--- a/src/engine/events/Disconnect.hpp
+++ b/src/engine/events/Disconnect.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef DISCONNECTIONEVENT_H
-#define DISCONNECTIONEVENT_H
+#ifndef INGEN_EVENTS_DISCONNECT_HPP
+#define INGEN_EVENTS_DISCONNECT_HPP
#include "raul/Path.hpp"
#include "QueuedEvent.hpp"
@@ -99,4 +99,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // DISCONNECTIONEVENT_H
+#endif // INGEN_EVENTS_DISCONNECT_HPP
diff --git a/src/engine/events/DisconnectAll.hpp b/src/engine/events/DisconnectAll.hpp
index 8cb3f9a2..d350e889 100644
--- a/src/engine/events/DisconnectAll.hpp
+++ b/src/engine/events/DisconnectAll.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef DISCONNECTNODEEVENT_H
-#define DISCONNECTNODEEVENT_H
+#ifndef INGEN_EVENTS_DISCONNECTALL_HPP
+#define INGEN_EVENTS_DISCONNECTALL_HPP
#include "raul/List.hpp"
#include "raul/Path.hpp"
@@ -87,4 +87,4 @@ private:
} // namespace Events
-#endif // DISCONNECTNODEEVENT_H
+#endif // INGEN_EVENTS_DISCONNECTALL_HPP
diff --git a/src/engine/events/Get.hpp b/src/engine/events/Get.hpp
index 81d86b25..5054ddb5 100644
--- a/src/engine/events/Get.hpp
+++ b/src/engine/events/Get.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef REQUESTOBJECTEVENT_H
-#define REQUESTOBJECTEVENT_H
+#ifndef INGEN_EVENTS_GET_HPP
+#define INGEN_EVENTS_GET_HPP
#include "QueuedEvent.hpp"
#include "types.hpp"
@@ -56,4 +56,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // REQUESTOBJECTEVENT_H
+#endif // INGEN_EVENTS_GET_HPP
diff --git a/src/engine/events/Learn.hpp b/src/engine/events/Learn.hpp
index 8eb61c5f..5f548797 100644
--- a/src/engine/events/Learn.hpp
+++ b/src/engine/events/Learn.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MIDILEARNEVENT_H
-#define MIDILEARNEVENT_H
+#ifndef INGEN_EVENTS_LEARN_HPP
+#define INGEN_EVENTS_LEARN_HPP
#include "QueuedEvent.hpp"
#include "internals/Controller.hpp"
@@ -58,4 +58,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // MIDILEARNEVENT_H
+#endif // INGEN_EVENTS_LEARN_HPP
diff --git a/src/engine/events/LoadPlugins.hpp b/src/engine/events/LoadPlugins.hpp
index 3549fdfd..dcc5cd52 100644
--- a/src/engine/events/LoadPlugins.hpp
+++ b/src/engine/events/LoadPlugins.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LOADPLUGINSEVENT_H
-#define LOADPLUGINSEVENT_H
+#ifndef INGEN_EVENTS_LOADPLUGINS_HPP
+#define INGEN_EVENTS_LOADPLUGINS_HPP
#include "QueuedEvent.hpp"
@@ -44,4 +44,4 @@ public:
} // namespace Ingen
} // namespace Events
-#endif // LOADPLUGINSEVENT_H
+#endif // INGEN_EVENTS_LOADPLUGINS_HPP
diff --git a/src/engine/events/Move.hpp b/src/engine/events/Move.hpp
index 7effaae0..5a982397 100644
--- a/src/engine/events/Move.hpp
+++ b/src/engine/events/Move.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RENAMEEVENT_H
-#define RENAMEEVENT_H
+#ifndef INGEN_EVENTS_MOVE_HPP
+#define INGEN_EVENTS_MOVE_HPP
#include "raul/Path.hpp"
#include "QueuedEvent.hpp"
@@ -77,4 +77,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // RENAMEEVENT_H
+#endif // INGEN_EVENTS_MOVE_HPP
diff --git a/src/engine/events/Note.hpp b/src/engine/events/Note.hpp
index 9d895652..418e9130 100644
--- a/src/engine/events/Note.hpp
+++ b/src/engine/events/Note.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NOTEEVENT_H
-#define NOTEEVENT_H
+#ifndef INGEN_EVENTS_NOTE_HPP
+#define INGEN_EVENTS_NOTE_HPP
#include "Event.hpp"
#include "types.hpp"
@@ -66,4 +66,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // NOTEEVENT_H
+#endif // INGEN_EVENTS_NOTE_HPP
diff --git a/src/engine/events/Ping.hpp b/src/engine/events/Ping.hpp
index 8a8b554d..f7359efc 100644
--- a/src/engine/events/Ping.hpp
+++ b/src/engine/events/Ping.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PINGQUEUEDEVENT_H
-#define PINGQUEUEDEVENT_H
+#ifndef INGEN_EVENTS_PING_HPP
+#define INGEN_EVENTS_PING_HPP
#include "QueuedEvent.hpp"
#include "types.hpp"
@@ -48,4 +48,4 @@ public:
} // namespace Ingen
} // namespace Events
-#endif // PINGQUEUEDEVENT_H
+#endif // INGEN_EVENTS_PING_HPP
diff --git a/src/engine/events/RegisterClient.hpp b/src/engine/events/RegisterClient.hpp
index 92c62cc7..baecdc4d 100644
--- a/src/engine/events/RegisterClient.hpp
+++ b/src/engine/events/RegisterClient.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef REGISTERCLIENTEVENT_H
-#define REGISTERCLIENTEVENT_H
+#ifndef INGEN_EVENTS_REGISTERCLIENT_HPP
+#define INGEN_EVENTS_REGISTERCLIENT_HPP
#include "raul/URI.hpp"
#include "interface/ClientInterface.hpp"
@@ -51,4 +51,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // REGISTERCLIENTEVENT_H
+#endif // INGEN_EVENTS_REGISTERCLIENT_HPP
diff --git a/src/engine/events/RequestAllObjects.hpp b/src/engine/events/RequestAllObjects.hpp
index 1499a83c..3b44c5c0 100644
--- a/src/engine/events/RequestAllObjects.hpp
+++ b/src/engine/events/RequestAllObjects.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef REQUESTALLOBJECTSEVENT_H
-#define REQUESTALLOBJECTSEVENT_H
+#ifndef INGEN_EVENTS_REQUESTALLOBJECTS_HPP
+#define INGEN_EVENTS_REQUESTALLOBJECTS_HPP
#include "QueuedEvent.hpp"
@@ -41,4 +41,4 @@ public:
} // namespace Ingen
} // namespace Events
-#endif // REQUESTALLOBJECTSEVENT_H
+#endif // INGEN_EVENTS_REQUESTALLOBJECTS_HPP
diff --git a/src/engine/events/RequestMetadata.hpp b/src/engine/events/RequestMetadata.hpp
index 0777c79a..68da6adc 100644
--- a/src/engine/events/RequestMetadata.hpp
+++ b/src/engine/events/RequestMetadata.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef REQUESTMETADATAEVENT_H
-#define REQUESTMETADATAEVENT_H
+#ifndef INGEN_EVENTS_REQUESTMETADATA_HPP
+#define INGEN_EVENTS_REQUESTMETADATA_HPP
#include "QueuedEvent.hpp"
#include "raul/Atom.hpp"
@@ -73,4 +73,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // REQUESTMETADATAEVENT_H
+#endif // INGEN_EVENTS_REQUESTMETADATA_HPP
diff --git a/src/engine/events/RequestPlugins.hpp b/src/engine/events/RequestPlugins.hpp
index 16f878db..e4372bc6 100644
--- a/src/engine/events/RequestPlugins.hpp
+++ b/src/engine/events/RequestPlugins.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef REQUESTPLUGINSEVENT_H
-#define REQUESTPLUGINSEVENT_H
+#ifndef INGEN_EVENTS_REQUESTPLUGINS_HPP
+#define INGEN_EVENTS_REQUESTPLUGINS_HPP
#include "QueuedEvent.hpp"
#include "NodeFactory.hpp"
@@ -48,4 +48,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // REQUESTPLUGINSEVENT_H
+#endif // INGEN_EVENTS_REQUESTPLUGINS_HPP
diff --git a/src/engine/events/SendBinding.hpp b/src/engine/events/SendBinding.hpp
index 303e29fa..7cce3767 100644
--- a/src/engine/events/SendBinding.hpp
+++ b/src/engine/events/SendBinding.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef SENDBINDINGEVENT_H
-#define SENDBINDINGEVENT_H
+#ifndef INGEN_EVENTS_SENDBINDING_HPP
+#define INGEN_EVENTS_SENDBINDING_HPP
#include "raul/Atom.hpp"
#include "interface/MessageType.hpp"
@@ -65,4 +65,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // SENDBINDINGEVENT_H
+#endif // INGEN_EVENTS_SENDBINDING_HPP
diff --git a/src/engine/events/SendPortActivity.hpp b/src/engine/events/SendPortActivity.hpp
index c35266c5..2e1c40f2 100644
--- a/src/engine/events/SendPortActivity.hpp
+++ b/src/engine/events/SendPortActivity.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef SENDPORTACTIVITYEVENT_H
-#define SENDPORTACTIVITYEVENT_H
+#ifndef INGEN_EVENTS_SENDPORTACTIVITY_HPP
+#define INGEN_EVENTS_SENDPORTACTIVITY_HPP
#include "Event.hpp"
#include "types.hpp"
@@ -65,4 +65,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // SENDPORTACTIVITYEVENT_H
+#endif // INGEN_EVENTS_SENDPORTACTIVITY_HPP
diff --git a/src/engine/events/SendPortValue.hpp b/src/engine/events/SendPortValue.hpp
index b942398c..a106f459 100644
--- a/src/engine/events/SendPortValue.hpp
+++ b/src/engine/events/SendPortValue.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef SENDPORTVALUEEVENT_H
-#define SENDPORTVALUEEVENT_H
+#ifndef INGEN_EVENTS_SENDPORTVALUE_HPP
+#define INGEN_EVENTS_SENDPORTVALUE_HPP
#include "raul/Atom.hpp"
#include "engine/Event.hpp"
@@ -78,4 +78,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // SENDPORTVALUEEVENT_H
+#endif // INGEN_EVENTS_SENDPORTVALUE_HPP
diff --git a/src/engine/events/SetMetadata.hpp b/src/engine/events/SetMetadata.hpp
index 1417e02c..cf49efae 100644
--- a/src/engine/events/SetMetadata.hpp
+++ b/src/engine/events/SetMetadata.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef SETMETADATAEVENT_H
-#define SETMETADATAEVENT_H
+#ifndef INGEN_EVENTS_SETMETADATA_HPP
+#define INGEN_EVENTS_SETMETADATA_HPP
#include <vector>
#include "raul/URI.hpp"
@@ -117,4 +117,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // SETMETADATAEVENT_H
+#endif // INGEN_EVENTS_SETMETADATA_HPP
diff --git a/src/engine/events/SetPortValue.hpp b/src/engine/events/SetPortValue.hpp
index aab59811..821672fd 100644
--- a/src/engine/events/SetPortValue.hpp
+++ b/src/engine/events/SetPortValue.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef SETPORTVALUEEVENT_H
-#define SETPORTVALUEEVENT_H
+#ifndef INGEN_EVENTS_SETPORTVALUE_HPP
+#define INGEN_EVENTS_SETPORTVALUE_HPP
#include "raul/Atom.hpp"
#include "QueuedEvent.hpp"
@@ -92,4 +92,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // SETPORTVALUEEVENT_H
+#endif // INGEN_EVENTS_SETPORTVALUE_HPP
diff --git a/src/engine/events/UnregisterClient.hpp b/src/engine/events/UnregisterClient.hpp
index 9b6f9ab1..e32f8a94 100644
--- a/src/engine/events/UnregisterClient.hpp
+++ b/src/engine/events/UnregisterClient.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef UNREGISTERCLIENTEVENT_H
-#define UNREGISTERCLIENTEVENT_H
+#ifndef INGEN_EVENTS_UNREGISTERCLIENT_HPP
+#define INGEN_EVENTS_UNREGISTERCLIENT_HPP
#include "QueuedEvent.hpp"
#include "raul/URI.hpp"
@@ -47,4 +47,4 @@ private:
} // namespace Ingen
} // namespace Events
-#endif // UNREGISTERCLIENTEVENT_H
+#endif // INGEN_EVENTS_UNREGISTERCLIENT_HPP
diff --git a/src/engine/internals/Controller.hpp b/src/engine/internals/Controller.hpp
index bca26ed5..35824f52 100644
--- a/src/engine/internals/Controller.hpp
+++ b/src/engine/internals/Controller.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MIDICONTROLNODE_H
-#define MIDICONTROLNODE_H
+#ifndef INGEN_INTERNALS_CONTROLLER_HPP
+#define INGEN_INTERNALS_CONTROLLER_HPP
#include <string>
#include "NodeBase.hpp"
@@ -62,4 +62,4 @@ private:
} // namespace Ingen
} // namespace Internals
-#endif // MIDICONTROLNODE_H
+#endif // INGEN_INTERNALS_CONTROLLER_HPP
diff --git a/src/engine/internals/Note.hpp b/src/engine/internals/Note.hpp
index 7f091231..45bb084f 100644
--- a/src/engine/internals/Note.hpp
+++ b/src/engine/internals/Note.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MIDINOTENODE_H
-#define MIDINOTENODE_H
+#ifndef INGEN_INTERNALS_NOTE_HPP
+#define INGEN_INTERNALS_NOTE_HPP
#include <string>
#include "types.hpp"
@@ -88,4 +88,4 @@ private:
} // namespace Ingen
} // namespace Internals
-#endif // MIDINOTENODE_H
+#endif // INGEN_INTERNALS_NOTE_HPP
diff --git a/src/engine/internals/Trigger.hpp b/src/engine/internals/Trigger.hpp
index 84281ac7..dcc69b92 100644
--- a/src/engine/internals/Trigger.hpp
+++ b/src/engine/internals/Trigger.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MIDITRIGGERNODE_H
-#define MIDITRIGGERNODE_H
+#ifndef INGEN_INTERNALS_TRIGGER_HPP
+#define INGEN_INTERNALS_TRIGGER_HPP
#include <string>
#include "NodeBase.hpp"
@@ -65,4 +65,4 @@ private:
} // namespace Ingen
} // namespace Internals
-#endif // MIDITRIGGERNODE_H
+#endif // INGEN_INTERNALS_TRIGGER_HPP
diff --git a/src/engine/mix.hpp b/src/engine/mix.hpp
index 792e4e94..ad12bad0 100644
--- a/src/engine/mix.hpp
+++ b/src/engine/mix.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MIX_HPP
-#define MIX_HPP
+#ifndef INGEN_ENGINE_MIX_HPP
+#define INGEN_ENGINE_MIX_HPP
#include "raul/log.hpp"
#include "interface/PortType.hpp"
@@ -83,4 +83,4 @@ mix(Context& context, Buffer* dst, const Buffer*const* srcs, uint32_t num_srcs)
} // namespace Ingen
-#endif // MIX_HPP
+#endif // INGEN_ENGINE_MIX_HPP
diff --git a/src/engine/tuning.hpp b/src/engine/tuning.hpp
index 1ddaf71a..70538c25 100644
--- a/src/engine/tuning.hpp
+++ b/src/engine/tuning.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef TUNING_H
-#define TUNING_H
+#ifndef INGEN_ENGINE_TUNING_HPP
+#define INGEN_ENGINE_TUNING_HPP
#include <stddef.h>
#include <time.h>
@@ -37,4 +37,4 @@ static const timespec main_rate = { 0, 125000000 }; // 1/8 second
} // namespace Ingen
-#endif // TUNING_H
+#endif // INGEN_ENGINE_TUNING_HPP
diff --git a/src/engine/types.hpp b/src/engine/types.hpp
index e1c8df0b..65c4fb95 100644
--- a/src/engine/types.hpp
+++ b/src/engine/types.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef TYPES_HPP
-#define TYPES_HPP
+#ifndef INGEN_ENGINE_TYPES_HPP
+#define INGEN_ENGINE_TYPES_HPP
#include <stdint.h>
#include <cstddef>
@@ -26,4 +26,4 @@ typedef uint32_t SampleCount;
typedef uint32_t SampleRate;
typedef uint32_t FrameTime;
-#endif // TYPES_HPP
+#endif // INGEN_ENGINE_TYPES_HPP
diff --git a/src/engine/util.hpp b/src/engine/util.hpp
index 3b9d436c..42acdb17 100644
--- a/src/engine/util.hpp
+++ b/src/engine/util.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef UTIL_HPP
-#define UTIL_HPP
+#ifndef INGEN_ENGINE_UTIL_HPP
+#define INGEN_ENGINE_UTIL_HPP
#include <cstdlib>
#include "raul/log.hpp"
@@ -82,4 +82,4 @@ ingen_jack_port_name(const Raul::Path& path)
} // namespace Ingen
-#endif // UTIL_HPP
+#endif // INGEN_ENGINE_UTIL_HPP
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 5153849b..0de1a7ea 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INGEN_APP_HPP
-#define INGEN_APP_HPP
+#ifndef INGEN_GUI_APP_HPP
+#define INGEN_GUI_APP_HPP
#include <cassert>
#include <string>
@@ -166,5 +166,5 @@ protected:
} // namespace GUI
} // namespace Ingen
-#endif // INGEN_APP_HPP
+#endif // INGEN_GUI_APP_HPP
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index adabe88f..492a634b 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef BREADCRUMBBOX_H
-#define BREADCRUMBBOX_H
+#ifndef INGEN_GUI_BREADCRUMBS_HPP
+#define INGEN_GUI_BREADCRUMBS_HPP
#include <list>
#include <gtkmm.h>
@@ -112,4 +112,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // BREADCRUMBBOX_H
+#endif // INGEN_GUI_BREADCRUMBS_HPP
diff --git a/src/gui/Configuration.hpp b/src/gui/Configuration.hpp
index fef86999..51e68a24 100644
--- a/src/gui/Configuration.hpp
+++ b/src/gui/Configuration.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef INGEN_GUI_CONFIGURATION_HPP
+#define INGEN_GUI_CONFIGURATION_HPP
#include <stdint.h>
#include <string>
@@ -75,6 +75,6 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // CONFIG_H
+#endif // INGEN_GUI_CONFIGURATION_HPP
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 3c2136af..05393a1e 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONNECT_WINDOW_H
-#define CONNECT_WINDOW_H
+#ifndef INGEN_GUI_CONNECTWINDOW_HPP
+#define INGEN_GUI_CONNECTWINDOW_HPP
#include "ingen-config.h"
@@ -109,4 +109,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // CONNECT_WINDOW_H
+#endif // INGEN_GUI_CONNECTWINDOW_HPP
diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp
index e9d5aa3c..43899aec 100644
--- a/src/gui/Connection.hpp
+++ b/src/gui/Connection.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GUI_CONNECTION_H
-#define GUI_CONNECTION_H
+#ifndef INGEN_GUI_CONNECTION_HPP
+#define INGEN_GUI_CONNECTION_HPP
#include <cassert>
#include <string>
@@ -54,4 +54,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // GUI_CONNECTION_H
+#endif // INGEN_GUI_CONNECTION_HPP
diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp
index 024bd720..93110cfa 100644
--- a/src/gui/ControlPanel.hpp
+++ b/src/gui/ControlPanel.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONTROLPANEL_H
-#define CONTROLPANEL_H
+#ifndef INGEN_GUI_CONTROLPANEL_HPP
+#define INGEN_GUI_CONTROLPANEL_HPP
#include <vector>
#include <string>
@@ -95,4 +95,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // CONTROLPANEL_H
+#endif // INGEN_GUI_CONTROLPANEL_HPP
diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp
index 1a5ee46d..2996b177 100644
--- a/src/gui/Controls.hpp
+++ b/src/gui/Controls.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONTROLGROUPS_H
-#define CONTROLGROUPS_H
+#ifndef INGEN_GUI_CONTROLS_HPP
+#define INGEN_GUI_CONTROLS_HPP
#include <cassert>
#include <gtkmm.h>
@@ -142,4 +142,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // CONTROLGROUPS_H
+#endif // INGEN_GUI_CONTROLS_HPP
diff --git a/src/gui/GladeFactory.hpp b/src/gui/GladeFactory.hpp
index d666301d..f9801223 100644
--- a/src/gui/GladeFactory.hpp
+++ b/src/gui/GladeFactory.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GLADEFACTORY_H
-#define GLADEFACTORY_H
+#ifndef INGEN_GUI_GLADEFACTORY_HPP
+#define INGEN_GUI_GLADEFACTORY_HPP
#include <string>
#include <libglademm/xml.h>
@@ -44,4 +44,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // GLADEFACTORY_H
+#endif // INGEN_GUI_GLADEFACTORY_HPP
diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp
index df0c982d..a3356de6 100644
--- a/src/gui/LoadPatchWindow.hpp
+++ b/src/gui/LoadPatchWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LOADPATCHWINDOW_H
-#define LOADPATCHWINDOW_H
+#ifndef INGEN_GUI_LOADPATCHWINDOW_HPP
+#define INGEN_GUI_LOADPATCHWINDOW_HPP
#include <libglademm/xml.h>
#include <gtkmm.h>
@@ -83,4 +83,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // LOADPATCHWINDOW_H
+#endif // INGEN_GUI_LOADPATCHWINDOW_HPP
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 9f24d278..3ff1b724 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LOADPLUGINWINDOW_H
-#define LOADPLUGINWINDOW_H
+#ifndef INGEN_GUI_LOADPLUGINWINDOW_HPP
+#define INGEN_GUI_LOADPLUGINWINDOW_HPP
#include <map>
#include <libglademm/xml.h>
@@ -146,4 +146,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // LOADPLUGINWINDOW_H
+#endif // INGEN_GUI_LOADPLUGINWINDOW_HPP
diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp
index ded08e6b..6c1a17d1 100644
--- a/src/gui/LoadRemotePatchWindow.hpp
+++ b/src/gui/LoadRemotePatchWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LOADREMOTEPATCHWINDOW_H
-#define LOADREMOTEPATCHWINDOW_H
+#ifndef INGEN_GUI_LOADREMOTEPATCHWINDOW_HPP
+#define INGEN_GUI_LOADREMOTEPATCHWINDOW_HPP
#include <libglademm/xml.h>
#include <gtkmm.h>
@@ -89,4 +89,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // LOADREMOTEPATCHWINDOW_H
+#endif // INGEN_GUI_LOADREMOTEPATCHWINDOW_HPP
diff --git a/src/gui/LoadSubpatchWindow.hpp b/src/gui/LoadSubpatchWindow.hpp
index 7473811f..6f71642b 100644
--- a/src/gui/LoadSubpatchWindow.hpp
+++ b/src/gui/LoadSubpatchWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LOADSUBPATCHWINDOW_H
-#define LOADSUBPATCHWINDOW_H
+#ifndef INGEN_GUI_LOADSUBPATCHWINDOW_HPP
+#define INGEN_GUI_LOADSUBPATCHWINDOW_HPP
#include <libglademm/xml.h>
#include <gtkmm.h>
@@ -78,4 +78,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // LOADSUBPATCHWINDOW_H
+#endif // INGEN_GUI_LOADSUBPATCHWINDOW_HPP
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index eac20df3..33c0a9af 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MESSAGESWINDOW_H
-#define MESSAGESWINDOW_H
+#ifndef INGEN_GUI_MESSAGESWINDOW_HPP
+#define INGEN_GUI_MESSAGESWINDOW_HPP
#include <string>
#include <gtkmm.h>
@@ -53,4 +53,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // MESSAGESWINDOW_H
+#endif // INGEN_GUI_MESSAGESWINDOW_HPP
diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp
index 5f493582..1b227c1e 100644
--- a/src/gui/NewSubpatchWindow.hpp
+++ b/src/gui/NewSubpatchWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NEWSUBPATCHWINDOW_H
-#define NEWSUBPATCHWINDOW_H
+#ifndef INGEN_GUI_NEWSUBPATCHWINDOW_HPP
+#define INGEN_GUI_NEWSUBPATCHWINDOW_HPP
#include <libglademm/xml.h>
#include <gtkmm.h>
@@ -68,4 +68,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // NEWSUBPATCHWINDOW_H
+#endif // INGEN_GUI_NEWSUBPATCHWINDOW_HPP
diff --git a/src/gui/NodeControlWindow.hpp b/src/gui/NodeControlWindow.hpp
index e8c1c064..10f517ad 100644
--- a/src/gui/NodeControlWindow.hpp
+++ b/src/gui/NodeControlWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NODECONTROLWINDOW_H
-#define NODECONTROLWINDOW_H
+#ifndef INGEN_GUI_NODECONTROLWINDOW_HPP
+#define INGEN_GUI_NODECONTROLWINDOW_HPP
#include <gtkmm.h>
#include <libglademm.h>
@@ -71,4 +71,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // NODECONTROLWINDOW_H
+#endif // INGEN_GUI_NODECONTROLWINDOW_HPP
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index dc9c2cfe..7d2be982 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NODEMENU_H
-#define NODEMENU_H
+#ifndef INGEN_GUI_NODEMENU_HPP
+#define INGEN_GUI_NODEMENU_HPP
#include <string>
#include <gtkmm.h>
@@ -66,4 +66,4 @@ protected:
} // namespace GUI
} // namespace Ingen
-#endif // NODEMENU_H
+#endif // INGEN_GUI_NODEMENU_HPP
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 496d8867..08a396a1 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -14,8 +14,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NODEMODULE_H
-#define NODEMODULE_H
+#ifndef INGEN_GUI_NODEMODULE_HPP
+#define INGEN_GUI_NODEMODULE_HPP
#include <string>
#include <libgnomecanvasmm.h>
@@ -98,4 +98,4 @@ protected:
} // namespace GUI
} // namespace Ingen
-#endif // NODEMODULE_H
+#endif // INGEN_GUI_NODEMODULE_HPP
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index a619c5e4..83857b2b 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OBJECTMENU_H
-#define OBJECTMENU_H
+#ifndef INGEN_GUI_OBJECTMENU_HPP
+#define INGEN_GUI_OBJECTMENU_HPP
#include <string>
#include <gtkmm.h>
@@ -66,4 +66,4 @@ protected:
} // namespace GUI
} // namespace Ingen
-#endif // OBJECTMENU_H
+#endif // INGEN_GUI_OBJECTMENU_HPP
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index 41787929..12587c2b 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCHCANVAS_H
-#define PATCHCANVAS_H
+#ifndef INGEN_GUI_PATCHCANVAS_HPP
+#define INGEN_GUI_PATCHCANVAS_HPP
#include <string>
#include <map>
@@ -170,4 +170,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // PATCHCANVAS_H
+#endif // INGEN_GUI_PATCHCANVAS_HPP
diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp
index 060c3950..a5884b4b 100644
--- a/src/gui/PatchPortModule.hpp
+++ b/src/gui/PatchPortModule.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCHPORTMODULE_H
-#define PATCHPORTMODULE_H
+#ifndef INGEN_GUI_PATCHPORTMODULE_HPP
+#define INGEN_GUI_PATCHPORTMODULE_HPP
#include <string>
#include <boost/enable_shared_from_this.hpp>
@@ -81,4 +81,4 @@ protected:
} // namespace GUI
} // namespace Ingen
-#endif // PATCHPORTMODULE_H
+#endif // INGEN_GUI_PATCHPORTMODULE_HPP
diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp
index c745b07d..b4f6ec2f 100644
--- a/src/gui/PatchTreeWindow.hpp
+++ b/src/gui/PatchTreeWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCHTREEWINDOW_H
-#define PATCHTREEWINDOW_H
+#ifndef INGEN_GUI_PATCHTREEWINDOW_HPP
+#define INGEN_GUI_PATCHTREEWINDOW_HPP
#include <gtkmm.h>
#include <libglademm.h>
@@ -111,4 +111,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // PATCHTREEWINDOW_H
+#endif // INGEN_GUI_PATCHTREEWINDOW_HPP
diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp
index ed713803..776cea48 100644
--- a/src/gui/PatchView.hpp
+++ b/src/gui/PatchView.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCHVIEW_H
-#define PATCHVIEW_H
+#ifndef INGEN_GUI_PATCHVIEW_HPP
+#define INGEN_GUI_PATCHVIEW_HPP
#include <string>
#include <gtkmm.h>
@@ -109,4 +109,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // PATCHVIEW_H
+#endif // INGEN_GUI_PATCHVIEW_HPP
diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp
index 0f10cd84..8fecd28f 100644
--- a/src/gui/PatchWindow.hpp
+++ b/src/gui/PatchWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PATCHWINDOW_H
-#define PATCHWINDOW_H
+#ifndef INGEN_GUI_PATCHWINDOW_HPP
+#define INGEN_GUI_PATCHWINDOW_HPP
#include <gtkmm.h>
#include <libglademm/xml.h>
@@ -160,4 +160,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // PATCHWINDOW_H
+#endif // INGEN_GUI_PATCHWINDOW_HPP
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index 2c79ec7c..ae105fb0 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GUI_PORT_H
-#define GUI_PORT_H
+#ifndef INGEN_GUI_PORT_HPP
+#define INGEN_GUI_PORT_HPP
#include <cassert>
#include <string>
@@ -76,4 +76,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // GUI_PORT_H
+#endif // INGEN_GUI_PORT_HPP
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index 61ff1cc5..829cefbf 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PORTMENU_H
-#define PORTMENU_H
+#ifndef INGEN_GUI_PORTMENU_HPP
+#define INGEN_GUI_PORTMENU_HPP
#include <string>
#include <gtkmm.h>
@@ -59,4 +59,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // PORTMENU_H
+#endif // INGEN_GUI_PORTMENU_HPP
diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp
index b8e71209..56b1bc69 100644
--- a/src/gui/PortPropertiesWindow.hpp
+++ b/src/gui/PortPropertiesWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PORTPROPERTIESWINDOW_H
-#define PORTPROPERTIESWINDOW_H
+#ifndef INGEN_GUI_PORTPROPERTIESWINDOW_HPP
+#define INGEN_GUI_PORTPROPERTIESWINDOW_HPP
#include <gtkmm.h>
#include <libglademm.h>
@@ -65,4 +65,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // PORTPROPERTIESWINDOW_H
+#endif // INGEN_GUI_PORTPROPERTIESWINDOW_HPP
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index 2511e78a..e4c7b962 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PROPERTIES_WINDOW_HPP
-#define PROPERTIES_WINDOW_HPP
+#ifndef INGEN_GUI_PROPERTIES_WINDOW_HPP
+#define INGEN_GUI_PROPERTIES_WINDOW_HPP
#include <gtkmm.h>
#include <libglademm.h>
@@ -96,4 +96,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // PROPERTIES_WINDOW_HPP
+#endif // INGEN_GUI_PROPERTIES_WINDOW_HPP
diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp
index 360fc36f..b4c43442 100644
--- a/src/gui/RenameWindow.hpp
+++ b/src/gui/RenameWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RENAMEWINDOW_H
-#define RENAMEWINDOW_H
+#ifndef INGEN_GUI_RENAMEWINDOW_HPP
+#define INGEN_GUI_RENAMEWINDOW_HPP
#include <gtkmm.h>
#include <libglademm.h>
@@ -61,4 +61,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // RENAMEWINDOW_H
+#endif // INGEN_GUI_RENAMEWINDOW_HPP
diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp
index cef2dfb6..1e48ccf7 100644
--- a/src/gui/SubpatchModule.hpp
+++ b/src/gui/SubpatchModule.hpp
@@ -15,9 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-#ifndef SUBPATCHMODULE_H
-#define SUBPATCHMODULE_H
+#ifndef INGEN_GUI_SUBPATCHMODULE_HPP
+#define INGEN_GUI_SUBPATCHMODULE_HPP
#include <string>
#include <libgnomecanvasmm.h>
@@ -66,4 +65,4 @@ protected:
} // namespace GUI
} // namespace Ingen
-#endif // SUBPATCHMODULE_H
+#endif // INGEN_GUI_SUBPATCHMODULE_HPP
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index be86c95b..f6b8d706 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef THREADEDLOADER_H
-#define THREADEDLOADER_H
+#ifndef INGEN_GUI_THREADEDLOADER_HPP
+#define INGEN_GUI_THREADEDLOADER_HPP
#include <string>
#include <list>
@@ -88,4 +88,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // LOADERRTHREAD_H
+#endif // INGEN_GUI_LOADERRTHREAD_HPP
diff --git a/src/gui/UploadPatchWindow.hpp b/src/gui/UploadPatchWindow.hpp
index 2c2d8aa9..cd583f19 100644
--- a/src/gui/UploadPatchWindow.hpp
+++ b/src/gui/UploadPatchWindow.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef UPLOADPATCHWINDOW_H
-#define UPLOADPATCHWINDOW_H
+#ifndef INGEN_GUI_UPLOADPATCHWINDOW_HPP
+#define INGEN_GUI_UPLOADPATCHWINDOW_HPP
#include <sstream>
#include <libglademm/xml.h>
@@ -104,4 +104,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // UPLOADPATCHWINDOW_H
+#endif // INGEN_GUI_UPLOADPATCHWINDOW_HPP
diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp
index b8bc0047..48a9eb1b 100644
--- a/src/gui/Window.hpp
+++ b/src/gui/Window.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef WINDOW_HPP
-#define WINDOW_HPP
+#ifndef INGEN_GUI_WINDOW_HPP
+#define INGEN_GUI_WINDOW_HPP
#include <gtkmm.h>
#include <libglademm.h>
@@ -74,4 +74,4 @@ public:
} // namespace GUI
} // namespace Ingen
-#endif // WINDOW_HPP
+#endif // INGEN_GUI_WINDOW_HPP
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index adfd1c0d..8f205620 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef WINDOW_FACTORY_H
-#define WINDOW_FACTORY_H
+#ifndef INGEN_GUI_WINDOWFACTORY_HPP
+#define INGEN_GUI_WINDOWFACTORY_HPP
#include <map>
#include <gtkmm.h>
@@ -113,4 +113,4 @@ private:
} // namespace GUI
} // namespace Ingen
-#endif // WINDOW_FACTORY_H
+#endif // INGEN_GUI_WINDOWFACTORY_HPP
diff --git a/src/module/Module.hpp b/src/module/Module.hpp
index 7d2aec6e..68b398b4 100644
--- a/src/module/Module.hpp
+++ b/src/module/Module.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INGEN_MODULE_HPP
-#define INGEN_MODULE_HPP
+#ifndef INGEN_MODULE_MODULE_HPP
+#define INGEN_MODULE_MODULE_HPP
#include <string>
#include <glibmm/module.h>
@@ -42,4 +42,4 @@ struct Module {
} // namespace Shared
} // namespace Ingen
-#endif // INGEN_MODULE_HPP
+#endif // INGEN_MODULE_MODULE_HPP
diff --git a/src/module/World.hpp b/src/module/World.hpp
index 59500c3e..e1ccf5d1 100644
--- a/src/module/World.hpp
+++ b/src/module/World.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INGEN_WORLD_HPP
-#define INGEN_WORLD_HPP
+#ifndef INGEN_MODULE_WORLD_HPP
+#define INGEN_MODULE_WORLD_HPP
#include <map>
#include <string>
@@ -95,5 +95,5 @@ private:
} // namespace Shared
} // namespace Ingen
-#endif // INGEN_WORLD_HPP
+#endif // INGEN_MODULE_WORLD_HPP
diff --git a/src/module/ingen_module.hpp b/src/module/ingen_module.hpp
index 1095a3e6..bb2c3adb 100644
--- a/src/module/ingen_module.hpp
+++ b/src/module/ingen_module.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INGEN_LIB_MODULE_HPP
-#define INGEN_LIB_MODULE_HPP
+#ifndef INGEN_MODULE_HPP
+#define INGEN_MODULE_HPP
namespace Ingen { namespace Shared { class World; } }
@@ -27,5 +27,5 @@ void ingen_destroy_world();
} // extern "C"
-#endif // INGEN_LIB_MODULE_HPP
+#endif // INGEN_MODULE_HPP
diff --git a/src/serialisation/Parser.hpp b/src/serialisation/Parser.hpp
index 99c6dc81..0ce81e37 100644
--- a/src/serialisation/Parser.hpp
+++ b/src/serialisation/Parser.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LOADER_H
-#define LOADER_H
+#ifndef INGEN_SERIALISATION_LOADER_HPP
+#define INGEN_SERIALISATION_LOADER_HPP
#include <string>
#include <glibmm/ustring.h>
@@ -117,4 +117,4 @@ private:
} // namespace Serialisation
} // namespace Ingen
-#endif // LOADER_H
+#endif // INGEN_SERIALISATION_LOADER_HPP
diff --git a/src/serialisation/Serialiser.hpp b/src/serialisation/Serialiser.hpp
index 2515417e..b4e148e1 100644
--- a/src/serialisation/Serialiser.hpp
+++ b/src/serialisation/Serialiser.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef SERIALISER_H
-#define SERIALISER_H
+#ifndef INGEN_SERIALISATION_SERIALISER_HPP
+#define INGEN_SERIALISATION_SERIALISER_HPP
#include <map>
#include <utility>
@@ -125,4 +125,4 @@ private:
} // namespace Serialisation
} // namespace Ingen
-#endif // SERIALISER_H
+#endif // INGEN_SERIALISATION_SERIALISER_HPP
diff --git a/src/shared/Builder.hpp b/src/shared/Builder.hpp
index b80816b4..ec953d41 100644
--- a/src/shared/Builder.hpp
+++ b/src/shared/Builder.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef BUILDER_H
-#define BUILDER_H
+#ifndef INGEN_SHARED_BUILDER_HPP
+#define INGEN_SHARED_BUILDER_HPP
#include "raul/SharedPtr.hpp"
@@ -52,5 +52,5 @@ private:
} // namespace Shared
} // namespace Ingen
-#endif // BUILDER_H
+#endif // INGEN_SHARED_BUILDER_HPP
diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp
index d99b5525..5160ab2e 100644
--- a/src/shared/ClashAvoider.hpp
+++ b/src/shared/ClashAvoider.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CLASHAVOIDER_H
-#define CLASHAVOIDER_H
+#ifndef INGEN_SHARED_CLASHAVOIDER_HPP
+#define INGEN_SHARED_CLASHAVOIDER_HPP
#include <inttypes.h>
#include <string>
@@ -94,5 +94,5 @@ private:
} // namespace Shared
} // namespace Ingen
-#endif // CLASHAVOIDER_H
+#endif // INGEN_SHARED_CLASHAVOIDER_HPP
diff --git a/src/shared/HTTPSender.hpp b/src/shared/HTTPSender.hpp
index 6c741bb9..7a291a99 100644
--- a/src/shared/HTTPSender.hpp
+++ b/src/shared/HTTPSender.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef HTTPSENDER_H
-#define HTTPSENDER_H
+#ifndef INGEN_SHARED_HTTPSENDER_HPP
+#define INGEN_SHARED_HTTPSENDER_HPP
#include <stdint.h>
#include <string>
@@ -62,5 +62,5 @@ protected:
} // namespace Shared
} // namespace Ingen
-#endif // HTTPSENDER_H
+#endif // INGEN_SHARED_HTTPSENDER_HPP
diff --git a/src/shared/LV2Features.hpp b/src/shared/LV2Features.hpp
index 78d467a5..84b737f6 100644
--- a/src/shared/LV2Features.hpp
+++ b/src/shared/LV2Features.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LV2FEATURES_HPP
-#define LV2FEATURES_HPP
+#ifndef INGEN_SHARED_LV2FEATURES_HPP
+#define INGEN_SHARED_LV2FEATURES_HPP
#include "ingen-config.h"
#ifndef HAVE_SLV2
@@ -84,4 +84,4 @@ private:
} // namespace Shared
} // namespace Ingen
-#endif // LV2FEATURES_HPP
+#endif // INGEN_SHARED_LV2FEATURES_HPP
diff --git a/src/shared/LV2Object.hpp b/src/shared/LV2Object.hpp
index dc587e92..b0136d06 100644
--- a/src/shared/LV2Object.hpp
+++ b/src/shared/LV2Object.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LV2_OBJECT_HPP
-#define LV2_OBJECT_HPP
+#ifndef INGEN_SHARED_LV2OBJECT_HPP
+#define INGEN_SHARED_LV2OBJECT_HPP
namespace Raul { class Atom; }
typedef struct _LV2_Object LV2_Object;
@@ -36,4 +36,4 @@ namespace LV2Object {
} // namespace Shared
} // namespace Ingen
-#endif // LV2_OBJECT_HPP
+#endif // INGEN_SHARED_LV2OBJECT_HPP
diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp
index 30823ef0..ae43a9f2 100644
--- a/src/shared/LV2URIMap.hpp
+++ b/src/shared/LV2URIMap.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LV2URIMAP_HPP
-#define LV2URIMAP_HPP
+#ifndef INGEN_SHARED_LV2URIMAP_HPP
+#define INGEN_SHARED_LV2URIMAP_HPP
#include "ingen-config.h"
#ifndef HAVE_SLV2
@@ -74,4 +74,4 @@ public:
} // namespace Shared
} // namespace Ingen
-#endif // LV2URIMAP_HPP
+#endif // INGEN_SHARED_LV2URIMAP_HPP
diff --git a/src/shared/OSCSender.hpp b/src/shared/OSCSender.hpp
index ddf33c14..3a3ccb87 100644
--- a/src/shared/OSCSender.hpp
+++ b/src/shared/OSCSender.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef OSCSENDER_H
-#define OSCSENDER_H
+#ifndef INGEN_SHARED_OSCSENDER_HPP
+#define INGEN_SHARED_OSCSENDER_HPP
#include <inttypes.h>
#include <lo/lo.h>
@@ -55,5 +55,5 @@ protected:
} // namespace Shared
} // namespace Ingen
-#endif // OSCSENDER_H
+#endif // INGEN_SHARED_OSCSENDER_HPP
diff --git a/src/shared/ResourceImpl.hpp b/src/shared/ResourceImpl.hpp
index 9cb40521..f5e6e4da 100644
--- a/src/shared/ResourceImpl.hpp
+++ b/src/shared/ResourceImpl.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RESOURCEIMPL_HPP
-#define RESOURCEIMPL_HPP
+#ifndef INGEN_SHARED_RESOURCEIMPL_HPP
+#define INGEN_SHARED_RESOURCEIMPL_HPP
#include <map>
#include <sigc++/sigc++.h>
@@ -72,5 +72,5 @@ private:
} // namespace Shared
} // namespace Ingen
-#endif // RESOURCEIMPL_HPP
+#endif // INGEN_SHARED_RESOURCEIMPL_HPP
diff --git a/src/shared/Store.hpp b/src/shared/Store.hpp
index 6d588436..d6e93e03 100644
--- a/src/shared/Store.hpp
+++ b/src/shared/Store.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef COMMON_STORE_H
-#define COMMON_STORE_H
+#ifndef INGEN_SHARED_STORE_HPP
+#define INGEN_SHARED_STORE_HPP
#include <string>
#include <glibmm/thread.h>
@@ -55,4 +55,4 @@ private:
} // namespace Shared
} // namespace Ingen
-#endif // COMMON_STORE_H
+#endif // INGEN_SHARED_STORE_HPP
diff --git a/src/shared/runtime_paths.hpp b/src/shared/runtime_paths.hpp
index c832f087..e93e2343 100644
--- a/src/shared/runtime_paths.hpp
+++ b/src/shared/runtime_paths.hpp
@@ -15,8 +15,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INGEN_RUNTIME_PATHS_HPP
-#define INGEN_RUNTIME_PATHS_HPP
+#ifndef INGEN_SHARED_RUNTIME_PATHS_HPP
+#define INGEN_SHARED_RUNTIME_PATHS_HPP
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@@ -35,4 +35,4 @@ std::string module_path(const std::string& name);
} // namespace Ingen
} // namespace Shared
-#endif // INGEN_RUNTIME_PATHS_HPP
+#endif // INGEN_SHARED_RUNTIME_PATHS_HPP