From 908a001ea84dcf3a1204746d110068454c637119 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 May 2012 04:47:49 +0000 Subject: Fix include guards. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4349 a436a847-0d15-0410-975c-d299462d15a1 --- ingen/Edge.hpp | 6 +++--- ingen/EngineBase.hpp | 6 +++--- ingen/GraphObject.hpp | 6 +++--- ingen/Node.hpp | 6 +++--- ingen/Patch.hpp | 6 +++--- ingen/Plugin.hpp | 6 +++--- ingen/Port.hpp | 6 +++--- ingen/Resource.hpp | 6 +++--- ingen/client/EdgeModel.hpp | 6 +++--- ingen/shared/AtomReader.hpp | 6 +++--- ingen/shared/AtomSink.hpp | 6 +++--- ingen/shared/AtomWriter.hpp | 6 +++--- ingen/shared/Forge.hpp | 6 +++--- ingen/shared/URIMap.hpp | 6 +++--- wscript | 2 +- 15 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ingen/Edge.hpp b/ingen/Edge.hpp index 66e9c21b..064d39e1 100644 --- a/ingen/Edge.hpp +++ b/ingen/Edge.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_INTERFACE_EDGE_HPP -#define INGEN_INTERFACE_EDGE_HPP +#ifndef INGEN_EDGE_HPP +#define INGEN_EDGE_HPP namespace Raul { class Path; } @@ -36,4 +36,4 @@ public: } // namespace Ingen -#endif // INGEN_INTERFACE_EDGE_HPP +#endif // INGEN_EDGE_HPP diff --git a/ingen/EngineBase.hpp b/ingen/EngineBase.hpp index 51af6de5..f6999c47 100644 --- a/ingen/EngineBase.hpp +++ b/ingen/EngineBase.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_ENGINE_BASE_HPP -#define INGEN_ENGINE_BASE_HPP +#ifndef INGEN_ENGINEBASE_HPP +#define INGEN_ENGINEBASE_HPP #include @@ -87,4 +87,4 @@ public: } // namespace Ingen -#endif // INGEN_ENGINE_BASE_HPP +#endif // INGEN_ENGINEBASE_HPP diff --git a/ingen/GraphObject.hpp b/ingen/GraphObject.hpp index 65d2eb55..cfc98e04 100644 --- a/ingen/GraphObject.hpp +++ b/ingen/GraphObject.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_INTERFACE_GRAPHOBJECT_HPP -#define INGEN_INTERFACE_GRAPHOBJECT_HPP +#ifndef INGEN_GRAPHOBJECT_HPP +#define INGEN_GRAPHOBJECT_HPP #include "raul/Deletable.hpp" @@ -48,4 +48,4 @@ public: } // namespace Ingen -#endif // INGEN_INTERFACE_GRAPHOBJECT_HPP +#endif // INGEN_GRAPHOBJECT_HPP diff --git a/ingen/Node.hpp b/ingen/Node.hpp index b2af12b6..ccd62495 100644 --- a/ingen/Node.hpp +++ b/ingen/Node.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_INTERFACE_NODE_HPP -#define INGEN_INTERFACE_NODE_HPP +#ifndef INGEN_NODE_HPP +#define INGEN_NODE_HPP #include @@ -45,4 +45,4 @@ public: } // namespace Ingen -#endif // INGEN_INTERFACE_NODE_HPP +#endif // INGEN_NODE_HPP diff --git a/ingen/Patch.hpp b/ingen/Patch.hpp index c0056f44..85478c65 100644 --- a/ingen/Patch.hpp +++ b/ingen/Patch.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_INTERFACE_PATCH_HPP -#define INGEN_INTERFACE_PATCH_HPP +#ifndef INGEN_PATCH_HPP +#define INGEN_PATCH_HPP #include #include @@ -46,4 +46,4 @@ public: } // namespace Ingen -#endif // INGEN_INTERFACE_PATCH_HPP +#endif // INGEN_PATCH_HPP diff --git a/ingen/Plugin.hpp b/ingen/Plugin.hpp index 34825c0e..faad50ce 100644 --- a/ingen/Plugin.hpp +++ b/ingen/Plugin.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_INTERFACE_PLUGIN_HPP -#define INGEN_INTERFACE_PLUGIN_HPP +#ifndef INGEN_PLUGIN_HPP +#define INGEN_PLUGIN_HPP #include "raul/URI.hpp" @@ -59,4 +59,4 @@ public: } // namespace Ingen -#endif // INGEN_INTERFACE_PLUGIN_HPP +#endif // INGEN_PLUGIN_HPP diff --git a/ingen/Port.hpp b/ingen/Port.hpp index 4232c0d7..18c3b432 100644 --- a/ingen/Port.hpp +++ b/ingen/Port.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_INTERFACE_PORT_HPP -#define INGEN_INTERFACE_PORT_HPP +#ifndef INGEN_PORT_HPP +#define INGEN_PORT_HPP #include @@ -43,4 +43,4 @@ public: } // namespace Ingen -#endif // INGEN_INTERFACE_PORT_HPP +#endif // INGEN_PORT_HPP diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp index af524831..8c8a591a 100644 --- a/ingen/Resource.hpp +++ b/ingen/Resource.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_INTERFACE_RESOURCE_HPP -#define INGEN_INTERFACE_RESOURCE_HPP +#ifndef INGEN_RESOURCE_HPP +#define INGEN_RESOURCE_HPP #include #include @@ -110,5 +110,5 @@ public: } // namespace Ingen -#endif // INGEN_INTERFACE_RESOURCE_HPP +#endif // INGEN_RESOURCE_HPP diff --git a/ingen/client/EdgeModel.hpp b/ingen/client/EdgeModel.hpp index 83faa25f..41e1273c 100644 --- a/ingen/client/EdgeModel.hpp +++ b/ingen/client/EdgeModel.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_CLIENT_EDGE_MODEL_HPP -#define INGEN_CLIENT_EDGE_MODEL_HPP +#ifndef INGEN_CLIENT_EDGEMODEL_HPP +#define INGEN_CLIENT_EDGEMODEL_HPP #include @@ -64,4 +64,4 @@ private: } // namespace Client } // namespace Ingen -#endif // INGEN_CLIENT_EDGE_MODEL_HPP +#endif // INGEN_CLIENT_EDGEMODEL_HPP diff --git a/ingen/shared/AtomReader.hpp b/ingen/shared/AtomReader.hpp index 30c4a8b0..9bab2588 100644 --- a/ingen/shared/AtomReader.hpp +++ b/ingen/shared/AtomReader.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_SHARED_ATOM_READER_HPP -#define INGEN_SHARED_ATOM_READER_HPP +#ifndef INGEN_SHARED_ATOMREADER_HPP +#define INGEN_SHARED_ATOMREADER_HPP #include "ingen/Interface.hpp" #include "ingen/shared/AtomSink.hpp" @@ -55,5 +55,5 @@ private: } // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_ATOM_READER_HPP +#endif // INGEN_SHARED_ATOMREADER_HPP diff --git a/ingen/shared/AtomSink.hpp b/ingen/shared/AtomSink.hpp index 1292454f..c156d3cd 100644 --- a/ingen/shared/AtomSink.hpp +++ b/ingen/shared/AtomSink.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_ATOMSINK_HPP -#define INGEN_ATOMSINK_HPP +#ifndef INGEN_SHARED_ATOMSINK_HPP +#define INGEN_SHARED_ATOMSINK_HPP #include "lv2/lv2plug.in/ns/ext/atom/atom.h" @@ -31,5 +31,5 @@ public: } // namespace Shared } // namespace Ingen -#endif // INGEN_ATOMSINK_HPP +#endif // INGEN_SHARED_ATOMSINK_HPP diff --git a/ingen/shared/AtomWriter.hpp b/ingen/shared/AtomWriter.hpp index 1eae7a80..cdf0660a 100644 --- a/ingen/shared/AtomWriter.hpp +++ b/ingen/shared/AtomWriter.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_SHARED_ATOM_WRITER_HPP -#define INGEN_SHARED_ATOM_WRITER_HPP +#ifndef INGEN_SHARED_ATOMWRITER_HPP +#define INGEN_SHARED_ATOMWRITER_HPP #include @@ -96,5 +96,5 @@ private: } // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_ATOM_WRITER_HPP +#endif // INGEN_SHARED_ATOMWRITER_HPP diff --git a/ingen/shared/Forge.hpp b/ingen/shared/Forge.hpp index 36de8758..16629683 100644 --- a/ingen/shared/Forge.hpp +++ b/ingen/shared/Forge.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_FORGE_HPP -#define INGEN_FORGE_HPP +#ifndef INGEN_SHARED_FORGE_HPP +#define INGEN_SHARED_FORGE_HPP #include @@ -35,4 +35,4 @@ public: } // namespace Ingen -#endif // INGEN_FORGE_HPP +#endif // INGEN_SHARED_FORGE_HPP diff --git a/ingen/shared/URIMap.hpp b/ingen/shared/URIMap.hpp index 39f17bea..1e8fb452 100644 --- a/ingen/shared/URIMap.hpp +++ b/ingen/shared/URIMap.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see . */ -#ifndef INGEN_SHARED_LV2URIMAP_HPP -#define INGEN_SHARED_LV2URIMAP_HPP +#ifndef INGEN_SHARED_URIMAP_HPP +#define INGEN_SHARED_URIMAP_HPP #include #include @@ -78,4 +78,4 @@ private: } // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_LV2URIMAP_HPP +#endif // INGEN_SHARED_URIMAP_HPP diff --git a/wscript b/wscript index e260047a..cefc8745 100644 --- a/wscript +++ b/wscript @@ -173,4 +173,4 @@ def build(bld): bld.add_post_fun(autowaf.run_ldconfig) def lint(ctx): - subprocess.call('cpplint.py --filter=-whitespace/comments,-whitespace/tab,-whitespace/braces,-whitespace/labels,+build/header_guard,-readability/casting,-readability/todo,-build/namespaces,-whitespace/line_length,-runtime/rtti,-runtime/references,-whitespace/blank_line,-runtime/sizeof,-readability/streams,-whitespace/operators,-whitespace/parens,-build/include_order `find -name *.cpp -or -name *.hpp`', shell=True) + subprocess.call('cpplint.py --filter=-whitespace/comments,-whitespace/tab,-whitespace/braces,-whitespace/labels,-build/header_guard,-readability/casting,-readability/todo,-build/namespaces,-whitespace/line_length,-runtime/rtti,-runtime/references,-whitespace/blank_line,-runtime/sizeof,-readability/streams,-whitespace/operators,-whitespace/parens,-build/include `find -name *.cpp -or -name *.hpp`', shell=True) -- cgit v1.2.1