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

124
src/unix/threadpsx.cpp
View File

@@ -84,10 +84,10 @@ enum wxThreadState
static const wxThread::ExitCode EXITCODE_CANCELLED = (wxThread::ExitCode)-1;
// trace mask for wxThread operations
#define TRACE_THREADS _T("thread")
#define TRACE_THREADS wxT("thread")
// you can get additional debugging messages for the semaphore operations
#define TRACE_SEMA _T("semaphore")
#define TRACE_SEMA wxT("semaphore")
// ----------------------------------------------------------------------------
// private functions
@@ -232,7 +232,7 @@ wxMutexInternal::wxMutexInternal(wxMutexType mutexType)
break;
default:
wxFAIL_MSG( _T("unknown mutex type") );
wxFAIL_MSG( wxT("unknown mutex type") );
// fall through
case wxMUTEX_DEFAULT:
@@ -329,11 +329,11 @@ wxMutexError wxMutexInternal::HandleLockResult(int err)
case EDEADLK:
// only error checking mutexes return this value and so it's an
// unexpected situation -- hence use assert, not wxLogDebug
wxFAIL_MSG( _T("mutex deadlock prevented") );
wxFAIL_MSG( wxT("mutex deadlock prevented") );
return wxMUTEX_DEAD_LOCK;
case EINVAL:
wxLogDebug(_T("pthread_mutex_[timed]lock(): mutex not initialized"));
wxLogDebug(wxT("pthread_mutex_[timed]lock(): mutex not initialized"));
break;
case ETIMEDOUT:
@@ -345,7 +345,7 @@ wxMutexError wxMutexInternal::HandleLockResult(int err)
return wxMUTEX_NO_ERROR;
default:
wxLogApiError(_T("pthread_mutex_[timed]lock()"), err);
wxLogApiError(wxT("pthread_mutex_[timed]lock()"), err);
}
return wxMUTEX_MISC_ERROR;
@@ -363,7 +363,7 @@ wxMutexError wxMutexInternal::TryLock()
return wxMUTEX_BUSY;
case EINVAL:
wxLogDebug(_T("pthread_mutex_trylock(): mutex not initialized."));
wxLogDebug(wxT("pthread_mutex_trylock(): mutex not initialized."));
break;
case 0:
@@ -372,7 +372,7 @@ wxMutexError wxMutexInternal::TryLock()
return wxMUTEX_NO_ERROR;
default:
wxLogApiError(_T("pthread_mutex_trylock()"), err);
wxLogApiError(wxT("pthread_mutex_trylock()"), err);
}
return wxMUTEX_MISC_ERROR;
@@ -390,14 +390,14 @@ wxMutexError wxMutexInternal::Unlock()
return wxMUTEX_UNLOCKED;
case EINVAL:
wxLogDebug(_T("pthread_mutex_unlock(): mutex not initialized."));
wxLogDebug(wxT("pthread_mutex_unlock(): mutex not initialized."));
break;
case 0:
return wxMUTEX_NO_ERROR;
default:
wxLogApiError(_T("pthread_mutex_unlock()"), err);
wxLogApiError(wxT("pthread_mutex_unlock()"), err);
}
return wxMUTEX_MISC_ERROR;
@@ -446,7 +446,7 @@ wxConditionInternal::wxConditionInternal(wxMutex& mutex)
if ( !m_isOk )
{
wxLogApiError(_T("pthread_cond_init()"), err);
wxLogApiError(wxT("pthread_cond_init()"), err);
}
}
@@ -457,7 +457,7 @@ wxConditionInternal::~wxConditionInternal()
int err = pthread_cond_destroy(&m_cond);
if ( err != 0 )
{
wxLogApiError(_T("pthread_cond_destroy()"), err);
wxLogApiError(wxT("pthread_cond_destroy()"), err);
}
}
}
@@ -467,7 +467,7 @@ wxCondError wxConditionInternal::Wait()
int err = pthread_cond_wait(&m_cond, GetPMutex());
if ( err != 0 )
{
wxLogApiError(_T("pthread_cond_wait()"), err);
wxLogApiError(wxT("pthread_cond_wait()"), err);
return wxCOND_MISC_ERROR;
}
@@ -500,7 +500,7 @@ wxCondError wxConditionInternal::WaitTimeout(unsigned long milliseconds)
return wxCOND_NO_ERROR;
default:
wxLogApiError(_T("pthread_cond_timedwait()"), err);
wxLogApiError(wxT("pthread_cond_timedwait()"), err);
}
return wxCOND_MISC_ERROR;
@@ -511,7 +511,7 @@ wxCondError wxConditionInternal::Signal()
int err = pthread_cond_signal(&m_cond);
if ( err != 0 )
{
wxLogApiError(_T("pthread_cond_signal()"), err);
wxLogApiError(wxT("pthread_cond_signal()"), err);
return wxCOND_MISC_ERROR;
}
@@ -524,7 +524,7 @@ wxCondError wxConditionInternal::Broadcast()
int err = pthread_cond_broadcast(&m_cond);
if ( err != 0 )
{
wxLogApiError(_T("pthread_cond_broadcast()"), err);
wxLogApiError(wxT("pthread_cond_broadcast()"), err);
return wxCOND_MISC_ERROR;
}
@@ -573,7 +573,7 @@ wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
if ( (initialcount < 0 || maxcount < 0) ||
((maxcount > 0) && (initialcount > maxcount)) )
{
wxFAIL_MSG( _T("wxSemaphore: invalid initial or maximal count") );
wxFAIL_MSG( wxT("wxSemaphore: invalid initial or maximal count") );
m_isOk = false;
}
@@ -593,14 +593,14 @@ wxSemaError wxSemaphoreInternal::Wait()
while ( m_count == 0 )
{
wxLogTrace(TRACE_SEMA,
_T("Thread %p waiting for semaphore to become signalled"),
wxT("Thread %p waiting for semaphore to become signalled"),
wxThread::GetCurrentId());
if ( m_cond.Wait() != wxCOND_NO_ERROR )
return wxSEMA_MISC_ERROR;
wxLogTrace(TRACE_SEMA,
_T("Thread %p finished waiting for semaphore, count = %lu"),
wxT("Thread %p finished waiting for semaphore, count = %lu"),
wxThread::GetCurrentId(), (unsigned long)m_count);
}
@@ -667,7 +667,7 @@ wxSemaError wxSemaphoreInternal::Post()
m_count++;
wxLogTrace(TRACE_SEMA,
_T("Thread %p about to signal semaphore, count = %lu"),
wxT("Thread %p about to signal semaphore, count = %lu"),
wxThread::GetCurrentId(), (unsigned long)m_count);
return m_cond.Signal() == wxCOND_NO_ERROR ? wxSEMA_NO_ERROR
@@ -727,13 +727,13 @@ public:
#if wxUSE_LOG_TRACE
static const wxChar *stateNames[] =
{
_T("NEW"),
_T("RUNNING"),
_T("PAUSED"),
_T("EXITED"),
wxT("NEW"),
wxT("RUNNING"),
wxT("PAUSED"),
wxT("EXITED"),
};
wxLogTrace(TRACE_THREADS, _T("Thread %p: %s => %s."),
wxLogTrace(TRACE_THREADS, wxT("Thread %p: %s => %s."),
GetId(), stateNames[m_state], stateNames[state]);
#endif // wxUSE_LOG_TRACE
@@ -810,7 +810,7 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
{
wxThreadInternal *pthread = thread->m_internal;
wxLogTrace(TRACE_THREADS, _T("Thread %p started."), THR_ID(pthread));
wxLogTrace(TRACE_THREADS, wxT("Thread %p started."), THR_ID(pthread));
// associate the thread pointer with the newly created thread so that
// wxThread::This() will work
@@ -848,7 +848,7 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
{
// call the main entry
wxLogTrace(TRACE_THREADS,
_T("Thread %p about to enter its Entry()."),
wxT("Thread %p about to enter its Entry()."),
THR_ID(pthread));
wxTRY
@@ -856,7 +856,7 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
pthread->m_exitcode = thread->Entry();
wxLogTrace(TRACE_THREADS,
_T("Thread %p Entry() returned %lu."),
wxT("Thread %p Entry() returned %lu."),
THR_ID(pthread), wxPtrToUInt(pthread->m_exitcode));
}
wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
@@ -971,7 +971,7 @@ wxThreadError wxThreadInternal::Run()
void wxThreadInternal::Wait()
{
wxCHECK_RET( !m_isDetached, _T("can't wait for a detached thread") );
wxCHECK_RET( !m_isDetached, wxT("can't wait for a detached thread") );
// if the thread we're waiting for is waiting for the GUI mutex, we will
// deadlock so make sure we release it temporarily
@@ -979,7 +979,7 @@ void wxThreadInternal::Wait()
wxMutexGuiLeave();
wxLogTrace(TRACE_THREADS,
_T("Starting to wait for thread %p to exit."),
wxT("Starting to wait for thread %p to exit."),
THR_ID(this));
// to avoid memory leaks we should call pthread_join(), but it must only be
@@ -1019,7 +1019,7 @@ void wxThreadInternal::Pause()
wxT("thread must first be paused with wxThread::Pause().") );
wxLogTrace(TRACE_THREADS,
_T("Thread %p goes to sleep."), THR_ID(this));
wxT("Thread %p goes to sleep."), THR_ID(this));
// wait until the semaphore is Post()ed from Resume()
m_semSuspend.Wait();
@@ -1035,7 +1035,7 @@ void wxThreadInternal::Resume()
if ( IsReallyPaused() )
{
wxLogTrace(TRACE_THREADS,
_T("Waking up thread %p"), THR_ID(this));
wxT("Waking up thread %p"), THR_ID(this));
// wake up Pause()
m_semSuspend.Post();
@@ -1046,7 +1046,7 @@ void wxThreadInternal::Resume()
else
{
wxLogTrace(TRACE_THREADS,
_T("Thread %p is not yet really paused"), THR_ID(this));
wxT("Thread %p is not yet really paused"), THR_ID(this));
}
SetState(STATE_RUNNING);
@@ -1082,7 +1082,7 @@ int wxThread::GetCPUCount()
// it has 0 size but still can be read from)
wxLogNull nolog;
wxFFile file(_T("/proc/cpuinfo"));
wxFFile file(wxT("/proc/cpuinfo"));
if ( file.IsOpened() )
{
// slurp the whole file
@@ -1090,17 +1090,17 @@ int wxThread::GetCPUCount()
if ( file.ReadAll(&s) )
{
// (ab)use Replace() to find the number of "processor: num" strings
size_t count = s.Replace(_T("processor\t:"), _T(""));
size_t count = s.Replace(wxT("processor\t:"), wxT(""));
if ( count > 0 )
{
return count;
}
wxLogDebug(_T("failed to parse /proc/cpuinfo"));
wxLogDebug(wxT("failed to parse /proc/cpuinfo"));
}
else
{
wxLogDebug(_T("failed to read /proc/cpuinfo"));
wxLogDebug(wxT("failed to read /proc/cpuinfo"));
}
}
#endif // different ways to get number of CPUs
@@ -1121,7 +1121,7 @@ bool wxThread::SetConcurrency(size_t level)
int rc = thr_setconcurrency(level);
if ( rc != 0 )
{
wxLogSysError(rc, _T("thr_setconcurrency() failed"));
wxLogSysError(rc, wxT("thr_setconcurrency() failed"));
}
return rc == 0;
@@ -1214,14 +1214,14 @@ wxThreadError wxThread::Create(unsigned int WXUNUSED_STACKSIZE(stackSize))
struct sched_param sp;
if ( pthread_attr_getschedparam(&attr, &sp) != 0 )
{
wxFAIL_MSG(_T("pthread_attr_getschedparam() failed"));
wxFAIL_MSG(wxT("pthread_attr_getschedparam() failed"));
}
sp.sched_priority = min_prio + (prio*(max_prio - min_prio))/100;
if ( pthread_attr_setschedparam(&attr, &sp) != 0 )
{
wxFAIL_MSG(_T("pthread_attr_setschedparam(priority) failed"));
wxFAIL_MSG(wxT("pthread_attr_setschedparam(priority) failed"));
}
}
#endif // HAVE_THREAD_PRIORITY_FUNCTIONS
@@ -1230,7 +1230,7 @@ wxThreadError wxThread::Create(unsigned int WXUNUSED_STACKSIZE(stackSize))
// this will make the threads created by this process really concurrent
if ( pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) != 0 )
{
wxFAIL_MSG(_T("pthread_attr_setscope(PTHREAD_SCOPE_SYSTEM) failed"));
wxFAIL_MSG(wxT("pthread_attr_setscope(PTHREAD_SCOPE_SYSTEM) failed"));
}
#endif // HAVE_PTHREAD_ATTR_SETSCOPE
@@ -1241,7 +1241,7 @@ wxThreadError wxThread::Create(unsigned int WXUNUSED_STACKSIZE(stackSize))
{
if ( pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0 )
{
wxFAIL_MSG(_T("pthread_attr_setdetachstate(DETACHED) failed"));
wxFAIL_MSG(wxT("pthread_attr_setdetachstate(DETACHED) failed"));
}
// never try to join detached threads
@@ -1260,7 +1260,7 @@ wxThreadError wxThread::Create(unsigned int WXUNUSED_STACKSIZE(stackSize))
if ( pthread_attr_destroy(&attr) != 0 )
{
wxFAIL_MSG(_T("pthread_attr_destroy() failed"));
wxFAIL_MSG(wxT("pthread_attr_destroy() failed"));
}
if ( rc != 0 )
@@ -1362,7 +1362,7 @@ wxThreadIdType wxThread::GetId() const
wxThreadError wxThread::Pause()
{
wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR,
_T("a thread can't pause itself") );
wxT("a thread can't pause itself") );
wxCriticalSectionLocker lock(m_critsect);
@@ -1383,7 +1383,7 @@ wxThreadError wxThread::Pause()
wxThreadError wxThread::Resume()
{
wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR,
_T("a thread can't resume itself") );
wxT("a thread can't resume itself") );
wxCriticalSectionLocker lock(m_critsect);
@@ -1392,7 +1392,7 @@ wxThreadError wxThread::Resume()
switch ( state )
{
case STATE_PAUSED:
wxLogTrace(TRACE_THREADS, _T("Thread %p suspended, resuming."),
wxLogTrace(TRACE_THREADS, wxT("Thread %p suspended, resuming."),
GetId());
m_internal->Resume();
@@ -1400,12 +1400,12 @@ wxThreadError wxThread::Resume()
return wxTHREAD_NO_ERROR;
case STATE_EXITED:
wxLogTrace(TRACE_THREADS, _T("Thread %p exited, won't resume."),
wxLogTrace(TRACE_THREADS, wxT("Thread %p exited, won't resume."),
GetId());
return wxTHREAD_NO_ERROR;
default:
wxLogDebug(_T("Attempt to resume a thread which is not paused."));
wxLogDebug(wxT("Attempt to resume a thread which is not paused."));
return wxTHREAD_MISC_ERROR;
}
@@ -1418,10 +1418,10 @@ wxThreadError wxThread::Resume()
wxThread::ExitCode wxThread::Wait()
{
wxCHECK_MSG( This() != this, (ExitCode)-1,
_T("a thread can't wait for itself") );
wxT("a thread can't wait for itself") );
wxCHECK_MSG( !m_isDetached, (ExitCode)-1,
_T("can't wait for detached thread") );
wxT("can't wait for detached thread") );
m_internal->Wait();
@@ -1431,7 +1431,7 @@ wxThread::ExitCode wxThread::Wait()
wxThreadError wxThread::Delete(ExitCode *rc)
{
wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR,
_T("a thread can't delete itself") );
wxT("a thread can't delete itself") );
bool isDetached = m_isDetached;
@@ -1484,7 +1484,7 @@ wxThreadError wxThread::Delete(ExitCode *rc)
wxThreadError wxThread::Kill()
{
wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR,
_T("a thread can't kill itself") );
wxT("a thread can't kill itself") );
switch ( m_internal->GetState() )
{
@@ -1535,7 +1535,7 @@ wxThreadError wxThread::Kill()
void wxThread::Exit(ExitCode status)
{
wxASSERT_MSG( This() == this,
_T("wxThread::Exit() can only be called in the context of the same thread") );
wxT("wxThread::Exit() can only be called in the context of the same thread") );
if ( m_isDetached )
{
@@ -1578,14 +1578,14 @@ void wxThread::Exit(ExitCode status)
// terminate the thread (pthread_exit() never returns)
pthread_exit(status);
wxFAIL_MSG(_T("pthread_exit() failed"));
wxFAIL_MSG(wxT("pthread_exit() failed"));
}
// also test whether we were paused
bool wxThread::TestDestroy()
{
wxASSERT_MSG( This() == this,
_T("wxThread::TestDestroy() can only be called in the context of the same thread") );
wxT("wxThread::TestDestroy() can only be called in the context of the same thread") );
m_critsect.Enter();
@@ -1617,7 +1617,7 @@ wxThread::~wxThread()
if ( m_internal->GetState() != STATE_EXITED &&
m_internal->GetState() != STATE_NEW )
{
wxLogDebug(_T("The thread %ld is being destroyed although it is still running! The application may crash."),
wxLogDebug(wxT("The thread %ld is being destroyed although it is still running! The application may crash."),
(long)GetId());
}
@@ -1719,7 +1719,7 @@ void wxThreadModule::OnExit()
if ( nThreadsBeingDeleted > 0 )
{
wxLogTrace(TRACE_THREADS,
_T("Waiting for %lu threads to disappear"),
wxT("Waiting for %lu threads to disappear"),
(unsigned long)nThreadsBeingDeleted);
// have to wait until all of them disappear
@@ -1771,9 +1771,9 @@ static void ScheduleThreadForDeletion()
gs_nThreadsBeingDeleted++;
wxLogTrace(TRACE_THREADS, _T("%lu thread%s waiting to be deleted"),
wxLogTrace(TRACE_THREADS, wxT("%lu thread%s waiting to be deleted"),
(unsigned long)gs_nThreadsBeingDeleted,
gs_nThreadsBeingDeleted == 1 ? _T("") : _T("s"));
gs_nThreadsBeingDeleted == 1 ? wxT("") : wxT("s"));
}
static void DeleteThread(wxThread *This)
@@ -1782,14 +1782,14 @@ static void DeleteThread(wxThread *This)
// or wxThreadModule::OnExit() would deadlock
wxMutexLocker locker( *gs_mutexDeleteThread );
wxLogTrace(TRACE_THREADS, _T("Thread %p auto deletes."), This->GetId());
wxLogTrace(TRACE_THREADS, wxT("Thread %p auto deletes."), This->GetId());
delete This;
wxCHECK_RET( gs_nThreadsBeingDeleted > 0,
_T("no threads scheduled for deletion, yet we delete one?") );
wxT("no threads scheduled for deletion, yet we delete one?") );
wxLogTrace(TRACE_THREADS, _T("%lu threads remain scheduled for deletion."),
wxLogTrace(TRACE_THREADS, wxT("%lu threads remain scheduled for deletion."),
(unsigned long)gs_nThreadsBeingDeleted - 1);
if ( !--gs_nThreadsBeingDeleted )