Global-Layer-Renaming: adjust header includes

research/gtk-canvas-experiment.hpp

@@ -31,7 +31,7 @@
 #ifndef RESEARCH_GTK_CANVAS_EXPERIMENT_H
 #define RESEARCH_GTK_CANVAS_EXPERIMENT_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 
 #include <vector>
 

research/gtk-canvas-main.cpp

@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "gtk-canvas-experiment.hpp"
 #include "lib/error.hpp"
 

src/common/guifacade.cpp

@@ -31,7 +31,7 @@
  */
 
 
-#include "gui/guifacade.hpp"
+#include "stage/guifacade.hpp"
 #include "include/gui-notification-facade.h"
 #include "lib/sync.hpp"
 #include "lib/error.hpp"

src/common/ui-protocol.cpp

@@ -25,7 +25,7 @@
  ** Storage for key constants and basic definitions used for interfacing with the GUI.
  */
 
-//#include "gui/gtk-base.hpp"    /////////////////////TODO necessary?
+//#include "stage/gtk-base.hpp"    /////////////////////TODO necessary?
 #include "include/ui-protocol.hpp"
 
 

src/include/play-facade.hpp

@@ -41,13 +41,13 @@
 #include "lib/iter-source.hpp"                 ////////////////////TICKET #493 : only using the IterSource base interface here
 #include "lib/time/control.hpp"
 #include "lib/time/timevalue.hpp"
-#include "proc/mobject/model-port.hpp"
-#include "proc/mobject/output-designation.hpp"
-#include "proc/mobject/session/clip.hpp"
-#include "proc/mobject/session/fork.hpp"
-#include "proc/play/output-manager.hpp"
-#include "proc/asset/timeline.hpp"
-#include "proc/asset/viewer.hpp"
+#include "steam/mobject/model-port.hpp"
+#include "steam/mobject/output-designation.hpp"
+#include "steam/mobject/session/clip.hpp"
+#include "steam/mobject/session/fork.hpp"
+#include "steam/play/output-manager.hpp"
+#include "steam/asset/timeline.hpp"
+#include "steam/asset/viewer.hpp"
 
 
 

src/lib/safeclib.c

@@ -29,7 +29,7 @@
 #include "lib/error.h"
 #include "lib/safeclib.h"
 
-#include "backend/resourcecollector.h"
+#include "vault/resourcecollector.h"
 
 #include <string.h>
 #include <stdlib.h>

src/lib/test/microbenchmark.hpp

@@ -53,7 +53,7 @@
 #define LIB_TEST_MICROBENCHMARK_H
 
 
-#include "backend/thread-wrapper.hpp"
+#include "vault/thread-wrapper.hpp"
 
 #include <chrono>
 #include <vector>

src/lib/test/run.hpp

@@ -36,7 +36,7 @@
 #ifndef TESTHELPER_RUN_H
 #define TESTHELPER_RUN_H
 
-#include "proc/common.hpp"
+#include "steam/common.hpp"
 #include "include/logging.h"
 
 #include "lib/test/suite.hpp"

src/lib/wrapperptr.hpp

@@ -36,7 +36,7 @@
 #include "lib/access-casted-o.hpp"
 
 #include "lib/meta/typelist.hpp"
-#include "proc/mobject/placement.hpp"
+#include "steam/mobject/placement.hpp"
 #include "lib/p.hpp"
 
 

src/lumiera/main.cpp

@@ -32,12 +32,12 @@
 #include "common/appstate.hpp"
 #include "common/option.hpp"
 
-#include "backend/enginefacade.hpp"
-#include "backend/netnodefacade.hpp"
-#include "backend/scriptrunnerfacade.hpp"
+#include "vault/enginefacade.hpp"
+#include "vault/netnodefacade.hpp"
+#include "vault/scriptrunnerfacade.hpp"
 #include "include/dummy-player-facade.h"
-#include "proc/facade.hpp"
-#include "gui/guifacade.hpp"
+#include "steam/facade.hpp"
+#include "stage/guifacade.hpp"
 
 using lib::Cmdline;
 using lumiera::Subsys;

src/stage/config-keys.cpp

@@ -30,7 +30,7 @@
  ** 
  */
 
-#include "gui/config-keys.hpp"
+#include "stage/config-keys.hpp"
 
 namespace gui {
   

src/stage/ctrl/actions.hpp

@@ -41,11 +41,11 @@
 #ifndef GUI_CTRL_ACTIONS_H
 #define GUI_CTRL_ACTIONS_H
 
-#include "gui/gtk-base.hpp"
-#include "gui/ctrl/global-ctx.hpp"
-#include "gui/ctrl/window-locator.hpp"
-#include "gui/workspace/workspace-window.hpp"
-#include "gui/workspace/panel-manager.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/ctrl/global-ctx.hpp"
+#include "stage/ctrl/window-locator.hpp"
+#include "stage/workspace/workspace-window.hpp"
+#include "stage/workspace/panel-manager.hpp"
 #include "lib/format-string.hpp"
 #include "lib/nocopy.hpp"
 

src/stage/ctrl/core-service.hpp

@@ -90,9 +90,9 @@
 #include "lib/idi/entry-id.hpp"
 #include "lib/diff/gen-node.hpp"
 #include "include/session-command-facade.h"
-#include "gui/ctrl/state-recorder.hpp"
-#include "gui/ctrl/bus-term.hpp"
-#include "gui/ctrl/nexus.hpp"
+#include "stage/ctrl/state-recorder.hpp"
+#include "stage/ctrl/bus-term.hpp"
+#include "stage/ctrl/nexus.hpp"
 
 
 namespace gui {

src/stage/ctrl/facade.hpp

@@ -42,8 +42,8 @@
 #ifndef GUI_CTRL_FACADE_H
 #define GUI_CTRL_FACADE_H
 
-#include "gui/notification-service.hpp"
-#include "gui/display-service.hpp"
+#include "stage/notification-service.hpp"
+#include "stage/display-service.hpp"
 #include "lib/depend-inject.hpp"
 #include "lib/nocopy.hpp"
 

src/stage/ctrl/global-ctx.hpp

@@ -53,12 +53,12 @@
 #ifndef GUI_CTRL_GLOBAL_CTX_H
 #define GUI_CTRL_GLOBAL_CTX_H
 
-#include "gui/gtk-base.hpp"
-#include "gui/ui-bus.hpp"
-#include "gui/ctrl/ui-manager.hpp"
-#include "gui/ctrl/window-locator.hpp"
-#include "gui/interact/wizard.hpp"
-#include "gui/interact/interaction-director.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/ui-bus.hpp"
+#include "stage/ctrl/ui-manager.hpp"
+#include "stage/ctrl/window-locator.hpp"
+#include "stage/interact/wizard.hpp"
+#include "stage/interact/interaction-director.hpp"
 #include "lib/nocopy.hpp"
 
 

src/stage/ctrl/nexus.hpp

@@ -45,8 +45,8 @@
 #include "lib/idi/genfunc.hpp"
 #include "lib/diff/mutation-message.hpp"
 #include "lib/diff/tree-diff-application.hpp"
-#include "gui/ctrl/bus-term.hpp"
-#include "gui/model/tangible.hpp"
+#include "stage/ctrl/bus-term.hpp"
+#include "stage/model/tangible.hpp"
 #include "lib/idi/entry-id.hpp"
 
 #include <unordered_map>

src/stage/ctrl/notification-hub.hpp

@@ -62,10 +62,10 @@
 #ifndef GUI_CTRL_NOTIFICATION_HUB_H
 #define GUI_CTRL_NOTIFICATION_HUB_H
 
-#include "gui/widget/error-log-display.hpp"
+#include "stage/widget/error-log-display.hpp"
 #include "lib/diff/tree-mutator.hpp"
-#include "gui/model/controller.hpp"
-#include "gui/model/w-link.hpp"
+#include "stage/model/controller.hpp"
+#include "stage/model/w-link.hpp"
 
 #include <functional>
 

src/stage/ctrl/panel-locator.hpp

@@ -49,8 +49,8 @@
 #ifndef GUI_CTRL_PANEL_LOCATOR_H
 #define GUI_CTRL_PANEL_LOCATOR_H
 
-#include "gui/gtk-base.hpp"
-#include "gui/workspace/panel-manager.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/workspace/panel-manager.hpp"
 #include "lib/format-string.hpp"
 #include "lib/meta/util.hpp"
 #include "lib/nocopy.hpp"

src/stage/ctrl/playback-controller.cpp

@@ -29,8 +29,8 @@
  */
 
 
-#include "gui/ctrl/playback-controller.hpp"
-#include "gui/display-service.hpp"
+#include "stage/ctrl/playback-controller.hpp"
+#include "stage/display-service.hpp"
 #include "lib/error.hpp"
 #include "include/logging.h"
 

src/stage/ctrl/playback-controller.hpp

@@ -39,7 +39,7 @@
 #ifndef PLAYBACK_CONTROLLER_HPP
 #define PLAYBACK_CONTROLLER_HPP
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "include/dummy-player-facade.h"
 #include "include/display-facade.h"
 #include "lib/nocopy.hpp"

src/stage/ctrl/state-recorder.hpp

@@ -56,9 +56,9 @@
 #include "lib/error.hpp"
 #include "lib/idi/entry-id.hpp"
 #include "lib/diff/gen-node.hpp"
-#include "gui/ctrl/bus-term.hpp"
-#include "gui/ctrl/state-manager.hpp"
-#include "gui/ctrl/state-map-grouping-storage.hpp"
+#include "stage/ctrl/bus-term.hpp"
+#include "stage/ctrl/state-manager.hpp"
+#include "stage/ctrl/state-map-grouping-storage.hpp"
 #include "include/ui-protocol.hpp"
 
 #include <string>

src/stage/ctrl/ui-dispatcher.hpp

@@ -75,7 +75,7 @@
 #ifndef GUI_CTRL_UI_DISPATCHER_H
 #define GUI_CTRL_UI_DISPATCHER_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "lib/call-queue.hpp"
 #include "lib/format-string.hpp"
 #include "lib/nocopy.hpp"

src/stage/ctrl/ui-manager.cpp

@@ -33,13 +33,13 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/config-keys.hpp"
-#include "gui/ctrl/ui-manager.hpp"
-#include "gui/ctrl/global-ctx.hpp"
-#include "gui/ctrl/actions.hpp"
-#include "gui/ctrl/facade.hpp"
-#include "gui/workspace/ui-style.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/config-keys.hpp"
+#include "stage/ctrl/ui-manager.hpp"
+#include "stage/ctrl/global-ctx.hpp"
+#include "stage/ctrl/actions.hpp"
+#include "stage/ctrl/facade.hpp"
+#include "stage/workspace/ui-style.hpp"
 #include "lib/searchpath.hpp"
 #include "lib/util.hpp"
 

src/stage/ctrl/ui-manager.hpp

@@ -47,7 +47,7 @@
 #ifndef GUI_CTRL_UI_MANAGER_H
 #define GUI_CTRL_UI_MANAGER_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
 
 #include <functional>

src/stage/ctrl/ui-state.cpp

@@ -27,10 +27,10 @@
  */
 
 
-#include "gui/ctrl/ui-state.hpp"
-#include "gui/ctrl/state-manager.hpp"
-#include "gui/interact/focus-tracker.hpp"
-//#include "gui/ctrl/global-ctx.hpp"
+#include "stage/ctrl/ui-state.hpp"
+#include "stage/ctrl/state-manager.hpp"
+#include "stage/interact/focus-tracker.hpp"
+//#include "stage/ctrl/global-ctx.hpp"
 //#include "lib/util.hpp"
 
 //using util::cStr;

src/stage/ctrl/ui-state.hpp

@@ -54,7 +54,7 @@
 #ifndef GUI__H
 #define GUI__H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
 
 //#include <string>

src/stage/ctrl/window-locator.cpp

@@ -27,11 +27,11 @@
  */
 
 
-#include "gui/ctrl/global-ctx.hpp"
-#include "gui/ctrl/panel-locator.hpp"
-#include "gui/ctrl/window-locator.hpp"
-#include "gui/interact/elem-access-dir.hpp"
-#include "gui/workspace/workspace-window.hpp"
+#include "stage/ctrl/global-ctx.hpp"
+#include "stage/ctrl/panel-locator.hpp"
+#include "stage/ctrl/window-locator.hpp"
+#include "stage/interact/elem-access-dir.hpp"
+#include "stage/workspace/workspace-window.hpp"
 #include "lib/util.hpp"
 
 #include <memory>

src/stage/ctrl/window-locator.hpp

@@ -35,8 +35,8 @@
 #ifndef GUI_CTRL_WINDOW_LOCATOR_H
 #define GUI_CTRL_WINDOW_LOCATOR_H
 
-#include "gui/gtk-base.hpp"
-#include "gui/ctrl/panel-locator.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/ctrl/panel-locator.hpp"
 #include "lib/depend-inject.hpp"
 #include "lib/nocopy.hpp"
 

src/stage/dialog/name-chooser.cpp

@@ -27,9 +27,9 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/dialog/name-chooser.hpp"
-#include "gui/dialog/dialog.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/dialog/name-chooser.hpp"
+#include "stage/dialog/dialog.hpp"
 
 using namespace Gtk;         //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace Glib;        //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!

src/stage/dialog/name-chooser.hpp

@@ -29,7 +29,7 @@
 #ifndef GUI_DIALOG_NAME_CHOOSER_H
 #define GUI_DIALOG_NAME_CHOOSER_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 
 
 namespace gui {

src/stage/dialog/preferences-dialog.hpp

@@ -33,8 +33,8 @@
 #define GUI_DIALOG_PREFERENCES_DIALOG_H
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/dialog/dialog.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/dialog/dialog.hpp"
 
 namespace gui {
 namespace dialog {

src/stage/dialog/render.cpp

@@ -27,10 +27,10 @@
  */
 
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 
-#include "gui/dialog/render.hpp"
-#include "gui/dialog/dialog.hpp"
+#include "stage/dialog/render.hpp"
+#include "stage/dialog/dialog.hpp"
 #include "include/logging.h"
 
 

src/stage/dialog/render.hpp

@@ -29,7 +29,7 @@
 #ifndef GUI_DIALOG_RENDER_H
 #define GUI_DIALOG_RENDER_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 
 
 namespace gui {

src/stage/dialog/test-control.hpp

@@ -39,15 +39,15 @@
 #define GUI_DIALOG_TEST_CONTROL_H
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/dialog/dialog.hpp"
-#include "gui/ctrl/bus-term.hpp"
-#include "gui/model/tangible.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/dialog/dialog.hpp"
+#include "stage/ctrl/bus-term.hpp"
+#include "stage/model/tangible.hpp"
 #include "include/ui-protocol.hpp"
 
-#include "proc/cmd.hpp"
+#include "steam/cmd.hpp"
 #include "include/gui-notification-facade.h"
-#include "proc/mobject/session/dummy-session-connection.hpp"
+#include "steam/mobject/session/dummy-session-connection.hpp"
 
 #include "lib/test/test-helper.hpp"
 #include "lib/diff/gen-node.hpp"

src/stage/display-service.cpp

@@ -32,7 +32,7 @@
  */
 
 
-#include "gui/display-service.hpp"
+#include "stage/display-service.hpp"
 #include "lib/depend.hpp"
 
 extern "C" {

src/stage/draw/cairo-util.cpp

@@ -26,7 +26,7 @@
  */
 
 
-#include "gui/draw/cairo-util.hpp"
+#include "stage/draw/cairo-util.hpp"
 
 namespace gui {
 namespace draw {

src/stage/draw/rectangle.cpp

@@ -25,7 +25,7 @@
  ** Implementation of functions to work with rectangular screen ranges
  */
 
-#include "gui/draw/rectangle.hpp"
+#include "stage/draw/rectangle.hpp"
 #include <algorithm>
 
 

src/stage/draw/rectangle.hpp

@@ -29,7 +29,7 @@
 #ifndef GUI_DRAW_RECTANGLE_H
 #define GUI_DRAW_RECTANGLE_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 
 namespace gui {
 namespace draw {

src/stage/gtk-lumiera.cpp

@@ -46,13 +46,13 @@
  ** @see ui-manager.hpp
  */
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 
 #include "lib/error.hpp"
-#include "gui/ui-bus.hpp"
-#include "gui/guifacade.hpp"
-#include "gui/ctrl/ui-manager.hpp"
-#include "backend/thread-wrapper.hpp"
+#include "stage/ui-bus.hpp"
+#include "stage/guifacade.hpp"
+#include "stage/ctrl/ui-manager.hpp"
+#include "vault/thread-wrapper.hpp"
 #include "common/subsys.hpp"
 #include "lib/nocopy.hpp"
 

src/stage/id-scheme.hpp

@@ -56,7 +56,7 @@
 
 #include "lib/symbol.hpp"
 #include "lib/idi/entry-id.hpp"
-#include "gui/interact/view-spec-dsl.hpp"
+#include "stage/interact/view-spec-dsl.hpp"
 
 
 /* === forward declarations === */

src/stage/interact/cmd-context.cpp

@@ -32,7 +32,7 @@
 //#include "lib/util.hpp"
 //#include "lib/symbol.hpp"
 //#include "include/logging.h"
-#include "gui/interact/cmd-context.hpp"
+#include "stage/interact/cmd-context.hpp"
 
 //#include <string>
 //#include <map>

src/stage/interact/cmd-context.hpp

@@ -56,7 +56,7 @@
 
 #include "lib/error.hpp"
 #include "lib/nocopy.hpp"
-//#include "gui/ctrl/bus-term.hpp"
+//#include "stage/ctrl/bus-term.hpp"
 //#include "lib/idi/entry-id.hpp"
 #include "lib/hash-indexed.hpp"
 #include "lib/symbol.hpp"

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

@@ -43,9 +43,9 @@
 
 
 #include "lib/error.hpp"
-#include "gui/model/element-access.hpp"
-#include "gui/ctrl/window-locator.hpp"
-#include "gui/ctrl/panel-locator.hpp"
+#include "stage/model/element-access.hpp"
+#include "stage/ctrl/window-locator.hpp"
+#include "stage/ctrl/panel-locator.hpp"
 //#include "lib/symbol.hpp"
 //#include "lib/util.hpp"
 

src/stage/interact/focus-tracker.cpp

@@ -29,9 +29,9 @@
  */
 
 
-#include "gui/interact/focus-tracker.hpp"
-#include "gui/interact/navigator.hpp"
-//#include "gui/ctrl/global-ctx.hpp"
+#include "stage/interact/focus-tracker.hpp"
+#include "stage/interact/navigator.hpp"
+//#include "stage/ctrl/global-ctx.hpp"
 //#include "lib/util.hpp"
 
 //using util::cStr;

src/stage/interact/focus-tracker.hpp

@@ -54,7 +54,7 @@
 #ifndef GUI_INTERACT_FOCUS_TRACKER_H
 #define GUI_INTERACT_FOCUS_TRACKER_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
 
 //#include <string>

src/stage/interact/interaction-director.cpp

@@ -26,34 +26,34 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/ui-bus.hpp"
-#include "gui/ctrl/bus-term.hpp"
-#include "gui/ctrl/global-ctx.hpp"
-#include "gui/interact/interaction-director.hpp"
-#include "gui/interact/view-locator.hpp"
-#include "gui/interact/spot-locator.hpp"
-#include "gui/interact/navigator.hpp"
-#include "gui/interact/focus-tracker.hpp"
-#include "gui/interact/ui-coord-resolver.hpp"
-#include "gui/dialog/preferences-dialog.hpp"
-#include "gui/dialog/render.hpp"
-#include "gui/workspace/workspace-window.hpp"
-#include "gui/ctrl/ui-state.hpp"
-#include "gui/setting/asset-controller.hpp"
-#include "gui/panel/timeline-panel.hpp"
-//#include "gui/timeline/timeline-widget.hpp"
-//#include "gui/timeline/timeline-controller.hpp"   /////////////////TODO still required?
+#include "stage/gtk-base.hpp"
+#include "stage/ui-bus.hpp"
+#include "stage/ctrl/bus-term.hpp"
+#include "stage/ctrl/global-ctx.hpp"
+#include "stage/interact/interaction-director.hpp"
+#include "stage/interact/view-locator.hpp"
+#include "stage/interact/spot-locator.hpp"
+#include "stage/interact/navigator.hpp"
+#include "stage/interact/focus-tracker.hpp"
+#include "stage/interact/ui-coord-resolver.hpp"
+#include "stage/dialog/preferences-dialog.hpp"
+#include "stage/dialog/render.hpp"
+#include "stage/workspace/workspace-window.hpp"
+#include "stage/ctrl/ui-state.hpp"
+#include "stage/setting/asset-controller.hpp"
+#include "stage/panel/timeline-panel.hpp"
+//#include "stage/timeline/timeline-widget.hpp"
+//#include "stage/timeline/timeline-controller.hpp"   /////////////////TODO still required?
 #include "include/ui-protocol.hpp"
-#include "proc/mobject/session/root.hpp"
-#include "proc/asset/sequence.hpp"                ///////////////////////////////////////////////////////////TICKET #1096 : avoid direct inclusion to reduce compile times
-#include "proc/mobject/session/fork.hpp"          ///////////////////////////////////////////////////////////TICKET #1096 : avoid direct inclusion to reduce compile times
-#include "proc/cmd.hpp"
-#include "backend/real-clock.hpp"
+#include "steam/mobject/session/root.hpp"
+#include "steam/asset/sequence.hpp"                ///////////////////////////////////////////////////////////TICKET #1096 : avoid direct inclusion to reduce compile times
+#include "steam/mobject/session/fork.hpp"          ///////////////////////////////////////////////////////////TICKET #1096 : avoid direct inclusion to reduce compile times
+#include "steam/cmd.hpp"
+#include "vault/real-clock.hpp"
 #include "lib/diff/tree-mutator.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-obj.hpp"
-//#include "gui/ui-bus.hpp"
+//#include "stage/ui-bus.hpp"
 //#include "lib/util.hpp"
 
 //#include <memory>

src/stage/interact/interaction-director.hpp

@@ -53,8 +53,8 @@
 #ifndef GUI_INTERACT_INTERACTION_DIRECTOR_H
 #define GUI_INTERACT_INTERACTION_DIRECTOR_H
 
-#include "gui/model/controller.hpp"
-#include "gui/timeline/timeline-gui.hpp"
+#include "stage/model/controller.hpp"
+#include "stage/timeline/timeline-gui.hpp"
 #include "lib/depend-inject.hpp"
 
 //#include <string>

src/stage/interact/interaction-state.cpp

@@ -32,7 +32,7 @@
 //#include "lib/util.hpp"
 //#include "lib/symbol.hpp"
 //#include "include/logging.h"
-#include "gui/interact/interaction-state.hpp"
+#include "stage/interact/interaction-state.hpp"
 
 //#include <string>
 //#include <map>

src/stage/interact/interaction-state.hpp

@@ -40,7 +40,7 @@
 
 #include "lib/error.hpp"
 #include "lib/nocopy.hpp"
-#include "gui/ctrl/bus-term.hpp"
+#include "stage/ctrl/bus-term.hpp"
 #include "lib/idi/entry-id.hpp"
 //#include "lib/symbol.hpp"
 //#include "lib/util.hpp"

src/stage/interact/navigator.cpp

@@ -34,9 +34,9 @@
  */
 
 
-#include "gui/interact/navigator.hpp"
-#include "gui/interact/spot-locator.hpp"
-//#include "gui/ctrl/global-ctx.hpp"
+#include "stage/interact/navigator.hpp"
+#include "stage/interact/spot-locator.hpp"
+//#include "stage/ctrl/global-ctx.hpp"
 //#include "lib/util.hpp"
 
 //using util::cStr;

src/stage/interact/navigator.hpp

@@ -38,8 +38,8 @@
 #ifndef GUI_INTERACT_NAVIGATOR_H
 #define GUI_INTERACT_NAVIGATOR_H
 
-#include "gui/gtk-base.hpp"
-#include "gui/interact/ui-coord-resolver.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/interact/ui-coord-resolver.hpp"
 #include "lib/nocopy.hpp"
 
 //#include <string>

src/stage/interact/spot-locator.cpp

@@ -28,8 +28,8 @@
  */
 
 
-#include "gui/interact/spot-locator.hpp"
-//#include "gui/ctrl/global-ctx.hpp"
+#include "stage/interact/spot-locator.hpp"
+//#include "stage/ctrl/global-ctx.hpp"
 //#include "lib/util.hpp"
 
 //using util::cStr;

src/stage/interact/spot-locator.hpp

@@ -39,7 +39,7 @@
 #ifndef GUI_INTERACT_SPOT_LOCATOR_H
 #define GUI_INTERACT_SPOT_LOCATOR_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
 
 //#include <string>

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

@@ -28,7 +28,7 @@
  */
 
 
-#include "gui/interact/ui-coord-resolver.hpp"
+#include "stage/interact/ui-coord-resolver.hpp"
 #include "lib/util.hpp"
 
 using util::isnil;

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

@@ -118,7 +118,7 @@
 #include "lib/error.hpp"
 #include "lib/symbol.hpp"
 #include "lib/format-string.hpp"
-#include "gui/interact/ui-coord.hpp"
+#include "stage/interact/ui-coord.hpp"
 #include "lib/iter-tree-explorer.hpp"
 #include "lib/iter-source.hpp"
 #include "lib/depend.hpp"

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

@@ -71,8 +71,8 @@
 #include "lib/error.hpp"
 #include "lib/symbol.hpp"
 #include "lib/format-util.hpp"
-#include "gui/interact/ui-coord.hpp"
-#include "gui/interact/ui-coord-resolver.hpp"
+#include "stage/interact/ui-coord.hpp"
+#include "stage/interact/ui-coord-resolver.hpp"
 #include "lib/nocopy.hpp"
 
 #include <utility>

src/stage/interact/view-locator.cpp

@@ -39,13 +39,13 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/interact/view-locator.hpp"
-#include "gui/interact/view-spec-dsl.hpp"
-#include "gui/interact/ui-location-solver.hpp"
-#include "gui/ctrl/panel-locator.hpp"
-#include "gui/model/element-access.hpp"
-#include "gui/interact/ui-coord-resolver.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/interact/view-locator.hpp"
+#include "stage/interact/view-spec-dsl.hpp"
+#include "stage/interact/ui-location-solver.hpp"
+#include "stage/ctrl/panel-locator.hpp"
+#include "stage/model/element-access.hpp"
+#include "stage/interact/ui-coord-resolver.hpp"
 #include "lib/depend.hpp"
 #include "lib/symbol.hpp"
 //#include "lib/util.hpp"

src/stage/interact/view-locator.hpp

@@ -65,9 +65,9 @@
 #define GUI_INTERACT_VIEW_LOCATOR_H
 
 #include "lib/depend-inject.hpp"
-#include "gui/id-scheme.hpp"
-#include "gui/interact/view-spec-dsl.hpp"
-#include "gui/model/element-access.hpp"
+#include "stage/id-scheme.hpp"
+#include "stage/interact/view-spec-dsl.hpp"
+#include "stage/model/element-access.hpp"
 #include "lib/idi/genfunc.hpp"
 #include "lib/symbol.hpp"
 #include "lib/nocopy.hpp"

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

@@ -103,8 +103,8 @@
 #include "lib/meta/function.hpp"
 #include "lib/meta/tuple-helper.hpp"
 #include "lib/meta/function-closure.hpp"
-#include "gui/interact/ui-location-solver.hpp"
-#include "gui/interact/ui-coord.hpp"
+#include "stage/interact/ui-location-solver.hpp"
+#include "stage/interact/ui-coord.hpp"
 
 #include <functional>
 #include <utility>

src/stage/interact/wizard.cpp

@@ -28,15 +28,15 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/config-keys.hpp"
-#include "gui/interact/wizard.hpp"
-#include "gui/interact/spot-locator.hpp"
-#include "gui/workspace/workspace-window.hpp"
-#include "gui/panel/infobox-panel.hpp"
-#include "gui/dialog/test-control.hpp"
-#include "gui/ctrl/notification-hub.hpp"
-#include "gui/ctrl/global-ctx.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/config-keys.hpp"
+#include "stage/interact/wizard.hpp"
+#include "stage/interact/spot-locator.hpp"
+#include "stage/workspace/workspace-window.hpp"
+#include "stage/panel/infobox-panel.hpp"
+#include "stage/dialog/test-control.hpp"
+#include "stage/ctrl/notification-hub.hpp"
+#include "stage/ctrl/global-ctx.hpp"
 #include "lib/format-string.hpp"
 //#include "lib/util.hpp"
 

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

@@ -28,8 +28,8 @@
  */
 
 
-#include "gui/interact/work-site-trail.hpp"
-//#include "gui/ctrl/global-ctx.hpp"
+#include "stage/interact/work-site-trail.hpp"
+//#include "stage/ctrl/global-ctx.hpp"
 //#include "lib/util.hpp"
 
 //using util::cStr;

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

@@ -40,7 +40,7 @@
 #ifndef GUI_INTERACT_WORK_SITE_TRAIL_H
 #define GUI_INTERACT_WORK_SITE_TRAIL_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
 
 //#include <string>

src/stage/interact/work-site.cpp

@@ -29,8 +29,8 @@
  */
 
 
-#include "gui/interact/work-site.hpp"
-//#include "gui/ctrl/global-ctx.hpp"
+#include "stage/interact/work-site.hpp"
+//#include "stage/ctrl/global-ctx.hpp"
 //#include "lib/util.hpp"
 
 //using util::cStr;

src/stage/interact/work-site.hpp

@@ -45,7 +45,7 @@
 #ifndef GUI_INTERACT_WORK_SITE_H
 #define GUI_INTERACT_WORK_SITE_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "lib/nocopy.hpp"
 
 //#include <string>

src/stage/model/clip-track.hpp

@@ -31,7 +31,7 @@
 #ifndef CLIP_TRACK_HPP
 #define CLIP_TRACK_HPP
 
-#include "gui/model/track.hpp"
+#include "stage/model/track.hpp"
 #include "lib/observable-list.hpp"
 
 namespace gui {

src/stage/model/clip.cpp

@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/model/clip.hpp"
+#include "stage/model/clip.hpp"
 #include "lib/time/mutation.hpp"
 
 using lib::time::FSecs;

src/stage/model/clip.hpp

@@ -30,7 +30,7 @@
 #ifndef GUI_MODEL_CLIP_H
 #define GUI_MODEL_CLIP_H
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 #include "lib/time/timevalue.hpp"
 
 #include <string>

src/stage/model/controller.hpp

@@ -40,7 +40,7 @@
 
 
 #include "lib/error.hpp"
-#include "gui/model/tangible.hpp"
+#include "stage/model/tangible.hpp"
 //#include "lib/symbol.hpp"
 //#include "lib/util.hpp"
 

src/stage/model/element-access.hpp

@@ -59,7 +59,7 @@
 #include "lib/variant.hpp"
 #include "lib/meta/typelist-manip.hpp"
 #include "lib/access-casted.hpp"
-#include "gui/interact/ui-coord.hpp"
+#include "stage/interact/ui-coord.hpp"
 
 #include <string>
 

src/stage/model/flash-deco.hpp

@@ -41,8 +41,8 @@
 #define GUI_MODEL_FLASH_DECO_H
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/style-scheme.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/style-scheme.hpp"
 
 
 namespace gui {

src/stage/model/group-track.hpp

@@ -31,7 +31,7 @@
 #ifndef GROUP_TRACK_HPP
 #define GROUP_TRACK_HPP
 
-#include "gui/model/parent-track.hpp"
+#include "stage/model/parent-track.hpp"
 
 
 namespace gui {

src/stage/model/parent-track.hpp

@@ -31,7 +31,7 @@
 #ifndef PARENT_TRACK_HPP
 #define PARENT_TRACK_HPP
 
-#include "gui/model/track.hpp"
+#include "stage/model/track.hpp"
 #include "lib/observable-list.hpp"
 
 namespace gui {

src/stage/model/project.cpp

@@ -30,8 +30,8 @@
  */
 
 
-#include "gui/model/project.hpp"
-#include "gui/model/sequence.hpp"
+#include "stage/model/project.hpp"
+#include "stage/model/sequence.hpp"
 
 #include <memory>
 

src/stage/model/project.hpp

@@ -34,7 +34,7 @@
 #define PROJECT_HPP
 
 
-#include "gui/model/sequence.hpp"
+#include "stage/model/sequence.hpp"
 #include "lib/observable-list.hpp"
 
 namespace gui {

src/stage/model/sequence.cpp

@@ -27,14 +27,14 @@
  **          and will be replaced in entirety by UI-Bus and diff framework.
  */
 
-#include "gui/model/sequence.hpp"
+#include "stage/model/sequence.hpp"
 #include "include/logging.h"
 
 #include <memory>
 
 // TEST CODE
-#include "gui/model/group-track.hpp"
-#include "gui/model/clip-track.hpp"
+#include "stage/model/group-track.hpp"
+#include "stage/model/clip-track.hpp"
 
 
 namespace gui {

src/stage/model/sequence.hpp

@@ -34,7 +34,7 @@
 #ifndef SEQUENCE_HPP
 #define SEQUENCE_HPP
 
-#include "gui/model/parent-track.hpp"
+#include "stage/model/parent-track.hpp"
 #include "lib/hash-indexed.hpp"
 
 #include <string>

src/stage/model/session-facade.cpp

@@ -38,7 +38,7 @@
 //#include "lib/util.hpp"
 //#include "lib/symbol.hpp"
 //#include "include/logging.h"
-#include "gui/model/session-facade.hpp"
+#include "stage/model/session-facade.hpp"
 #include "lib/depend.hpp"
 
 //#include <string>

src/stage/model/tangible.cpp

@@ -30,9 +30,9 @@
  */
 
 
-#include "gui/model/tangible.hpp"
-#include "gui/model/widget.hpp"
-#include "gui/model/controller.hpp"
+#include "stage/model/tangible.hpp"
+#include "stage/model/widget.hpp"
+#include "stage/model/controller.hpp"
 #include "include/ui-protocol.hpp"
 #include "lib/diff/gen-node.hpp"
 

src/stage/model/tangible.hpp

@@ -132,8 +132,8 @@
 
 #include "lib/error.hpp"
 #include "lib/nocopy.hpp"
-#include "gui/ctrl/bus-term.hpp"
-#include "gui/model/expander-revealer.hpp"
+#include "stage/ctrl/bus-term.hpp"
+#include "stage/model/expander-revealer.hpp"
 #include "lib/diff/diff-mutable.hpp"
 #include "lib/idi/entry-id.hpp"
 #include "lib/symbol.hpp"

src/stage/model/track.cpp

@@ -29,8 +29,8 @@
  */
 
 
-#include "gui/model/track.hpp"
-#include "gui/model/parent-track.hpp"
+#include "stage/model/track.hpp"
+#include "stage/model/parent-track.hpp"
 
 #include <boost/foreach.hpp>
 #include <memory>

src/stage/model/track.hpp

@@ -28,7 +28,7 @@
  */
 
 
-#include "gui/gtk-base.hpp"
+#include "stage/gtk-base.hpp"
 
 #include <memory>
 #include <list>

src/stage/model/widget.hpp

@@ -37,7 +37,7 @@
 
 
 #include "lib/error.hpp"
-#include "gui/model/tangible.hpp"
+#include "stage/model/tangible.hpp"
 //#include "lib/symbol.hpp"
 //#include "lib/util.hpp"
 

src/stage/notification-service.cpp

@@ -52,10 +52,10 @@
 
 
 
-#include "gui/ctrl/ui-manager.hpp"
-#include "gui/ctrl/ui-dispatcher.hpp"
-#include "gui/notification-service.hpp"
-#include "gui/interact/wizard.hpp"
+#include "stage/ctrl/ui-manager.hpp"
+#include "stage/ctrl/ui-dispatcher.hpp"
+#include "stage/notification-service.hpp"
+#include "stage/interact/wizard.hpp"
 #include "include/ui-protocol.hpp"
 
 #include "lib/diff/mutation-message.hpp"

src/stage/notification-service.hpp

@@ -42,7 +42,7 @@
 
 #include "include/gui-notification-facade.h"
 #include "common/instancehandle.hpp"
-#include "gui/ctrl/bus-term.hpp"
+#include "stage/ctrl/bus-term.hpp"
 
 #include <memory>
 

src/stage/output/displayer.cpp

@@ -35,10 +35,10 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/output/displayer.hpp"
-#include "gui/output/xvdisplayer.hpp"
-#include "gui/output/gdkdisplayer.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/output/displayer.hpp"
+#include "stage/output/xvdisplayer.hpp"
+#include "stage/output/gdkdisplayer.hpp"
 
 namespace gui {
 namespace output {

src/stage/output/gdkdisplayer.cpp

@@ -30,8 +30,8 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/output/gdkdisplayer.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/output/gdkdisplayer.hpp"
 
 #if false  ///////////////////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display
 #include <gdk/gdkx.h>

src/stage/output/gdkdisplayer.hpp

@@ -33,8 +33,8 @@
 #ifndef GUI_OUTPUT_GDKDISPLAYER_H
 #define GUI_OUTPUT_GDKDISPLAYER_H
 
-#include "gui/gtk-base.hpp"
-#include "gui/output/displayer.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/output/displayer.hpp"
 
 namespace Gtk {
   class Widget;

src/stage/output/xvdisplayer.cpp

@@ -33,8 +33,8 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/output/xvdisplayer.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/output/xvdisplayer.hpp"
 #include "include/logging.h"
 
 #include <gdk/gdkx.h>

src/stage/output/xvdisplayer.hpp

@@ -38,8 +38,8 @@
 #define GUI_OUTPUT_XVDISPLAYER_H
 
 
-#include "gui/output/displayer.hpp"
-#include "gui/gtk-base.hpp"
+#include "stage/output/displayer.hpp"
+#include "stage/gtk-base.hpp"
 
 #include <X11/Xlib.h>
 #include <sys/ipc.h>

src/stage/panel/assets-panel.cpp

@@ -25,8 +25,8 @@
  ** Implementation of a (dockable) panel to organise the assets of a project.
  */
 
-#include "gui/gtk-base.hpp"
-#include "gui/panel/assets-panel.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/panel/assets-panel.hpp"
 
 namespace gui  {
 namespace panel{

src/stage/panel/assets-panel.hpp

@@ -37,7 +37,7 @@
 #define GUI_PANEL_ASSETS_PANEL_H
 
 
-#include "gui/panel/panel.hpp"
+#include "stage/panel/panel.hpp"
 
 namespace gui  {
 namespace panel{

src/stage/panel/infobox-panel.cpp

@@ -25,9 +25,9 @@
  ** Implementation of a (dockable) panel to display and manipulate parameters.
  */
 
-#include "gui/gtk-base.hpp"
-#include "gui/panel/infobox-panel.hpp"
-#include "gui/widget/error-log-display.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/panel/infobox-panel.hpp"
+#include "stage/widget/error-log-display.hpp"
 
 
 namespace gui  {

src/stage/panel/infobox-panel.hpp

@@ -35,7 +35,7 @@
 #define GUI_PANEL_INFOBOX_PANEL_H
 
 
-#include "gui/panel/panel.hpp"
+#include "stage/panel/panel.hpp"
 
 #include <memory>
 

src/stage/panel/panel.cpp

@@ -26,10 +26,10 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/panel/panel.hpp"
-#include "gui/workspace/panel-manager.hpp"
-#include "gui/workspace/workspace-window.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/panel/panel.hpp"
+#include "stage/workspace/panel-manager.hpp"
+#include "stage/workspace/workspace-window.hpp"
 
 #include <gdl/gdl-dock-item-grip.h>
 

src/stage/panel/panel.hpp

@@ -30,8 +30,8 @@
 #ifndef GUI_PANEL_PANEL_H
 #define GUI_PANEL_PANEL_H
 
-#include "gui/gtk-base.hpp"
-#include "gui/widget/panel-bar.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/widget/panel-bar.hpp"
 
 #include <gdlmm.h>
 

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

@@ -21,13 +21,13 @@
 * *****************************************************/
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/panel/timeline-panel-obsolete.hpp"
-#include "gui/widget/timeline/timeline-zoom-scale.hpp"
-#include "gui/workspace/workspace-window.hpp"
-#include "gui/ctrl/playback-controller.hpp"
-#include "gui/model/project.hpp"
-#include "gui/ui-bus.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/panel/timeline-panel-obsolete.hpp"
+#include "stage/widget/timeline/timeline-zoom-scale.hpp"
+#include "stage/workspace/workspace-window.hpp"
+#include "stage/ctrl/playback-controller.hpp"
+#include "stage/model/project.hpp"
+#include "stage/ui-bus.hpp"
 
 #include "lib/util.hpp"
 

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

@@ -29,12 +29,12 @@
 #ifndef GUI_PANEL_TIMELINE_PANEL_OBSOLETE_H
 #define GUI_PANEL_TIMELINE_PANEL_OBSOLETE_H
 
-#include "gui/panel/panel.hpp"
-#include "gui/widget/timecode-widget.hpp"
-#include "gui/widget/timeline-widget.hpp"
-#include "gui/widget/timeline/timeline-zoom-scale.hpp"
-#include "gui/model/project.hpp"
-#include "gui/ui-bus.hpp"   ////////////TODO for the obsolete Controller
+#include "stage/panel/panel.hpp"
+#include "stage/widget/timecode-widget.hpp"
+#include "stage/widget/timeline-widget.hpp"
+#include "stage/widget/timeline/timeline-zoom-scale.hpp"
+#include "stage/model/project.hpp"
+#include "stage/ui-bus.hpp"   ////////////TODO for the obsolete Controller
 
 #include "lib/time/timevalue.hpp"
 #include "lib/util-coll.hpp"

src/stage/panel/timeline-panel.cpp

@@ -31,10 +31,10 @@
  */
 
 
-#include "gui/gtk-base.hpp"
-#include "gui/panel/timeline-panel.hpp"
-#include "gui/timeline/timeline-widget.hpp"
-#include "gui/timeline/timeline-widget-empty.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/panel/timeline-panel.hpp"
+#include "stage/timeline/timeline-widget.hpp"
+#include "stage/timeline/timeline-widget-empty.hpp"
 
 using std::make_unique;
 

src/stage/panel/timeline-panel.hpp

@@ -41,8 +41,8 @@
 #ifndef GUI_PANEL_TIMELINE_PANEL_H
 #define GUI_PANEL_TIMELINE_PANEL_H
 
-#include "gui/panel/panel.hpp"
-#include "gui/timeline/timeline-widget.hpp"
+#include "stage/panel/panel.hpp"
+#include "stage/timeline/timeline-widget.hpp"
 
 #include <gtkmm/notebook.h>
 #include <memory>

src/stage/panel/viewer-panel.cpp

@@ -25,12 +25,12 @@
  ** Implementation of a dockable panel to hold the video viewers
  */
 
-#include "gui/gtk-base.hpp"
-#include "gui/panel/viewer-panel.hpp"
+#include "stage/gtk-base.hpp"
+#include "stage/panel/viewer-panel.hpp"
 
-#include "gui/workspace/workspace-window.hpp"
-#include "gui/ui-bus.hpp"  ///////////////////////////////////TODO why are we forced to include this after workspace-window.hpp ??  Ambiguity between std::ref and boost::reference_wrapper
-#include "gui/display-service.hpp"
+#include "stage/workspace/workspace-window.hpp"
+#include "stage/ui-bus.hpp"  ///////////////////////////////////TODO why are we forced to include this after workspace-window.hpp ??  Ambiguity between std::ref and boost::reference_wrapper
+#include "stage/display-service.hpp"
 
 
 using namespace Gtk;                   ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!