From: Václav Slavík Date: Wed, 18 Jul 2007 09:44:36 +0000 (+0000) Subject: use iterators instead of c_str() X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/66c71d8a3d5dff6759b941eed4762896a76e9642 use iterators instead of c_str() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp index 34ba2b0523..ea615aaf57 100644 --- a/src/common/tokenzr.cpp +++ b/src/common/tokenzr.cpp @@ -59,14 +59,14 @@ void wxStringTokenizer::SetString(const wxString& str, // whitespace characters and as wxTOKEN_RET_EMPTY otherwise (for // whitespace delimiters, strtok() behaviour is better because we want // to count consecutive spaces as one delimiter) - const wxChar *p; - for ( p = delims.c_str(); *p; p++ ) + wxString::const_iterator p; + for ( p = delims.begin(); p != delims.end(); ++p ) { if ( !wxIsspace(*p) ) break; } - if ( *p ) + if ( p != delims.end() ) { // not whitespace char in delims mode = wxTOKEN_RET_EMPTY;