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/region.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/region.h')
| -rw-r--r-- | libs/ardour/ardour/region.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index d9a8945bae..b6b80efa84 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -163,7 +163,7 @@ class Region virtual bool should_save_state () const { return !(_flags & DoNotSaveState); }; void freeze (); - void thaw (const string& why); + void thaw (const std::string& why); bool covers (nframes_t frame) const { return first_frame() <= frame && frame <= last_frame(); @@ -226,7 +226,7 @@ class Region const SourceList& sources() const { return _sources; } const SourceList& master_sources() const { return _master_sources; } - std::vector<string> master_source_names(); + std::vector<std::string> master_source_names(); void set_master_sources (const SourceList&); /* automation */ @@ -270,20 +270,20 @@ class Region friend class RegionFactory; Region (boost::shared_ptr<Source> src, nframes_t start, nframes_t length, - const string& name, DataType type, layer_t = 0, Flag flags = DefaultFlags); + const std::string& name, DataType type, layer_t = 0, Flag flags = DefaultFlags); Region (const SourceList& srcs, nframes_t start, nframes_t length, - const string& name, DataType type, layer_t = 0, Flag flags = DefaultFlags); + const std::string& name, DataType type, layer_t = 0, Flag flags = DefaultFlags); - Region (boost::shared_ptr<const Region>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Flag flags = DefaultFlags); - Region (boost::shared_ptr<const Region>, nframes_t length, const string& name, layer_t = 0, Flag flags = DefaultFlags); + Region (boost::shared_ptr<const Region>, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Flag flags = DefaultFlags); + Region (boost::shared_ptr<const Region>, nframes_t length, const std::string& name, layer_t = 0, Flag flags = DefaultFlags); Region (boost::shared_ptr<const Region>); Region (boost::shared_ptr<Source> src, const XMLNode&); Region (const SourceList& srcs, const XMLNode&); - Region (Session& s, nframes_t start, nframes_t length, const string& name, DataType, layer_t = 0, Flag flags = DefaultFlags); + Region (Session& s, nframes_t start, nframes_t length, const std::string& name, DataType, layer_t = 0, Flag flags = DefaultFlags); protected: - void copy_stuff (boost::shared_ptr<const Region>, nframes_t start, nframes_t length, const string& name, layer_t, Flag flags); + void copy_stuff (boost::shared_ptr<const Region>, nframes_t start, nframes_t length, const std::string& name, layer_t, Flag flags); XMLNode& get_short_state (); /* used only by Session */ |