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/automation_line.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/automation_line.h')
| -rw-r--r-- | gtk2_ardour/automation_line.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index b312cbd685..136196cd72 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -55,7 +55,7 @@ namespace Gnome { class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoingAway { public: - AutomationLine (const string& name, TimeAxisView&, ArdourCanvas::Group&, + AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&, boost::shared_ptr<ARDOUR::AutomationList>, const Evoral::TimeConverter<double, ARDOUR::sframes_t>* converter = 0); virtual ~AutomationLine (); @@ -82,7 +82,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin ControlPoint* nth (uint32_t); uint32_t npoints() const { return control_points.size(); } - string name() const { return _name; } + std::string name() const { return _name; } bool visible() const { return _visible; } guint32 height() const { return _height; } @@ -106,9 +106,9 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin void show_selection(); void hide_selection (); - string get_verbose_cursor_string (double) const; - string fraction_to_string (double) const; - double string_to_fraction (string const &) const; + std::string get_verbose_cursor_string (double) const; + std::string fraction_to_string (double) const; + double string_to_fraction (std::string const &) const; void view_to_model_coord (double& x, double& y) const; void model_to_view_coord (double& x, double& y) const; @@ -132,7 +132,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin protected: - string _name; + std::string _name; guint32 _height; uint32_t _line_color; |