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

Globally replace _T() with wxT().

Browse Source 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/common/regex.cpp
View File

@@ -274,10 +274,10 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
#else
# define FLAVORS (wxRE_ADVANCED | wxRE_BASIC)
wxASSERT_MSG( (flags & FLAVORS) != FLAVORS,
_T("incompatible flags in wxRegEx::Compile") );
wxT("incompatible flags in wxRegEx::Compile") );
#endif
wxASSERT_MSG( !(flags & ~(FLAVORS | wxRE_ICASE | wxRE_NOSUB | wxRE_NEWLINE)),
_T("unrecognized flags in wxRegEx::Compile") );
wxT("unrecognized flags in wxRegEx::Compile") );
// translate our flags to regcomp() ones
int flagsRE = 0;
@@ -335,15 +335,15 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
// and some more for bracketed subexperessions
for ( const wxChar *cptr = expr.c_str(); *cptr; cptr++ )
{
if ( *cptr == _T('\\') )
if ( *cptr == wxT('\\') )
{
// in basic RE syntax groups are inside \(...\)
if ( *++cptr == _T('(') && (flags & wxRE_BASIC) )
if ( *++cptr == wxT('(') && (flags & wxRE_BASIC) )
{
m_nMatches++;
}
}
else if ( *cptr == _T('(') && !(flags & wxRE_BASIC) )
else if ( *cptr == wxT('(') && !(flags & wxRE_BASIC) )
{
// we know that the previous character is not an unquoted
// backslash because it would have been eaten above, so we
@@ -351,7 +351,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
// extended syntax. '(?' is used for extensions by perl-
// like REs (e.g. advanced), and is not valid for POSIX
// extended, so ignore them always.
if ( cptr[1] != _T('?') )
if ( cptr[1] != wxT('?') )
m_nMatches++;
}
}
@@ -394,11 +394,11 @@ bool wxRegExImpl::Matches(const wxRegChar *str,
int flags
WXREGEX_IF_NEED_LEN(size_t len)) const
{
wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") );
// translate our flags to regexec() ones
wxASSERT_MSG( !(flags & ~(wxRE_NOTBOL | wxRE_NOTEOL)),
_T("unrecognized flags in wxRegEx::Matches") );
wxT("unrecognized flags in wxRegEx::Matches") );
int flagsRE = 0;
if ( flags & wxRE_NOTBOL )
@@ -444,10 +444,10 @@ bool wxRegExImpl::Matches(const wxRegChar *str,
bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const
{
wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
wxCHECK_MSG( m_nMatches, false, _T("can't use with wxRE_NOSUB") );
wxCHECK_MSG( m_Matches, false, _T("must call Matches() first") );
wxCHECK_MSG( index < m_nMatches, false, _T("invalid match index") );
wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") );
wxCHECK_MSG( m_nMatches, false, wxT("can't use with wxRE_NOSUB") );
wxCHECK_MSG( m_Matches, false, wxT("must call Matches() first") );
wxCHECK_MSG( index < m_nMatches, false, wxT("invalid match index") );
if ( start )
*start = m_Matches->Start(index);
@@ -459,8 +459,8 @@ bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const
size_t wxRegExImpl::GetMatchCount() const
{
wxCHECK_MSG( IsValid(), 0, _T("must successfully Compile() first") );
wxCHECK_MSG( m_nMatches, 0, _T("can't use with wxRE_NOSUB") );
wxCHECK_MSG( IsValid(), 0, wxT("must successfully Compile() first") );
wxCHECK_MSG( m_nMatches, 0, wxT("can't use with wxRE_NOSUB") );
return m_nMatches;
}
@@ -469,8 +469,8 @@ int wxRegExImpl::Replace(wxString *text,
const wxString& replacement,
size_t maxMatches) const
{
wxCHECK_MSG( text, wxNOT_FOUND, _T("NULL text in wxRegEx::Replace") );
wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") );
wxCHECK_MSG( text, wxNOT_FOUND, wxT("NULL text in wxRegEx::Replace") );
wxCHECK_MSG( IsValid(), wxNOT_FOUND, wxT("must successfully Compile() first") );
// the input string
#ifndef WXREGEX_CONVERT_TO_MB
@@ -498,7 +498,7 @@ int wxRegExImpl::Replace(wxString *text,
// attempt at optimization: don't iterate over the string if it doesn't
// contain back references at all
bool mayHaveBackrefs =
replacement.find_first_of(_T("\\&")) != wxString::npos;
replacement.find_first_of(wxT("\\&")) != wxString::npos;
if ( !mayHaveBackrefs )
{
@@ -536,7 +536,7 @@ int wxRegExImpl::Replace(wxString *text,
{
size_t index = (size_t)-1;
if ( *p == _T('\\') )
if ( *p == wxT('\\') )
{
if ( wxIsdigit(*++p) )
{
@@ -547,7 +547,7 @@ int wxRegExImpl::Replace(wxString *text,
}
//else: backslash used as escape character
}
else if ( *p == _T('&') )
else if ( *p == wxT('&') )
{
// treat this as "\0" for compatbility with ed and such
index = 0;
@@ -560,7 +560,7 @@ int wxRegExImpl::Replace(wxString *text,
size_t start, len;
if ( !GetMatch(&start, &len, index) )
{
wxFAIL_MSG( _T("invalid back reference") );
wxFAIL_MSG( wxT("invalid back reference") );
// just eat it...
}
@@ -588,7 +588,7 @@ int wxRegExImpl::Replace(wxString *text,
if ( !GetMatch(&start, &len) )
{
// we did have match as Matches() returned true above!
wxFAIL_MSG( _T("internal logic error in wxRegEx::Replace") );
wxFAIL_MSG( wxT("internal logic error in wxRegEx::Replace") );
return wxNOT_FOUND;
}
@@ -657,7 +657,7 @@ bool wxRegEx::Compile(const wxString& expr, int flags)
bool wxRegEx::Matches(const wxString& str, int flags) const
{
wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") );
return m_impl->Matches(WXREGEX_CHAR(str), flags
WXREGEX_IF_NEED_LEN(str.length()));
@@ -665,7 +665,7 @@ bool wxRegEx::Matches(const wxString& str, int flags) const
bool wxRegEx::GetMatch(size_t *start, size_t *len, size_t index) const
{
wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") );
return m_impl->GetMatch(start, len, index);
}
@@ -681,7 +681,7 @@ wxString wxRegEx::GetMatch(const wxString& text, size_t index) const
size_t wxRegEx::GetMatchCount() const
{
wxCHECK_MSG( IsValid(), 0, _T("must successfully Compile() first") );
wxCHECK_MSG( IsValid(), 0, wxT("must successfully Compile() first") );
return m_impl->GetMatchCount();
}
@@ -690,7 +690,7 @@ int wxRegEx::Replace(wxString *pattern,
const wxString& replacement,
size_t maxMatches) const
{
wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") );
wxCHECK_MSG( IsValid(), wxNOT_FOUND, wxT("must successfully Compile() first") );
return m_impl->Replace(pattern, replacement, maxMatches);
}