toupper_text -> make_upper

This commit is contained in:
David Rose 2003-04-01 21:35:10 +00:00
parent af4494d2de
commit 72238abee5
3 changed files with 8 additions and 8 deletions

View File

@ -441,7 +441,7 @@ upper(const string &source, TextEncoder::Encoding encoding) {
TextEncoder encoder; TextEncoder encoder;
encoder.set_encoding(encoding); encoder.set_encoding(encoding);
encoder.set_text(source); encoder.set_text(source);
encoder.toupper_text(); encoder.make_upper();
return encoder.get_text(); return encoder.get_text();
} }
@ -467,7 +467,7 @@ lower(const string &source, TextEncoder::Encoding encoding) {
TextEncoder encoder; TextEncoder encoder;
encoder.set_encoding(encoding); encoder.set_encoding(encoding);
encoder.set_text(source); encoder.set_text(source);
encoder.tolower_text(); encoder.make_lower();
return encoder.get_text(); return encoder.get_text();
} }

View File

@ -24,14 +24,14 @@ TypeHandle TextEncoder::_type_handle;
TextEncoder::Encoding TextEncoder::_default_encoding; TextEncoder::Encoding TextEncoder::_default_encoding;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: TextEncoder::toupper_text // Function: TextEncoder::make_upper
// Access: Published // Access: Published
// Description: Adjusts the text stored within the encoder to all // Description: Adjusts the text stored within the encoder to all
// uppercase letters (preserving accent marks // uppercase letters (preserving accent marks
// correctly). // correctly).
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void TextEncoder:: void TextEncoder::
toupper_text() { make_upper() {
get_wtext(); get_wtext();
wstring::iterator si; wstring::iterator si;
for (si = _wtext.begin(); si != _wtext.end(); ++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 // Access: Published
// Description: Adjusts the text stored within the encoder to all // Description: Adjusts the text stored within the encoder to all
// lowercase letters (preserving accent marks // lowercase letters (preserving accent marks
// correctly). // correctly).
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void TextEncoder:: void TextEncoder::
tolower_text() { make_lower() {
get_wtext(); get_wtext();
wstring::iterator si; wstring::iterator si;
for (si = _wtext.begin(); si != _wtext.end(); ++si) { for (si = _wtext.begin(); si != _wtext.end(); ++si) {

View File

@ -57,8 +57,8 @@ PUBLISHED:
INLINE void clear_text(); INLINE void clear_text();
INLINE bool has_text() const; INLINE bool has_text() const;
void toupper_text(); void make_upper();
void tolower_text(); void make_lower();
INLINE string get_text() const; INLINE string get_text() const;
INLINE string get_text(Encoding encoding) const; INLINE string get_text(Encoding encoding) const;