cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't call wxString::Len() from operator==; use IsSameAs() instead of move the length check to there (for non-UTF8 builds)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2008-01-07 10:27:35 +00:00
parent 52ca4ec419
commit 2712e31795
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/string.h
View File

@ -1508,14 +1508,23 @@ public:
{ return compare(s); } { return compare(s); }
// same as Cmp() but not case-sensitive // same as Cmp() but not case-sensitive
int CmpNoCase(const wxString& s) const; int CmpNoCase(const wxString& s) const;
// test for the string equality, either considering case or not // test for the string equality, either considering case or not
// (if compareWithCase then the case matters) // (if compareWithCase then the case matters)
bool IsSameAs(const wxString& str, bool compareWithCase = true) const bool IsSameAs(const wxString& str, bool compareWithCase = true) const
{ return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; } {
#if !wxUSE_UNICODE_UTF8
// in UTF-8 build, length() is O(n) and doing this would be _slower_
if ( length() != str.length() )
return false;
#endif
return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0;
}
bool IsSameAs(const char *str, bool compareWithCase = true) const bool IsSameAs(const char *str, bool compareWithCase = true) const
{ return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; } { return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; }
bool IsSameAs(const wchar_t *str, bool compareWithCase = true) const bool IsSameAs(const wchar_t *str, bool compareWithCase = true) const
{ return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; } { return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; }
bool IsSameAs(const wxCStrData& str, bool compareWithCase = true) const bool IsSameAs(const wxCStrData& str, bool compareWithCase = true) const
{ return IsSameAs(str.AsString(), compareWithCase); } { return IsSameAs(str.AsString(), compareWithCase); }
bool IsSameAs(const wxCharBuffer& str, bool compareWithCase = true) const bool IsSameAs(const wxCharBuffer& str, bool compareWithCase = true) const
@ -2844,12 +2853,10 @@ wxDEFINE_ALL_COMPARISONS(const wxChar *, const wxString&, wxCMP_WXCHAR_STRING)
#undef wxCMP_WXCHAR_STRING #undef wxCMP_WXCHAR_STRING
// note that there is an optimization in operator==() and !=(): we (quickly)
// checks the strings length first, before comparing their data
inline bool operator==(const wxString& s1, const wxString& s2) inline bool operator==(const wxString& s1, const wxString& s2)
{ return (s1.Len() == s2.Len()) && (s1.Cmp(s2) == 0); } { return s1.IsSameAs(s2); }
inline bool operator!=(const wxString& s1, const wxString& s2) inline bool operator!=(const wxString& s1, const wxString& s2)
{ return (s1.Len() != s2.Len()) || (s1.Cmp(s2) != 0); } { return !s1.IsSameAs(s2); }
inline bool operator< (const wxString& s1, const wxString& s2) inline bool operator< (const wxString& s1, const wxString& s2)
{ return s1.Cmp(s2) < 0; } { return s1.Cmp(s2) < 0; }
inline bool operator> (const wxString& s1, const wxString& s2) inline bool operator> (const wxString& s1, const wxString& s2)