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/sndfile_helpers.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/sndfile_helpers.h')
-rw-r--r-- | libs/ardour/ardour/sndfile_helpers.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libs/ardour/ardour/sndfile_helpers.h b/libs/ardour/ardour/sndfile_helpers.h index cf6b15f3a4..23ece80df2 100644 --- a/libs/ardour/ardour/sndfile_helpers.h +++ b/libs/ardour/ardour/sndfile_helpers.h @@ -23,8 +23,6 @@ #include <string> #include <stdint.h> -using std::string; - // Use this define when initializing arrarys for use in sndfile_*_format() #define SNDFILE_STR_LENGTH 32 @@ -44,15 +42,15 @@ extern const char * const sndfile_endian_formats_strings[SNDFILE_ENDIAN_FORMATS+ extern int sndfile_endian_formats[SNDFILE_ENDIAN_FORMATS]; -int sndfile_bitdepth_format_from_string(string); -int sndfile_header_format_from_string(string); -int sndfile_endian_format_from_string(string); -string sndfile_file_ending_from_string(string); +int sndfile_bitdepth_format_from_string (std::string); +int sndfile_header_format_from_string (std::string); +int sndfile_endian_format_from_string (std::string); +std::string sndfile_file_ending_from_string (std::string); int sndfile_data_width (int format); // It'd be nice if libsndfile did this for us -string sndfile_major_format(int); -string sndfile_minor_format(int); +std::string sndfile_major_format (int); +std::string sndfile_minor_format (int); #endif /* __sndfile_helpers_h__ */ |