From f02481bb90e9182d79e68706290ef009c82fd725 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sun, 17 Aug 2014 07:02:48 +0200 Subject: [PATCH] fix include order in GUI headers the rules are: - our own headers go before any library headers - all headers need to be spelled relative to include root - ensure that gtk is always included via gui/gtk-base.hpp --- src/gui/controller/controller.cpp | 3 ++- src/gui/controller/controller.hpp | 5 ++++- src/gui/controller/playback-controller.cpp | 2 +- src/gui/controller/playback-controller.hpp | 5 ++++- src/gui/dialogs/dialog.hpp | 2 ++ src/gui/dialogs/name-chooser.cpp | 4 ++-- src/gui/dialogs/name-chooser.hpp | 3 +++ src/gui/dialogs/preferences-dialog.cpp | 5 +++-- src/gui/dialogs/preferences-dialog.hpp | 4 +++- src/gui/dialogs/render.cpp | 6 ++++-- src/gui/dialogs/render.hpp | 3 +++ src/gui/model/clip-track.hpp | 2 ++ src/gui/model/group-track.hpp | 5 ++++- src/gui/model/project.cpp | 4 ++-- src/gui/model/project.hpp | 2 ++ src/gui/model/sequence.cpp | 6 +++--- src/gui/model/track.cpp | 5 +++-- src/gui/model/track.hpp | 1 + src/gui/output/displayer.cpp | 6 +++--- src/gui/output/displayer.hpp | 4 +++- src/gui/output/gdkdisplayer.cpp | 3 ++- src/gui/output/gdkdisplayer.hpp | 3 ++- src/gui/output/xvdisplayer.cpp | 6 +++--- src/gui/output/xvdisplayer.hpp | 6 ++++-- src/gui/panels/assets-panel.cpp | 2 +- src/gui/panels/assets-panel.hpp | 3 ++- src/gui/panels/panel.cpp | 4 ++-- src/gui/panels/viewer-panel.hpp | 2 -- src/gui/widgets/button-bar.cpp | 4 ++-- src/gui/widgets/menu-button.cpp | 5 +++-- src/gui/widgets/mini-button.hpp | 3 ++- src/gui/widgets/panel-bar.cpp | 4 ++-- src/gui/widgets/panel-bar.hpp | 6 ++++-- src/gui/widgets/timecode-widget.cpp | 3 ++- src/gui/widgets/timeline-widget.cpp | 2 +- src/gui/widgets/timeline/timeline-body.cpp | 7 ++++--- src/gui/widgets/timeline/timeline-clip-track.cpp | 4 ++-- src/gui/widgets/timeline/timeline-group-track.cpp | 3 ++- src/gui/widgets/timeline/timeline-header-container.cpp | 6 +++--- src/gui/widgets/timeline/timeline-header-widget.cpp | 3 ++- src/gui/widgets/timeline/timeline-layout-helper.cpp | 2 +- src/gui/widgets/timeline/timeline-state.hpp | 1 + src/gui/widgets/timeline/timeline-tool.cpp | 2 +- src/gui/widgets/timeline/timeline-track.cpp | 2 +- src/gui/widgets/timeline/timeline-view-window.cpp | 4 +++- src/gui/widgets/video-display-widget.hpp | 4 ++-- src/gui/workspace/actions.cpp | 4 ++-- src/gui/workspace/actions.hpp | 1 + src/gui/workspace/panel-manager.cpp | 2 +- src/gui/workspace/panel-manager.hpp | 3 ++- src/gui/workspace/workspace-window.cpp | 7 ++++--- src/gui/workspace/workspace-window.hpp | 7 ++++--- 52 files changed, 122 insertions(+), 73 deletions(-) diff --git a/src/gui/controller/controller.cpp b/src/gui/controller/controller.cpp index 3ddf903d5..a958869d6 100644 --- a/src/gui/controller/controller.cpp +++ b/src/gui/controller/controller.cpp @@ -20,7 +20,8 @@ * *****************************************************/ -#include "controller.hpp" + +#include "gui/controller/controller.hpp" namespace gui { namespace controller { diff --git a/src/gui/controller/controller.hpp b/src/gui/controller/controller.hpp index e462612aa..82050a2aa 100644 --- a/src/gui/controller/controller.hpp +++ b/src/gui/controller/controller.hpp @@ -19,14 +19,17 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file controller/controller.hpp ** This file contains the definition of the controller object */ + #ifndef CONTROLLER_HPP #define CONTROLLER_HPP -#include "playback-controller.hpp" + +#include "gui/controller/playback-controller.hpp" namespace gui { diff --git a/src/gui/controller/playback-controller.cpp b/src/gui/controller/playback-controller.cpp index 12727c86b..d896d2fa3 100644 --- a/src/gui/controller/playback-controller.cpp +++ b/src/gui/controller/playback-controller.cpp @@ -24,8 +24,8 @@ #include "gui/controller/playback-controller.hpp" #include "gui/display-service.hpp" #include "lib/error.hpp" +#include "include/logging.h" -#include namespace gui { namespace controller { diff --git a/src/gui/controller/playback-controller.hpp b/src/gui/controller/playback-controller.hpp index e403bc528..c4bf1c12d 100644 --- a/src/gui/controller/playback-controller.hpp +++ b/src/gui/controller/playback-controller.hpp @@ -19,19 +19,22 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file controller/playback-controller.hpp ** This file contains the definition of the playback controller object */ + #ifndef PLAYBACK_CONTROLLER_HPP #define PLAYBACK_CONTROLLER_HPP +#include "gui/gtk-base.hpp" #include "include/dummy-player-facade.h" #include "include/display-facade.h" -#include #include + namespace gui { namespace controller { diff --git a/src/gui/dialogs/dialog.hpp b/src/gui/dialogs/dialog.hpp index 049ea19c2..948c1274a 100644 --- a/src/gui/dialogs/dialog.hpp +++ b/src/gui/dialogs/dialog.hpp @@ -19,11 +19,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file render.hpp ** This file contains definitions of globals for dialogs ** */ + #ifndef DIALOG_HPP #define DIALOG_HPP diff --git a/src/gui/dialogs/name-chooser.cpp b/src/gui/dialogs/name-chooser.cpp index 4c8a297e1..c109a8ef3 100644 --- a/src/gui/dialogs/name-chooser.cpp +++ b/src/gui/dialogs/name-chooser.cpp @@ -21,8 +21,8 @@ * *****************************************************/ #include "gui/gtk-lumiera.hpp" -#include "name-chooser.hpp" -#include "dialog.hpp" +#include "gui/dialogs/name-chooser.hpp" +#include "gui/dialogs/dialog.hpp" using namespace Gtk; using namespace Glib; diff --git a/src/gui/dialogs/name-chooser.hpp b/src/gui/dialogs/name-chooser.hpp index 84634591f..88f9a100c 100644 --- a/src/gui/dialogs/name-chooser.hpp +++ b/src/gui/dialogs/name-chooser.hpp @@ -19,16 +19,19 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file name-chooser.hpp ** This file contains the definition of the name chooser dialog ** */ + #ifndef NAME_CHOOSER_H #define NAME_CHOOSER_H #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 183b4858d..16efef076 100644 --- a/src/gui/dialogs/preferences-dialog.cpp +++ b/src/gui/dialogs/preferences-dialog.cpp @@ -20,10 +20,11 @@ * *****************************************************/ + #include "gui/gtk-lumiera.hpp" -#include "preferences-dialog.hpp" -#include "dialog.hpp" +#include "gui/dialogs/preferences-dialog.hpp" +#include "gui/dialogs/dialog.hpp" using namespace Gtk; diff --git a/src/gui/dialogs/preferences-dialog.hpp b/src/gui/dialogs/preferences-dialog.hpp index 1ba7d7f27..adecd181d 100644 --- a/src/gui/dialogs/preferences-dialog.hpp +++ b/src/gui/dialogs/preferences-dialog.hpp @@ -19,11 +19,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file render.hpp ** This file contains the definition of the application preferences dialog ** */ + #ifndef PREFERENCES_DIALOG_HPP #define PREFERENCES_DIALOG_HPP @@ -33,7 +35,7 @@ namespace gui { namespace dialogs { /** - * The defintion of render output dialog class + * The definition of render output dialog class */ class PreferencesDialog : public Gtk::Dialog { diff --git a/src/gui/dialogs/render.cpp b/src/gui/dialogs/render.cpp index e4a9b774b..52ba96e0a 100644 --- a/src/gui/dialogs/render.cpp +++ b/src/gui/dialogs/render.cpp @@ -20,12 +20,14 @@ * *****************************************************/ + #include "gui/gtk-lumiera.hpp" -#include "render.hpp" -#include "dialog.hpp" +#include "gui/dialogs/render.hpp" +#include "gui/dialogs/dialog.hpp" #include "include/logging.h" + using namespace Gtk; namespace gui { diff --git a/src/gui/dialogs/render.hpp b/src/gui/dialogs/render.hpp index 470cc5ae8..1268ffd15 100644 --- a/src/gui/dialogs/render.hpp +++ b/src/gui/dialogs/render.hpp @@ -19,16 +19,19 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file render.hpp ** This file contains the definition of the render output dialog ** */ + #ifndef RENDER_HPP #define RENDER_HPP #include "gui/gtk-lumiera.hpp" + namespace gui { namespace dialogs { diff --git a/src/gui/model/clip-track.hpp b/src/gui/model/clip-track.hpp index 45a067f60..24169a04e 100644 --- a/src/gui/model/clip-track.hpp +++ b/src/gui/model/clip-track.hpp @@ -19,12 +19,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** * @file model/clip-track.hpp * This file contains the definition of timeline track objects which * contain clips. */ + #ifndef CLIP_TRACK_HPP #define CLIP_TRACK_HPP diff --git a/src/gui/model/group-track.hpp b/src/gui/model/group-track.hpp index 8f729ec59..16663a31c 100644 --- a/src/gui/model/group-track.hpp +++ b/src/gui/model/group-track.hpp @@ -19,14 +19,17 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file widgets/timeline/group-track.hpp ** This file contains the definition of group track timeline objects */ + #ifndef GROUP_TRACK_HPP #define GROUP_TRACK_HPP -#include "parent-track.hpp" +#include "gui/model/parent-track.hpp" + namespace gui { namespace model { diff --git a/src/gui/model/project.cpp b/src/gui/model/project.cpp index 4ea08b7dd..78ebc0e8e 100644 --- a/src/gui/model/project.cpp +++ b/src/gui/model/project.cpp @@ -21,8 +21,8 @@ * *****************************************************/ -#include "project.hpp" -#include "sequence.hpp" +#include "gui/model/project.hpp" +#include "gui/model/sequence.hpp" #include diff --git a/src/gui/model/project.hpp b/src/gui/model/project.hpp index f2806abca..8074d9f86 100644 --- a/src/gui/model/project.hpp +++ b/src/gui/model/project.hpp @@ -19,6 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file project.hpp ** This file contains the definition of Project, a class which ** stores project data, and wraps proc layer data @@ -27,6 +28,7 @@ #ifndef PROJECT_HPP #define PROJECT_HPP + #include "gui/model/sequence.hpp" #include "lib/observable-list.hpp" diff --git a/src/gui/model/sequence.cpp b/src/gui/model/sequence.cpp index 2aa4ae479..830420c83 100644 --- a/src/gui/model/sequence.cpp +++ b/src/gui/model/sequence.cpp @@ -20,14 +20,14 @@ * *****************************************************/ -#include "sequence.hpp" +#include "gui/model/sequence.hpp" #include "include/logging.h" #include // TEST CODE -#include "group-track.hpp" -#include "clip-track.hpp" +#include "gui/model/group-track.hpp" +#include "gui/model/clip-track.hpp" namespace gui { diff --git a/src/gui/model/track.cpp b/src/gui/model/track.cpp index 4c3de6e19..35f0c2473 100644 --- a/src/gui/model/track.cpp +++ b/src/gui/model/track.cpp @@ -20,8 +20,9 @@ * *****************************************************/ -#include "track.hpp" -#include "parent-track.hpp" + +#include "gui/model/track.hpp" +#include "gui/model/parent-track.hpp" #include #include diff --git a/src/gui/model/track.hpp b/src/gui/model/track.hpp index c7472b03f..ebe71dab0 100644 --- a/src/gui/model/track.hpp +++ b/src/gui/model/track.hpp @@ -24,6 +24,7 @@ ** represents a track, and wraps proc layer data */ + #include "gui/gtk-lumiera.hpp" #ifndef TRACK_HPP diff --git a/src/gui/output/displayer.cpp b/src/gui/output/displayer.cpp index fc82ebb3e..320edf934 100644 --- a/src/gui/output/displayer.cpp +++ b/src/gui/output/displayer.cpp @@ -23,9 +23,9 @@ * *****************************************************/ #include "gui/gtk-lumiera.hpp" -#include "displayer.hpp" -#include "xvdisplayer.hpp" -#include "gdkdisplayer.hpp" +#include "gui/output/displayer.hpp" +#include "gui/output/xvdisplayer.hpp" +#include "gui/output/gdkdisplayer.hpp" namespace gui { namespace output { diff --git a/src/gui/output/displayer.hpp b/src/gui/output/displayer.hpp index 5c7fcc796..d9f2e304d 100644 --- a/src/gui/output/displayer.hpp +++ b/src/gui/output/displayer.hpp @@ -21,8 +21,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file displayer.hpp - ** This file contains the defintion of Displayer; the base class + ** This file contains the definition of Displayer; the base class ** of all video display implementations ** @see displayer.cpp */ @@ -30,6 +31,7 @@ #ifndef DISPLAYER_HPP #define DISPLAYER_HPP + namespace gui { namespace output { diff --git a/src/gui/output/gdkdisplayer.cpp b/src/gui/output/gdkdisplayer.cpp index e07f4717b..eeddfa5c5 100644 --- a/src/gui/output/gdkdisplayer.cpp +++ b/src/gui/output/gdkdisplayer.cpp @@ -23,13 +23,14 @@ * *****************************************************/ #include "gui/gtk-lumiera.hpp" +#include "gui/output/gdkdisplayer.hpp" #include #include + using std::cerr; using std::endl; -#include "gdkdisplayer.hpp" namespace gui { namespace output { diff --git a/src/gui/output/gdkdisplayer.hpp b/src/gui/output/gdkdisplayer.hpp index 8c94efec0..f6010c77e 100644 --- a/src/gui/output/gdkdisplayer.hpp +++ b/src/gui/output/gdkdisplayer.hpp @@ -33,7 +33,8 @@ #ifndef GUI_OUTPUT_GDKDISPLAYER_H #define GUI_OUTPUT_GDKDISPLAYER_H -#include "displayer.hpp" +#include "gui/output/displayer.hpp" +#include "gui/gtk-base.hpp" namespace Gtk { class Widget; diff --git a/src/gui/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp index f9aa71553..14518428f 100644 --- a/src/gui/output/xvdisplayer.cpp +++ b/src/gui/output/xvdisplayer.cpp @@ -22,13 +22,13 @@ * *****************************************************/ + #include "gui/gtk-lumiera.hpp" +#include "gui/output/xvdisplayer.hpp" +#include "include/logging.h" #include -#include "xvdisplayer.hpp" -#include "include/logging.h" - namespace gui { namespace output { diff --git a/src/gui/output/xvdisplayer.hpp b/src/gui/output/xvdisplayer.hpp index 8f8bf388c..a6a0f6090 100644 --- a/src/gui/output/xvdisplayer.hpp +++ b/src/gui/output/xvdisplayer.hpp @@ -34,14 +34,16 @@ #ifndef GUI_OUTPUT_XVDISPLAYER_H #define GUI_OUTPUT_XVDISPLAYER_H + +#include "gui/output/displayer.hpp" +#include "gui/gtk-base.hpp" + #include #include #include #include #include -#include "displayer.hpp" - namespace Gtk { class Widget; diff --git a/src/gui/panels/assets-panel.cpp b/src/gui/panels/assets-panel.cpp index 12010d31c..f9a9d1259 100644 --- a/src/gui/panels/assets-panel.cpp +++ b/src/gui/panels/assets-panel.cpp @@ -21,7 +21,7 @@ * *****************************************************/ #include "gui/gtk-lumiera.hpp" -#include "assets-panel.hpp" +#include "gui/panels/assets-panel.hpp" namespace gui { namespace panels { diff --git a/src/gui/panels/assets-panel.hpp b/src/gui/panels/assets-panel.hpp index 18f8093d6..60cdf688f 100644 --- a/src/gui/panels/assets-panel.hpp +++ b/src/gui/panels/assets-panel.hpp @@ -26,7 +26,8 @@ #ifndef ASSETS_PANEL_HPP #define ASSETS_PANEL_HPP -#include "panel.hpp" + +#include "gui/panels/panel.hpp" namespace gui { namespace panels { diff --git a/src/gui/panels/panel.cpp b/src/gui/panels/panel.cpp index 4606c0ab3..03349e3ff 100644 --- a/src/gui/panels/panel.cpp +++ b/src/gui/panels/panel.cpp @@ -20,13 +20,13 @@ * *****************************************************/ -#include #include "gui/gtk-lumiera.hpp" +#include "gui/panels/panel.hpp" #include "gui/workspace/panel-manager.hpp" #include "gui/workspace/workspace-window.hpp" -#include "gui/panels/panel.hpp" +#include using namespace Gtk; diff --git a/src/gui/panels/viewer-panel.hpp b/src/gui/panels/viewer-panel.hpp index 7fe5cace3..1c050e4ac 100644 --- a/src/gui/panels/viewer-panel.hpp +++ b/src/gui/panels/viewer-panel.hpp @@ -30,8 +30,6 @@ #include "gui/panels/panel.hpp" #include "gui/widgets/video-display-widget.hpp" -#include - namespace gui { namespace panels { diff --git a/src/gui/widgets/button-bar.cpp b/src/gui/widgets/button-bar.cpp index ccd3c1919..63e5f423d 100644 --- a/src/gui/widgets/button-bar.cpp +++ b/src/gui/widgets/button-bar.cpp @@ -20,9 +20,9 @@ * *****************************************************/ -#include "button-bar.hpp" +#include "gui/widgets/button-bar.hpp" +#include "include/logging.h" -#include #include using namespace Gtk; diff --git a/src/gui/widgets/menu-button.cpp b/src/gui/widgets/menu-button.cpp index d7756a17c..853c07474 100644 --- a/src/gui/widgets/menu-button.cpp +++ b/src/gui/widgets/menu-button.cpp @@ -20,9 +20,10 @@ * *****************************************************/ -#include "menu-button.hpp" -#include +#include "gui/widgets/menu-button.hpp" +#include "include/logging.h" + using namespace Gtk; using namespace sigc; diff --git a/src/gui/widgets/mini-button.hpp b/src/gui/widgets/mini-button.hpp index 5e09d48f0..a5d955f63 100644 --- a/src/gui/widgets/mini-button.hpp +++ b/src/gui/widgets/mini-button.hpp @@ -26,7 +26,8 @@ #ifndef MINI_BUTTON_HPP #define MINI_BUTTON_HPP -#include +#include "gui/gtk-base.hpp" + namespace gui { namespace widgets { diff --git a/src/gui/widgets/panel-bar.cpp b/src/gui/widgets/panel-bar.cpp index 94464e70d..7aeccb160 100644 --- a/src/gui/widgets/panel-bar.cpp +++ b/src/gui/widgets/panel-bar.cpp @@ -20,13 +20,13 @@ * *****************************************************/ -#include "panel-bar.hpp" +#include "gui/widgets/panel-bar.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/logging.h" -#include #include using namespace Gtk; diff --git a/src/gui/widgets/panel-bar.hpp b/src/gui/widgets/panel-bar.hpp index 507cb5063..087961301 100644 --- a/src/gui/widgets/panel-bar.hpp +++ b/src/gui/widgets/panel-bar.hpp @@ -26,13 +26,15 @@ #ifndef PANEL_BAR_HPP #define PANEL_BAR_HPP +#include "gui/widgets/menu-button.hpp" + #include -#include "menu-button.hpp" + namespace gui { namespace panels { -class Panel; + class Panel; } namespace widgets { diff --git a/src/gui/widgets/timecode-widget.cpp b/src/gui/widgets/timecode-widget.cpp index 6b5379a8e..300e63003 100644 --- a/src/gui/widgets/timecode-widget.cpp +++ b/src/gui/widgets/timecode-widget.cpp @@ -22,8 +22,9 @@ * *****************************************************/ -#include "timecode-widget.hpp" +#include "gui/widgets/timecode-widget.hpp" #include "gui/util/convert.hpp" + #include "lib/time/diagnostics.hpp" ////////////TODO: temporary solution to get H:M:S components. Use TimeCode instead! #include diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp index dae888c1c..765bb3790 100644 --- a/src/gui/widgets/timeline-widget.cpp +++ b/src/gui/widgets/timeline-widget.cpp @@ -20,7 +20,7 @@ * *****************************************************/ -#include "timeline-widget.hpp" +#include "gui/widgets/timeline-widget.hpp" #include #include diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp index b20c229e6..0092d629c 100644 --- a/src/gui/widgets/timeline/timeline-body.cpp +++ b/src/gui/widgets/timeline/timeline-body.cpp @@ -20,10 +20,8 @@ * *****************************************************/ -#include -#include -#include "timeline-body.hpp" +#include "gui/widgets/timeline/timeline-body.hpp" #include "gui/widgets/timeline-widget.hpp" #include "gui/window-manager.hpp" #include "gui/util/cairo-util.hpp" @@ -32,6 +30,9 @@ #include "timeline-ibeam-tool.hpp" #include "include/logging.h" +#include +#include + using namespace Gtk; using namespace std; using namespace lumiera; diff --git a/src/gui/widgets/timeline/timeline-clip-track.cpp b/src/gui/widgets/timeline/timeline-clip-track.cpp index d9c6014b5..78aa98563 100644 --- a/src/gui/widgets/timeline/timeline-clip-track.cpp +++ b/src/gui/widgets/timeline/timeline-clip-track.cpp @@ -20,12 +20,12 @@ * *****************************************************/ -#include - #include "gui/widgets/timeline/timeline-clip.hpp" #include "gui/widgets/timeline/timeline-clip-track.hpp" #include "gui/widgets/timeline/timeline-view-window.hpp" +#include + using namespace Gtk; using std::shared_ptr; diff --git a/src/gui/widgets/timeline/timeline-group-track.cpp b/src/gui/widgets/timeline/timeline-group-track.cpp index ad73b7a5b..4c708e6ce 100644 --- a/src/gui/widgets/timeline/timeline-group-track.cpp +++ b/src/gui/widgets/timeline/timeline-group-track.cpp @@ -20,7 +20,8 @@ * *****************************************************/ -#include "timeline-group-track.hpp" + +#include "gui/widgets/timeline/timeline-group-track.hpp" #include "gui/widgets/timeline-widget.hpp" using namespace Gtk; diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp index ce07aa876..6747c3d61 100644 --- a/src/gui/widgets/timeline/timeline-header-container.cpp +++ b/src/gui/widgets/timeline/timeline-header-container.cpp @@ -21,13 +21,13 @@ * *****************************************************/ -#include -#include "timeline-header-container.hpp" -#include "timeline-track.hpp" +#include "gui/widgets/timeline/timeline-header-container.hpp" +#include "gui/widgets/timeline/timeline-track.hpp" #include "gui/widgets/timeline-widget.hpp" #include "gui/util/rectangle.hpp" +#include #include using std::pair; diff --git a/src/gui/widgets/timeline/timeline-header-widget.cpp b/src/gui/widgets/timeline/timeline-header-widget.cpp index cf4298c79..c0f3514db 100644 --- a/src/gui/widgets/timeline/timeline-header-widget.cpp +++ b/src/gui/widgets/timeline/timeline-header-widget.cpp @@ -21,11 +21,12 @@ * *****************************************************/ -#include #include "gui/widgets/timeline-widget.hpp" #include "gui/util/rectangle.hpp" +#include + using namespace Gtk; using namespace std; using namespace util; diff --git a/src/gui/widgets/timeline/timeline-layout-helper.cpp b/src/gui/widgets/timeline/timeline-layout-helper.cpp index 42cfaab4d..163dc9a12 100644 --- a/src/gui/widgets/timeline/timeline-layout-helper.cpp +++ b/src/gui/widgets/timeline/timeline-layout-helper.cpp @@ -22,7 +22,7 @@ * *****************************************************/ -#include "timeline-layout-helper.hpp" +#include "gui/widgets/timeline/timeline-layout-helper.hpp" #include "gui/widgets/timeline-widget.hpp" #include "gui/model/sequence.hpp" #include "gui/util/rectangle.hpp" diff --git a/src/gui/widgets/timeline/timeline-state.hpp b/src/gui/widgets/timeline/timeline-state.hpp index 7b5221aa1..3c1440d23 100644 --- a/src/gui/widgets/timeline/timeline-state.hpp +++ b/src/gui/widgets/timeline/timeline-state.hpp @@ -27,6 +27,7 @@ #define TIMELINE_STATE_HPP #include "gui/widgets/timeline/timeline-view-window.hpp" + #include "lib/time/mutation.hpp" #include "lib/time/control.hpp" diff --git a/src/gui/widgets/timeline/timeline-tool.cpp b/src/gui/widgets/timeline/timeline-tool.cpp index ff3fb9b3c..7c5e6f4ea 100644 --- a/src/gui/widgets/timeline/timeline-tool.cpp +++ b/src/gui/widgets/timeline/timeline-tool.cpp @@ -20,7 +20,7 @@ * *****************************************************/ -#include "timeline-tool.hpp" +#include "gui/widgets/timeline/timeline-tool.hpp" #include "gui/widgets/timeline-widget.hpp" using namespace Gdk; diff --git a/src/gui/widgets/timeline/timeline-track.cpp b/src/gui/widgets/timeline/timeline-track.cpp index a020b46ce..932096b2f 100644 --- a/src/gui/widgets/timeline/timeline-track.cpp +++ b/src/gui/widgets/timeline/timeline-track.cpp @@ -20,7 +20,7 @@ * *****************************************************/ -#include "timeline-track.hpp" +#include "gui/widgets/timeline/timeline-track.hpp" #include "gui/widgets/timeline-widget.hpp" #include "gui/window-manager.hpp" #include "gui/dialogs/name-chooser.hpp" diff --git a/src/gui/widgets/timeline/timeline-view-window.cpp b/src/gui/widgets/timeline/timeline-view-window.cpp index 357e4db97..99e8446dd 100644 --- a/src/gui/widgets/timeline/timeline-view-window.cpp +++ b/src/gui/widgets/timeline/timeline-view-window.cpp @@ -20,9 +20,11 @@ * *****************************************************/ -#include "timeline-view-window.hpp" + +#include "gui/widgets/timeline/timeline-view-window.hpp" #include "gui/widgets/timeline-widget.hpp" + using namespace Gtk; using namespace gui::widgets; using namespace lumiera; diff --git a/src/gui/widgets/video-display-widget.hpp b/src/gui/widgets/video-display-widget.hpp index b77cb118e..12ea67f41 100644 --- a/src/gui/widgets/video-display-widget.hpp +++ b/src/gui/widgets/video-display-widget.hpp @@ -29,10 +29,10 @@ #ifndef VIDEO_DISPLAY_WIDGET_HPP #define VIDEO_DISPLAY_WIDGET_HPP -#include - +#include "gui/gtk-base.hpp" #include "gui/output/displayer.hpp" + using namespace gui::output; namespace gui { diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp index fffdd7f71..27329b0bf 100644 --- a/src/gui/workspace/actions.cpp +++ b/src/gui/workspace/actions.cpp @@ -20,8 +20,8 @@ * *****************************************************/ -#include "actions.hpp" -#include "workspace-window.hpp" +#include "gui/workspace/actions.hpp" +#include "gui/workspace/workspace-window.hpp" #include "gui/window-manager.hpp" diff --git a/src/gui/workspace/actions.hpp b/src/gui/workspace/actions.hpp index 06248d10f..2ee6e4528 100644 --- a/src/gui/workspace/actions.hpp +++ b/src/gui/workspace/actions.hpp @@ -19,6 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + /** @file actions.hpp ** This file contains the definition of a helper class for the ** main workspace window object, which registers and handles diff --git a/src/gui/workspace/panel-manager.cpp b/src/gui/workspace/panel-manager.cpp index dca33505b..852b8402e 100644 --- a/src/gui/workspace/panel-manager.cpp +++ b/src/gui/workspace/panel-manager.cpp @@ -20,7 +20,7 @@ * *****************************************************/ -#include "panel-manager.hpp" +#include "gui/workspace/panel-manager.hpp" #include "gui/panels/assets-panel.hpp" #include "gui/panels/viewer-panel.hpp" diff --git a/src/gui/workspace/panel-manager.hpp b/src/gui/workspace/panel-manager.hpp index d21fce950..936b2afa9 100644 --- a/src/gui/workspace/panel-manager.hpp +++ b/src/gui/workspace/panel-manager.hpp @@ -28,10 +28,11 @@ #ifndef PANEL_MANAGER_HPP #define PANEL_MANAGER_HPP +#include "gui/panels/panel.hpp" + #include #include -#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 015daa4c5..3a525a760 100644 --- a/src/gui/workspace/workspace-window.cpp +++ b/src/gui/workspace/workspace-window.cpp @@ -20,6 +20,10 @@ * *****************************************************/ +#include "gui/gtk-lumiera.hpp" +#include "workspace-window.hpp" +#include "include/logging.h" + #include #ifdef ENABLE_NLS @@ -32,9 +36,6 @@ #include #include -#include "gui/gtk-lumiera.hpp" -#include "workspace-window.hpp" -#include "include/logging.h" using namespace Gtk; using namespace Glib; diff --git a/src/gui/workspace/workspace-window.hpp b/src/gui/workspace/workspace-window.hpp index d68d1d3fd..b6d8ffeca 100644 --- a/src/gui/workspace/workspace-window.hpp +++ b/src/gui/workspace/workspace-window.hpp @@ -29,15 +29,16 @@ #ifndef WORKSPACE_WINDOW_HPP #define WORKSPACE_WINDOW_HPP -#include -#include "actions.hpp" -#include "panel-manager.hpp" +#include "gui/workspace/actions.hpp" +#include "gui/workspace/panel-manager.hpp" #include "gui/panels/assets-panel.hpp" #include "gui/panels/viewer-panel.hpp" #include "gui/panels/timeline-panel.hpp" +#include + using namespace gui::panels; namespace gui {