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/marker.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/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index 8a82a90271..d1bc12561f 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -50,7 +50,7 @@ class Marker : public PBD::Destructible }; - Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type, + Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, Type, nframes_t frame = 0, bool handle_events = true); virtual ~Marker (); @@ -63,7 +63,7 @@ class Marker : public PBD::Destructible void set_line_vpos (double y_origin, double height); void set_position (nframes_t); - void set_name (const string&); + void set_name (const std::string&); void set_color_rgba (uint32_t rgba); nframes64_t position() const { return frame_position; } @@ -98,7 +98,7 @@ class Marker : public PBD::Destructible class TempoMarker : public Marker { public: - TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&); + TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::TempoSection&); ~TempoMarker (); ARDOUR::TempoSection& tempo() const { return _tempo; } @@ -110,7 +110,7 @@ class TempoMarker : public Marker class MeterMarker : public Marker { public: - MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&); + MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::MeterSection&); ~MeterMarker (); ARDOUR::MeterSection& meter() const { return _meter; } |