diff --git a/include/cinder/Utilities.h b/include/cinder/Utilities.h index b3e5f9b68b..012e83a0ce 100644 --- a/include/cinder/Utilities.h +++ b/include/cinder/Utilities.h @@ -130,14 +130,10 @@ CI_API char charToLower( const char c ); //! Converts the character \a c to uppercase. Not Unicode-aware. CI_API char charToUpper( const char c ); -//! returns a copy of \a str with all characters converted to lowercase (using std::tolower()). Not Unicode-aware. +//! returns a copy of \a str with all characters converted to lowercase (using std::tolower()). CI_API std::string toLower( std::string str ); -//! returns a copy of \a str with all characters converted to lowercase (using std::tolower()). Not Unicode-aware. -CI_API std::string toLower( std::string str, const std::locale &loc ); -//! returns a copy of \a str with all characters converted to uppercase (using std::toupper()). Not Unicode-aware. +//! returns a copy of \a str with all characters converted to uppercase (using std::toupper()). CI_API std::string toUpper( std::string str ); -//! returns a copy of \a str with all characters converted to uppercase (using std::toupper()). Not Unicode-aware. -CI_API std::string toUpper( std::string str, const std::locale &loc ); //! replaces all instances of \a find with \a replace in \a str. Not Unicode-aware. CI_API void findReplaceInPlace( const std::string &find, const std::string &replace, std::string &str ); diff --git a/src/cinder/Utilities.cpp b/src/cinder/Utilities.cpp index 26328eb3ed..4f2134feb9 100644 --- a/src/cinder/Utilities.cpp +++ b/src/cinder/Utilities.cpp @@ -258,24 +258,12 @@ std::string toLower( std::string str ) return str; } -std::string toLower( std::string str, const std::locale &loc ) -{ - std::transform( str.begin(), str.end(), str.begin(), [loc]( unsigned char c ) { return std::tolower( c, loc ); } ); - return str; -} - std::string toUpper( std::string str ) { std::transform( str.begin(), str.end(), str.begin(), []( unsigned char c ) { return std::toupper( c ); } ); return str; } -std::string toUpper( std::string str, const std::locale &loc ) -{ - std::transform( str.begin(), str.end(), str.begin(), [loc]( unsigned char c ) { return std::toupper( c, loc ); } ); - return str; -} - void findReplaceInPlace( const std::string &find, const std::string &replace, std::string &str ) { auto pos = str.find( find );