solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

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

56
tests/regex/regextest.cpp
View file

@ -85,7 +85,7 @@ private:
void parseFlags(const wxString& flags);
void doTest(int flavor);
static wxString quote(const wxString& arg);
const wxChar *convError() const { return _T("<cannot convert>"); }
const wxChar *convError() const { return wxT("<cannot convert>"); }
// assertions - adds some information about the test that failed
void fail(const wxString& msg) const;
@ -140,13 +140,13 @@ RegExTestCase::RegExTestCase(
badconv = badconv || *m_expected.rbegin() == convError();
}
failIf(badconv, _T("cannot convert to default character encoding"));
failIf(badconv, wxT("cannot convert to default character encoding"));
// the flags need further parsing...
parseFlags(m_flags);
#ifndef wxHAS_REGEX_ADVANCED
failIf(!m_basic && !m_extended, _T("advanced regexs not available"));
failIf(!m_basic && !m_extended, wxT("advanced regexs not available"));
#endif
}
@ -210,7 +210,7 @@ void RegExTestCase::parseFlags(const wxString& flags)
// anything else we must skip the test
default:
fail(wxString::Format(
_T("requires unsupported flag '%c'"), *p));
wxT("requires unsupported flag '%c'"), *p));
}
}
}
@ -237,29 +237,29 @@ void RegExTestCase::doTest(int flavor)
// 'e' - test that the pattern fails to compile
if (m_mode == 'e') {
failIf(re.IsValid(), _T("compile succeeded (should fail)"));
failIf(re.IsValid(), wxT("compile succeeded (should fail)"));
return;
}
failIf(!re.IsValid(), _T("compile failed"));
failIf(!re.IsValid(), wxT("compile failed"));
bool matches = re.Matches(m_data, m_matchFlags);
// 'f' or 'p' - test that the pattern does not match
if (m_mode == 'f' || m_mode == 'p') {
failIf(matches, _T("match succeeded (should fail)"));
failIf(matches, wxT("match succeeded (should fail)"));
return;
}
// otherwise 'm' or 'i' - test the pattern does match
failIf(!matches, _T("match failed"));
failIf(!matches, wxT("match failed"));
if (m_compileFlags & wxRE_NOSUB)
return;
// check wxRegEx has correctly counted the number of subexpressions
wxString msg;
msg << _T("GetMatchCount() == ") << re.GetMatchCount()
<< _T(", expected ") << m_expected.size();
msg << wxT("GetMatchCount() == ") << re.GetMatchCount()
<< wxT(", expected ") << m_expected.size();
failIf(m_expected.size() != re.GetMatchCount(), msg);
for (size_t i = 0; i < m_expected.size(); i++) {
@ -267,7 +267,7 @@ void RegExTestCase::doTest(int flavor)
size_t start, len;
msg.clear();
msg << _T("wxRegEx::GetMatch failed for match ") << i;
msg << wxT("wxRegEx::GetMatch failed for match ") << i;
failIf(!re.GetMatch(&start, &len, i), msg);
// m - check the match returns the strings given
@ -276,23 +276,23 @@ void RegExTestCase::doTest(int flavor)
if (start < INT_MAX)
result = m_data.substr(start, len);
else
result = _T("");
result = wxT("");
}
// i - check the match returns the offsets given
else if (m_mode == 'i')
{
if (start > INT_MAX)
result = _T("-1 -1");
result = wxT("-1 -1");
else if (start + len > 0)
result << start << _T(" ") << start + len - 1;
result << start << wxT(" ") << start + len - 1;
else
result << start << _T(" -1");
result << start << wxT(" -1");
}
msg.clear();
msg << _T("match(") << i << _T(") == ") << quote(result)
<< _T(", expected == ") << quote(m_expected[i]);
msg << wxT("match(") << i << wxT(") == ") << quote(result)
<< wxT(", expected == ") << quote(m_expected[i]);
failIf(result != m_expected[i], msg);
}
}
@ -304,16 +304,16 @@ void RegExTestCase::fail(const wxString& msg) const
wxString str;
wxArrayString::const_iterator it;
str << (wxChar)m_mode << _T(" ") << m_id << _T(" ") << m_flags << _T(" ")
<< quote(m_pattern) << _T(" ") << quote(m_data);
str << (wxChar)m_mode << wxT(" ") << m_id << wxT(" ") << m_flags << wxT(" ")
<< quote(m_pattern) << wxT(" ") << quote(m_data);
for (it = m_expected.begin(); it != m_expected.end(); ++it)
str << _T(" ") << quote(*it);
str << wxT(" ") << quote(*it);
if (str.length() > 77)
str = str.substr(0, 74) + _T("...");
str = str.substr(0, 74) + wxT("...");
str << _T("\n ") << msg;
str << wxT("\n ") << msg;
// no lossy convs so using utf8
CPPUNIT_FAIL(string(str.mb_str(wxConvUTF8)));
@ -323,8 +323,8 @@ void RegExTestCase::fail(const wxString& msg) const
//
wxString RegExTestCase::quote(const wxString& arg)
{
const wxChar *needEscape = _T("\a\b\t\n\v\f\r\"\\");
const wxChar *escapes = _T("abtnvfr\"\\");
const wxChar *needEscape = wxT("\a\b\t\n\v\f\r\"\\");
const wxChar *escapes = wxT("abtnvfr\"\\");
wxString str;
for (size_t i = 0; i < arg.length(); i++) {
@ -332,15 +332,15 @@ wxString RegExTestCase::quote(const wxString& arg)
const wxChar *p = wxStrchr(needEscape, ch);
if (p)
str += wxString::Format(_T("\\%c"), escapes[p - needEscape]);
str += wxString::Format(wxT("\\%c"), escapes[p - needEscape]);
else if (wxIscntrl(ch))
str += wxString::Format(_T("\\%03o"), ch);
str += wxString::Format(wxT("\\%03o"), ch);
else
str += (wxChar)ch;
}
return str.length() == arg.length() && str.find(' ') == wxString::npos ?
str : _T("\"") + str + _T("\"");
str : wxT("\"") + str + wxT("\"");
}
@ -380,7 +380,7 @@ void RegExTestSuite::add(
name, mode, id, flags, pattern, data, expected_results));
}
catch (Exception& e) {
wxLogInfo(wxString::Format(_T("skipping: %s\n %s\n"),
wxLogInfo(wxString::Format(wxT("skipping: %s\n %s\n"),
wxString(name.c_str(), wxConvUTF8).c_str(),
wxString(e.what(), wxConvUTF8).c_str()));
}

36
tests/regex/wxregextest.cpp
View file

@ -104,7 +104,7 @@ void RegExMatchTestCase::runTest()
CPPUNIT_ASSERT_MESSAGE("match failed", ok);
wxStringTokenizer tkz(wxString(m_expected, *wxConvCurrent),
_T("\t"), wxTOKEN_RET_EMPTY);
wxT("\t"), wxTOKEN_RET_EMPTY);
size_t i;
for (i = 0; i < re.GetMatchCount() && tkz.HasMoreTokens(); i++) {
@ -112,7 +112,7 @@ void RegExMatchTestCase::runTest()
wxString result = re.GetMatch(m_text, i);
wxString msgstr;
msgstr.Printf(_T("\\%d == '%s' (expected '%s')"),
msgstr.Printf(wxT("\\%d == '%s' (expected '%s')"),
(int)i, result.c_str(), expected.c_str());
CPPUNIT_ASSERT_MESSAGE((const char*)msgstr.mb_str(),
@ -166,10 +166,10 @@ void RegExReplaceTestCase::runTest()
size_t nRepl = re.Replace(&text, m_repl);
wxString msgstr;
msgstr.Printf(_T("returns '%s' (expected '%s')"), text.c_str(), m_expected.c_str());
msgstr.Printf(wxT("returns '%s' (expected '%s')"), text.c_str(), m_expected.c_str());
CPPUNIT_ASSERT_MESSAGE((const char*)msgstr.mb_str(), text == m_expected);
msgstr.Printf(_T("matches %d times (expected %d)"), (int)nRepl, (int)m_count);
msgstr.Printf(wxT("matches %d times (expected %d)"), (int)nRepl, (int)m_count);
CPPUNIT_ASSERT_MESSAGE((const char*)msgstr.mb_str(), nRepl == m_count);
}
@ -258,7 +258,7 @@ void wxRegExTestSuite::add(
int flags /*=wxRE_DEFAULT*/)
{
addTest(new RegExCompileTestCase(
(_T("/") + Conv(pattern) + _T("/") + FlagStr(flags)).mb_str(),
(wxT("/") + Conv(pattern) + wxT("/") + FlagStr(flags)).mb_str(),
Conv(pattern), correct, flags));
}
@ -272,9 +272,9 @@ void wxRegExTestSuite::add(
{
wxString name;
name << _T("'") << Conv(text) << _T("' =~ /") << Conv(pattern) << _T("/")
name << wxT("'") << Conv(text) << wxT("' =~ /") << Conv(pattern) << wxT("/")
<< FlagStr(flags);
name.Replace(_T("\n"), _T("\\n"));
name.Replace(wxT("\n"), wxT("\\n"));
addTest(new RegExMatchTestCase(name.mb_str(), Conv(pattern),
Conv(text), expected, flags));
@ -292,9 +292,9 @@ void wxRegExTestSuite::add(
{
wxString name;
name << _T("'") << Conv(text) << _T("' =~ s/") << Conv(pattern) << _T("/")
<< Conv(replacement) << _T("/g") << FlagStr(flags);
name.Replace(_T("\n"), _T("\\n"));
name << wxT("'") << Conv(text) << wxT("' =~ s/") << Conv(pattern) << wxT("/")
<< Conv(replacement) << wxT("/g") << FlagStr(flags);
name.Replace(wxT("\n"), wxT("\\n"));
addTest(new RegExReplaceTestCase(
name.mb_str(), Conv(pattern), Conv(text),
@ -314,19 +314,19 @@ wxString wxRegExTestSuite::FlagStr(int flags)
switch (flags & (1 << i)) {
case 0: break;
#ifdef wxHAS_REGEX_ADVANCED
case wxRE_ADVANCED: str += _T(" | wxRE_ADVANCED"); break;
case wxRE_ADVANCED: str += wxT(" | wxRE_ADVANCED"); break;
#endif
case wxRE_BASIC: str += _T(" | wxRE_BASIC"); break;
case wxRE_ICASE: str += _T(" | wxRE_ICASE"); break;
case wxRE_NOSUB: str += _T(" | wxRE_NOSUB"); break;
case wxRE_NEWLINE: str += _T(" | wxRE_NEWLINE"); break;
case wxRE_NOTBOL: str += _T(" | wxRE_NOTBOL"); break;
case wxRE_NOTEOL: str += _T(" | wxRE_NOTEOL"); break;
case wxRE_BASIC: str += wxT(" | wxRE_BASIC"); break;
case wxRE_ICASE: str += wxT(" | wxRE_ICASE"); break;
case wxRE_NOSUB: str += wxT(" | wxRE_NOSUB"); break;
case wxRE_NEWLINE: str += wxT(" | wxRE_NEWLINE"); break;
case wxRE_NOTBOL: str += wxT(" | wxRE_NOTBOL"); break;
case wxRE_NOTEOL: str += wxT(" | wxRE_NOTEOL"); break;
default: wxFAIL; break;
}
}
return _T(" (") + str.Mid(3) + _T(")");
return wxT(" (") + str.Mid(3) + wxT(")");
}
// register in the unnamed registry so that these tests are run by default