From 58e49200484cd14dc4892779f75bf40f87cc528e Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 18 Oct 2008 00:13:27 +0100 Subject: [PATCH] Corrected namespaces from lumiera::gui:: to gui:: --- 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/gtk-lumiera.cpp | 8 +++----- src/gui/gtk-lumiera.hpp | 3 --- src/gui/model/project.cpp | 4 ---- src/gui/model/project.hpp | 2 -- src/gui/output/displayer.cpp | 2 -- src/gui/output/displayer.hpp | 2 -- src/gui/output/gdkdisplayer.cpp | 2 -- src/gui/output/gdkdisplayer.hpp | 2 -- src/gui/output/xvdisplayer.cpp | 2 -- src/gui/output/xvdisplayer.hpp | 2 -- src/gui/panels/assets-panel.cpp | 2 -- src/gui/panels/assets-panel.hpp | 2 -- src/gui/panels/panel.cpp | 3 --- src/gui/panels/panel.hpp | 2 -- src/gui/panels/timeline-panel.cpp | 4 +--- src/gui/panels/timeline-panel.hpp | 4 +--- src/gui/panels/viewer-panel.cpp | 4 +--- src/gui/panels/viewer-panel.hpp | 4 +--- src/gui/widgets/timeline-widget.cpp | 4 +--- src/gui/widgets/timeline-widget.hpp | 2 -- src/gui/widgets/timeline/header-container.cpp | 5 ++--- src/gui/widgets/timeline/header-container.hpp | 7 ++----- src/gui/widgets/timeline/timeline-arrow-tool.cpp | 3 --- src/gui/widgets/timeline/timeline-arrow-tool.hpp | 2 -- src/gui/widgets/timeline/timeline-body.cpp | 12 +++++------- src/gui/widgets/timeline/timeline-body.hpp | 6 ++---- src/gui/widgets/timeline/timeline-ibeam-tool.cpp | 5 +---- src/gui/widgets/timeline/timeline-ibeam-tool.hpp | 2 -- src/gui/widgets/timeline/timeline-ruler.cpp | 10 ++++------ src/gui/widgets/timeline/timeline-ruler.hpp | 6 ++---- src/gui/widgets/timeline/timeline-tool.cpp | 7 ++----- src/gui/widgets/timeline/timeline-tool.hpp | 4 +--- src/gui/widgets/timeline/track.cpp | 2 -- src/gui/widgets/timeline/track.hpp | 2 -- src/gui/widgets/video-display-widget.cpp | 3 --- src/gui/widgets/video-display-widget.hpp | 4 +--- src/gui/window-manager.cpp | 2 -- src/gui/window-manager.hpp | 2 -- src/gui/workspace/actions.cpp | 4 +--- src/gui/workspace/actions.hpp | 2 -- src/gui/workspace/workspace-window.cpp | 5 +---- src/gui/workspace/workspace-window.hpp | 8 +++----- 46 files changed, 35 insertions(+), 136 deletions(-) diff --git a/src/gui/dialogs/preferences-dialog.cpp b/src/gui/dialogs/preferences-dialog.cpp index 10f187c1c..c8348c5c7 100644 --- a/src/gui/dialogs/preferences-dialog.cpp +++ b/src/gui/dialogs/preferences-dialog.cpp @@ -26,7 +26,6 @@ using namespace Gtk; -namespace lumiera { namespace gui { namespace dialogs { @@ -58,4 +57,3 @@ namespace dialogs { } // namespace dialogs } // namespace gui -} // namespace lumiera diff --git a/src/gui/dialogs/preferences-dialog.hpp b/src/gui/dialogs/preferences-dialog.hpp index 31ad169c7..87765a7f4 100644 --- a/src/gui/dialogs/preferences-dialog.hpp +++ b/src/gui/dialogs/preferences-dialog.hpp @@ -31,7 +31,6 @@ using namespace Gtk; -namespace lumiera { namespace gui { namespace dialogs { @@ -56,6 +55,5 @@ namespace dialogs { } // namespace dialogs } // namespace gui -} // namespace lumiera #endif // PREFERENCES_DIALOG_HPP diff --git a/src/gui/dialogs/render.cpp b/src/gui/dialogs/render.cpp index 25dafdc88..e4f1d6fd1 100644 --- a/src/gui/dialogs/render.cpp +++ b/src/gui/dialogs/render.cpp @@ -26,7 +26,6 @@ using namespace Gtk; -namespace lumiera { namespace gui { namespace dialogs { @@ -98,4 +97,3 @@ namespace dialogs { } // namespace dialogs } // namespace gui -} // namespace lumiera diff --git a/src/gui/dialogs/render.hpp b/src/gui/dialogs/render.hpp index 1474afe31..75e63ffb9 100644 --- a/src/gui/dialogs/render.hpp +++ b/src/gui/dialogs/render.hpp @@ -31,7 +31,6 @@ using namespace Gtk; -namespace lumiera { namespace gui { namespace dialogs { @@ -67,6 +66,5 @@ namespace dialogs { } // namespace dialogs } // namespace gui -} // namespace lumiera #endif // RENDER_H diff --git a/src/gui/gtk-lumiera.cpp b/src/gui/gtk-lumiera.cpp index ba11f168a..1a895084f 100644 --- a/src/gui/gtk-lumiera.cpp +++ b/src/gui/gtk-lumiera.cpp @@ -36,9 +36,9 @@ NOBUG_CPP_DEFINE_FLAG(gui); using namespace Gtk; using namespace Glib; -using namespace lumiera::gui; -using namespace lumiera::gui::workspace; -using namespace lumiera::gui::model; +using namespace gui; +using namespace gui::workspace; +using namespace gui::model; GtkLumiera the_application; @@ -50,7 +50,6 @@ main (int argc, char *argv[]) -namespace lumiera { namespace gui { int @@ -87,6 +86,5 @@ application() } } // namespace gui -} // namespace lumiera diff --git a/src/gui/gtk-lumiera.hpp b/src/gui/gtk-lumiera.hpp index d3c59d7ba..180148f7f 100644 --- a/src/gui/gtk-lumiera.hpp +++ b/src/gui/gtk-lumiera.hpp @@ -50,8 +50,6 @@ NOBUG_DECLARE_FLAG(gui); # define bindtextdomain(Package, Directory) #endif -namespace lumiera { - /** * The namespace of all GUI code. */ @@ -140,7 +138,6 @@ namespace widgets {} namespace workspace {} } // namespace gui -} // namespace lumiera #endif // GTK_LUMIERA_HPP diff --git a/src/gui/model/project.cpp b/src/gui/model/project.cpp index 345398c7a..71bfe02eb 100644 --- a/src/gui/model/project.cpp +++ b/src/gui/model/project.cpp @@ -22,7 +22,6 @@ #include "project.hpp" -namespace lumiera { namespace gui { namespace model { @@ -33,6 +32,3 @@ Project::Project() } // namespace model } // namespace gui -} // namespace lumiera - - diff --git a/src/gui/model/project.hpp b/src/gui/model/project.hpp index c7d02c51a..aa899bf56 100644 --- a/src/gui/model/project.hpp +++ b/src/gui/model/project.hpp @@ -27,7 +27,6 @@ #ifndef PROJECT_HPP #define PROJECT_HPP -namespace lumiera { namespace gui { namespace model { @@ -39,6 +38,5 @@ public: } // namespace model } // namespace gui -} // namespace lumiera #endif // PROJECT_HPP diff --git a/src/gui/output/displayer.cpp b/src/gui/output/displayer.cpp index f2b036116..a7676c8dd 100644 --- a/src/gui/output/displayer.cpp +++ b/src/gui/output/displayer.cpp @@ -27,7 +27,6 @@ #include "xvdisplayer.hpp" #include "gdkdisplayer.hpp" -namespace lumiera { namespace gui { namespace output { @@ -83,4 +82,3 @@ Displayer::calculateVideoLayout( } // namespace output } // namespace gui -} // namespace lumiera diff --git a/src/gui/output/displayer.hpp b/src/gui/output/displayer.hpp index d5bf2a329..235de278f 100644 --- a/src/gui/output/displayer.hpp +++ b/src/gui/output/displayer.hpp @@ -30,7 +30,6 @@ #ifndef DISPLAYER_HPP #define DISPLAYER_HPP -namespace lumiera { namespace gui { namespace output { @@ -130,6 +129,5 @@ namespace output { } // namespace output } // namespace gui -} // namespace lumiera #endif // DISPLAYER_HPP diff --git a/src/gui/output/gdkdisplayer.cpp b/src/gui/output/gdkdisplayer.cpp index 3718b9f1e..ffe6b81e3 100644 --- a/src/gui/output/gdkdisplayer.cpp +++ b/src/gui/output/gdkdisplayer.cpp @@ -31,7 +31,6 @@ using std::endl; #include "gdkdisplayer.hpp" -namespace lumiera { namespace gui { namespace output { @@ -83,4 +82,3 @@ GdkDisplayer::put( void *image ) } // namespace output } // namespace gui -} // namespace lumiera diff --git a/src/gui/output/gdkdisplayer.hpp b/src/gui/output/gdkdisplayer.hpp index 40ef3b547..8e74d4404 100644 --- a/src/gui/output/gdkdisplayer.hpp +++ b/src/gui/output/gdkdisplayer.hpp @@ -37,7 +37,6 @@ namespace Gtk { class Widget; } -namespace lumiera { namespace gui { namespace output { @@ -57,6 +56,5 @@ class GdkDisplayer : public Displayer } // namespace output } // namespace gui -} // namespace lumiera #endif // GDKDISPLAYER_HPP diff --git a/src/gui/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp index cf7eeb53f..db3d2b25e 100644 --- a/src/gui/output/xvdisplayer.cpp +++ b/src/gui/output/xvdisplayer.cpp @@ -28,7 +28,6 @@ #include "xvdisplayer.hpp" -namespace lumiera { namespace gui { namespace output { @@ -223,4 +222,3 @@ XvDisplayer::put( void *image ) } // namespace output } // namespace gui -} // namespace lumiera diff --git a/src/gui/output/xvdisplayer.hpp b/src/gui/output/xvdisplayer.hpp index aae4e0281..c43db099e 100644 --- a/src/gui/output/xvdisplayer.hpp +++ b/src/gui/output/xvdisplayer.hpp @@ -43,7 +43,6 @@ namespace Gtk { class Widget; } -namespace lumiera { namespace gui { namespace output { @@ -74,6 +73,5 @@ namespace output { } // namespace output } // namespace gui -} // namespace lumiera #endif // XVDISPLAYER_HPP diff --git a/src/gui/panels/assets-panel.cpp b/src/gui/panels/assets-panel.cpp index 58535f0e0..15e079dcc 100644 --- a/src/gui/panels/assets-panel.cpp +++ b/src/gui/panels/assets-panel.cpp @@ -23,7 +23,6 @@ #include "../gtk-lumiera.hpp" #include "assets-panel.hpp" -namespace lumiera { namespace gui { namespace panels { @@ -36,4 +35,3 @@ AssetsPanel::AssetsPanel() : } // namespace panels } // namespace gui -} // namespace lumiera diff --git a/src/gui/panels/assets-panel.hpp b/src/gui/panels/assets-panel.hpp index 899c15db4..6f9dc8ec2 100644 --- a/src/gui/panels/assets-panel.hpp +++ b/src/gui/panels/assets-panel.hpp @@ -28,7 +28,6 @@ #include "panel.hpp" -namespace lumiera { namespace gui { namespace panels { @@ -43,6 +42,5 @@ namespace panels { } // namespace panels } // namespace gui -} // namespace lumiera #endif // ASSETS_PANEL_HPP diff --git a/src/gui/panels/panel.cpp b/src/gui/panels/panel.cpp index 814845113..e6101ae2a 100644 --- a/src/gui/panels/panel.cpp +++ b/src/gui/panels/panel.cpp @@ -23,7 +23,6 @@ #include "panel.hpp" #include "../gtk-lumiera.hpp" -namespace lumiera { namespace gui { namespace panels { @@ -89,5 +88,3 @@ Panel::internal_setup() } // namespace panels } // namespace gui -} // namespace lumiera - diff --git a/src/gui/panels/panel.hpp b/src/gui/panels/panel.hpp index 4c71217c6..6054e9932 100644 --- a/src/gui/panels/panel.hpp +++ b/src/gui/panels/panel.hpp @@ -30,7 +30,6 @@ #include "../gtk-lumiera.hpp" #include -namespace lumiera { namespace gui { namespace panels { @@ -92,6 +91,5 @@ protected: } // namespace panels } // namespace gui -} // namespace lumiera #endif // PANEL_HPP diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp index 709323bad..2fa3c9816 100644 --- a/src/gui/panels/timeline-panel.cpp +++ b/src/gui/panels/timeline-panel.cpp @@ -29,9 +29,8 @@ extern "C" { using namespace Gtk; using namespace sigc; -using namespace lumiera::gui::widgets; +using namespace gui::widgets; -namespace lumiera { namespace gui { namespace panels { @@ -247,4 +246,3 @@ TimelinePanel::on_frame() } // namespace panels } // namespace gui -} // namespace lumiera diff --git a/src/gui/panels/timeline-panel.hpp b/src/gui/panels/timeline-panel.hpp index e12a827f6..1826b87b1 100644 --- a/src/gui/panels/timeline-panel.hpp +++ b/src/gui/panels/timeline-panel.hpp @@ -29,9 +29,8 @@ #include "panel.hpp" #include "../widgets/timeline-widget.hpp" -using namespace lumiera::gui::widgets; +using namespace gui::widgets; -namespace lumiera { namespace gui { namespace panels { @@ -120,6 +119,5 @@ private: } // namespace panels } // namespace gui -} // namespace lumiera #endif // TIMELINE_PANEL_H diff --git a/src/gui/panels/viewer-panel.cpp b/src/gui/panels/viewer-panel.cpp index ee129a606..4ebd3d0cb 100644 --- a/src/gui/panels/viewer-panel.cpp +++ b/src/gui/panels/viewer-panel.cpp @@ -23,10 +23,9 @@ #include "../gtk-lumiera.hpp" #include "viewer-panel.hpp" -using namespace lumiera::gui::widgets; +using namespace gui::widgets; using namespace Gtk; -namespace lumiera { namespace gui { namespace panels { @@ -47,4 +46,3 @@ ViewerPanel::ViewerPanel() : } // namespace panels } // namespace gui -} // namespace lumiera diff --git a/src/gui/panels/viewer-panel.hpp b/src/gui/panels/viewer-panel.hpp index 5400aee41..0185e6d4a 100644 --- a/src/gui/panels/viewer-panel.hpp +++ b/src/gui/panels/viewer-panel.hpp @@ -31,7 +31,6 @@ #include "panel.hpp" #include "../widgets/video-display-widget.hpp" -namespace lumiera { namespace gui { namespace panels { @@ -42,12 +41,11 @@ namespace panels { protected: - lumiera::gui::widgets::VideoDisplayWidget display; + gui::widgets::VideoDisplayWidget display; Gtk::Toolbar toolBar; }; } // namespace panels } // namespace gui -} // namespace lumiera #endif // VIEWER_PANEL_HPP diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp index a3335cfd3..20014e675 100644 --- a/src/gui/widgets/timeline-widget.cpp +++ b/src/gui/widgets/timeline-widget.cpp @@ -26,9 +26,8 @@ using namespace Gtk; using namespace std; -using namespace lumiera::gui::widgets::timeline; +using namespace gui::widgets::timeline; -namespace lumiera { namespace gui { namespace widgets { @@ -403,4 +402,3 @@ TimelineWidget::on_playback_period_drag_released() } // namespace widgets } // namespace gui -} // namespace lumiera diff --git a/src/gui/widgets/timeline-widget.hpp b/src/gui/widgets/timeline-widget.hpp index 7d2bfef00..9a43769ed 100644 --- a/src/gui/widgets/timeline-widget.hpp +++ b/src/gui/widgets/timeline-widget.hpp @@ -35,7 +35,6 @@ #include "timeline/timeline-ibeam-tool.hpp" #include "timeline/track.hpp" -namespace lumiera { namespace gui { namespace widgets { @@ -267,7 +266,6 @@ protected: } // namespace widgets } // namespace gui -} // namespace lumiera #endif // TIMELINE_WIDGET_HPP diff --git a/src/gui/widgets/timeline/header-container.cpp b/src/gui/widgets/timeline/header-container.cpp index 6bd5a42ae..27812ccd1 100644 --- a/src/gui/widgets/timeline/header-container.cpp +++ b/src/gui/widgets/timeline/header-container.cpp @@ -29,12 +29,12 @@ using namespace Gtk; using namespace std; -namespace lumiera { namespace gui { namespace widgets { namespace timeline { -HeaderContainer::HeaderContainer(lumiera::gui::widgets::TimelineWidget *timeline_widget) : +HeaderContainer::HeaderContainer(gui::widgets::TimelineWidget + *timeline_widget) : Glib::ObjectBase("HeaderContainer"), timelineWidget(timeline_widget), margin(-1) @@ -282,4 +282,3 @@ HeaderContainer::read_styles() } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera diff --git a/src/gui/widgets/timeline/header-container.hpp b/src/gui/widgets/timeline/header-container.hpp index 6afb2396a..84f15116d 100644 --- a/src/gui/widgets/timeline/header-container.hpp +++ b/src/gui/widgets/timeline/header-container.hpp @@ -30,7 +30,6 @@ #include "../../gtk-lumiera.hpp" #include -namespace lumiera { namespace gui { namespace widgets { @@ -53,8 +52,7 @@ public: * * @param[in] timeline_widget A pointer to the owner timeline widget */ - HeaderContainer(lumiera::gui::widgets::TimelineWidget* - timeline_widget); + HeaderContainer(gui::widgets::TimelineWidget* timeline_widget); /** * Attaches the header all the header widgets of root @@ -135,7 +133,7 @@ private: /** * The owner TimelineWidget of which this class is a helper */ - lumiera::gui::widgets::TimelineWidget *timelineWidget; + gui::widgets::TimelineWidget *timelineWidget; /** * The widget's window object. @@ -175,7 +173,6 @@ private: } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera #endif // HEADER_CONTAINER_HPP diff --git a/src/gui/widgets/timeline/timeline-arrow-tool.cpp b/src/gui/widgets/timeline/timeline-arrow-tool.cpp index 109d6190e..52acb661e 100644 --- a/src/gui/widgets/timeline/timeline-arrow-tool.cpp +++ b/src/gui/widgets/timeline/timeline-arrow-tool.cpp @@ -22,7 +22,6 @@ #include "timeline-arrow-tool.hpp" -namespace lumiera { namespace gui { namespace widgets { namespace timeline { @@ -66,5 +65,3 @@ ArrowTool::on_motion_notify_event(GdkEventMotion *event) } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera - diff --git a/src/gui/widgets/timeline/timeline-arrow-tool.hpp b/src/gui/widgets/timeline/timeline-arrow-tool.hpp index a6ec1f1bf..902fb0a88 100644 --- a/src/gui/widgets/timeline/timeline-arrow-tool.hpp +++ b/src/gui/widgets/timeline/timeline-arrow-tool.hpp @@ -29,7 +29,6 @@ #include #include "timeline-tool.hpp" -namespace lumiera { namespace gui { namespace widgets { namespace timeline { @@ -78,6 +77,5 @@ protected: } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera #endif // TIMELINE_ARROW_TOOL_HPP diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp index 0d620ef07..11c3b2b73 100644 --- a/src/gui/widgets/timeline/timeline-body.cpp +++ b/src/gui/widgets/timeline/timeline-body.cpp @@ -32,16 +32,15 @@ using namespace Gtk; using namespace std; -using namespace lumiera::gui; -using namespace lumiera::gui::widgets; -using namespace lumiera::gui::widgets::timeline; +using namespace gui; +using namespace gui::widgets; +using namespace gui::widgets::timeline; -namespace lumiera { namespace gui { namespace widgets { namespace timeline { -TimelineBody::TimelineBody(lumiera::gui::widgets::TimelineWidget +TimelineBody::TimelineBody(gui::widgets::TimelineWidget *timeline_widget) : Glib::ObjectBase("TimelineBody"), tool(NULL), @@ -75,7 +74,7 @@ TimelineBody::get_tool() const REQUIRE(tool != NULL); if(tool != NULL) return tool->get_type(); - return lumiera::gui::widgets::timeline::None; + return gui::widgets::timeline::None; } void @@ -437,4 +436,3 @@ TimelineBody::read_styles() } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera diff --git a/src/gui/widgets/timeline/timeline-body.hpp b/src/gui/widgets/timeline/timeline-body.hpp index 971acd551..894cb9f09 100644 --- a/src/gui/widgets/timeline/timeline-body.hpp +++ b/src/gui/widgets/timeline/timeline-body.hpp @@ -29,7 +29,6 @@ #include "../../gtk-lumiera.hpp" #include "timeline-tool.hpp" -namespace lumiera { namespace gui { namespace widgets { @@ -50,7 +49,7 @@ public: * Constructor * @param timeline_widget The owner widget of this ruler. */ - TimelineBody(lumiera::gui::widgets::TimelineWidget *timeline_widget); + TimelineBody(gui::widgets::TimelineWidget *timeline_widget); /** * Destructor @@ -163,7 +162,7 @@ private: float selectionAlpha; GdkColor playbackPointColour; - lumiera::gui::widgets::TimelineWidget *timelineWidget; + gui::widgets::TimelineWidget *timelineWidget; friend class Tool; friend class ArrowTool; @@ -173,6 +172,5 @@ private: } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera #endif // TIMELINE_BODY_HPP diff --git a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp b/src/gui/widgets/timeline/timeline-ibeam-tool.cpp index fe3ce5d23..1417676d7 100644 --- a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp +++ b/src/gui/widgets/timeline/timeline-ibeam-tool.cpp @@ -23,9 +23,8 @@ #include "timeline-ibeam-tool.hpp" #include "../timeline-widget.hpp" -using namespace lumiera::gui::widgets; +using namespace gui::widgets; -namespace lumiera { namespace gui { namespace widgets { namespace timeline { @@ -239,5 +238,3 @@ IBeamTool::is_mouse_in_end_drag_zone() const } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera - diff --git a/src/gui/widgets/timeline/timeline-ibeam-tool.hpp b/src/gui/widgets/timeline/timeline-ibeam-tool.hpp index fab09c251..93dcd9f60 100644 --- a/src/gui/widgets/timeline/timeline-ibeam-tool.hpp +++ b/src/gui/widgets/timeline/timeline-ibeam-tool.hpp @@ -30,7 +30,6 @@ #include #include "timeline-tool.hpp" -namespace lumiera { namespace gui { namespace widgets { namespace timeline { @@ -206,6 +205,5 @@ private: } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera #endif // TIMELINE_IBEAM_TOOL_HPP diff --git a/src/gui/widgets/timeline/timeline-ruler.cpp b/src/gui/widgets/timeline/timeline-ruler.cpp index 52112c4fe..bead8a507 100644 --- a/src/gui/widgets/timeline/timeline-ruler.cpp +++ b/src/gui/widgets/timeline/timeline-ruler.cpp @@ -33,17 +33,16 @@ extern "C" { using namespace Gtk; using namespace Cairo; using namespace std; -using namespace lumiera::gui; -using namespace lumiera::gui::widgets; -using namespace lumiera::gui::widgets::timeline; +using namespace gui; +using namespace gui::widgets; +using namespace gui::widgets::timeline; -namespace lumiera { namespace gui { namespace widgets { namespace timeline { TimelineRuler::TimelineRuler( - lumiera::gui::widgets::TimelineWidget *timeline_widget) : + gui::widgets::TimelineWidget *timeline_widget) : Glib::ObjectBase("TimelineRuler"), isDragging(false), pinnedDragTime(0), @@ -647,4 +646,3 @@ TimelineRuler::read_styles() } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera diff --git a/src/gui/widgets/timeline/timeline-ruler.hpp b/src/gui/widgets/timeline/timeline-ruler.hpp index a5435e859..525ae9dc3 100644 --- a/src/gui/widgets/timeline/timeline-ruler.hpp +++ b/src/gui/widgets/timeline/timeline-ruler.hpp @@ -29,7 +29,6 @@ #include "../../gtk-lumiera.hpp" -namespace lumiera { namespace gui { namespace widgets { @@ -49,7 +48,7 @@ public: * @param timeline_widget The owner widget of this ruler. */ TimelineRuler( - lumiera::gui::widgets::TimelineWidget *timeline_widget); + gui::widgets::TimelineWidget *timeline_widget); /** * Sets offset of the mouse chevron @@ -217,7 +216,7 @@ private: /** * The owner widget */ - lumiera::gui::widgets::TimelineWidget *timelineWidget; + gui::widgets::TimelineWidget *timelineWidget; /** * The caches image of the ruler, over which the chevrons etc. will @@ -232,7 +231,6 @@ private: } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera #endif // TIMELINE_RULER_HPP diff --git a/src/gui/widgets/timeline/timeline-tool.cpp b/src/gui/widgets/timeline/timeline-tool.cpp index 3d279c73b..dc462529a 100644 --- a/src/gui/widgets/timeline/timeline-tool.cpp +++ b/src/gui/widgets/timeline/timeline-tool.cpp @@ -25,7 +25,6 @@ using namespace Gdk; -namespace lumiera { namespace gui { namespace widgets { namespace timeline { @@ -76,11 +75,11 @@ Tool::on_motion_notify_event(GdkEventMotion *event) mousePoint = Point(event->x, event->y); } -lumiera::gui::widgets::TimelineWidget* +gui::widgets::TimelineWidget* Tool::get_timeline_widget() const { REQUIRE(timelineBody != NULL); - lumiera::gui::widgets::TimelineWidget *timeline_widget = + gui::widgets::TimelineWidget *timeline_widget = timelineBody->timelineWidget; REQUIRE(timeline_widget != NULL); return timeline_widget; @@ -96,5 +95,3 @@ Tool::get_body_rectangle() const } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera - diff --git a/src/gui/widgets/timeline/timeline-tool.hpp b/src/gui/widgets/timeline/timeline-tool.hpp index 8e003b35e..49c1697ed 100644 --- a/src/gui/widgets/timeline/timeline-tool.hpp +++ b/src/gui/widgets/timeline/timeline-tool.hpp @@ -29,7 +29,6 @@ #include "../../gtk-lumiera.hpp" -namespace lumiera { namespace gui { namespace widgets { @@ -121,7 +120,7 @@ protected: * Helper function which retrieves the pointer to owner timeline * widget object, which is the owner of the timeline body. */ - lumiera::gui::widgets::TimelineWidget *get_timeline_widget() const; + gui::widgets::TimelineWidget *get_timeline_widget() const; /** * Helper function which retrieves the rectangle of the timeline @@ -139,6 +138,5 @@ protected: } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera #endif // TIMELINE_TOOL_HPP diff --git a/src/gui/widgets/timeline/track.cpp b/src/gui/widgets/timeline/track.cpp index 177d0b388..f8acb35de 100644 --- a/src/gui/widgets/timeline/track.cpp +++ b/src/gui/widgets/timeline/track.cpp @@ -24,7 +24,6 @@ using namespace Gtk; -namespace lumiera { namespace gui { namespace widgets { namespace timeline { @@ -65,5 +64,4 @@ Track::draw_track(Cairo::RefPtr cairo) } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera diff --git a/src/gui/widgets/timeline/track.hpp b/src/gui/widgets/timeline/track.hpp index 719ce7d34..a1b6d48e8 100644 --- a/src/gui/widgets/timeline/track.hpp +++ b/src/gui/widgets/timeline/track.hpp @@ -28,7 +28,6 @@ #include "../../gtk-lumiera.hpp" -namespace lumiera { namespace gui { namespace widgets { namespace timeline { @@ -58,6 +57,5 @@ protected: } // namespace timeline } // namespace widgets } // namespace gui -} // namespace lumiera #endif // TRACK_HPP diff --git a/src/gui/widgets/video-display-widget.cpp b/src/gui/widgets/video-display-widget.cpp index fc400cf5d..720986156 100644 --- a/src/gui/widgets/video-display-widget.cpp +++ b/src/gui/widgets/video-display-widget.cpp @@ -31,7 +31,6 @@ #include "video-display-widget.hpp" -namespace lumiera { namespace gui { namespace widgets { @@ -100,5 +99,3 @@ VideoDisplayWidget::createDisplayer( Gtk::Widget *drawingArea, int width, int he } // namespace widgets } // namespace gui -} // namespace lumiera - diff --git a/src/gui/widgets/video-display-widget.hpp b/src/gui/widgets/video-display-widget.hpp index 1d033ae98..6bf829f7a 100644 --- a/src/gui/widgets/video-display-widget.hpp +++ b/src/gui/widgets/video-display-widget.hpp @@ -30,9 +30,8 @@ #include "../output/displayer.hpp" -using namespace lumiera::gui::output; +using namespace gui::output; -namespace lumiera { namespace gui { namespace widgets { @@ -62,6 +61,5 @@ private: } // namespace widgets } // namespace gui -} // namespace lumiera #endif // VIDEO_DISPLAY_WIDGET_HPP diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp index 127b4273c..4a89158d7 100644 --- a/src/gui/window-manager.cpp +++ b/src/gui/window-manager.cpp @@ -25,7 +25,6 @@ using namespace Gtk; using namespace Glib; -namespace lumiera { namespace gui { IconSize WindowManager::giantIconSize = ICON_SIZE_INVALID; @@ -189,4 +188,3 @@ WindowManager::add_stock_icon_source(Gtk::IconSet &icon_set, } } // namespace gui -} // namespace lumiera diff --git a/src/gui/window-manager.hpp b/src/gui/window-manager.hpp index a15214ab8..c25a763ef 100644 --- a/src/gui/window-manager.hpp +++ b/src/gui/window-manager.hpp @@ -30,7 +30,6 @@ #include "gtk-lumiera.hpp" -namespace lumiera { namespace gui { /** @@ -130,6 +129,5 @@ private: }; } // namespace gui -} // namespace lumiera #endif // WINDOW_MANAGER_HPP diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp index 7dffaad28..71997fbd7 100644 --- a/src/gui/workspace/actions.cpp +++ b/src/gui/workspace/actions.cpp @@ -29,9 +29,8 @@ using namespace Gtk; using namespace Glib; using namespace sigc; -using namespace lumiera::gui; +using namespace gui; -namespace lumiera { namespace gui { namespace workspace { @@ -200,5 +199,4 @@ Actions::on_menu_others() } // namespace workspace } // namespace gui -} // namespace lumiera diff --git a/src/gui/workspace/actions.hpp b/src/gui/workspace/actions.hpp index 8976c5e29..49d5e0b3a 100644 --- a/src/gui/workspace/actions.hpp +++ b/src/gui/workspace/actions.hpp @@ -31,7 +31,6 @@ #include "../gtk-lumiera.hpp" -namespace lumiera { namespace gui { namespace workspace { @@ -94,6 +93,5 @@ private: } // namespace workspace } // namespace gui -} // namespace lumiera #endif // ACTIONS_H diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp index 4b82c8d5c..f3b9e3c97 100644 --- a/src/gui/workspace/workspace-window.cpp +++ b/src/gui/workspace/workspace-window.cpp @@ -36,9 +36,8 @@ #include "workspace-window.hpp" using namespace Gtk; -using namespace lumiera::gui::model; +using namespace gui::model; -namespace lumiera { namespace gui { namespace workspace { @@ -194,5 +193,3 @@ WorkspaceWindow::create_ui() } // namespace workspace } // namespace gui -} // namespace lumiera - diff --git a/src/gui/workspace/workspace-window.hpp b/src/gui/workspace/workspace-window.hpp index 3f3b60de1..4bcb50488 100644 --- a/src/gui/workspace/workspace-window.hpp +++ b/src/gui/workspace/workspace-window.hpp @@ -38,9 +38,8 @@ #include "../panels/viewer-panel.hpp" #include "../panels/timeline-panel.hpp" -using namespace lumiera::gui::panels; +using namespace gui::panels; -namespace lumiera { namespace gui { namespace model { @@ -55,7 +54,7 @@ namespace workspace { class WorkspaceWindow : public Gtk::Window { public: - WorkspaceWindow(lumiera::gui::model::Project *source_project); + WorkspaceWindow(gui::model::Project *source_project); ~WorkspaceWindow(); @@ -64,7 +63,7 @@ private: /* ===== Model ===== */ private: - lumiera::gui::model::Project *project; + gui::model::Project *project; /* ===== UI ===== */ private: @@ -98,6 +97,5 @@ private: } // namespace workspace } // namespace gui -} // namespace lumiera #endif // WORKSPACE_WINDOW_HPP