Global-Layer-Renaming: transform header include guards

btw... we could change to #pragma once

src/include/display-facade.h

@@ -40,8 +40,8 @@
  */
 
 
-#ifndef GUI_INTERFACE_DISPLAY_H
-#define GUI_INTERFACE_DISPLAY_H
+#ifndef STAGE_INTERFACE_DISPLAY_H
+#define STAGE_INTERFACE_DISPLAY_H
 
 #include "include/display-handles.h"
 

src/include/dummy-player-facade.h

@@ -26,8 +26,8 @@
  */
 
 
-#ifndef PROC_INTERFACE_DUMMYPLAYER_H
-#define PROC_INTERFACE_DUMMYPLAYER_H
+#ifndef STEAM_INTERFACE_DUMMYPLAYER_H
+#define STEAM_INTERFACE_DUMMYPLAYER_H
 
 #include "include/display-facade.h"
 #include "include/display-handles.h"

src/include/gui-notification-facade.h

@@ -36,8 +36,8 @@
  */
 
 
-#ifndef GUI_GUI_NOTIFICATION_H
-#define GUI_GUI_NOTIFICATION_H
+#ifndef STAGE_GUI_NOTIFICATION_H
+#define STAGE_GUI_NOTIFICATION_H
 
 
 
@@ -148,4 +148,4 @@ LUMIERA_INTERFACE_DECLARE (lumieraorg_GuiNotification, 0,
 #ifdef __cplusplus
 }// extern "C"
 #endif
-#endif /*GUI_GUI_NOTIFICATION_H*/
+#endif /*STAGE_GUI_NOTIFICATION_H*/

src/include/play-facade.hpp

@@ -31,8 +31,8 @@
  */
 
 
-#ifndef PROC_INTERFACE_PLAY_H
-#define PROC_INTERFACE_PLAY_H
+#ifndef STEAM_INTERFACE_PLAY_H
+#define STEAM_INTERFACE_PLAY_H
 
 
 
@@ -155,4 +155,4 @@ namespace lumiera {
     
     
 } // namespace lumiera
-#endif /*PROC_INTERFACE_PLAY_H*/
+#endif /*STEAM_INTERFACE_PLAY_H*/

src/include/session-command-facade.h

@@ -44,8 +44,8 @@
  */
 
 
-#ifndef PROC_CONTROL_SESSION_COMMAND_H
-#define PROC_CONTROL_SESSION_COMMAND_H
+#ifndef STEAM_CONTROL_SESSION_COMMAND_H
+#define STEAM_CONTROL_SESSION_COMMAND_H
 
 
 
@@ -135,4 +135,4 @@ LUMIERA_INTERFACE_DECLARE (lumieraorg_SessionCommand, 0,
 #ifdef __cplusplus
 }// extern "C"
 #endif
-#endif /*PROC_CONTROL_SESSION_COMMAND_H*/
+#endif /*STEAM_CONTROL_SESSION_COMMAND_H*/

src/include/ui-protocol.hpp

@@ -47,8 +47,8 @@
  */
 
 
-#ifndef GUI_INTERFACE_UI_PROTOCOL_H
-#define GUI_INTERFACE_UI_PROTOCOL_H
+#ifndef STAGE_INTERFACE_UI_PROTOCOL_H
+#define STAGE_INTERFACE_UI_PROTOCOL_H
 
 
 #include "lib/error.hpp"
@@ -97,4 +97,4 @@ namespace gui {
   
   
 }// namespace gui
-#endif /*GUI_INTERFACE_UI_PROTOCOL_H*/
+#endif /*STAGE_INTERFACE_UI_PROTOCOL_H*/

src/stage/config-keys.hpp

@@ -42,8 +42,8 @@
  ** 
  */
 
-#ifndef GUI_CONFIG_KEYS_H
-#define GUI_CONFIG_KEYS_H
+#ifndef STAGE_CONFIG_KEYS_H
+#define STAGE_CONFIG_KEYS_H
 
 
 #include "lib/symbol.hpp"
@@ -68,4 +68,4 @@ namespace gui {
   
   
 }// namespace gui
-#endif /*GUI_CONFIG_KEYS_H*/
+#endif /*STAGE_CONFIG_KEYS_H*/

src/stage/ctrl/actions.hpp

@@ -38,8 +38,8 @@
  */
 
 
-#ifndef GUI_CTRL_ACTIONS_H
-#define GUI_CTRL_ACTIONS_H
+#ifndef STAGE_CTRL_ACTIONS_H
+#define STAGE_CTRL_ACTIONS_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/ctrl/global-ctx.hpp"
@@ -375,4 +375,4 @@ namespace ctrl {
   
   
 }}// namespace gui::ctrl
-#endif /*GUI_CTRL_ACTIONS_H*/
+#endif /*STAGE_CTRL_ACTIONS_H*/

src/stage/ctrl/bus-term.hpp

@@ -55,8 +55,8 @@
  */
 
 
-#ifndef GUI_CTRL_BUS_TERM_H
-#define GUI_CTRL_BUS_TERM_H
+#ifndef STAGE_CTRL_BUS_TERM_H
+#define STAGE_CTRL_BUS_TERM_H
 
 
 #include "lib/error.hpp"
@@ -178,4 +178,4 @@ namespace ctrl{
   
   
 }} // namespace gui::ctrl
-#endif /*GUI_CTRL_BUS_TERM_H*/
+#endif /*STAGE_CTRL_BUS_TERM_H*/

src/stage/ctrl/core-service.hpp

@@ -81,8 +81,8 @@
  */
 
 
-#ifndef GUI_CTRL_CORE_SERVICE_H
-#define GUI_CTRL_CORE_SERVICE_H
+#ifndef STAGE_CTRL_CORE_SERVICE_H
+#define STAGE_CTRL_CORE_SERVICE_H
 
 
 #include "lib/error.hpp"
@@ -157,4 +157,4 @@ namespace ctrl{
   
   
 }} // namespace gui::ctrl
-#endif /*GUI_CTRL_CORE_SERVICE_H*/
+#endif /*STAGE_CTRL_CORE_SERVICE_H*/

src/stage/ctrl/facade.hpp

@@ -39,8 +39,8 @@
  */
 
 
-#ifndef GUI_CTRL_FACADE_H
-#define GUI_CTRL_FACADE_H
+#ifndef STAGE_CTRL_FACADE_H
+#define STAGE_CTRL_FACADE_H
 
 #include "stage/notification-service.hpp"
 #include "stage/display-service.hpp"
@@ -87,4 +87,4 @@ namespace ctrl {
   
   
 }}// namespace gui::ctrl
-#endif /*GUI_CTRL_FACADE_H*/
+#endif /*STAGE_CTRL_FACADE_H*/

src/stage/ctrl/global-ctx.hpp

@@ -50,8 +50,8 @@
  */
 
 
-#ifndef GUI_CTRL_GLOBAL_CTX_H
-#define GUI_CTRL_GLOBAL_CTX_H
+#ifndef STAGE_CTRL_GLOBAL_CTX_H
+#define STAGE_CTRL_GLOBAL_CTX_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/ui-bus.hpp"
@@ -107,4 +107,4 @@ namespace ctrl {
   
   
 }}// namespace gui::ctrl
-#endif /*GUI_CTRL_GLOBAL_CTX_H*/
+#endif /*STAGE_CTRL_GLOBAL_CTX_H*/

src/stage/ctrl/nexus.hpp

@@ -36,8 +36,8 @@
  */
 
 
-#ifndef GUI_CTRL_NEXUS_H
-#define GUI_CTRL_NEXUS_H
+#ifndef STAGE_CTRL_NEXUS_H
+#define STAGE_CTRL_NEXUS_H
 
 
 #include "lib/error.hpp"
@@ -193,4 +193,4 @@ namespace ctrl{
   
   
 }} // namespace gui::ctrl
-#endif /*GUI_CTRL_NEXUS_H*/
+#endif /*STAGE_CTRL_NEXUS_H*/

src/stage/ctrl/notification-hub.hpp

@@ -59,8 +59,8 @@
  */
 
 
-#ifndef GUI_CTRL_NOTIFICATION_HUB_H
-#define GUI_CTRL_NOTIFICATION_HUB_H
+#ifndef STAGE_CTRL_NOTIFICATION_HUB_H
+#define STAGE_CTRL_NOTIFICATION_HUB_H
 
 #include "stage/widget/error-log-display.hpp"
 #include "lib/diff/tree-mutator.hpp"
@@ -205,4 +205,4 @@ namespace ctrl {
   
   
 }}// namespace gui::ctrl
-#endif /*GUI_CTRL_NOTIFICATION_HUB_H*/
+#endif /*STAGE_CTRL_NOTIFICATION_HUB_H*/

src/stage/ctrl/panel-locator.hpp

@@ -46,8 +46,8 @@
  */
 
 
-#ifndef GUI_CTRL_PANEL_LOCATOR_H
-#define GUI_CTRL_PANEL_LOCATOR_H
+#ifndef STAGE_CTRL_PANEL_LOCATOR_H
+#define STAGE_CTRL_PANEL_LOCATOR_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/workspace/panel-manager.hpp"
@@ -134,4 +134,4 @@ namespace ctrl {
   
   
 }}// namespace gui::ctrl
-#endif /*GUI_CTRL_PANEL_LOCATOR_H*/
+#endif /*STAGE_CTRL_PANEL_LOCATOR_H*/

src/stage/ctrl/state-manager.hpp

@@ -49,8 +49,8 @@
  */
 
 
-#ifndef GUI_CTRL_STATE_MANAGER_H
-#define GUI_CTRL_STATE_MANAGER_H
+#ifndef STAGE_CTRL_STATE_MANAGER_H
+#define STAGE_CTRL_STATE_MANAGER_H
 
 
 #include "lib/idi/entry-id.hpp"
@@ -110,4 +110,4 @@ namespace ctrl {
   
   
 }} // namespace gui::ctrl
-#endif /*GUI_CTRL_STATE_MANAGER_H*/
+#endif /*STAGE_CTRL_STATE_MANAGER_H*/

src/stage/ctrl/state-map-grouping-storage.hpp

@@ -33,8 +33,8 @@
  */
 
 
-#ifndef GUI_CTRL_STATE_MAP_GROUPING_STORAGE_H
-#define GUI_CTRL_STATE_MAP_GROUPING_STORAGE_H
+#ifndef STAGE_CTRL_STATE_MAP_GROUPING_STORAGE_H
+#define STAGE_CTRL_STATE_MAP_GROUPING_STORAGE_H
 
 
 #include "lib/error.hpp"
@@ -223,4 +223,4 @@ namespace ctrl {
   
   
 }} // namespace gui::ctrl
-#endif /*GUI_CTRL_STATE_MAP_GROUPING_STORAGE_H*/
+#endif /*STAGE_CTRL_STATE_MAP_GROUPING_STORAGE_H*/

src/stage/ctrl/state-recorder.hpp

@@ -49,8 +49,8 @@
  */
 
 
-#ifndef GUI_CTRL_STATE_RECORDER_H
-#define GUI_CTRL_STATE_RECORDER_H
+#ifndef STAGE_CTRL_STATE_RECORDER_H
+#define STAGE_CTRL_STATE_RECORDER_H
 
 
 #include "lib/error.hpp"
@@ -208,4 +208,4 @@ namespace ctrl {
   
   
 }} // namespace gui::ctrl
-#endif /*GUI_CTRL_STATE_RECORDER_H*/
+#endif /*STAGE_CTRL_STATE_RECORDER_H*/

src/stage/ctrl/ui-dispatcher.hpp

@@ -72,8 +72,8 @@
  */
 
 
-#ifndef GUI_CTRL_UI_DISPATCHER_H
-#define GUI_CTRL_UI_DISPATCHER_H
+#ifndef STAGE_CTRL_UI_DISPATCHER_H
+#define STAGE_CTRL_UI_DISPATCHER_H
 
 #include "stage/gtk-base.hpp"
 #include "lib/call-queue.hpp"
@@ -155,4 +155,4 @@ namespace ctrl {
   
   
 }}// namespace gui::ctrl
-#endif /*GUI_CTRL_UI_DISPATCHER_H*/
+#endif /*STAGE_CTRL_UI_DISPATCHER_H*/

src/stage/ctrl/ui-manager.hpp

@@ -44,8 +44,8 @@
  */
 
 
-#ifndef GUI_CTRL_UI_MANAGER_H
-#define GUI_CTRL_UI_MANAGER_H
+#ifndef STAGE_CTRL_UI_MANAGER_H
+#define STAGE_CTRL_UI_MANAGER_H
 
 #include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
@@ -153,4 +153,4 @@ namespace ctrl {
   
   
 }}// namespace gui::ctrl
-#endif /*GUI_CTRL_UI_MANAGER_H*/
+#endif /*STAGE_CTRL_UI_MANAGER_H*/

src/stage/ctrl/ui-state.hpp

@@ -51,8 +51,8 @@
  */
 
 
-#ifndef GUI__H
-#define GUI__H
+#ifndef STAGE__H
+#define STAGE__H
 
 #include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
@@ -98,4 +98,4 @@ namespace ctrl {
   
   
 }}// namespace gui::workspace
-#endif /*GUI_CTRL_UI_MANAGER_H*/
+#endif /*STAGE_CTRL_UI_MANAGER_H*/

src/stage/ctrl/window-locator.hpp

@@ -32,8 +32,8 @@
  */
 
 
-#ifndef GUI_CTRL_WINDOW_LOCATOR_H
-#define GUI_CTRL_WINDOW_LOCATOR_H
+#ifndef STAGE_CTRL_WINDOW_LOCATOR_H
+#define STAGE_CTRL_WINDOW_LOCATOR_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/ctrl/panel-locator.hpp"
@@ -124,4 +124,4 @@ namespace ctrl {
   
   
 }}// namespace gui::ctrl
-#endif /*GUI_CTRL_WINDOW_LOCATOR_H*/
+#endif /*STAGE_CTRL_WINDOW_LOCATOR_H*/

src/stage/dialog/dialog.hpp

@@ -26,8 +26,8 @@
  */
 
 
-#ifndef GUI_DIALOG_DIALOG_H
-#define GUI_DIALOG_DIALOG_H
+#ifndef STAGE_DIALOG_DIALOG_H
+#define STAGE_DIALOG_DIALOG_H
 
 namespace gui {
 namespace dialog {
@@ -44,4 +44,4 @@ namespace dialog {
   
   
 }} // namespace gui::dialog
-#endif /*GUI_DIALOG_DIALOG_H*/
+#endif /*STAGE_DIALOG_DIALOG_H*/

src/stage/dialog/name-chooser.hpp

@@ -26,8 +26,8 @@
  */
 
 
-#ifndef GUI_DIALOG_NAME_CHOOSER_H
-#define GUI_DIALOG_NAME_CHOOSER_H
+#ifndef STAGE_DIALOG_NAME_CHOOSER_H
+#define STAGE_DIALOG_NAME_CHOOSER_H
 
 #include "stage/gtk-base.hpp"
 
@@ -70,4 +70,4 @@ namespace dialog {
   
   
 }} // namespace gui::dialog
-#endif /*GUI_DIALOG_NAME_CHOOSER_H*/
+#endif /*STAGE_DIALOG_NAME_CHOOSER_H*/

src/stage/dialog/preferences-dialog.hpp

@@ -29,8 +29,8 @@
  */
 
 
-#ifndef GUI_DIALOG_PREFERENCES_DIALOG_H
-#define GUI_DIALOG_PREFERENCES_DIALOG_H
+#ifndef STAGE_DIALOG_PREFERENCES_DIALOG_H
+#define STAGE_DIALOG_PREFERENCES_DIALOG_H
 
 
 #include "stage/gtk-base.hpp"
@@ -80,4 +80,4 @@ namespace dialog {
   
   
 }} // namespace gui::dialog
-#endif /*GUI_DIALOG_PREFERENCES_DIALOG_H*/
+#endif /*STAGE_DIALOG_PREFERENCES_DIALOG_H*/

src/stage/dialog/render.hpp

@@ -26,8 +26,8 @@
  */
 
 
-#ifndef GUI_DIALOG_RENDER_H
-#define GUI_DIALOG_RENDER_H
+#ifndef STAGE_DIALOG_RENDER_H
+#define STAGE_DIALOG_RENDER_H
 
 #include "stage/gtk-base.hpp"
 
@@ -67,4 +67,4 @@ namespace dialog {
   
   
 }} // namespace gui::dialog
-#endif /*GUI_DIALOG_RENDER_H*/
+#endif /*STAGE_DIALOG_RENDER_H*/

src/stage/dialog/test-control.hpp

@@ -35,8 +35,8 @@
  */
 
 
-#ifndef GUI_DIALOG_TEST_CONTROL_H
-#define GUI_DIALOG_TEST_CONTROL_H
+#ifndef STAGE_DIALOG_TEST_CONTROL_H
+#define STAGE_DIALOG_TEST_CONTROL_H
 
 
 #include "stage/gtk-base.hpp"
@@ -359,4 +359,4 @@ namespace dialog {
   
   
 }} // namespace gui::dialog
-#endif /*GUI_DIALOG_TEST_CONTROL_H*/
+#endif /*STAGE_DIALOG_TEST_CONTROL_H*/

src/stage/display-service.hpp

@@ -46,8 +46,8 @@
  */
 
 
-#ifndef GUI_DISPLAY_SERVICE_H
-#define GUI_DISPLAY_SERVICE_H
+#ifndef STAGE_DISPLAY_SERVICE_H
+#define STAGE_DISPLAY_SERVICE_H
 
 
 #include "include/display-facade.h"

src/stage/draw/cairo-util.hpp

@@ -28,8 +28,8 @@
 
 #include <cairomm/cairomm.h>
 
-#ifndef GUI_DRAW_CAIRO_H
-#define GUI_DRAW_CAIRO_H
+#ifndef STAGE_DRAW_CAIRO_H
+#define STAGE_DRAW_CAIRO_H
 
 using Cairo::RefPtr;
 using Cairo::SolidPattern;
@@ -79,4 +79,4 @@ namespace draw {
   
   
 }}// namespace gui::draw
-#endif /*GUI_DRAW_CAIRO_H*/
+#endif /*STAGE_DRAW_CAIRO_H*/

src/stage/draw/rectangle.hpp

@@ -26,8 +26,8 @@
  */
 
 
-#ifndef GUI_DRAW_RECTANGLE_H
-#define GUI_DRAW_RECTANGLE_H
+#ifndef STAGE_DRAW_RECTANGLE_H
+#define STAGE_DRAW_RECTANGLE_H
 
 #include "stage/gtk-base.hpp"
 
@@ -43,4 +43,4 @@ namespace draw {
   
   
 }}// namespace gui::draw
-#endif /*GUI_DRAW_RECTANGLE_H*/
+#endif /*STAGE_DRAW_RECTANGLE_H*/

src/stage/gtk-base.hpp

@@ -54,8 +54,8 @@
  */
 
 
-#ifndef GUI_GTK_BASE_H
-#define GUI_GTK_BASE_H
+#ifndef STAGE_GTK_BASE_H
+#define STAGE_GTK_BASE_H
 
 //--------------------tricky special Include sequence
 #include "lib/hash-standard.hpp"
@@ -159,4 +159,4 @@ namespace gui {
   
   
 }// namespace gui
-#endif /*GUI_GTK_BASE_H*/
+#endif /*STAGE_GTK_BASE_H*/

src/stage/guifacade.hpp

@@ -34,8 +34,8 @@
  */
 
 
-#ifndef GUI_FACADE_H
-#define GUI_FACADE_H
+#ifndef STAGE_FACADE_H
+#define STAGE_FACADE_H
 
 
 #include "common/subsys.hpp"

src/stage/id-scheme.hpp

@@ -50,8 +50,8 @@
  ** 
  */
 
-#ifndef GUI_ID_SCHEME_H
-#define GUI_ID_SCHEME_H
+#ifndef STAGE_ID_SCHEME_H
+#define STAGE_ID_SCHEME_H
 
 
 #include "lib/symbol.hpp"
@@ -168,4 +168,4 @@ locate = currentWindow().panel(infobox)
     
   }//namespace gui::idi
 } // namespace gui
-#endif /*GUI_ID_SCHEME_H*/
+#endif /*STAGE_ID_SCHEME_H*/

src/stage/interact/cmd-context.hpp

@@ -50,8 +50,8 @@
  */
 
 
-#ifndef GUI_INTERACT_CMD_CONTEXT_H
-#define GUI_INTERACT_CMD_CONTEXT_H
+#ifndef STAGE_INTERACT_CMD_CONTEXT_H
+#define STAGE_INTERACT_CMD_CONTEXT_H
 
 
 #include "lib/error.hpp"
@@ -138,4 +138,4 @@ namespace interact {
   
   
 }} // namespace gui::interact
-#endif /*GUI_INTERACT_CMD_CONTEXT_H*/
+#endif /*STAGE_INTERACT_CMD_CONTEXT_H*/

src/stage/interact/elem-access-dir.hpp

@@ -38,8 +38,8 @@
  */
 
 
-#ifndef GUI_CTRL_ELEM_ACCESS_DIR_H
-#define GUI_CTRL_ELEM_ACCESS_DIR_H
+#ifndef STAGE_CTRL_ELEM_ACCESS_DIR_H
+#define STAGE_CTRL_ELEM_ACCESS_DIR_H
 
 
 #include "lib/error.hpp"
@@ -111,4 +111,4 @@ namespace ctrl{
   
   
 }} // namespace gui::ctrl
-#endif /*GUI_CTRL_ELEM_ACCESS_DIR_H*/
+#endif /*STAGE_CTRL_ELEM_ACCESS_DIR_H*/

src/stage/interact/focus-tracker.hpp

@@ -51,8 +51,8 @@
  */
 
 
-#ifndef GUI_INTERACT_FOCUS_TRACKER_H
-#define GUI_INTERACT_FOCUS_TRACKER_H
+#ifndef STAGE_INTERACT_FOCUS_TRACKER_H
+#define STAGE_INTERACT_FOCUS_TRACKER_H
 
 #include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
@@ -96,4 +96,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_FOCUS_TRACKER_H*/
+#endif /*STAGE_INTERACT_FOCUS_TRACKER_H*/

src/stage/interact/interaction-director.hpp

@@ -50,8 +50,8 @@
  */
 
 
-#ifndef GUI_INTERACT_INTERACTION_DIRECTOR_H
-#define GUI_INTERACT_INTERACTION_DIRECTOR_H
+#ifndef STAGE_INTERACT_INTERACTION_DIRECTOR_H
+#define STAGE_INTERACT_INTERACTION_DIRECTOR_H
 
 #include "stage/model/controller.hpp"
 #include "stage/timeline/timeline-gui.hpp"
@@ -160,4 +160,4 @@ namespace interact {
   
   
 }}// namespace gui::workspace
-#endif /*GUI_INTERACT_INTERACTION_DIRECTOR_H*/
+#endif /*STAGE_INTERACT_INTERACTION_DIRECTOR_H*/

src/stage/interact/interaction-state.hpp

@@ -34,8 +34,8 @@
  */
 
 
-#ifndef GUI_INTERACT_INTERACTION_STATE_H
-#define GUI_INTERACT_INTERACTION_STATE_H
+#ifndef STAGE_INTERACT_INTERACTION_STATE_H
+#define STAGE_INTERACT_INTERACTION_STATE_H
 
 
 #include "lib/error.hpp"
@@ -74,4 +74,4 @@ namespace interact {
   
   
 }} // namespace gui::interact
-#endif /*GUI_INTERACT_INTERACTION_STATE_H*/
+#endif /*STAGE_INTERACT_INTERACTION_STATE_H*/

src/stage/interact/navigator.hpp

@@ -35,8 +35,8 @@
  */
 
 
-#ifndef GUI_INTERACT_NAVIGATOR_H
-#define GUI_INTERACT_NAVIGATOR_H
+#ifndef STAGE_INTERACT_NAVIGATOR_H
+#define STAGE_INTERACT_NAVIGATOR_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/interact/ui-coord-resolver.hpp"
@@ -87,4 +87,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_NAVIGATOR_H*/
+#endif /*STAGE_INTERACT_NAVIGATOR_H*/

src/stage/interact/spot-locator.hpp

@@ -36,8 +36,8 @@
  */
 
 
-#ifndef GUI_INTERACT_SPOT_LOCATOR_H
-#define GUI_INTERACT_SPOT_LOCATOR_H
+#ifndef STAGE_INTERACT_SPOT_LOCATOR_H
+#define STAGE_INTERACT_SPOT_LOCATOR_H
 
 #include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
@@ -76,4 +76,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_SPOT_LOCATOR_H*/
+#endif /*STAGE_INTERACT_SPOT_LOCATOR_H*/

src/stage/interact/ui-coord-resolver.hpp

@@ -112,8 +112,8 @@
  */
 
 
-#ifndef GUI_INTERACT_UI_COORD_RESOLVER_H
-#define GUI_INTERACT_UI_COORD_RESOLVER_H
+#ifndef STAGE_INTERACT_UI_COORD_RESOLVER_H
+#define STAGE_INTERACT_UI_COORD_RESOLVER_H
 
 #include "lib/error.hpp"
 #include "lib/symbol.hpp"
@@ -598,4 +598,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_UI_COORD_RESOLVER_H*/
+#endif /*STAGE_INTERACT_UI_COORD_RESOLVER_H*/

src/stage/interact/ui-coord.hpp

@@ -79,8 +79,8 @@
  */
 
 
-#ifndef GUI_INTERACT_UI_COORD_H
-#define GUI_INTERACT_UI_COORD_H
+#ifndef STAGE_INTERACT_UI_COORD_H
+#define STAGE_INTERACT_UI_COORD_H
 
 #include "lib/error.hpp"
 #include "lib/symbol.hpp"
@@ -768,4 +768,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_UI_COORD_H*/
+#endif /*STAGE_INTERACT_UI_COORD_H*/

src/stage/interact/ui-location-solver.hpp

@@ -65,8 +65,8 @@
  */
 
 
-#ifndef GUI_INTERACT_UI_LOCATION_SOLVER_H
-#define GUI_INTERACT_UI_LOCATION_SOLVER_H
+#ifndef STAGE_INTERACT_UI_LOCATION_SOLVER_H
+#define STAGE_INTERACT_UI_LOCATION_SOLVER_H
 
 #include "lib/error.hpp"
 #include "lib/symbol.hpp"
@@ -324,4 +324,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_UI_LOCATION_SOLVER_H*/
+#endif /*STAGE_INTERACT_UI_LOCATION_SOLVER_H*/

src/stage/interact/view-locator.hpp

@@ -61,8 +61,8 @@
  */
 
 
-#ifndef GUI_INTERACT_VIEW_LOCATOR_H
-#define GUI_INTERACT_VIEW_LOCATOR_H
+#ifndef STAGE_INTERACT_VIEW_LOCATOR_H
+#define STAGE_INTERACT_VIEW_LOCATOR_H
 
 #include "lib/depend-inject.hpp"
 #include "stage/id-scheme.hpp"
@@ -138,4 +138,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_VIEW_LOCATOR_H*/
+#endif /*STAGE_INTERACT_VIEW_LOCATOR_H*/

src/stage/interact/view-spec-dsl.hpp

@@ -94,8 +94,8 @@
  */
 
 
-#ifndef GUI_INTERACT_VIEW_SPEC_DSL_H
-#define GUI_INTERACT_VIEW_SPEC_DSL_H
+#ifndef STAGE_INTERACT_VIEW_SPEC_DSL_H
+#define STAGE_INTERACT_VIEW_SPEC_DSL_H
 
 #include "lib/error.hpp"
 #include "lib/symbol.hpp"
@@ -288,4 +288,4 @@ namespace idi {
   
   
 }}// namespace gui::idi
-#endif /*GUI_INTERACT_VIEW_SPEC_DSL_H*/
+#endif /*STAGE_INTERACT_VIEW_SPEC_DSL_H*/

src/stage/interact/wizard.hpp

@@ -39,8 +39,8 @@
  */
 
 
-#ifndef GUI_INTERACT_WIZARD_H
-#define GUI_INTERACT_WIZARD_H
+#ifndef STAGE_INTERACT_WIZARD_H
+#define STAGE_INTERACT_WIZARD_H
 
 #include "lib/nocopy.hpp"
 #include "lib/idi/entry-id.hpp"
@@ -104,4 +104,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_WIZARD_H*/
+#endif /*STAGE_INTERACT_WIZARD_H*/

src/stage/interact/work-site-trail.hpp

@@ -37,8 +37,8 @@
  */
 
 
-#ifndef GUI_INTERACT_WORK_SITE_TRAIL_H
-#define GUI_INTERACT_WORK_SITE_TRAIL_H
+#ifndef STAGE_INTERACT_WORK_SITE_TRAIL_H
+#define STAGE_INTERACT_WORK_SITE_TRAIL_H
 
 #include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
@@ -77,4 +77,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_WORK_SITE_H*/
+#endif /*STAGE_INTERACT_WORK_SITE_H*/

src/stage/interact/work-site.hpp

@@ -42,8 +42,8 @@
  */
 
 
-#ifndef GUI_INTERACT_WORK_SITE_H
-#define GUI_INTERACT_WORK_SITE_H
+#ifndef STAGE_INTERACT_WORK_SITE_H
+#define STAGE_INTERACT_WORK_SITE_H
 
 #include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
@@ -84,4 +84,4 @@ namespace interact {
   
   
 }}// namespace gui::interact
-#endif /*GUI_INTERACT_WORK_SITE_H*/
+#endif /*STAGE_INTERACT_WORK_SITE_H*/

src/stage/model/clip.hpp

@@ -27,8 +27,8 @@
  **          and will be replaced in entirety by UI-Bus and diff framework.
  */
 
-#ifndef GUI_MODEL_CLIP_H
-#define GUI_MODEL_CLIP_H
+#ifndef STAGE_MODEL_CLIP_H
+#define STAGE_MODEL_CLIP_H
 
 #include "stage/gtk-base.hpp"
 #include "lib/time/timevalue.hpp"

src/stage/model/controller.hpp

@@ -35,8 +35,8 @@
  */
 
 
-#ifndef GUI_MODEL_CONTROLLER_H
-#define GUI_MODEL_CONTROLLER_H
+#ifndef STAGE_MODEL_CONTROLLER_H
+#define STAGE_MODEL_CONTROLLER_H
 
 
 #include "lib/error.hpp"
@@ -121,4 +121,4 @@ namespace model {
   
   
 }} // namespace gui::model
-#endif /*GUI_MODEL_CONTROLLER_H*/
+#endif /*STAGE_MODEL_CONTROLLER_H*/

src/stage/model/diagnostics.hpp

@@ -34,8 +34,8 @@
  */
 
 
-#ifndef GUI_MODEL_DIAGNOSTICS_H
-#define GUI_MODEL_DIAGNOSTICS_H
+#ifndef STAGE_MODEL_DIAGNOSTICS_H
+#define STAGE_MODEL_DIAGNOSTICS_H
 
 
 #include "lib/error.hpp"
@@ -117,4 +117,4 @@ namespace model {
   
   
 }} // namespace gui::model
-#endif /*GUI_MODEL_DIAGNOSTICS_H*/
+#endif /*STAGE_MODEL_DIAGNOSTICS_H*/

src/stage/model/element-access.hpp

@@ -48,8 +48,8 @@
  */
 
 
-#ifndef GUI_MODEL_ELEMENT_ACCESS_H
-#define GUI_MODEL_ELEMENT_ACCESS_H
+#ifndef STAGE_MODEL_ELEMENT_ACCESS_H
+#define STAGE_MODEL_ELEMENT_ACCESS_H
 
 
 #include "lib/error.hpp"
@@ -199,4 +199,4 @@ namespace model {
   
   
 }} // namespace gui::model
-#endif /*GUI_MODEL_ELEMENT_ACCESS_H*/
+#endif /*STAGE_MODEL_ELEMENT_ACCESS_H*/

src/stage/model/expander-revealer.hpp

@@ -59,8 +59,8 @@
  */
 
 
-#ifndef GUI_MODEL_EXPANDER_REVEALER_H
-#define GUI_MODEL_EXPANDER_REVEALER_H
+#ifndef STAGE_MODEL_EXPANDER_REVEALER_H
+#define STAGE_MODEL_EXPANDER_REVEALER_H
 
 
 #include "lib/error.hpp"
@@ -186,4 +186,4 @@ namespace model {
   
   
 }} // namespace gui::model
-#endif /*GUI_MODEL_EXPANDER_REVEALER_H*/
+#endif /*STAGE_MODEL_EXPANDER_REVEALER_H*/

src/stage/model/flash-deco.hpp

@@ -37,8 +37,8 @@
  */
 
 
-#ifndef GUI_MODEL_FLASH_DECO_H
-#define GUI_MODEL_FLASH_DECO_H
+#ifndef STAGE_MODEL_FLASH_DECO_H
+#define STAGE_MODEL_FLASH_DECO_H
 
 
 #include "stage/gtk-base.hpp"
@@ -87,4 +87,4 @@ namespace model {
   
   
 }} // namespace gui::model
-#endif /*GUI_MODEL_FLASH_DECO_H*/
+#endif /*STAGE_MODEL_FLASH_DECO_H*/

src/stage/model/tangible.hpp

@@ -126,8 +126,8 @@
  */
 
 
-#ifndef GUI_MODEL_TANGIBLE_H
-#define GUI_MODEL_TANGIBLE_H
+#ifndef STAGE_MODEL_TANGIBLE_H
+#define STAGE_MODEL_TANGIBLE_H
 
 
 #include "lib/error.hpp"
@@ -301,4 +301,4 @@ namespace model {
   
   
 }} // namespace gui::model
-#endif /*GUI_MODEL_TANGIBLE_H*/
+#endif /*STAGE_MODEL_TANGIBLE_H*/

src/stage/model/w-link.hpp

@@ -54,8 +54,8 @@
  */
 
 
-#ifndef GUI_MODEL_W_LINK_H
-#define GUI_MODEL_W_LINK_H
+#ifndef STAGE_MODEL_W_LINK_H
+#define STAGE_MODEL_W_LINK_H
 
 
 #include "lib/error.hpp"
@@ -241,4 +241,4 @@ namespace model {
   
   
 }} // namespace gui::model
-#endif /*GUI_MODEL_W_LINK_H*/
+#endif /*STAGE_MODEL_W_LINK_H*/

src/stage/model/widget.hpp

@@ -32,8 +32,8 @@
  */
 
 
-#ifndef GUI_MODEL_WIDGET_H
-#define GUI_MODEL_WIDGET_H
+#ifndef STAGE_MODEL_WIDGET_H
+#define STAGE_MODEL_WIDGET_H
 
 
 #include "lib/error.hpp"
@@ -112,4 +112,4 @@ namespace model {
   
   
 }} // namespace gui::model
-#endif /*GUI_MODEL_WIDGET_H*/
+#endif /*STAGE_MODEL_WIDGET_H*/

src/stage/notification-service.hpp

@@ -36,8 +36,8 @@
  */
 
 
-#ifndef GUI_NOTIFICATION_SERVICE_H
-#define GUI_NOTIFICATION_SERVICE_H
+#ifndef STAGE_NOTIFICATION_SERVICE_H
+#define STAGE_NOTIFICATION_SERVICE_H
 
 
 #include "include/gui-notification-facade.h"

src/stage/output/displayer.hpp

@@ -32,8 +32,8 @@
  */
 
 
-#ifndef GUI_OUTPUT_DISPLAYER_H
-#define GUI_OUTPUT_DISPLAYER_H
+#ifndef STAGE_OUTPUT_DISPLAYER_H
+#define STAGE_OUTPUT_DISPLAYER_H
 
 
 namespace gui {
@@ -124,4 +124,4 @@ namespace output {
     
   
 }} // namespace gui::output
-#endif /*GUI_OUTPUT_DISPLAYER_H*/
+#endif /*STAGE_OUTPUT_DISPLAYER_H*/

src/stage/output/gdkdisplayer.hpp

@@ -30,8 +30,8 @@
  ** @see displayer.hpp
  */
 
-#ifndef GUI_OUTPUT_GDKDISPLAYER_H
-#define GUI_OUTPUT_GDKDISPLAYER_H
+#ifndef STAGE_OUTPUT_GDKDISPLAYER_H
+#define STAGE_OUTPUT_GDKDISPLAYER_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/output/displayer.hpp"
@@ -94,4 +94,4 @@ class GdkDisplayer
   
   
 }}   // namespace gui::output
-#endif /*GUI_OUTPUT_GDKDISPLAYER_H*/
+#endif /*STAGE_OUTPUT_GDKDISPLAYER_H*/

src/stage/output/xvdisplayer.hpp

@@ -34,8 +34,8 @@
  */
 
 
-#ifndef GUI_OUTPUT_XVDISPLAYER_H
-#define GUI_OUTPUT_XVDISPLAYER_H
+#ifndef STAGE_OUTPUT_XVDISPLAYER_H
+#define STAGE_OUTPUT_XVDISPLAYER_H
 
 
 #include "stage/output/displayer.hpp"

src/stage/panel/assets-panel.hpp

@@ -33,8 +33,8 @@
 
 
 
-#ifndef GUI_PANEL_ASSETS_PANEL_H
-#define GUI_PANEL_ASSETS_PANEL_H
+#ifndef STAGE_PANEL_ASSETS_PANEL_H
+#define STAGE_PANEL_ASSETS_PANEL_H
 
 
 #include "stage/panel/panel.hpp"
@@ -68,4 +68,4 @@ namespace panel{
   
   
 }}// namespace gui::panel
-#endif /*GUI_PANEL_ASSETS_PANEL_H*/
+#endif /*STAGE_PANEL_ASSETS_PANEL_H*/

src/stage/panel/infobox-panel.hpp

@@ -31,8 +31,8 @@
 
 
 
-#ifndef GUI_PANEL_INFOBOX_PANEL_H
-#define GUI_PANEL_INFOBOX_PANEL_H
+#ifndef STAGE_PANEL_INFOBOX_PANEL_H
+#define STAGE_PANEL_INFOBOX_PANEL_H
 
 
 #include "stage/panel/panel.hpp"
@@ -78,4 +78,4 @@ namespace panel{
   
   
 }}// namespace gui::panel
-#endif /*GUI_PANEL_INFOBOX_PANEL_H*/
+#endif /*STAGE_PANEL_INFOBOX_PANEL_H*/

src/stage/panel/panel.hpp

@@ -27,8 +27,8 @@
 
 
 
-#ifndef GUI_PANEL_PANEL_H
-#define GUI_PANEL_PANEL_H
+#ifndef STAGE_PANEL_PANEL_H
+#define STAGE_PANEL_PANEL_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/widget/panel-bar.hpp"
@@ -114,4 +114,4 @@ namespace panel {
   
   
 }}// namespace gui::panel
-#endif /*GUI_PANEL_PANEL_H*/
+#endif /*STAGE_PANEL_PANEL_H*/

src/stage/panel/timeline-panel-obsolete.hpp

@@ -26,8 +26,8 @@
  */
 
 
-#ifndef GUI_PANEL_TIMELINE_PANEL_OBSOLETE_H
-#define GUI_PANEL_TIMELINE_PANEL_OBSOLETE_H
+#ifndef STAGE_PANEL_TIMELINE_PANEL_OBSOLETE_H
+#define STAGE_PANEL_TIMELINE_PANEL_OBSOLETE_H
 
 #include "stage/panel/panel.hpp"
 #include "stage/widget/timecode-widget.hpp"
@@ -207,4 +207,4 @@ namespace model{
   
   
 }}// namespace gui::panel
-#endif /*GUI_PANEL_TIMELINE_PANEL_OBSOLETE_H*/
+#endif /*STAGE_PANEL_TIMELINE_PANEL_OBSOLETE_H*/

src/stage/panel/timeline-panel.hpp

@@ -38,8 +38,8 @@
  */
 
 
-#ifndef GUI_PANEL_TIMELINE_PANEL_H
-#define GUI_PANEL_TIMELINE_PANEL_H
+#ifndef STAGE_PANEL_TIMELINE_PANEL_H
+#define STAGE_PANEL_TIMELINE_PANEL_H
 
 #include "stage/panel/panel.hpp"
 #include "stage/timeline/timeline-widget.hpp"
@@ -86,4 +86,4 @@ namespace panel{
   
   
 }}// namespace gui::panel
-#endif /*GUI_PANEL_TIMELINE_PANEL_H*/
+#endif /*STAGE_PANEL_TIMELINE_PANEL_H*/

src/stage/panel/viewer-panel.hpp

@@ -25,8 +25,8 @@
  */
 
 
-#ifndef GUI_PANEL_VIEWER_PANEL_H
-#define GUI_PANEL_VIEWER_PANEL_H
+#ifndef STAGE_PANEL_VIEWER_PANEL_H
+#define STAGE_PANEL_VIEWER_PANEL_H
 
 
 #include "stage/panel/panel.hpp"
@@ -61,4 +61,4 @@ namespace panel{
     };
   
 }}// namespace gui::panel
-#endif /*GUI_PANEL_VIEWER_PANEL_H*/
+#endif /*STAGE_PANEL_VIEWER_PANEL_H*/

src/stage/setting/asset-controller.hpp

@@ -48,8 +48,8 @@
  */
 
 
-#ifndef GUI_SETTING_ASSET_CONTROLLER_H
-#define GUI_SETTING_ASSET_CONTROLLER_H
+#ifndef STAGE_SETTING_ASSET_CONTROLLER_H
+#define STAGE_SETTING_ASSET_CONTROLLER_H
 
 //#include "stage/gtk-base.hpp"
 #include "stage/model/controller.hpp"
@@ -92,4 +92,4 @@ namespace setting {
   
   
 }}// namespace gui::setting
-#endif /*GUI_SETTING_ASSET_CONTROLLER_H*/
+#endif /*STAGE_SETTING_ASSET_CONTROLLER_H*/

src/stage/style-scheme.hpp

@@ -30,8 +30,8 @@
  ** 
  */
 
-#ifndef GUI_STYLE_SCHEME_H
-#define GUI_STYLE_SCHEME_H
+#ifndef STAGE_STYLE_SCHEME_H
+#define STAGE_STYLE_SCHEME_H
 
 
 #include "lib/symbol.hpp"
@@ -55,4 +55,4 @@ namespace gui {
   
   
 }// namespace gui
-#endif /*GUI_STYLE_SCHEME_H*/
+#endif /*STAGE_STYLE_SCHEME_H*/

src/stage/timeline/body-canvas-widget.hpp

@@ -54,8 +54,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_BODY_CANVAS_WIDGET_H
-#define GUI_TIMELINE_BODY_CANVAS_WIDGET_H
+#ifndef STAGE_TIMELINE_BODY_CANVAS_WIDGET_H
+#define STAGE_TIMELINE_BODY_CANVAS_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -103,4 +103,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_BODY_CANVAS_WIDGET_H*/
+#endif /*STAGE_TIMELINE_BODY_CANVAS_WIDGET_H*/

src/stage/timeline/clip-presenter.hpp

@@ -49,8 +49,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_CLIP_PRESENTER_H
-#define GUI_TIMELINE_CLIP_PRESENTER_H
+#ifndef STAGE_TIMELINE_CLIP_PRESENTER_H
+#define STAGE_TIMELINE_CLIP_PRESENTER_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/model/controller.hpp"
@@ -103,4 +103,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_CLIP_PRESENTER_H*/
+#endif /*STAGE_TIMELINE_CLIP_PRESENTER_H*/

src/stage/timeline/clip-widget.hpp

@@ -98,8 +98,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_CLIP_WIDGET_H
-#define GUI_TIMELINE_CLIP_WIDGET_H
+#ifndef STAGE_TIMELINE_CLIP_WIDGET_H
+#define STAGE_TIMELINE_CLIP_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -129,4 +129,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_CLIP_WIDGET_H*/
+#endif /*STAGE_TIMELINE_CLIP_WIDGET_H*/

src/stage/timeline/header-pane-widget.hpp

@@ -46,8 +46,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_HEADER_PANE_WIDGET_H
-#define GUI_TIMELINE_HEADER_PANE_WIDGET_H
+#ifndef STAGE_TIMELINE_HEADER_PANE_WIDGET_H
+#define STAGE_TIMELINE_HEADER_PANE_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/timeline/navigator-widget.hpp"
@@ -107,4 +107,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_HEADER_PANE_WIDGET_H*/
+#endif /*STAGE_TIMELINE_HEADER_PANE_WIDGET_H*/

src/stage/timeline/marker-widget.hpp

@@ -35,8 +35,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_MARKER_WIDGET_H
-#define GUI_TIMELINE_MARKER_WIDGET_H
+#ifndef STAGE_TIMELINE_MARKER_WIDGET_H
+#define STAGE_TIMELINE_MARKER_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/model/widget.hpp"
@@ -88,4 +88,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_MARKER_WIDGET_H*/
+#endif /*STAGE_TIMELINE_MARKER_WIDGET_H*/

src/stage/timeline/navigator-widget.hpp

@@ -38,8 +38,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_NAVIGATOR_WIDGET_H
-#define GUI_TIMELINE_NAVIGATOR_WIDGET_H
+#ifndef STAGE_TIMELINE_NAVIGATOR_WIDGET_H
+#define STAGE_TIMELINE_NAVIGATOR_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -70,4 +70,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_NAVIGATOR_WIDGET_H*/
+#endif /*STAGE_TIMELINE_NAVIGATOR_WIDGET_H*/

src/stage/timeline/patchbay-widget.hpp

@@ -34,8 +34,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_PATCHBAY_WIDGET_H
-#define GUI_TIMELINE_PATCHBAY_WIDGET_H
+#ifndef STAGE_TIMELINE_PATCHBAY_WIDGET_H
+#define STAGE_TIMELINE_PATCHBAY_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -77,4 +77,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_PATCHBAY_WIDGET_H*/
+#endif /*STAGE_TIMELINE_PATCHBAY_WIDGET_H*/

src/stage/timeline/pipe-widget.hpp

@@ -36,8 +36,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_PIPE_WIDGET_H
-#define GUI_TIMELINE_PIPE_WIDGET_H
+#ifndef STAGE_TIMELINE_PIPE_WIDGET_H
+#define STAGE_TIMELINE_PIPE_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -67,4 +67,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_PIPE_WIDGET_H*/
+#endif /*STAGE_TIMELINE_PIPE_WIDGET_H*/

src/stage/timeline/ruler-widget.hpp

@@ -29,8 +29,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_RULER_WIDGET_H
-#define GUI_TIMELINE_RULER_WIDGET_H
+#ifndef STAGE_TIMELINE_RULER_WIDGET_H
+#define STAGE_TIMELINE_RULER_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -60,4 +60,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_RULER_WIDGET_H*/
+#endif /*STAGE_TIMELINE_RULER_WIDGET_H*/

src/stage/timeline/timeline-controller.hpp

@@ -50,8 +50,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_TIMELINE_CONTROLLER_H
-#define GUI_TIMELINE_TIMELINE_CONTROLLER_H
+#ifndef STAGE_TIMELINE_TIMELINE_CONTROLLER_H
+#define STAGE_TIMELINE_TIMELINE_CONTROLLER_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/model/controller.hpp"
@@ -125,4 +125,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_TIMELINE_CONTROLLER_H*/
+#endif /*STAGE_TIMELINE_TIMELINE_CONTROLLER_H*/

src/stage/timeline/timeline-gui.hpp

@@ -49,8 +49,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_TIMELINE_GUI_H
-#define GUI_TIMELINE_TIMELINE_GUI_H
+#ifndef STAGE_TIMELINE_TIMELINE_GUI_H
+#define STAGE_TIMELINE_TIMELINE_GUI_H
 
 #include "stage/ctrl/bus-term.hpp"
 #include "stage/model/w-link.hpp"
@@ -103,4 +103,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_TIMELINE_GUI_H*/
+#endif /*STAGE_TIMELINE_TIMELINE_GUI_H*/

src/stage/timeline/timeline-layout.hpp

@@ -79,8 +79,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_TIMELINE_LAYOUT_H
-#define GUI_TIMELINE_TIMELINE_LAYOUT_H
+#ifndef STAGE_TIMELINE_TIMELINE_LAYOUT_H
+#define STAGE_TIMELINE_TIMELINE_LAYOUT_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/timeline/header-pane-widget.hpp"
@@ -127,4 +127,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_TIMELINE_LAYOUT_H*/
+#endif /*STAGE_TIMELINE_TIMELINE_LAYOUT_H*/

src/stage/timeline/timeline-widget-empty.hpp

@@ -33,8 +33,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_TIMELINE_WIDGET_EMPTY_H
-#define GUI_TIMELINE_TIMELINE_WIDGET_EMPTY_H
+#ifndef STAGE_TIMELINE_TIMELINE_WIDGET_EMPTY_H
+#define STAGE_TIMELINE_TIMELINE_WIDGET_EMPTY_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/timeline/timeline-widget.hpp"
@@ -95,4 +95,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_TIMELINE_WIDGET_EMPTY_H*/
+#endif /*STAGE_TIMELINE_TIMELINE_WIDGET_EMPTY_H*/

src/stage/timeline/timeline-widget.hpp

@@ -52,8 +52,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_TIMELINE_WIDGET_H
-#define GUI_TIMELINE_TIMELINE_WIDGET_H
+#ifndef STAGE_TIMELINE_TIMELINE_WIDGET_H
+#define STAGE_TIMELINE_TIMELINE_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 //#include "stage/timeline/timeline-controller.hpp"   /////TODO possible to push that into the implementation?
@@ -156,4 +156,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_TIMELINE_WIDGET_H*/
+#endif /*STAGE_TIMELINE_TIMELINE_WIDGET_H*/

src/stage/timeline/track-body.hpp

@@ -37,8 +37,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_TRACK_BODY_H
-#define GUI_TIMELINE_TRACK_BODY_H
+#ifndef STAGE_TIMELINE_TRACK_BODY_H
+#define STAGE_TIMELINE_TRACK_BODY_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/ctrl/bus-term.hpp"
@@ -91,4 +91,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_TRACK_BODY_H*/
+#endif /*STAGE_TIMELINE_TRACK_BODY_H*/

src/stage/timeline/track-head-widget.hpp

@@ -42,8 +42,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_TRACK_HEAD_WIDGET_H
-#define GUI_TIMELINE_TRACK_HEAD_WIDGET_H
+#ifndef STAGE_TIMELINE_TRACK_HEAD_WIDGET_H
+#define STAGE_TIMELINE_TRACK_HEAD_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/ctrl/bus-term.hpp"
@@ -88,4 +88,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_TRACK_HEAD_WIDGET_H*/
+#endif /*STAGE_TIMELINE_TRACK_HEAD_WIDGET_H*/

src/stage/timeline/track-presenter.hpp

@@ -44,8 +44,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_TRACK_PRESENTER_H
-#define GUI_TIMELINE_TRACK_PRESENTER_H
+#ifndef STAGE_TIMELINE_TRACK_PRESENTER_H
+#define STAGE_TIMELINE_TRACK_PRESENTER_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/model/controller.hpp"
@@ -155,4 +155,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_TRACK_PRESENTER_H*/
+#endif /*STAGE_TIMELINE_TRACK_PRESENTER_H*/

src/stage/timeline/transition-widget.hpp

@@ -29,8 +29,8 @@
  */
 
 
-#ifndef GUI_TIMELINE_TRANSITION_WIDGET_H
-#define GUI_TIMELINE_TRANSITION_WIDGET_H
+#ifndef STAGE_TIMELINE_TRANSITION_WIDGET_H
+#define STAGE_TIMELINE_TRANSITION_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -60,4 +60,4 @@ namespace timeline {
   
   
 }}// namespace gui::timeline
-#endif /*GUI_TIMELINE_TRANSITION_WIDGET_H*/
+#endif /*STAGE_TIMELINE_TRANSITION_WIDGET_H*/

src/stage/ui-bus.hpp

@@ -99,8 +99,8 @@
  */
 
 
-#ifndef GUI_UI_BUS_H
-#define GUI_UI_BUS_H
+#ifndef STAGE_UI_BUS_H
+#define STAGE_UI_BUS_H
 
 
 #include "stage/gtk-base.hpp"  //////////////////////////////////////////////////////TODO remove any GTK dependency if possible
@@ -172,5 +172,5 @@ namespace gui {
   
   
 }// namespace gui
-#endif /*GUI_UI_BUS_H*/
+#endif /*STAGE_UI_BUS_H*/
 

src/stage/widget/bin-widget.hpp

@@ -45,8 +45,8 @@
  */
 
 
-#ifndef GUI_WIDGET_BIN_WIDGET_H
-#define GUI_WIDGET_BIN_WIDGET_H
+#ifndef STAGE_WIDGET_BIN_WIDGET_H
+#define STAGE_WIDGET_BIN_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -76,4 +76,4 @@ namespace widget {
   
   
 }}// namespace gui::widget
-#endif /*GUI_WIDGET_BIN_WIDGET_H*/
+#endif /*STAGE_WIDGET_BIN_WIDGET_H*/

src/stage/widget/button-bar.hpp

@@ -26,8 +26,8 @@
  */
 
 
-#ifndef GUI_WIDGET_BUTTON_BAR_H
-#define GUI_WIDGET_BUTTON_BAR_H
+#ifndef STAGE_WIDGET_BUTTON_BAR_H
+#define STAGE_WIDGET_BUTTON_BAR_H
 
 #include "stage/widget/mini-button.hpp"
 
@@ -61,4 +61,4 @@ namespace widget {
   
   
 }}// gui::widget
-#endif /*GUI_WIDGET_BUTTON_BAR_H*/
+#endif /*STAGE_WIDGET_BUTTON_BAR_H*/

src/stage/widget/element-box-widget.hpp

@@ -37,8 +37,8 @@
  */
 
 
-#ifndef GUI_WIDGET_ELEMENT_BOX_WIDGET_H
-#define GUI_WIDGET_ELEMENT_BOX_WIDGET_H
+#ifndef STAGE_WIDGET_ELEMENT_BOX_WIDGET_H
+#define STAGE_WIDGET_ELEMENT_BOX_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -68,4 +68,4 @@ namespace widget {
   
   
 }}// namespace gui::widget
-#endif /*GUI_WIDGET_ELEMENT_BOX_WIDGET_H*/
+#endif /*STAGE_WIDGET_ELEMENT_BOX_WIDGET_H*/

src/stage/widget/error-log-display.hpp

@@ -56,8 +56,8 @@
  */
 
 
-#ifndef GUI_WIDGET_ERROR_LOG_DISPLAY_H
-#define GUI_WIDGET_ERROR_LOG_DISPLAY_H
+#ifndef STAGE_WIDGET_ERROR_LOG_DISPLAY_H
+#define STAGE_WIDGET_ERROR_LOG_DISPLAY_H
 
 #include "stage/gtk-base.hpp"
 #include "stage/style-scheme.hpp"
@@ -334,4 +334,4 @@ namespace widget {
   
   
 }}// namespace gui::widget
-#endif /*GUI_WIDGET_ERROR_LOG_DISPLAY_H*/
+#endif /*STAGE_WIDGET_ERROR_LOG_DISPLAY_H*/

src/stage/widget/menu-button.hpp

@@ -26,8 +26,8 @@
  */
 
 
-#ifndef GUI_WIDGET_MENU_BUTTON_H
-#define GUI_WIDGET_MENU_BUTTON_H
+#ifndef STAGE_WIDGET_MENU_BUTTON_H
+#define STAGE_WIDGET_MENU_BUTTON_H
 
 #include "stage/gtk-base.hpp"
 
@@ -170,4 +170,4 @@ namespace widget {
   
   
 }}// gui::widget
-#endif /*GUI_WIDGET_MENU_BUTTON_H*/
+#endif /*STAGE_WIDGET_MENU_BUTTON_H*/

src/stage/widget/mini-button.hpp

@@ -27,8 +27,8 @@
 
 
 
-#ifndef GUI_WIDGET_MINI_BUTTON_H
-#define GUI_WIDGET_MINI_BUTTON_H
+#ifndef STAGE_WIDGET_MINI_BUTTON_H
+#define STAGE_WIDGET_MINI_BUTTON_H
 
 #include "stage/gtk-base.hpp"
 
@@ -87,4 +87,4 @@ namespace widget {
   
   
 }}// gui::widget
-#endif /*GUI_WIDGET_MINI_BUTTON_H*/
+#endif /*STAGE_WIDGET_MINI_BUTTON_H*/

src/stage/widget/mixer-widget.hpp

@@ -48,8 +48,8 @@
  */
 
 
-#ifndef GUI_WIDGET_MIXER_WIDGET_H
-#define GUI_WIDGET_MIXER_WIDGET_H
+#ifndef STAGE_WIDGET_MIXER_WIDGET_H
+#define STAGE_WIDGET_MIXER_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -79,4 +79,4 @@ namespace widget {
   
   
 }}// namespace gui::widget
-#endif /*GUI_WIDGET_MIXER_WIDGET_H*/
+#endif /*STAGE_WIDGET_MIXER_WIDGET_H*/

src/stage/widget/panel-bar.hpp

@@ -29,8 +29,8 @@
  */
 
 
-#ifndef GUI_WIDGET_PANEL_BAR_H
-#define GUI_WIDGET_PANEL_BAR_H
+#ifndef STAGE_WIDGET_PANEL_BAR_H
+#define STAGE_WIDGET_PANEL_BAR_H
 
 
 #include "stage/widget/menu-button.hpp"
@@ -114,4 +114,4 @@ namespace gui {
   
   
 }}// gui::widget
-#endif /*GUI_WIDGET_PANEL_BAR_H*/
+#endif /*STAGE_WIDGET_PANEL_BAR_H*/

src/stage/widget/player-widget.hpp

@@ -47,8 +47,8 @@
  */
 
 
-#ifndef GUI_WIDGET_PLAYER_WIDGET_H
-#define GUI_WIDGET_PLAYER_WIDGET_H
+#ifndef STAGE_WIDGET_PLAYER_WIDGET_H
+#define STAGE_WIDGET_PLAYER_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -78,4 +78,4 @@ namespace widget {
   
   
 }}// namespace gui::widget
-#endif /*GUI_WIDGET_PLAYER_WIDGET_H*/
+#endif /*STAGE_WIDGET_PLAYER_WIDGET_H*/

src/stage/widget/switchboard-widget.hpp

@@ -51,8 +51,8 @@
  */
 
 
-#ifndef GUI_WIDGET_SWITCHBOARD_WIDGET_H
-#define GUI_WIDGET_SWITCHBOARD_WIDGET_H
+#ifndef STAGE_WIDGET_SWITCHBOARD_WIDGET_H
+#define STAGE_WIDGET_SWITCHBOARD_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 
@@ -82,4 +82,4 @@ namespace widget {
   
   
 }}// namespace gui::widget
-#endif /*GUI_WIDGET_SWITCHBOARD_WIDGET_H*/
+#endif /*STAGE_WIDGET_SWITCHBOARD_WIDGET_H*/

src/stage/widget/timecode-widget.hpp

@@ -32,8 +32,8 @@
  */
 
 
-#ifndef GUI_WIDGET_TIMECODE_WIDGET_H
-#define GUI_WIDGET_TIMECODE_WIDGET_H
+#ifndef STAGE_WIDGET_TIMECODE_WIDGET_H
+#define STAGE_WIDGET_TIMECODE_WIDGET_H
 
 #include "stage/gtk-base.hpp"
 #include "lib/time/timevalue.hpp"
@@ -218,4 +218,4 @@ namespace widget {
   
   
 }}// gui::widget
-#endif /*GUI_WIDGET_TIMECODE_WIDGET_H*/
+#endif /*STAGE_WIDGET_TIMECODE_WIDGET_H*/

src/stage/widget/timeline-widget.hpp

@@ -34,8 +34,8 @@
  */
 
 
-#ifndef GUI_WIDGET_TIMELINE_WIDGET_H
-#define GUI_WIDGET_TIMELINE_WIDGET_H
+#ifndef STAGE_WIDGET_TIMELINE_WIDGET_H
+#define STAGE_WIDGET_TIMELINE_WIDGET_H
 
 #include "stage/widget/timeline/timeline-state.hpp"
 #include "stage/widget/timeline/timeline-header-container.hpp"
@@ -311,4 +311,4 @@ namespace widget {
   
   
 }}// gui::widget
-#endif /*GUI_WIDGET_TIMELINE_WIDGET_H*/
+#endif /*STAGE_WIDGET_TIMELINE_WIDGET_H*/