diff --git a/src/gui/dialog/name-chooser.cpp b/src/gui/dialog/name-chooser.cpp index 1d52e3c2d..4de2596df 100644 --- a/src/gui/dialog/name-chooser.cpp +++ b/src/gui/dialog/name-chooser.cpp @@ -25,8 +25,8 @@ #include "gui/dialog/name-chooser.hpp" #include "gui/dialog/dialog.hpp" -using namespace Gtk; -using namespace Glib; +using namespace Gtk; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace Glib; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace dialog { diff --git a/src/gui/dialog/preferences-dialog.hpp b/src/gui/dialog/preferences-dialog.hpp index 51a726d69..f508ee6cd 100644 --- a/src/gui/dialog/preferences-dialog.hpp +++ b/src/gui/dialog/preferences-dialog.hpp @@ -44,7 +44,7 @@ namespace dialog { PreferencesDialog (Gtk::Window &parent) : Dialog(_("Preferences"), parent, true) { - using namespace Gtk; + using namespace Gtk; /////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! Box *v_box = get_vbox(); REQUIRE (v_box != NULL); diff --git a/src/gui/dialog/render.cpp b/src/gui/dialog/render.cpp index 5cc136875..cfe706a67 100644 --- a/src/gui/dialog/render.cpp +++ b/src/gui/dialog/render.cpp @@ -28,7 +28,7 @@ #include "include/logging.h" -using namespace Gtk; +using namespace Gtk; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace dialog { diff --git a/src/gui/gtk-lumiera.cpp b/src/gui/gtk-lumiera.cpp index d50705f54..5fd5a572b 100644 --- a/src/gui/gtk-lumiera.cpp +++ b/src/gui/gtk-lumiera.cpp @@ -39,7 +39,7 @@ namespace gui { - using namespace Gtk; ////////////////////TODO explicit usings please! + using namespace Gtk; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using namespace Glib; using namespace gui::model; using namespace gui::workspace; diff --git a/src/gui/model/parent-track.cpp b/src/gui/model/parent-track.cpp index b7fc61ad1..cfa4a95ff 100644 --- a/src/gui/model/parent-track.cpp +++ b/src/gui/model/parent-track.cpp @@ -70,10 +70,10 @@ ParentTrack::remove_descendant_track( shared_ptr ParentTrack::find_descendant_track_parent(shared_ptr child) { - using namespace boost; + using namespace boost; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! REQUIRE(child != NULL); - BOOST_FOREACH(std::shared_ptr track, tracks) + BOOST_FOREACH(std::shared_ptr track, tracks) ///////TODO use a standard foreach loop { if(track == child) return shared_from_this(); diff --git a/src/gui/panel/panel.cpp b/src/gui/panel/panel.cpp index f58760556..97a68c7e5 100644 --- a/src/gui/panel/panel.cpp +++ b/src/gui/panel/panel.cpp @@ -28,7 +28,7 @@ #include -using namespace Gtk; +using namespace Gtk; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace panel{ diff --git a/src/gui/panel/timeline-panel-obsolete.cpp b/src/gui/panel/timeline-panel-obsolete.cpp index 66419882a..47cebb65f 100644 --- a/src/gui/panel/timeline-panel-obsolete.cpp +++ b/src/gui/panel/timeline-panel-obsolete.cpp @@ -33,7 +33,7 @@ #include -using namespace Gtk; +using namespace Gtk; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using namespace sigc; using namespace gui::widget; using namespace gui::widget::timeline; diff --git a/src/gui/panel/timeline-panel-obsolete.hpp b/src/gui/panel/timeline-panel-obsolete.hpp index 4e0fdfde0..475b10e7e 100644 --- a/src/gui/panel/timeline-panel-obsolete.hpp +++ b/src/gui/panel/timeline-panel-obsolete.hpp @@ -42,7 +42,7 @@ #include #include -using namespace gui::widget; ////////////TODO only explicit using clauses please! +using namespace gui::widget; /////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace model{ diff --git a/src/gui/panel/viewer-panel.cpp b/src/gui/panel/viewer-panel.cpp index 1d30919dc..7aa0704e4 100644 --- a/src/gui/panel/viewer-panel.cpp +++ b/src/gui/panel/viewer-panel.cpp @@ -29,9 +29,9 @@ #include "gui/display-service.hpp" -using namespace Gtk; -using namespace gui::widget; -using namespace gui::controller; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui::widget; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui::controller; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace panel { diff --git a/src/gui/widget/menu-button.cpp b/src/gui/widget/menu-button.cpp index bd3134941..e4897d552 100644 --- a/src/gui/widget/menu-button.cpp +++ b/src/gui/widget/menu-button.cpp @@ -24,9 +24,9 @@ #include "gui/widget/menu-button.hpp" -using namespace Gtk; -using namespace Glib; -using namespace sigc; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace Glib; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace sigc; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! #define POPUP_SLUG "TheMenu" diff --git a/src/gui/widget/menu-button.hpp b/src/gui/widget/menu-button.hpp index 1da6d4aae..67768dbe7 100644 --- a/src/gui/widget/menu-button.hpp +++ b/src/gui/widget/menu-button.hpp @@ -31,7 +31,7 @@ namespace gui { namespace widget { - using namespace Gtk; + using namespace Gtk; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! /** * A button that displays a menu when clicked on. diff --git a/src/gui/widget/panel-bar.cpp b/src/gui/widget/panel-bar.cpp index b4ed380ee..f77c69dad 100644 --- a/src/gui/widget/panel-bar.cpp +++ b/src/gui/widget/panel-bar.cpp @@ -31,11 +31,11 @@ #include #include -using namespace Gtk; -using namespace Glib; -using namespace sigc; -using namespace std; -using namespace gui::workspace; +using namespace Gtk; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace Glib; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace sigc; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace std; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui::workspace; //////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace widget { diff --git a/src/gui/widget/timecode-widget.cpp b/src/gui/widget/timecode-widget.cpp index aa37787e8..e4f1b1d83 100644 --- a/src/gui/widget/timecode-widget.cpp +++ b/src/gui/widget/timecode-widget.cpp @@ -49,7 +49,7 @@ using std::string; namespace gui { namespace widget { - using namespace Gtk; + using namespace Gtk; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! // TODO: frame rate should not be a constant, but instead be per sequence const float framerate = 25; diff --git a/src/gui/widget/timeline-widget.cpp b/src/gui/widget/timeline-widget.cpp index 0fb05122b..b0fe331eb 100644 --- a/src/gui/widget/timeline-widget.cpp +++ b/src/gui/widget/timeline-widget.cpp @@ -39,10 +39,10 @@ using lib::time::Time; using lib::time::TimeValue; using std::dynamic_pointer_cast; -using namespace Gtk; +using namespace Gtk; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! -using namespace util; -using namespace gui::widget::timeline; +using namespace util; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui::widget::timeline; ////////////TODO OK this one looks more sensible, but why do we need to refer to such a nested space so much? namespace gui { namespace widget { diff --git a/src/gui/widget/timeline/timeline-body.cpp b/src/gui/widget/timeline/timeline-body.cpp index 373f5d025..c432ff3b4 100644 --- a/src/gui/widget/timeline/timeline-body.cpp +++ b/src/gui/widget/timeline/timeline-body.cpp @@ -33,9 +33,9 @@ #include #include -using namespace Gtk; -using namespace std; -using namespace lumiera; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace std; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace lumiera; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using gui::util::CairoUtil; using std::shared_ptr; diff --git a/src/gui/widget/timeline/timeline-clip-track.cpp b/src/gui/widget/timeline/timeline-clip-track.cpp index 04d4f92f1..22c6b7324 100644 --- a/src/gui/widget/timeline/timeline-clip-track.cpp +++ b/src/gui/widget/timeline/timeline-clip-track.cpp @@ -27,7 +27,7 @@ #include -using namespace Gtk; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using std::shared_ptr; using util::contains; diff --git a/src/gui/widget/timeline/timeline-group-track.cpp b/src/gui/widget/timeline/timeline-group-track.cpp index 6f7660a3c..13ec31340 100644 --- a/src/gui/widget/timeline/timeline-group-track.cpp +++ b/src/gui/widget/timeline/timeline-group-track.cpp @@ -24,8 +24,8 @@ #include "gui/widget/timeline/timeline-group-track.hpp" #include "gui/widget/timeline-widget.hpp" -using namespace Gtk; -using namespace sigc; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace sigc; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace widget { diff --git a/src/gui/widget/timeline/timeline-header-container.cpp b/src/gui/widget/timeline/timeline-header-container.cpp index 708564ebc..d7616812d 100644 --- a/src/gui/widget/timeline/timeline-header-container.cpp +++ b/src/gui/widget/timeline/timeline-header-container.cpp @@ -32,8 +32,8 @@ using std::pair; using std::shared_ptr; -using namespace Gtk; -using namespace util; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace util; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace widget { diff --git a/src/gui/widget/timeline/timeline-header-widget.cpp b/src/gui/widget/timeline/timeline-header-widget.cpp index ef957dd56..454e3c8f1 100644 --- a/src/gui/widget/timeline/timeline-header-widget.cpp +++ b/src/gui/widget/timeline/timeline-header-widget.cpp @@ -26,9 +26,9 @@ #include -using namespace Gtk; -using namespace std; -using namespace util; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace std; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace util; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using std::shared_ptr; diff --git a/src/gui/widget/timeline/timeline-ibeam-tool.cpp b/src/gui/widget/timeline/timeline-ibeam-tool.cpp index f86fa1453..b16cd4ed9 100644 --- a/src/gui/widget/timeline/timeline-ibeam-tool.cpp +++ b/src/gui/widget/timeline/timeline-ibeam-tool.cpp @@ -25,7 +25,7 @@ #include "gui/widget/timeline-widget.hpp" #include "lib/time/mutation.hpp" -using namespace gui::widget; +using namespace gui::widget; ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using lib::time::Mutation; using std::shared_ptr; diff --git a/src/gui/widget/timeline/timeline-layout-helper.cpp b/src/gui/widget/timeline/timeline-layout-helper.cpp index c0cf65483..af7997532 100644 --- a/src/gui/widget/timeline/timeline-layout-helper.cpp +++ b/src/gui/widget/timeline/timeline-layout-helper.cpp @@ -36,10 +36,10 @@ using std::shared_ptr; using std::weak_ptr; using std::dynamic_pointer_cast; -using namespace Gtk; -using namespace lumiera; -using namespace util; -using namespace gui::util; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace lumiera; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace util; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui::util; /////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace widget { diff --git a/src/gui/widget/timeline/timeline-ruler.cpp b/src/gui/widget/timeline/timeline-ruler.cpp index 5fba44173..e1866fee2 100644 --- a/src/gui/widget/timeline/timeline-ruler.cpp +++ b/src/gui/widget/timeline/timeline-ruler.cpp @@ -30,11 +30,11 @@ #include -using namespace Gtk; -using namespace Cairo; -using namespace gui; -using namespace gui::widget; -using namespace gui::widget::timeline; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace Cairo; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui::widget; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui::widget::timeline; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using std::shared_ptr; using gui::util::CairoUtil; diff --git a/src/gui/widget/timeline/timeline-state.cpp b/src/gui/widget/timeline/timeline-state.cpp index 3eec7bd2a..5c41c2db8 100644 --- a/src/gui/widget/timeline/timeline-state.cpp +++ b/src/gui/widget/timeline/timeline-state.cpp @@ -26,8 +26,8 @@ #include "lib/time/mutation.hpp" #include "lib/time/control.hpp" -using namespace Gtk; -using namespace sigc; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace sigc; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace widget { diff --git a/src/gui/widget/timeline/timeline-tool.cpp b/src/gui/widget/timeline/timeline-tool.cpp index c5e40ad88..cb7c20ce5 100644 --- a/src/gui/widget/timeline/timeline-tool.cpp +++ b/src/gui/widget/timeline/timeline-tool.cpp @@ -24,7 +24,7 @@ #include "gui/widget/timeline/timeline-tool.hpp" #include "gui/widget/timeline-widget.hpp" -using namespace Gdk; +using namespace Gdk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using std::shared_ptr; namespace gui { diff --git a/src/gui/widget/timeline/timeline-track.cpp b/src/gui/widget/timeline/timeline-track.cpp index 2bf53dcb2..ac439e34e 100644 --- a/src/gui/widget/timeline/timeline-track.cpp +++ b/src/gui/widget/timeline/timeline-track.cpp @@ -27,8 +27,8 @@ #include "gui/dialog/name-chooser.hpp" #include "include/logging.h" -using namespace Gtk; -using namespace sigc; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace sigc; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using std::shared_ptr; diff --git a/src/gui/widget/timeline/timeline-view-window.cpp b/src/gui/widget/timeline/timeline-view-window.cpp index b226552b3..30452296e 100644 --- a/src/gui/widget/timeline/timeline-view-window.cpp +++ b/src/gui/widget/timeline/timeline-view-window.cpp @@ -25,9 +25,9 @@ #include "gui/widget/timeline-widget.hpp" -using namespace Gtk; -using namespace gui::widget; -using namespace lumiera; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui::widget; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace lumiera; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace widget { diff --git a/src/gui/widget/timeline/timeline-zoom-scale.cpp b/src/gui/widget/timeline/timeline-zoom-scale.cpp index beac2ef86..ca891401d 100644 --- a/src/gui/widget/timeline/timeline-zoom-scale.cpp +++ b/src/gui/widget/timeline/timeline-zoom-scale.cpp @@ -24,7 +24,7 @@ #include "gui/widget/timeline-widget.hpp" #include "gui/widget/timeline/timeline-zoom-scale.hpp" -using namespace Gtk; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace widget { diff --git a/src/gui/widget/timeline/timeline-zoom-scale.hpp b/src/gui/widget/timeline/timeline-zoom-scale.hpp index e2ca1a91b..e95150ab2 100644 --- a/src/gui/widget/timeline/timeline-zoom-scale.hpp +++ b/src/gui/widget/timeline/timeline-zoom-scale.hpp @@ -30,8 +30,8 @@ #include "gui/widget/timeline-widget.hpp" #include "gui/widget/timeline/timeline-state.hpp" -using namespace Gtk; -using namespace gui::widget; +using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui::widget; ////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace widget { diff --git a/src/gui/widget/video-display-widget.hpp b/src/gui/widget/video-display-widget.hpp index 2e9bcde49..0586c4ee0 100644 --- a/src/gui/widget/video-display-widget.hpp +++ b/src/gui/widget/video-display-widget.hpp @@ -30,7 +30,7 @@ #include "gui/output/displayer.hpp" -using namespace gui::output; +using namespace gui::output; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace widget { diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp index 1e298b4c9..1d469670d 100644 --- a/src/gui/workspace/actions.cpp +++ b/src/gui/workspace/actions.cpp @@ -34,10 +34,10 @@ #include "include/logging.h" -using namespace Gtk; -using namespace Glib; -using namespace sigc; -using namespace gui; +using namespace Gtk; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace Glib; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace sigc; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace gui; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace workspace { diff --git a/src/gui/workspace/panel-manager.cpp b/src/gui/workspace/panel-manager.cpp index d2d6ad2ad..aaf2f3c55 100644 --- a/src/gui/workspace/panel-manager.cpp +++ b/src/gui/workspace/panel-manager.cpp @@ -30,9 +30,9 @@ #include "include/logging.h" -using namespace boost; -using namespace std; -using namespace Gtk; +using namespace boost; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace std; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace Gtk; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace workspace { diff --git a/src/gui/workspace/panel-manager.hpp b/src/gui/workspace/panel-manager.hpp index ba383ab09..6c6d62bf5 100644 --- a/src/gui/workspace/panel-manager.hpp +++ b/src/gui/workspace/panel-manager.hpp @@ -36,7 +36,7 @@ #include -using namespace gui::panel; +using namespace gui::panel; ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace workspace { diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp index 597469fdc..ce14e380e 100644 --- a/src/gui/workspace/workspace-window.cpp +++ b/src/gui/workspace/workspace-window.cpp @@ -32,8 +32,8 @@ -using namespace Gtk; -using namespace Glib; +using namespace Gtk; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! +using namespace Glib; ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using namespace gui::model; using namespace gui::controller; diff --git a/src/gui/workspace/workspace-window.hpp b/src/gui/workspace/workspace-window.hpp index b31ebb9e2..5c25a04d2 100644 --- a/src/gui/workspace/workspace-window.hpp +++ b/src/gui/workspace/workspace-window.hpp @@ -37,7 +37,7 @@ #include -using namespace gui::panel; +using namespace gui::panel; ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! namespace gui { namespace model {