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

92
src/common/fileconf.cpp
View File

@@ -70,7 +70,7 @@
#define MAX_PATH 512
#endif
#define FILECONF_TRACE_MASK _T("fileconf")
#define FILECONF_TRACE_MASK wxT("fileconf")
// ----------------------------------------------------------------------------
// global functions declarations
@@ -915,7 +915,7 @@ bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const
bool wxFileConfig::DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const
{
wxCHECK_MSG( buf, false, _T("NULL buffer") );
wxCHECK_MSG( buf, false, wxT("NULL buffer") );
wxString str;
if ( !Read(key, &str) )
@@ -933,7 +933,7 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
wxString strName = path.Name();
wxLogTrace( FILECONF_TRACE_MASK,
_T(" Writing String '%s' = '%s' to Group '%s'"),
wxT(" Writing String '%s' = '%s' to Group '%s'"),
strName.c_str(),
szValue.c_str(),
GetPath().c_str() );
@@ -947,7 +947,7 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
// ... except if it's empty in which case it's a way to force it's creation
wxLogTrace( FILECONF_TRACE_MASK,
_T(" Creating group %s"),
wxT(" Creating group %s"),
m_pCurrentGroup->Name().c_str() );
SetDirty();
@@ -971,13 +971,13 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
if ( pEntry == 0 )
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" Adding Entry %s"),
wxT(" Adding Entry %s"),
strName.c_str() );
pEntry = m_pCurrentGroup->AddEntry(strName);
}
wxLogTrace( FILECONF_TRACE_MASK,
_T(" Setting value %s"),
wxT(" Setting value %s"),
szValue.c_str() );
pEntry->SetValue(szValue);
@@ -989,7 +989,7 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
bool wxFileConfig::DoWriteLong(const wxString& key, long lValue)
{
return Write(key, wxString::Format(_T("%ld"), lValue));
return Write(key, wxString::Format(wxT("%ld"), lValue));
}
#if wxUSE_BASE64
@@ -1081,7 +1081,7 @@ bool wxFileConfig::RenameEntry(const wxString& oldName,
const wxString& newName)
{
wxASSERT_MSG( oldName.find(wxCONFIG_PATH_SEPARATOR) == wxString::npos,
_T("RenameEntry(): paths are not supported") );
wxT("RenameEntry(): paths are not supported") );
// check that the entry exists
wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
@@ -1192,14 +1192,14 @@ bool wxFileConfig::DeleteAll()
wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" ** Adding Line '%s'"),
wxT(" ** Adding Line '%s'"),
str.c_str() );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" head: %s"),
wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" tail: %s"),
wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
@@ -1220,11 +1220,11 @@ wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
m_linesTail = pLine;
wxLogTrace( FILECONF_TRACE_MASK,
_T(" head: %s"),
wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" tail: %s"),
wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
@@ -1236,16 +1236,16 @@ wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
wxFileConfigLineList *pLine)
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" ** Inserting Line '%s' after '%s'"),
wxT(" ** Inserting Line '%s' after '%s'"),
str.c_str(),
((pLine) ? (const wxChar*)pLine->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" head: %s"),
wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" tail: %s"),
wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
@@ -1271,11 +1271,11 @@ wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
}
wxLogTrace( FILECONF_TRACE_MASK,
_T(" head: %s"),
wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" tail: %s"),
wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
@@ -1285,14 +1285,14 @@ wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" ** Removing Line '%s'"),
wxT(" ** Removing Line '%s'"),
pLine->Text().c_str() );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" head: %s"),
wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" tail: %s"),
wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
@@ -1314,11 +1314,11 @@ void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
pNext->SetPrev(pPrev);
wxLogTrace( FILECONF_TRACE_MASK,
_T(" head: %s"),
wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" tail: %s"),
wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
@@ -1377,7 +1377,7 @@ void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
// for a normal (i.e. not root) group this method shouldn't be called twice
// unless we are resetting the line
wxASSERT_MSG( !m_pParent || !m_pLine || !pLine,
_T("changing line for a non-root group?") );
wxT("changing line for a non-root group?") );
m_pLine = pLine;
}
@@ -1419,13 +1419,13 @@ void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" GetGroupLine() for Group '%s'"),
wxT(" GetGroupLine() for Group '%s'"),
Name().c_str() );
if ( !m_pLine )
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" Getting Line item pointer") );
wxT(" Getting Line item pointer") );
wxFileConfigGroup *pParent = Parent();
@@ -1433,7 +1433,7 @@ wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
if ( pParent )
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" checking parent '%s'"),
wxT(" checking parent '%s'"),
pParent->Name().c_str() );
wxString strFullName;
@@ -1464,7 +1464,7 @@ wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine()
{
wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();
wxASSERT_MSG( pLine, _T("last group must have !NULL associated line") );
wxASSERT_MSG( pLine, wxT("last group must have !NULL associated line") );
return pLine;
}
@@ -1479,14 +1479,14 @@ wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine()
wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine()
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" GetLastEntryLine() for Group '%s'"),
wxT(" GetLastEntryLine() for Group '%s'"),
Name().c_str() );
if ( m_pLastEntry )
{
wxFileConfigLineList *pLine = m_pLastEntry->GetLine();
wxASSERT_MSG( pLine, _T("last entry must have !NULL associated line") );
wxASSERT_MSG( pLine, wxT("last entry must have !NULL associated line") );
return pLine;
}
@@ -1504,7 +1504,7 @@ void wxFileConfigGroup::SetLastEntry(wxFileConfigEntry *pEntry)
// the only situation in which a group without its own line can have
// an entry is when the first entry is added to the initially empty
// root pseudo-group
wxASSERT_MSG( !m_pParent, _T("unexpected for non root group") );
wxASSERT_MSG( !m_pParent, wxT("unexpected for non root group") );
// let the group know that it does have a line in the file now
m_pLine = pEntry->GetLine();
@@ -1519,10 +1519,10 @@ void wxFileConfigGroup::UpdateGroupAndSubgroupsLines()
{
// update the line of this group
wxFileConfigLineList *line = GetGroupLine();
wxCHECK_RET( line, _T("a non root group must have a corresponding line!") );
wxCHECK_RET( line, wxT("a non root group must have a corresponding line!") );
// +1: skip the leading '/'
line->SetText(wxString::Format(_T("[%s]"), GetFullName().c_str() + 1));
line->SetText(wxString::Format(wxT("[%s]"), GetFullName().c_str() + 1));
// also update all subgroups as they have this groups name in their lines
@@ -1535,7 +1535,7 @@ void wxFileConfigGroup::UpdateGroupAndSubgroupsLines()
void wxFileConfigGroup::Rename(const wxString& newName)
{
wxCHECK_RET( m_pParent, _T("the root group can't be renamed") );
wxCHECK_RET( m_pParent, wxT("the root group can't be renamed") );
if ( newName == m_strName )
return;
@@ -1674,20 +1674,20 @@ bool wxFileConfigGroup::DeleteSubgroupByName(const wxString& name)
// other data structures.
bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
{
wxCHECK_MSG( pGroup, false, _T("deleting non existing group?") );
wxCHECK_MSG( pGroup, false, wxT("deleting non existing group?") );
wxLogTrace( FILECONF_TRACE_MASK,
_T("Deleting group '%s' from '%s'"),
wxT("Deleting group '%s' from '%s'"),
pGroup->Name().c_str(),
Name().c_str() );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" (m_pLine) = prev: %p, this %p, next %p"),
wxT(" (m_pLine) = prev: %p, this %p, next %p"),
m_pLine ? static_cast<void*>(m_pLine->Prev()) : 0,
static_cast<void*>(m_pLine),
m_pLine ? static_cast<void*>(m_pLine->Next()) : 0 );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" text: '%s'"),
wxT(" text: '%s'"),
m_pLine ? (const wxChar*)m_pLine->Text().c_str()
: wxEmptyString );
@@ -1695,7 +1695,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
size_t nCount = pGroup->m_aEntries.GetCount();
wxLogTrace(FILECONF_TRACE_MASK,
_T("Removing %lu entries"), (unsigned long)nCount );
wxT("Removing %lu entries"), (unsigned long)nCount );
for ( size_t nEntry = 0; nEntry < nCount; nEntry++ )
{
@@ -1704,7 +1704,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
if ( pLine )
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" '%s'"),
wxT(" '%s'"),
pLine->Text().c_str() );
m_pConfig->LineListRemove(pLine);
}
@@ -1714,7 +1714,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
nCount = pGroup->m_aSubgroups.GetCount();
wxLogTrace( FILECONF_TRACE_MASK,
_T("Removing %lu subgroups"), (unsigned long)nCount );
wxT("Removing %lu subgroups"), (unsigned long)nCount );
for ( size_t nGroup = 0; nGroup < nCount; nGroup++ )
{
@@ -1726,11 +1726,11 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
if ( pLine )
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" Removing line for group '%s' : '%s'"),
wxT(" Removing line for group '%s' : '%s'"),
pGroup->Name().c_str(),
pLine->Text().c_str() );
wxLogTrace( FILECONF_TRACE_MASK,
_T(" Removing from group '%s' : '%s'"),
wxT(" Removing from group '%s' : '%s'"),
Name().c_str(),
((m_pLine) ? (const wxChar*)m_pLine->Text().c_str()
: wxEmptyString) );
@@ -1740,7 +1740,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
if ( pGroup == m_pLastGroup )
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" Removing last group") );
wxT(" Removing last group") );
// our last entry is being deleted, so find the last one which
// stays by going back until we find a subgroup or reach the
@@ -1774,7 +1774,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
else
{
wxLogTrace( FILECONF_TRACE_MASK,
_T(" No line entry for Group '%s'?"),
wxT(" No line entry for Group '%s'?"),
pGroup->Name().c_str() );
}
@@ -2080,7 +2080,7 @@ static wxString FilterInEntryName(const wxString& str)
for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) {
if ( *pc == wxT('\\') ) {
// we need to test it here or we'd skip past the NUL in the loop line
if ( *++pc == _T('\0') )
if ( *++pc == wxT('\0') )
break;
}