unused variable, more efficient increment operator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -975,13 +975,12 @@ int wxString::CmpNoCase(const wxString& s) const
|
|||||||
{
|
{
|
||||||
// FIXME-UTF8: use wxUniChar::ToLower/ToUpper once added
|
// FIXME-UTF8: use wxUniChar::ToLower/ToUpper once added
|
||||||
|
|
||||||
size_t idx = 0;
|
|
||||||
const_iterator i1 = begin();
|
const_iterator i1 = begin();
|
||||||
const_iterator end1 = end();
|
const_iterator end1 = end();
|
||||||
const_iterator i2 = s.begin();
|
const_iterator i2 = s.begin();
|
||||||
const_iterator end2 = s.end();
|
const_iterator end2 = s.end();
|
||||||
|
|
||||||
for ( ; i1 != end1 && i2 != end2; ++idx, ++i1, ++i2 )
|
for ( ; i1 != end1 && i2 != end2; ++i1, ++i2 )
|
||||||
{
|
{
|
||||||
wxUniChar lower1 = (wxChar)wxTolower(*i1);
|
wxUniChar lower1 = (wxChar)wxTolower(*i1);
|
||||||
wxUniChar lower2 = (wxChar)wxTolower(*i2);
|
wxUniChar lower2 = (wxChar)wxTolower(*i2);
|
||||||
@@ -1353,7 +1352,7 @@ wxString& wxString::Trim(bool bFromRight)
|
|||||||
// find last non-space character
|
// find last non-space character
|
||||||
reverse_iterator psz = rbegin();
|
reverse_iterator psz = rbegin();
|
||||||
while ( (psz != rend()) && wxSafeIsspace(*psz) )
|
while ( (psz != rend()) && wxSafeIsspace(*psz) )
|
||||||
psz++;
|
++psz;
|
||||||
|
|
||||||
// truncate at trailing space start
|
// truncate at trailing space start
|
||||||
erase(psz.base(), end());
|
erase(psz.base(), end());
|
||||||
@@ -1363,7 +1362,7 @@ wxString& wxString::Trim(bool bFromRight)
|
|||||||
// find first non-space character
|
// find first non-space character
|
||||||
iterator psz = begin();
|
iterator psz = begin();
|
||||||
while ( (psz != end()) && wxSafeIsspace(*psz) )
|
while ( (psz != end()) && wxSafeIsspace(*psz) )
|
||||||
psz++;
|
++psz;
|
||||||
|
|
||||||
// fix up data and length
|
// fix up data and length
|
||||||
erase(begin(), psz);
|
erase(begin(), psz);
|
||||||
|
Reference in New Issue
Block a user