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

@@ -20,7 +20,8 @@
 
 * *****************************************************/
 
-#include "controller.hpp"
+
+#include "gui/controller/controller.hpp"
 
 namespace gui {
 namespace controller {

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 {

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 <nobug.h>
 
 namespace gui {
 namespace controller { 

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 <glibmm.h>
 #include <boost/noncopyable.hpp>
 
+
 namespace gui {
 namespace controller {
 

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
 

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;

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 {
 

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;
 

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
 {

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 {

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 {
 

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
 

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 {

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 <memory>
 

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"
 

src/gui/model/sequence.cpp

@@ -20,14 +20,14 @@
 
 * *****************************************************/
 
-#include "sequence.hpp"
+#include "gui/model/sequence.hpp"
 #include "include/logging.h"
 
 #include <memory>
 
 // TEST CODE
-#include "group-track.hpp"
-#include "clip-track.hpp"
+#include "gui/model/group-track.hpp"
+#include "gui/model/clip-track.hpp"
 
 
 namespace gui {

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 <boost/foreach.hpp>
 #include <memory>

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

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 {

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 {
 

src/gui/output/gdkdisplayer.cpp

@@ -23,13 +23,14 @@
 * *****************************************************/
 
 #include "gui/gtk-lumiera.hpp"
+#include "gui/output/gdkdisplayer.hpp"
 
 #include <gdk/gdkx.h>
 #include <iostream>
+
 using std::cerr;
 using std::endl;
 
-#include "gdkdisplayer.hpp"
 
 namespace gui {
 namespace output {

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;

src/gui/output/xvdisplayer.cpp

@@ -22,13 +22,13 @@
 
 * *****************************************************/
 
+
 #include "gui/gtk-lumiera.hpp"
+#include "gui/output/xvdisplayer.hpp"
+#include "include/logging.h"
 
 #include <gdk/gdkx.h>
 
-#include "xvdisplayer.hpp"
-#include "include/logging.h"
-
 namespace gui {
 namespace output {
 

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 <X11/Xlib.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>
 #include <X11/extensions/Xvlib.h>
 
-#include "displayer.hpp"
-
 
 namespace Gtk {
   class Widget;

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 {

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 {

src/gui/panels/panel.cpp

@@ -20,13 +20,13 @@
 
 * *****************************************************/
 
-#include <gdl/gdl-dock-item-grip.h>
 
 #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 <gdl/gdl-dock-item-grip.h>
 
 using namespace Gtk;
 

src/gui/panels/viewer-panel.hpp

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

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 <nobug.h>
 #include <algorithm>
 
 using namespace Gtk;

src/gui/widgets/menu-button.cpp

@@ -20,9 +20,10 @@
 
 * *****************************************************/
 
-#include "menu-button.hpp"
 
-#include <nobug.h>
+#include "gui/widgets/menu-button.hpp"
+#include "include/logging.h"
+
 
 using namespace Gtk;
 using namespace sigc;

src/gui/widgets/mini-button.hpp

@@ -26,7 +26,8 @@
 #ifndef MINI_BUTTON_HPP
 #define MINI_BUTTON_HPP
 
-#include <gtkmm.h>
+#include "gui/gtk-base.hpp"
+
 
 namespace gui {
 namespace widgets {

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 <nobug.h>
 #include <algorithm>
 
 using namespace Gtk;

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 <gtkmm.h>
-#include "menu-button.hpp"
+
 
 namespace gui {
 
 namespace panels {
-class Panel; 
+  class Panel;
 }
   
 namespace widgets {

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 <cmath>

src/gui/widgets/timeline-widget.cpp

@@ -20,7 +20,7 @@
 
 * *****************************************************/
 
-#include "timeline-widget.hpp"
+#include "gui/widgets/timeline-widget.hpp"
 
 #include <boost/foreach.hpp>
 #include <typeinfo>

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

@@ -20,10 +20,8 @@
 
 * *****************************************************/
 
-#include <cairomm/cairomm.h>
-#include <boost/foreach.hpp>
 
-#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 <cairomm/cairomm.h>
+#include <boost/foreach.hpp>
+
 using namespace Gtk;
 using namespace std;
 using namespace lumiera;

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

@@ -20,12 +20,12 @@
 
 * *****************************************************/
 
-#include <boost/foreach.hpp>
-
 #include "gui/widgets/timeline/timeline-clip.hpp"
 #include "gui/widgets/timeline/timeline-clip-track.hpp"
 #include "gui/widgets/timeline/timeline-view-window.hpp"
 
+#include <boost/foreach.hpp>
+
 using namespace Gtk;
 
 using std::shared_ptr;

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;

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

@@ -21,13 +21,13 @@
 
 * *****************************************************/
 
-#include <boost/foreach.hpp>
 
-#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 <boost/foreach.hpp>
 #include <memory>
 
 using std::pair;

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

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

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"

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"
 

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;

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"

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;

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

@@ -29,10 +29,10 @@
 #ifndef VIDEO_DISPLAY_WIDGET_HPP
 #define VIDEO_DISPLAY_WIDGET_HPP
 
-#include <gtkmm.h>
-
+#include "gui/gtk-base.hpp"
 #include "gui/output/displayer.hpp"
 
+
 using namespace gui::output;
 
 namespace gui {

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"
 

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

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"

src/gui/workspace/panel-manager.hpp

@@ -28,10 +28,11 @@
 #ifndef PANEL_MANAGER_HPP
 #define PANEL_MANAGER_HPP
 
+#include "gui/panels/panel.hpp"
+
 #include <gdl/gdl.h>
 #include <typeinfo>
 
-#include "gui/panels/panel.hpp"
 
 using namespace gui::panels;
 

src/gui/workspace/workspace-window.cpp

@@ -20,6 +20,10 @@
 
 * *****************************************************/
 
+#include "gui/gtk-lumiera.hpp"
+#include "workspace-window.hpp"
+#include "include/logging.h"
+
 #include <gtkmm/stock.h>
 
 #ifdef ENABLE_NLS
@@ -32,9 +36,6 @@
 #include <gdl/gdl-dock-item.h>
 #include <gdl/gdl-dock-placeholder.h>
 
-#include "gui/gtk-lumiera.hpp"
-#include "workspace-window.hpp"
-#include "include/logging.h"
 
 using namespace Gtk;
 using namespace Glib;

src/gui/workspace/workspace-window.hpp

@@ -29,15 +29,16 @@
 #ifndef WORKSPACE_WINDOW_HPP
 #define WORKSPACE_WINDOW_HPP
 
-#include <gtkmm.h>
 
-#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 <gtkmm.h>
+
 using namespace gui::panels;
 
 namespace gui {