const wxString::const_iterator& from,
const wxString::const_iterator& end)
{
- wxASSERT_MSG( from <= end, _T("invalid index") );
+ wxASSERT_MSG( from <= end, wxT("invalid index") );
for ( wxString::const_iterator i = from; i != end; ++i )
{
const wxString::const_iterator& from,
const wxString::const_iterator& end)
{
- wxASSERT_MSG( from <= end, _T("invalid index") );
+ wxASSERT_MSG( from <= end, wxT("invalid index") );
for ( wxString::const_iterator i = from; i != end; ++i )
{
void wxStringTokenizer::Reinit(const wxString& str)
{
- wxASSERT_MSG( IsOk(), _T("you should call SetString() first") );
+ wxASSERT_MSG( IsOk(), wxT("you should call SetString() first") );
m_string = str;
m_stringEnd = m_string.end();
m_pos = m_string.begin();
- m_lastDelim = _T('\0');
+ m_lastDelim = wxT('\0');
m_hasMoreTokens = MoreTokens_Unknown;
}
bool wxStringTokenizer::DoHasMoreTokens() const
{
- wxCHECK_MSG( IsOk(), false, _T("you should call SetString() first") );
+ wxCHECK_MSG( IsOk(), false, wxT("you should call SetString() first") );
if ( find_first_not_of(m_delims, m_delimsLen, m_pos, m_stringEnd)
!= m_stringEnd )
// up to the end of the string in GetNextToken(), but if it is not
// NUL yet we still have this last token to return even if m_pos is
// already at m_string.length()
- return m_pos < m_stringEnd || m_lastDelim != _T('\0');
+ return m_pos < m_stringEnd || m_lastDelim != wxT('\0');
case wxTOKEN_INVALID:
case wxTOKEN_DEFAULT:
- wxFAIL_MSG( _T("unexpected tokenizer mode") );
+ wxFAIL_MSG( wxT("unexpected tokenizer mode") );
// fall through
case wxTOKEN_STRTOK:
// count the number of (remaining) tokens in the string
size_t wxStringTokenizer::CountTokens() const
{
- wxCHECK_MSG( IsOk(), 0, _T("you should call SetString() first") );
+ wxCHECK_MSG( IsOk(), 0, wxT("you should call SetString() first") );
// VZ: this function is IMHO not very useful, so it's probably not very
// important if its implementation here is not as efficient as it
m_pos = m_stringEnd;
// it wasn't terminated
- m_lastDelim = _T('\0');
+ m_lastDelim = wxT('\0');
}
else // we found a delimiter at pos
{
// in wxTOKEN_RET_DELIMS mode we return the delimiter character
// with token, otherwise leave it out
+ wxString::const_iterator tokenEnd(pos);
if ( m_mode == wxTOKEN_RET_DELIMS )
- ++pos;
+ ++tokenEnd;
- token.assign(m_pos, pos);
+ token.assign(m_pos, tokenEnd);
// skip the token and the trailing delimiter
m_pos = pos + 1;
- m_lastDelim = (pos == m_stringEnd) ? _T('\0') : (wxChar)*pos;
+ m_lastDelim = (pos == m_stringEnd) ? wxT('\0') : (wxChar)*pos;
}
}
while ( !AllowEmpty() && token.empty() );