X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..588c80dea16b3ab32c7f1f8f15b62eb4450a20a9:/src/common/tokenzr.cpp diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp index 5c131f1cba..26612661ee 100644 --- a/src/common/tokenzr.cpp +++ b/src/common/tokenzr.cpp @@ -6,7 +6,7 @@ // Created: 04/22/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "tokenzr.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -102,11 +98,11 @@ void wxStringTokenizer::Reinit(const wxString& str) // do we have more of them? bool wxStringTokenizer::HasMoreTokens() const { - wxCHECK_MSG( IsOk(), FALSE, _T("you should call SetString() first") ); + wxCHECK_MSG( IsOk(), false, _T("you should call SetString() first") ); if ( m_string.find_first_not_of(m_delims) == wxString::npos ) { - // no non empty tokens left, but in 2 cases we still may return TRUE if + // no non empty tokens left, but in 2 cases we still may return true if // GetNextToken() wasn't called yet for this empty token: // // a) in wxTOKEN_RET_EMPTY_ALL mode we always do it @@ -115,13 +111,13 @@ bool wxStringTokenizer::HasMoreTokens() const // token just before it return (m_mode == wxTOKEN_RET_EMPTY_ALL) || (m_mode == wxTOKEN_RET_EMPTY && m_pos == 0) - ? m_hasMore : FALSE; + ? m_hasMore : false; } else { // there are non delimiter characters left, hence we do have more // tokens - return TRUE; + return true; } } @@ -181,7 +177,7 @@ wxString wxStringTokenizer::GetNextToken() // no more tokens in this string, even in wxTOKEN_RET_EMPTY_ALL // mode (we will return the trailing one right now in this case) - m_hasMore = FALSE; + m_hasMore = false; } else {