Replace relative #include paths with absolute paths.

src/gui/dialogs/name-chooser.cpp

@@ -20,7 +20,7 @@
 
 * *****************************************************/
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 #include "name-chooser.hpp"
 #include "dialog.hpp"
 

src/gui/dialogs/name-chooser.hpp

@@ -27,7 +27,7 @@
 #ifndef NAME_CHOOSER_H
 #define NAME_CHOOSER_H
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 namespace gui {
 namespace dialogs {

src/gui/dialogs/preferences-dialog.cpp

@@ -20,7 +20,7 @@
 
 * *****************************************************/
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 #include "preferences-dialog.hpp"
 #include "dialog.hpp"

src/gui/dialogs/preferences-dialog.hpp

@@ -27,7 +27,7 @@
 #ifndef PREFERENCES_DIALOG_HPP
 #define PREFERENCES_DIALOG_HPP
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 namespace gui {
 namespace dialogs {

src/gui/dialogs/render.cpp

@@ -20,7 +20,7 @@
 
 * *****************************************************/
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 #include "render.hpp"
 #include "dialog.hpp"

src/gui/dialogs/render.hpp

@@ -27,7 +27,7 @@
 #ifndef RENDER_HPP
 #define RENDER_HPP
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 namespace gui {
 namespace dialogs {

src/gui/model/track.hpp

@@ -24,7 +24,7 @@
  ** represents a track, and wraps proc layer data
  */
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 #ifndef TRACK_HPP
 #define TRACK_HPP

src/gui/output/displayer.cpp

@@ -22,7 +22,7 @@
 
 * *****************************************************/
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 #include "displayer.hpp"
 #include "xvdisplayer.hpp"
 #include "gdkdisplayer.hpp"

src/gui/output/gdkdisplayer.cpp

@@ -22,7 +22,7 @@
 
 * *****************************************************/
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 #include <gdk/gdkx.h>
 #include <iostream>

src/gui/output/xvdisplayer.cpp

@@ -22,7 +22,7 @@
 
 * *****************************************************/
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 #include <gdk/gdkx.h>
 

src/gui/panels/assets-panel.cpp

@@ -20,7 +20,7 @@
 
 * *****************************************************/
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 #include "assets-panel.hpp"
 
 namespace gui {

src/gui/panels/panel.cpp

@@ -20,12 +20,14 @@
 
 * *****************************************************/
 
-#include "panel.hpp"
-#include "../gtk-lumiera.hpp"
-#include "../workspace/panel-manager.hpp"
-#include "../workspace/workspace-window.hpp"
 #include <gdl/gdl-dock-item-grip.h>
 
+#include "gui/gtk-lumiera.hpp"
+#include "gui/workspace/panel-manager.hpp"
+#include "gui/workspace/workspace-window.hpp"
+
+#include "panel.hpp"
+
 using namespace Gtk;
 
 namespace gui {

src/gui/panels/panel.hpp

@@ -27,10 +27,10 @@
 #ifndef PANEL_HPP
 #define PANEL_HPP
 
-#include "../gtk-lumiera.hpp"
 #include <gdl/gdl-dock-item.h>
 
-#include "../widgets/panel-bar.hpp"
+#include "gui/gtk-lumiera.hpp"
+#include "gui/widgets/panel-bar.hpp"
 
 namespace gui {
 

src/gui/panels/timeline-panel.cpp

@@ -22,15 +22,15 @@
 
 #include <boost/foreach.hpp>
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 #include "timeline-panel.hpp"
 
-#include "../workspace/workspace-window.hpp"
-#include "../model/project.hpp"
-#include "../controller/controller.hpp"
+#include "gui/workspace/workspace-window.hpp"
+#include "gui/model/project.hpp"
+#include "gui/controller/controller.hpp"
 
 extern "C" {
-#include "../../lib/time.h"
+#include "lib/time.h"
 }
 
 using namespace Gtk;

src/gui/panels/timeline-panel.hpp

@@ -27,8 +27,8 @@
 #define TIMELINE_PANEL_HPP
 
 #include "panel.hpp"
-#include "../widgets/timecode-widget.hpp"
-#include "../widgets/timeline-widget.hpp"
+#include "gui/widgets/timecode-widget.hpp"
+#include "gui/widgets/timeline-widget.hpp"
 
 using namespace gui::widgets;
 

src/gui/panels/viewer-panel.cpp

@@ -20,14 +20,14 @@
 
 * *****************************************************/
 
-#include "../gtk-lumiera.hpp"
-#include "viewer-panel.hpp"
-
-#include "../workspace/workspace-window.hpp"
-#include "../controller/controller.hpp"
-#include "../controller/playback-controller.hpp"
+#include "gui/gtk-lumiera.hpp"
 
+#include "gui/controller/controller.hpp"
+#include "gui/controller/playback-controller.hpp"
 #include "gui/display-service.hpp"
+#include "gui/workspace/workspace-window.hpp"
+
+#include "viewer-panel.hpp"
 
 using namespace Gtk;
 using namespace gui::widgets;

src/gui/panels/viewer-panel.hpp

@@ -29,7 +29,7 @@
 #include <gtkmm.h>
 
 #include "panel.hpp"
-#include "../widgets/video-display-widget.hpp"
+#include "gui/widgets/video-display-widget.hpp"
 
 namespace gui {
 namespace panels {

src/gui/util/rectangle.hpp

@@ -27,7 +27,7 @@
 #ifndef RECTANGLE_HPP
 #define RECTANGLE_HPP
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 namespace gui {
 namespace util {

src/gui/widgets/panel-bar.cpp

@@ -21,10 +21,10 @@
 * *****************************************************/
 
 #include "panel-bar.hpp"
-#include "../workspace/workspace-window.hpp"
-#include "../workspace/panel-manager.hpp"
-#include "../panels/panel.hpp"
-#include "../util/rectangle.hpp"
+#include "gui/workspace/workspace-window.hpp"
+#include "gui/workspace/panel-manager.hpp"
+#include "gui/panels/panel.hpp"
+#include "gui/util/rectangle.hpp"
 
 #include <nobug.h>
 #include <algorithm>

src/gui/widgets/timecode-widget.cpp

@@ -31,7 +31,7 @@
 #include <sigc++/bind.h>
 
 #include "timecode-widget.hpp"
-#include "../util/convert.hpp"
+#include "gui/util/convert.hpp"
 
 using namespace sigc;
 using namespace Gtk;

src/gui/widgets/timeline-widget.hpp

@@ -37,7 +37,7 @@
 #include "timeline/timeline-clip-track.hpp"
 #include "timeline/timeline-layout-helper.hpp"
 
-#include "../model/sequence.hpp"
+#include "gui/model/sequence.hpp"
 
 namespace gui {
 namespace widgets {

src/gui/widgets/timeline/timeline-body.cpp

@@ -24,9 +24,9 @@
 #include <boost/foreach.hpp>
 
 #include "timeline-body.hpp"
-#include "../timeline-widget.hpp"
-#include "../../window-manager.hpp"
-#include "../../util/cairo-util.hpp"
+#include "gui/widgets/timeline-widget.hpp"
+#include "gui/window-manager.hpp"
+#include "gui/util/cairo-util.hpp"
 
 #include "timeline-arrow-tool.hpp"
 #include "timeline-ibeam-tool.hpp"

src/gui/widgets/timeline/timeline-body.hpp

@@ -26,7 +26,7 @@
 #ifndef TIMELINE_BODY_HPP
 #define TIMELINE_BODY_HPP
 
-#include "../../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 #include "timeline-tool.hpp"
 
 namespace gui {

src/gui/widgets/timeline/timeline-clip-track.hpp

@@ -31,7 +31,7 @@
 #include <vector>
 
 #include "timeline-track.hpp"
-#include "../../model/clip-track.hpp"
+#include "gui/model/clip-track.hpp"
 
 namespace gui {
 namespace widgets {

src/gui/widgets/timeline/timeline-clip.hpp

@@ -24,8 +24,8 @@
  */
  
 
-#include "../../gtk-lumiera.hpp"
-#include "../../model/clip.hpp"
+#include "gui/gtk-lumiera.hpp"
+#include "gui/model/clip.hpp"
 #include "timeline-view-window.hpp"
 #include "include/logging.h"
 

src/gui/widgets/timeline/timeline-group-track.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 #include "timeline-group-track.hpp"
-#include "../timeline-widget.hpp"
+#include "gui/widgets/timeline-widget.hpp"
 
 using namespace Gtk;
 using namespace boost;

src/gui/widgets/timeline/timeline-group-track.hpp

@@ -27,7 +27,7 @@
 #define TIMELINE_GROUP_TRACK_HPP
 
 #include "timeline-track.hpp"
-#include "../../model/group-track.hpp"
+#include "gui/model/group-track.hpp"
 
 namespace gui {
 namespace widgets {

src/gui/widgets/timeline/timeline-header-container.cpp

@@ -25,8 +25,8 @@
 
 #include "timeline-header-container.hpp"
 #include "timeline-track.hpp"
-#include "../timeline-widget.hpp"
-#include "../../util/rectangle.hpp"
+#include "gui/widgets/timeline-widget.hpp"
+#include "gui/util/rectangle.hpp"
 
 using namespace Gtk;
 using namespace std;

src/gui/widgets/timeline/timeline-header-container.hpp

@@ -28,7 +28,7 @@
 #ifndef HEADER_CONTAINER_HPP
 #define HEADER_CONTAINER_HPP
 
-#include "../../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 #include "timeline-layout-helper.hpp"
 
 namespace gui {

src/gui/widgets/timeline/timeline-header-widget.cpp

@@ -23,8 +23,8 @@
 
 #include <boost/foreach.hpp>
 
-#include "../timeline-widget.hpp"
-#include "../../util/rectangle.hpp"
+#include "gui/widgets/timeline-widget.hpp"
+#include "gui/util/rectangle.hpp"
 
 using namespace Gtk;
 using namespace std;

src/gui/widgets/timeline/timeline-header-widget.hpp

@@ -27,7 +27,7 @@
 #ifndef HEADER_WIDGET_HPP
 #define HEADER_WIDGET_HPP
 
-#include "../../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 namespace gui {  
 namespace widgets {

src/gui/widgets/timeline/timeline-ibeam-tool.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 #include "timeline-ibeam-tool.hpp"
-#include "../timeline-widget.hpp"
+#include "gui/widgets/timeline-widget.hpp"
 
 using namespace boost;
 using namespace gui::widgets;

src/gui/widgets/timeline/timeline-layout-helper.cpp

@@ -24,9 +24,9 @@
 #include <boost/foreach.hpp>
 
 #include "timeline-layout-helper.hpp"
-#include "../timeline-widget.hpp"
-#include "../../model/sequence.hpp"
-#include "../../util/rectangle.hpp"
+#include "gui/widgets/timeline-widget.hpp"
+#include "gui/model/sequence.hpp"
+#include "gui/util/rectangle.hpp"
 
 using namespace Gtk;
 using namespace std;

src/gui/widgets/timeline/timeline-layout-helper.hpp

@@ -27,8 +27,8 @@
 #ifndef TIMELINE_LAYOUT_HELPER_HPP
 #define TIMELINE_LAYOUT_HELPER_HPP
 
-#include "../../gtk-lumiera.hpp"
-#include "../../../lib/tree.hpp"
+#include "gui/gtk-lumiera.hpp"
+#include "lib/tree.hpp"
 
 namespace gui {
 

src/gui/widgets/timeline/timeline-ruler.cpp

@@ -23,12 +23,12 @@
 #include <cairomm-1.0/cairomm/cairomm.h>
 
 #include "timeline-ruler.hpp"
-#include "../timeline-widget.hpp"
-#include "../../window-manager.hpp"
-#include "../../util/cairo-util.hpp"
+#include "gui/widgets/timeline-widget.hpp"
+#include "gui/window-manager.hpp"
+#include "gui/util/cairo-util.hpp"
 
 extern "C" {
-#include "../../../lib/time.h"
+#include "lib/time.h"
 }
 
 using namespace Gtk;

src/gui/widgets/timeline/timeline-ruler.hpp

@@ -27,7 +27,7 @@
 #ifndef TIMELINE_RULER_HPP
 #define TIMELINE_RULER_HPP
 
-#include "../../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 namespace gui {
 namespace widgets {

src/gui/widgets/timeline/timeline-tool.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 #include "timeline-tool.hpp"
-#include "../timeline-widget.hpp"
+#include "gui/widgets/timeline-widget.hpp"
 
 using namespace Gdk;
 using namespace boost;

src/gui/widgets/timeline/timeline-tool.hpp

@@ -27,7 +27,7 @@
 #ifndef TIMELINE_TOOL_HPP
 #define TIMELINE_TOOL_HPP
 
-#include "../../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 namespace gui {
 namespace widgets {

src/gui/widgets/timeline/timeline-track.cpp

@@ -21,9 +21,9 @@
 * *****************************************************/
 
 #include "timeline-track.hpp"
-#include "../timeline-widget.hpp"
-#include "../../window-manager.hpp"
-#include "../../dialogs/name-chooser.hpp"
+#include "gui/widgets/timeline-widget.hpp"
+#include "gui/window-manager.hpp"
+#include "gui/dialogs/name-chooser.hpp"
 #include "include/logging.h"
 
 using namespace boost;

src/gui/widgets/timeline/timeline-track.hpp

@@ -23,11 +23,11 @@
  ** This file contains the definition of timeline track object
  */
 
-#include "../../gtk-lumiera.hpp"
-#include "../../model/track.hpp"
-#include "../menu-button.hpp"
-#include "../mini-button.hpp"
-#include "../button-bar.hpp"
+#include "gui/gtk-lumiera.hpp"
+#include "gui/model/track.hpp"
+#include "gui/widgets/menu-button.hpp"
+#include "gui/widgets/mini-button.hpp"
+#include "gui/widgets/button-bar.hpp"
 #include "timeline-header-container.hpp"
 #include "timeline-header-widget.hpp"
 

src/gui/widgets/timeline/timeline-view-window.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 #include "timeline-view-window.hpp"
-#include "../timeline-widget.hpp"
+#include "gui/widgets/timeline-widget.hpp"
 
 using namespace Gtk;
 using namespace gui::widgets;

src/gui/widgets/timeline/timeline-view-window.hpp

@@ -27,7 +27,7 @@
 #ifndef TIMELINE_VIEW_WINDOW_HPP
 #define TIMELINE_VIEW_WINDOW_HPP
 
-#include "../../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 namespace gui {
 namespace widgets {

src/gui/widgets/video-display-widget.cpp

@@ -24,10 +24,9 @@
 #include <gdkmm/general.h>
 #include <cairomm-1.0/cairomm/cairomm.h>
 
-#include "../gtk-lumiera.hpp"
-
-#include "../output/xvdisplayer.hpp"
-#include "../output/gdkdisplayer.hpp"
+#include "gui/gtk-lumiera.hpp"
+#include "gui/output/xvdisplayer.hpp"
+#include "gui/output/gdkdisplayer.hpp"
 
 #include "video-display-widget.hpp"
 

src/gui/widgets/video-display-widget.hpp

@@ -28,7 +28,7 @@
 
 #include <gtkmm.h>
 
-#include "../output/displayer.hpp"
+#include "gui/output/displayer.hpp"
 
 using namespace gui::output;
 

src/gui/workspace/actions.cpp

@@ -23,13 +23,13 @@
 #include "actions.hpp"
 #include "workspace-window.hpp"
 
-#include "../window-manager.hpp"
+#include "gui/window-manager.hpp"
 
-#include "../dialogs/render.hpp"
-#include "../dialogs/preferences-dialog.hpp"
-#include "../dialogs/name-chooser.hpp"
+#include "gui/dialogs/render.hpp"
+#include "gui/dialogs/preferences-dialog.hpp"
+#include "gui/dialogs/name-chooser.hpp"
 
-#include "../model/project.hpp"
+#include "gui/model/project.hpp"
 
 #include "include/logging.h"
 

src/gui/workspace/actions.hpp

@@ -29,7 +29,7 @@
 #ifndef ACTIONS_HPP
 #define ACTIONS_HPP
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 
 namespace gui {
 namespace workspace {

src/gui/workspace/panel-manager.cpp

@@ -22,9 +22,9 @@
 
 #include "panel-manager.hpp"
 
-#include "../panels/assets-panel.hpp"
-#include "../panels/viewer-panel.hpp"
-#include "../panels/timeline-panel.hpp"
+#include "gui/panels/assets-panel.hpp"
+#include "gui/panels/viewer-panel.hpp"
+#include "gui/panels/timeline-panel.hpp"
 
 #include "include/logging.h"
 

src/gui/workspace/panel-manager.hpp

@@ -31,7 +31,7 @@
 #include <gdl/gdl.h>
 #include <typeinfo>
 
-#include "../panels/panel.hpp"
+#include "gui/panels/panel.hpp"
 
 using namespace gui::panels;
 

src/gui/workspace/workspace-window.cpp

@@ -32,7 +32,7 @@
 #include <gdl/gdl-dock-item.h>
 #include <gdl/gdl-dock-placeholder.h>
 
-#include "../gtk-lumiera.hpp"
+#include "gui/gtk-lumiera.hpp"
 #include "workspace-window.hpp"
 #include "include/logging.h"
 

src/gui/workspace/workspace-window.hpp

@@ -34,9 +34,9 @@
 #include "actions.hpp"
 #include "panel-manager.hpp"
 
-#include "../panels/assets-panel.hpp"
-#include "../panels/viewer-panel.hpp"
-#include "../panels/timeline-panel.hpp"
+#include "gui/panels/assets-panel.hpp"
+#include "gui/panels/viewer-panel.hpp"
+#include "gui/panels/timeline-panel.hpp"
 
 using namespace gui::panels;