summaryrefslogtreecommitdiff
path: root/gtk2_ardour/time_axis_view.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-05-12 17:03:42 +0000
committerCarl Hetherington <carl@carlh.net>2009-05-12 17:03:42 +0000
commit3b89d9eaa03406a5e03648f47734211f09b89d62 (patch)
tree1c8d151bca327d4a5cb7047c8591aa814b9b4ec8 /gtk2_ardour/time_axis_view.h
parent2e5c935990d6ea5cc6e9a5a6de0fd8c52e68657c (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/time_axis_view.h')
-rw-r--r--gtk2_ardour/time_axis_view.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 6f0b3310eb..56e7042548 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -193,8 +193,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
void order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top);
- virtual void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results);
- virtual void get_inverted_selectables (Selection&, list<Selectable *>& results);
+ virtual void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list<Selectable*>& results);
+ virtual void get_inverted_selectables (Selection&, std::list<Selectable *>& results);
void add_ghost (RegionView*);
void remove_ghost (RegionView*);
@@ -233,8 +233,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
uint32_t height; /* in canvas units */
- string controls_base_unselected_name;
- string controls_base_selected_name;
+ std::string controls_base_unselected_name;
+ std::string controls_base_selected_name;
bool name_entry_button_press (GdkEventButton *ev);
bool name_entry_button_release (GdkEventButton *ev);
@@ -310,10 +310,10 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
ArdourCanvas::Group *selection_group;
- list<GhostRegion*> ghosts;
+ std::list<GhostRegion*> ghosts;
- list<SelectionRect*> free_selection_rects;
- list<SelectionRect*> used_selection_rects;
+ std::list<SelectionRect*> free_selection_rects;
+ std::list<SelectionRect*> used_selection_rects;
SelectionRect* get_selection_rect(uint32_t id);