diff --git a/panda/src/express/textEncoder.I b/panda/src/express/textEncoder.I index 75895a0562..03834a4d8a 100644 --- a/panda/src/express/textEncoder.I +++ b/panda/src/express/textEncoder.I @@ -441,7 +441,7 @@ upper(const string &source, TextEncoder::Encoding encoding) { TextEncoder encoder; encoder.set_encoding(encoding); encoder.set_text(source); - encoder.toupper_text(); + encoder.make_upper(); return encoder.get_text(); } @@ -467,7 +467,7 @@ lower(const string &source, TextEncoder::Encoding encoding) { TextEncoder encoder; encoder.set_encoding(encoding); encoder.set_text(source); - encoder.tolower_text(); + encoder.make_lower(); return encoder.get_text(); } diff --git a/panda/src/express/textEncoder.cxx b/panda/src/express/textEncoder.cxx index ec79d9efb5..508de36c56 100644 --- a/panda/src/express/textEncoder.cxx +++ b/panda/src/express/textEncoder.cxx @@ -24,14 +24,14 @@ TypeHandle TextEncoder::_type_handle; TextEncoder::Encoding TextEncoder::_default_encoding; //////////////////////////////////////////////////////////////////// -// Function: TextEncoder::toupper_text +// Function: TextEncoder::make_upper // Access: Published // Description: Adjusts the text stored within the encoder to all // uppercase letters (preserving accent marks // correctly). //////////////////////////////////////////////////////////////////// void TextEncoder:: -toupper_text() { +make_upper() { get_wtext(); wstring::iterator si; for (si = _wtext.begin(); si != _wtext.end(); ++si) { @@ -41,14 +41,14 @@ toupper_text() { } //////////////////////////////////////////////////////////////////// -// Function: TextEncoder::tolower_text +// Function: TextEncoder::make_lower // Access: Published // Description: Adjusts the text stored within the encoder to all // lowercase letters (preserving accent marks // correctly). //////////////////////////////////////////////////////////////////// void TextEncoder:: -tolower_text() { +make_lower() { get_wtext(); wstring::iterator si; for (si = _wtext.begin(); si != _wtext.end(); ++si) { diff --git a/panda/src/express/textEncoder.h b/panda/src/express/textEncoder.h index 37b6c5c42b..73cc245348 100644 --- a/panda/src/express/textEncoder.h +++ b/panda/src/express/textEncoder.h @@ -57,8 +57,8 @@ PUBLISHED: INLINE void clear_text(); INLINE bool has_text() const; - void toupper_text(); - void tolower_text(); + void make_upper(); + void make_lower(); INLINE string get_text() const; INLINE string get_text(Encoding encoding) const;