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 /libs/ardour/ardour/location.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 'libs/ardour/ardour/location.h')
-rw-r--r-- | libs/ardour/ardour/location.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 5585711272..5ee565fc1e 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -36,8 +36,6 @@ #include "ardour/ardour.h" -using std::string; - namespace ARDOUR { class Location : public PBD::StatefulDestructible @@ -56,7 +54,7 @@ class Location : public PBD::StatefulDestructible Location (nframes_t sample_start, nframes_t sample_end, - const string &name, + const std::string &name, Flags bits = Flags(0)) : _name (name), @@ -90,8 +88,8 @@ class Location : public PBD::StatefulDestructible int move_to (nframes_t pos); - const string& name() const { return _name; } - void set_name (const string &str) { _name = str; name_changed(this); } + const std::string& name() const { return _name; } + void set_name (const std::string &str) { _name = str; name_changed(this); } void set_auto_punch (bool yn, void *src); void set_auto_loop (bool yn, void *src); @@ -123,14 +121,14 @@ class Location : public PBD::StatefulDestructible /* CD Track / CD-Text info */ - std::map<string, string> cd_info; - XMLNode& cd_info_node (const string &, const string &); + std::map<std::string, std::string> cd_info; + XMLNode& cd_info_node (const std::string &, const std::string &); XMLNode& get_state (void); int set_state (const XMLNode&); private: - string _name; + std::string _name; nframes_t _start; nframes_t _end; Flags _flags; @@ -165,7 +163,7 @@ class Locations : public PBD::StatefulDestructible Location* end_location() const; Location* start_location() const; - int next_available_name(string& result,string base); + int next_available_name(std::string& result,std::string base); uint32_t num_range_markers() const; int set_current (Location *, bool want_lock = true); |