diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-05-12 17:03:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-05-12 17:03:42 +0000 |
| commit | 3b89d9eaa03406a5e03648f47734211f09b89d62 (patch) | |
| tree | 1c8d151bca327d4a5cb7047c8591aa814b9b4ec8 /gtk2_ardour/streamview.h | |
| parent | 2e5c935990d6ea5cc6e9a5a6de0fd8c52e68657c (diff) | |
Remove most using declarations from header files.
git-svn-id: svn://localhost/ardour2/branches/3.0@5069 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/streamview.h')
| -rw-r--r-- | gtk2_ardour/streamview.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index caea5487ee..546d51dee2 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -89,8 +89,8 @@ public: void foreach_regionview (sigc::slot<void,RegionView*> slot); void set_selected_regionviews (RegionSelection&); - void get_selectables (nframes_t start, nframes_t end, list<Selectable* >&); - void get_inverted_selectables (Selection&, list<Selectable* >& results); + void get_selectables (nframes_t start, nframes_t end, std::list<Selectable* >&); + void get_inverted_selectables (Selection&, std::list<Selectable* >& results); virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region> r) {} void add_region_view (boost::shared_ptr<ARDOUR::Region>); @@ -135,14 +135,14 @@ protected: ArdourCanvas::Group* canvas_group; ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */ - typedef list<RegionView* > RegionViewList; + typedef std::list<RegionView* > RegionViewList; RegionViewList region_views; double _samples_per_unit; sigc::connection screen_update_connection; - vector<RecBoxInfo> rec_rects; - list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions; + std::vector<RecBoxInfo> rec_rects; + std::list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions; bool rec_updating; bool rec_active; bool use_rec_regions; @@ -150,7 +150,7 @@ protected: Gdk::Color region_color; ///< Contained region color uint32_t stream_base_color; ///< Background color - vector<sigc::connection> playlist_connections; + std::vector<sigc::connection> playlist_connections; sigc::connection playlist_change_connection; ARDOUR::layer_t _layers; @@ -158,7 +158,7 @@ protected: double height; - list<sigc::connection> rec_data_ready_connections; + std::list<sigc::connection> rec_data_ready_connections; jack_nframes_t last_rec_data_frame; private: |