From 1eda2a070bcb1cbf5be71d5a848172063c843159 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 28 Nov 2015 18:36:35 +0100 Subject: [PATCH] harmonise the form of the header include guards no trailing underscore --- src/gui/ctrl/bus-term.hpp | 6 +++--- src/gui/interact/interaction-state-manager.hpp | 6 +++--- src/gui/interact/invocation-trail.hpp | 6 +++--- src/gui/model/controller.hpp | 6 +++--- src/gui/model/diagnostics.hpp | 6 +++--- src/gui/model/session-facade.hpp | 6 +++--- src/gui/model/tangible.hpp | 6 +++--- src/gui/model/widget.hpp | 6 +++--- src/lib/functor-util.hpp | 6 +++--- src/lib/test/event-log.hpp | 4 ++-- src/lib/test/test-helper.hpp | 6 +++--- tests/gui/test/mock-elm.hpp | 6 +++--- tests/gui/test/nexus.hpp | 6 +++--- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/gui/ctrl/bus-term.hpp b/src/gui/ctrl/bus-term.hpp index d087dcf8b..780f47384 100644 --- a/src/gui/ctrl/bus-term.hpp +++ b/src/gui/ctrl/bus-term.hpp @@ -46,8 +46,8 @@ */ -#ifndef GUI_CTRL_BUS_TERM_H_ -#define GUI_CTRL_BUS_TERM_H_ +#ifndef GUI_CTRL_BUS_TERM_H +#define GUI_CTRL_BUS_TERM_H #include "lib/error.hpp" @@ -118,4 +118,4 @@ namespace ctrl{ }} // namespace gui::ctrl -#endif /*GUI_CTRL_BUS_TERM_H_*/ +#endif /*GUI_CTRL_BUS_TERM_H*/ diff --git a/src/gui/interact/interaction-state-manager.hpp b/src/gui/interact/interaction-state-manager.hpp index e26decc06..1a1cee969 100644 --- a/src/gui/interact/interaction-state-manager.hpp +++ b/src/gui/interact/interaction-state-manager.hpp @@ -34,8 +34,8 @@ */ -#ifndef GUI_INTERACT_INTERACTION_STATE_MANAGER_H_ -#define GUI_INTERACT_INTERACTION_STATE_MANAGER_H_ +#ifndef GUI_INTERACT_INTERACTION_STATE_MANAGER_H +#define GUI_INTERACT_INTERACTION_STATE_MANAGER_H #include "lib/error.hpp" @@ -73,4 +73,4 @@ namespace interact { }} // namespace gui::interact -#endif /*GUI_INTERACT_INTERACTION_STATE_MANAGER_H_*/ +#endif /*GUI_INTERACT_INTERACTION_STATE_MANAGER_H*/ diff --git a/src/gui/interact/invocation-trail.hpp b/src/gui/interact/invocation-trail.hpp index d6765101a..6fd7a821d 100644 --- a/src/gui/interact/invocation-trail.hpp +++ b/src/gui/interact/invocation-trail.hpp @@ -40,8 +40,8 @@ */ -#ifndef GUI_INTERACT_INVOCATION_TRAIL_H_ -#define GUI_INTERACT_INVOCATION_TRAIL_H_ +#ifndef GUI_INTERACT_INVOCATION_TRAIL_H +#define GUI_INTERACT_INVOCATION_TRAIL_H #include "proc/control/command.hpp" @@ -104,4 +104,4 @@ namespace interact { }} // namespace gui::interact -#endif /*GUI_INTERACT_INVOCATION_TRAIL_H_*/ +#endif /*GUI_INTERACT_INVOCATION_TRAIL_H*/ diff --git a/src/gui/model/controller.hpp b/src/gui/model/controller.hpp index 049cdc47e..8e7641ce2 100644 --- a/src/gui/model/controller.hpp +++ b/src/gui/model/controller.hpp @@ -33,8 +33,8 @@ */ -#ifndef GUI_MODEL_CONTROLLER_H_ -#define GUI_MODEL_CONTROLLER_H_ +#ifndef GUI_MODEL_CONTROLLER_H +#define GUI_MODEL_CONTROLLER_H #include "lib/error.hpp" @@ -70,4 +70,4 @@ namespace model { }} // namespace gui::model -#endif /*GUI_MODEL_CONTROLLER_H_*/ +#endif /*GUI_MODEL_CONTROLLER_H*/ diff --git a/src/gui/model/diagnostics.hpp b/src/gui/model/diagnostics.hpp index 835e8a40e..0073e9abf 100644 --- a/src/gui/model/diagnostics.hpp +++ b/src/gui/model/diagnostics.hpp @@ -34,8 +34,8 @@ */ -#ifndef GUI_MODEL_DIAGNOSTICS_H_ -#define GUI_MODEL_DIAGNOSTICS_H_ +#ifndef GUI_MODEL_DIAGNOSTICS_H +#define GUI_MODEL_DIAGNOSTICS_H #include "lib/error.hpp" @@ -117,4 +117,4 @@ namespace model { }} // namespace gui::model -#endif /*GUI_MODEL_DIAGNOSTICS_H_*/ +#endif /*GUI_MODEL_DIAGNOSTICS_H*/ diff --git a/src/gui/model/session-facade.hpp b/src/gui/model/session-facade.hpp index 0b0df255e..7df641c2c 100644 --- a/src/gui/model/session-facade.hpp +++ b/src/gui/model/session-facade.hpp @@ -34,8 +34,8 @@ */ -#ifndef SESSION_FACADE_H_ -#define SESSION_FACADE_H_ +#ifndef SESSION_FACADE_H +#define SESSION_FACADE_H #include "lib/error.hpp" @@ -88,4 +88,4 @@ namespace model { }} // namespace gui::model -#endif /*SESSION_FACADE_H_*/ +#endif /*SESSION_FACADE_H*/ diff --git a/src/gui/model/tangible.hpp b/src/gui/model/tangible.hpp index c8439b35a..d1044926c 100644 --- a/src/gui/model/tangible.hpp +++ b/src/gui/model/tangible.hpp @@ -32,8 +32,8 @@ */ -#ifndef GUI_MODEL_TANGIBLE_H_ -#define GUI_MODEL_TANGIBLE_H_ +#ifndef GUI_MODEL_TANGIBLE_H +#define GUI_MODEL_TANGIBLE_H #include "lib/error.hpp" @@ -104,4 +104,4 @@ namespace model { }} // namespace gui::model -#endif /*GUI_MODEL_TANGIBLE_H_*/ +#endif /*GUI_MODEL_TANGIBLE_H*/ diff --git a/src/gui/model/widget.hpp b/src/gui/model/widget.hpp index 63105e871..1113e8f68 100644 --- a/src/gui/model/widget.hpp +++ b/src/gui/model/widget.hpp @@ -32,8 +32,8 @@ */ -#ifndef GUI_MODEL_WIDGET_H_ -#define GUI_MODEL_WIDGET_H_ +#ifndef GUI_MODEL_WIDGET_H +#define GUI_MODEL_WIDGET_H #include "lib/error.hpp" @@ -70,4 +70,4 @@ namespace model { }} // namespace gui::model -#endif /*GUI_MODEL_WIDGET_H_*/ +#endif /*GUI_MODEL_WIDGET_H*/ diff --git a/src/lib/functor-util.hpp b/src/lib/functor-util.hpp index 53fbf7867..3ec6dce42 100644 --- a/src/lib/functor-util.hpp +++ b/src/lib/functor-util.hpp @@ -34,8 +34,8 @@ -#ifndef FUNCTOR_UTIL_H_ -#define FUNCTOR_UTIL_H_ +#ifndef FUNCTOR_UTIL_H +#define FUNCTOR_UTIL_H #include "lib/hash-value.h" @@ -235,4 +235,4 @@ namespace std { } -#endif /*UTIL_HPP_*/ +#endif /*FUNCTOR_UTIL_H*/ diff --git a/src/lib/test/event-log.hpp b/src/lib/test/event-log.hpp index d90b026a7..cd8cb05bc 100644 --- a/src/lib/test/event-log.hpp +++ b/src/lib/test/event-log.hpp @@ -21,8 +21,8 @@ */ -#ifndef LIB_TEST_TEST_HELPER_H -#define LIB_TEST_TEST_HELPER_H +#ifndef LIB_TEST_EVENT_LOG_H +#define LIB_TEST_EVENT_LOG_H #include "lib/symbol.hpp" diff --git a/src/lib/test/test-helper.hpp b/src/lib/test/test-helper.hpp index 67355d213..8fc012c5d 100644 --- a/src/lib/test/test-helper.hpp +++ b/src/lib/test/test-helper.hpp @@ -36,8 +36,8 @@ */ -#ifndef LIB_TEST_TEST_HELPER_H_ -#define LIB_TEST_TEST_HELPER_H_ +#ifndef LIB_TEST_TEST_HELPER_H +#define LIB_TEST_TEST_HELPER_H #include "lib/symbol.hpp" @@ -230,4 +230,4 @@ namespace test{ CHECK (lumiera_error_expect (LUMIERA_ERROR_##ERROR_ID));\ } -#endif /*LIB_TEST_TEST_HELPER_H_*/ +#endif /*LIB_TEST_TEST_HELPER_H*/ diff --git a/tests/gui/test/mock-elm.hpp b/tests/gui/test/mock-elm.hpp index c87e2e222..56967e595 100644 --- a/tests/gui/test/mock-elm.hpp +++ b/tests/gui/test/mock-elm.hpp @@ -38,8 +38,8 @@ */ -#ifndef GUI_TEST_MOCK_ELM_H_ -#define GUI_TEST_MOCK_ELM_H_ +#ifndef GUI_TEST_MOCK_ELM_H +#define GUI_TEST_MOCK_ELM_H #include "lib/error.hpp" @@ -107,4 +107,4 @@ namespace test{ }} // namespace gui::test -#endif /*GUI_TEST_MOCK_ELM_H_*/ +#endif /*GUI_TEST_MOCK_ELM_H*/ diff --git a/tests/gui/test/nexus.hpp b/tests/gui/test/nexus.hpp index e12947137..70dcb6cba 100644 --- a/tests/gui/test/nexus.hpp +++ b/tests/gui/test/nexus.hpp @@ -35,8 +35,8 @@ */ -#ifndef GUI_TEST_NEXUS_H_ -#define GUI_TEST_NEXUS_H_ +#ifndef GUI_TEST_NEXUS_H +#define GUI_TEST_NEXUS_H #include "lib/error.hpp" @@ -80,4 +80,4 @@ namespace test{ }} // namespace gui::test -#endif /*GUI_TEST_NEXUS_H_*/ +#endif /*GUI_TEST_NEXUS_H*/