From 7a5ed1220d18b3fe2db1be455fa86fa28d1dbc04 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 27 Dec 2010 05:50:40 +0100 Subject: [PATCH] Replace relative #include paths with absolute paths. --- src/gui/dialogs/name-chooser.cpp | 2 +- src/gui/dialogs/name-chooser.hpp | 2 +- src/gui/dialogs/preferences-dialog.cpp | 2 +- src/gui/dialogs/preferences-dialog.hpp | 2 +- src/gui/dialogs/render.cpp | 2 +- src/gui/dialogs/render.hpp | 2 +- src/gui/model/track.hpp | 2 +- src/gui/output/displayer.cpp | 2 +- src/gui/output/gdkdisplayer.cpp | 2 +- src/gui/output/xvdisplayer.cpp | 2 +- src/gui/panels/assets-panel.cpp | 2 +- src/gui/panels/panel.cpp | 10 ++++++---- src/gui/panels/panel.hpp | 4 ++-- src/gui/panels/timeline-panel.cpp | 10 +++++----- src/gui/panels/timeline-panel.hpp | 4 ++-- src/gui/panels/viewer-panel.cpp | 12 ++++++------ src/gui/panels/viewer-panel.hpp | 2 +- src/gui/util/rectangle.hpp | 2 +- src/gui/widgets/panel-bar.cpp | 8 ++++---- src/gui/widgets/timecode-widget.cpp | 2 +- src/gui/widgets/timeline-widget.hpp | 2 +- src/gui/widgets/timeline/timeline-body.cpp | 6 +++--- src/gui/widgets/timeline/timeline-body.hpp | 2 +- src/gui/widgets/timeline/timeline-clip-track.hpp | 2 +- src/gui/widgets/timeline/timeline-clip.hpp | 4 ++-- src/gui/widgets/timeline/timeline-group-track.cpp | 2 +- src/gui/widgets/timeline/timeline-group-track.hpp | 2 +- .../widgets/timeline/timeline-header-container.cpp | 4 ++-- .../widgets/timeline/timeline-header-container.hpp | 2 +- src/gui/widgets/timeline/timeline-header-widget.cpp | 4 ++-- src/gui/widgets/timeline/timeline-header-widget.hpp | 2 +- src/gui/widgets/timeline/timeline-ibeam-tool.cpp | 2 +- src/gui/widgets/timeline/timeline-layout-helper.cpp | 6 +++--- src/gui/widgets/timeline/timeline-layout-helper.hpp | 4 ++-- src/gui/widgets/timeline/timeline-ruler.cpp | 8 ++++---- src/gui/widgets/timeline/timeline-ruler.hpp | 2 +- src/gui/widgets/timeline/timeline-tool.cpp | 2 +- src/gui/widgets/timeline/timeline-tool.hpp | 2 +- src/gui/widgets/timeline/timeline-track.cpp | 6 +++--- src/gui/widgets/timeline/timeline-track.hpp | 10 +++++----- src/gui/widgets/timeline/timeline-view-window.cpp | 2 +- src/gui/widgets/timeline/timeline-view-window.hpp | 2 +- src/gui/widgets/video-display-widget.cpp | 7 +++---- src/gui/widgets/video-display-widget.hpp | 2 +- src/gui/workspace/actions.cpp | 10 +++++----- src/gui/workspace/actions.hpp | 2 +- src/gui/workspace/panel-manager.cpp | 6 +++--- src/gui/workspace/panel-manager.hpp | 2 +- src/gui/workspace/workspace-window.cpp | 2 +- src/gui/workspace/workspace-window.hpp | 6 +++--- 50 files changed, 96 insertions(+), 95 deletions(-) diff --git a/src/gui/dialogs/name-chooser.cpp b/src/gui/dialogs/name-chooser.cpp index c61527be8..634f2bd07 100644 --- a/src/gui/dialogs/name-chooser.cpp +++ b/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" diff --git a/src/gui/dialogs/name-chooser.hpp b/src/gui/dialogs/name-chooser.hpp index 0794e6427..52a156c03 100644 --- a/src/gui/dialogs/name-chooser.hpp +++ b/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 { diff --git a/src/gui/dialogs/preferences-dialog.cpp b/src/gui/dialogs/preferences-dialog.cpp index 4db367360..183b4858d 100644 --- a/src/gui/dialogs/preferences-dialog.cpp +++ b/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" diff --git a/src/gui/dialogs/preferences-dialog.hpp b/src/gui/dialogs/preferences-dialog.hpp index 62a37ed07..1ba7d7f27 100644 --- a/src/gui/dialogs/preferences-dialog.hpp +++ b/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 { diff --git a/src/gui/dialogs/render.cpp b/src/gui/dialogs/render.cpp index 6178c014c..e4a9b774b 100644 --- a/src/gui/dialogs/render.cpp +++ b/src/gui/dialogs/render.cpp @@ -20,7 +20,7 @@ * *****************************************************/ -#include "../gtk-lumiera.hpp" +#include "gui/gtk-lumiera.hpp" #include "render.hpp" #include "dialog.hpp" diff --git a/src/gui/dialogs/render.hpp b/src/gui/dialogs/render.hpp index 8d586c398..470cc5ae8 100644 --- a/src/gui/dialogs/render.hpp +++ b/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 { diff --git a/src/gui/model/track.hpp b/src/gui/model/track.hpp index 6dc5d2b71..7517219a7 100644 --- a/src/gui/model/track.hpp +++ b/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 diff --git a/src/gui/output/displayer.cpp b/src/gui/output/displayer.cpp index 251279a9a..fc82ebb3e 100644 --- a/src/gui/output/displayer.cpp +++ b/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" diff --git a/src/gui/output/gdkdisplayer.cpp b/src/gui/output/gdkdisplayer.cpp index 1d6f96214..e07f4717b 100644 --- a/src/gui/output/gdkdisplayer.cpp +++ b/src/gui/output/gdkdisplayer.cpp @@ -22,7 +22,7 @@ * *****************************************************/ -#include "../gtk-lumiera.hpp" +#include "gui/gtk-lumiera.hpp" #include #include diff --git a/src/gui/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp index 4c0780101..f9aa71553 100644 --- a/src/gui/output/xvdisplayer.cpp +++ b/src/gui/output/xvdisplayer.cpp @@ -22,7 +22,7 @@ * *****************************************************/ -#include "../gtk-lumiera.hpp" +#include "gui/gtk-lumiera.hpp" #include diff --git a/src/gui/panels/assets-panel.cpp b/src/gui/panels/assets-panel.cpp index 45d4887ee..12010d31c 100644 --- a/src/gui/panels/assets-panel.cpp +++ b/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 { diff --git a/src/gui/panels/panel.cpp b/src/gui/panels/panel.cpp index 4db7a2ff2..4a72e82ff 100644 --- a/src/gui/panels/panel.cpp +++ b/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 +#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 { diff --git a/src/gui/panels/panel.hpp b/src/gui/panels/panel.hpp index 5b0ed2afe..0dd39e1e5 100644 --- a/src/gui/panels/panel.hpp +++ b/src/gui/panels/panel.hpp @@ -27,10 +27,10 @@ #ifndef PANEL_HPP #define PANEL_HPP -#include "../gtk-lumiera.hpp" #include -#include "../widgets/panel-bar.hpp" +#include "gui/gtk-lumiera.hpp" +#include "gui/widgets/panel-bar.hpp" namespace gui { diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp index 5f564dd90..5c79bbe44 100644 --- a/src/gui/panels/timeline-panel.cpp +++ b/src/gui/panels/timeline-panel.cpp @@ -22,15 +22,15 @@ #include -#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; diff --git a/src/gui/panels/timeline-panel.hpp b/src/gui/panels/timeline-panel.hpp index 75df50cd5..afd3b9faa 100644 --- a/src/gui/panels/timeline-panel.hpp +++ b/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; diff --git a/src/gui/panels/viewer-panel.cpp b/src/gui/panels/viewer-panel.cpp index 01a94934f..692f82308 100644 --- a/src/gui/panels/viewer-panel.cpp +++ b/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; diff --git a/src/gui/panels/viewer-panel.hpp b/src/gui/panels/viewer-panel.hpp index fd234a823..3a8e23b28 100644 --- a/src/gui/panels/viewer-panel.hpp +++ b/src/gui/panels/viewer-panel.hpp @@ -29,7 +29,7 @@ #include #include "panel.hpp" -#include "../widgets/video-display-widget.hpp" +#include "gui/widgets/video-display-widget.hpp" namespace gui { namespace panels { diff --git a/src/gui/util/rectangle.hpp b/src/gui/util/rectangle.hpp index ae77d2305..eb4110e83 100644 --- a/src/gui/util/rectangle.hpp +++ b/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 { diff --git a/src/gui/widgets/panel-bar.cpp b/src/gui/widgets/panel-bar.cpp index 7b41a4d32..94464e70d 100644 --- a/src/gui/widgets/panel-bar.cpp +++ b/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 #include diff --git a/src/gui/widgets/timecode-widget.cpp b/src/gui/widgets/timecode-widget.cpp index b43c9087f..fbf9c1eee 100644 --- a/src/gui/widgets/timecode-widget.cpp +++ b/src/gui/widgets/timecode-widget.cpp @@ -31,7 +31,7 @@ #include #include "timecode-widget.hpp" -#include "../util/convert.hpp" +#include "gui/util/convert.hpp" using namespace sigc; using namespace Gtk; diff --git a/src/gui/widgets/timeline-widget.hpp b/src/gui/widgets/timeline-widget.hpp index 2278f5ca9..ee9cd184a 100644 --- a/src/gui/widgets/timeline-widget.hpp +++ b/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 { diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp index 0143ea627..35a58f011 100644 --- a/src/gui/widgets/timeline/timeline-body.cpp +++ b/src/gui/widgets/timeline/timeline-body.cpp @@ -24,9 +24,9 @@ #include #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" diff --git a/src/gui/widgets/timeline/timeline-body.hpp b/src/gui/widgets/timeline/timeline-body.hpp index 71e22520b..f9adee189 100644 --- a/src/gui/widgets/timeline/timeline-body.hpp +++ b/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 { diff --git a/src/gui/widgets/timeline/timeline-clip-track.hpp b/src/gui/widgets/timeline/timeline-clip-track.hpp index 90f63fc7d..a0c630018 100644 --- a/src/gui/widgets/timeline/timeline-clip-track.hpp +++ b/src/gui/widgets/timeline/timeline-clip-track.hpp @@ -31,7 +31,7 @@ #include #include "timeline-track.hpp" -#include "../../model/clip-track.hpp" +#include "gui/model/clip-track.hpp" namespace gui { namespace widgets { diff --git a/src/gui/widgets/timeline/timeline-clip.hpp b/src/gui/widgets/timeline/timeline-clip.hpp index c08d87c66..fbc128166 100644 --- a/src/gui/widgets/timeline/timeline-clip.hpp +++ b/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" diff --git a/src/gui/widgets/timeline/timeline-group-track.cpp b/src/gui/widgets/timeline/timeline-group-track.cpp index 6ecc20005..9407a41da 100644 --- a/src/gui/widgets/timeline/timeline-group-track.cpp +++ b/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; diff --git a/src/gui/widgets/timeline/timeline-group-track.hpp b/src/gui/widgets/timeline/timeline-group-track.hpp index 62e4d8d53..3cf079b47 100644 --- a/src/gui/widgets/timeline/timeline-group-track.hpp +++ b/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 { diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp index 93f2e6aee..66732d383 100644 --- a/src/gui/widgets/timeline/timeline-header-container.cpp +++ b/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; diff --git a/src/gui/widgets/timeline/timeline-header-container.hpp b/src/gui/widgets/timeline/timeline-header-container.hpp index 921394eff..4bf03a1e9 100644 --- a/src/gui/widgets/timeline/timeline-header-container.hpp +++ b/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 { diff --git a/src/gui/widgets/timeline/timeline-header-widget.cpp b/src/gui/widgets/timeline/timeline-header-widget.cpp index ae5e85a98..5c9bf81bd 100644 --- a/src/gui/widgets/timeline/timeline-header-widget.cpp +++ b/src/gui/widgets/timeline/timeline-header-widget.cpp @@ -23,8 +23,8 @@ #include -#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; diff --git a/src/gui/widgets/timeline/timeline-header-widget.hpp b/src/gui/widgets/timeline/timeline-header-widget.hpp index 18dcfb78c..b9c6b9bf3 100644 --- a/src/gui/widgets/timeline/timeline-header-widget.hpp +++ b/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 { diff --git a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp b/src/gui/widgets/timeline/timeline-ibeam-tool.cpp index 5e37d4b4d..99e263ed7 100644 --- a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp +++ b/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; diff --git a/src/gui/widgets/timeline/timeline-layout-helper.cpp b/src/gui/widgets/timeline/timeline-layout-helper.cpp index c9ff0ed03..372220ff9 100644 --- a/src/gui/widgets/timeline/timeline-layout-helper.cpp +++ b/src/gui/widgets/timeline/timeline-layout-helper.cpp @@ -24,9 +24,9 @@ #include #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; diff --git a/src/gui/widgets/timeline/timeline-layout-helper.hpp b/src/gui/widgets/timeline/timeline-layout-helper.hpp index f8ac3f7bd..b488f8ced 100644 --- a/src/gui/widgets/timeline/timeline-layout-helper.hpp +++ b/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 { diff --git a/src/gui/widgets/timeline/timeline-ruler.cpp b/src/gui/widgets/timeline/timeline-ruler.cpp index f67f929bc..63d6ecc7a 100644 --- a/src/gui/widgets/timeline/timeline-ruler.cpp +++ b/src/gui/widgets/timeline/timeline-ruler.cpp @@ -23,12 +23,12 @@ #include #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; diff --git a/src/gui/widgets/timeline/timeline-ruler.hpp b/src/gui/widgets/timeline/timeline-ruler.hpp index bdeb08f63..bad7625ca 100644 --- a/src/gui/widgets/timeline/timeline-ruler.hpp +++ b/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 { diff --git a/src/gui/widgets/timeline/timeline-tool.cpp b/src/gui/widgets/timeline/timeline-tool.cpp index bc1092e53..0e8a95542 100644 --- a/src/gui/widgets/timeline/timeline-tool.cpp +++ b/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; diff --git a/src/gui/widgets/timeline/timeline-tool.hpp b/src/gui/widgets/timeline/timeline-tool.hpp index af9e61146..25d3e3263 100644 --- a/src/gui/widgets/timeline/timeline-tool.hpp +++ b/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 { diff --git a/src/gui/widgets/timeline/timeline-track.cpp b/src/gui/widgets/timeline/timeline-track.cpp index 240a62a2b..ea76eb1ea 100644 --- a/src/gui/widgets/timeline/timeline-track.cpp +++ b/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; diff --git a/src/gui/widgets/timeline/timeline-track.hpp b/src/gui/widgets/timeline/timeline-track.hpp index f550b2c80..474b74e41 100644 --- a/src/gui/widgets/timeline/timeline-track.hpp +++ b/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" diff --git a/src/gui/widgets/timeline/timeline-view-window.cpp b/src/gui/widgets/timeline/timeline-view-window.cpp index dcaf8845c..2a62fcc90 100644 --- a/src/gui/widgets/timeline/timeline-view-window.cpp +++ b/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; diff --git a/src/gui/widgets/timeline/timeline-view-window.hpp b/src/gui/widgets/timeline/timeline-view-window.hpp index 972f30edb..e0513bd15 100644 --- a/src/gui/widgets/timeline/timeline-view-window.hpp +++ b/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 { diff --git a/src/gui/widgets/video-display-widget.cpp b/src/gui/widgets/video-display-widget.cpp index 5b6d59b1f..0be796233 100644 --- a/src/gui/widgets/video-display-widget.cpp +++ b/src/gui/widgets/video-display-widget.cpp @@ -24,10 +24,9 @@ #include #include -#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" diff --git a/src/gui/widgets/video-display-widget.hpp b/src/gui/widgets/video-display-widget.hpp index 9eea972f2..8e6e9a5e4 100644 --- a/src/gui/widgets/video-display-widget.hpp +++ b/src/gui/widgets/video-display-widget.hpp @@ -28,7 +28,7 @@ #include -#include "../output/displayer.hpp" +#include "gui/output/displayer.hpp" using namespace gui::output; diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp index 2c8e205da..4260b40ad 100644 --- a/src/gui/workspace/actions.cpp +++ b/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" diff --git a/src/gui/workspace/actions.hpp b/src/gui/workspace/actions.hpp index e60557b3f..3076fedcb 100644 --- a/src/gui/workspace/actions.hpp +++ b/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 { diff --git a/src/gui/workspace/panel-manager.cpp b/src/gui/workspace/panel-manager.cpp index 4df663ba2..dca33505b 100644 --- a/src/gui/workspace/panel-manager.cpp +++ b/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" diff --git a/src/gui/workspace/panel-manager.hpp b/src/gui/workspace/panel-manager.hpp index 9362b66aa..9e3687513 100644 --- a/src/gui/workspace/panel-manager.hpp +++ b/src/gui/workspace/panel-manager.hpp @@ -31,7 +31,7 @@ #include #include -#include "../panels/panel.hpp" +#include "gui/panels/panel.hpp" using namespace gui::panels; diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp index c84ca228c..b8ef1ea56 100644 --- a/src/gui/workspace/workspace-window.cpp +++ b/src/gui/workspace/workspace-window.cpp @@ -32,7 +32,7 @@ #include #include -#include "../gtk-lumiera.hpp" +#include "gui/gtk-lumiera.hpp" #include "workspace-window.hpp" #include "include/logging.h" diff --git a/src/gui/workspace/workspace-window.hpp b/src/gui/workspace/workspace-window.hpp index 38ddab9f9..d68d1d3fd 100644 --- a/src/gui/workspace/workspace-window.hpp +++ b/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;