don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -721,8 +721,8 @@ wxDialUpManagerImpl::CheckIfconfig()
|
||||
|
||||
#if defined(__SOLARIS__) || defined (__SUNOS__)
|
||||
// dialup device under SunOS/Solaris
|
||||
hasModem = strstr(output.fn_str(),"ipdptp") != (char *)NULL;
|
||||
hasLAN = strstr(output.fn_str(), "hme") != (char *)NULL;
|
||||
hasModem = strstr(output.fn_str(),"ipdptp") != NULL;
|
||||
hasLAN = strstr(output.fn_str(), "hme") != NULL;
|
||||
#elif defined(__LINUX__) || defined (__FREEBSD__)
|
||||
hasModem = strstr(output.fn_str(),"ppp") // ppp
|
||||
|| strstr(output.fn_str(),"sl") // slip
|
||||
|
||||
@@ -115,7 +115,7 @@ wxDirData::~wxDirData()
|
||||
|
||||
bool wxDirData::Read(wxString *filename)
|
||||
{
|
||||
dirent *de = (dirent *)NULL; // just to silence compiler warnings
|
||||
dirent *de = NULL; // just to silence compiler warnings
|
||||
bool matches = false;
|
||||
|
||||
// speed up string concatenation in the loop a bit
|
||||
|
||||
@@ -370,7 +370,7 @@ wxString wxNativeFontInfo::ToUserString() const
|
||||
// private data
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
static wxHashTable *g_fontHash = (wxHashTable*) NULL;
|
||||
static wxHashTable *g_fontHash = NULL;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// private functions
|
||||
@@ -1407,7 +1407,7 @@ void wxFontModule::OnExit()
|
||||
{
|
||||
delete g_fontHash;
|
||||
|
||||
g_fontHash = (wxHashTable *)NULL;
|
||||
g_fontHash = NULL;
|
||||
}
|
||||
|
||||
#endif // GTK 2.0/1.x
|
||||
|
||||
@@ -53,7 +53,7 @@ wxDECLARE_LOCAL_EVENT( wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNo
|
||||
-1, \
|
||||
-1, \
|
||||
wxEVENT_HANDLER_CAST( wxSoundBackendSDLNotificationFunction, func ), \
|
||||
(wxObject *) NULL ),
|
||||
NULL ),
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSoundBackendSDLNotification, wxEvtHandler)
|
||||
wxDEFINE_EVENT( wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification )
|
||||
|
||||
@@ -128,11 +128,11 @@ static pthread_key_t gs_keySelf;
|
||||
static size_t gs_nThreadsBeingDeleted = 0;
|
||||
|
||||
// a mutex to protect gs_nThreadsBeingDeleted
|
||||
static wxMutex *gs_mutexDeleteThread = (wxMutex *)NULL;
|
||||
static wxMutex *gs_mutexDeleteThread = NULL;
|
||||
|
||||
// and a condition variable which will be signaled when all
|
||||
// gs_nThreadsBeingDeleted will have been deleted
|
||||
static wxCondition *gs_condAllDeleted = (wxCondition *)NULL;
|
||||
static wxCondition *gs_condAllDeleted = NULL;
|
||||
|
||||
// this mutex must be acquired before any call to a GUI function
|
||||
// (it's not inside #if wxUSE_GUI because this file is compiled as part
|
||||
|
||||
@@ -202,7 +202,7 @@ void wxMicroSleep(unsigned long microseconds)
|
||||
tmReq.tv_nsec = (microseconds % 1000000) * 1000;
|
||||
|
||||
// we're not interested in remaining time nor in return value
|
||||
(void)nanosleep(&tmReq, (timespec *)NULL);
|
||||
(void)nanosleep(&tmReq, NULL);
|
||||
#elif defined(HAVE_USLEEP)
|
||||
// uncomment this if you feel brave or if you are sure that your version
|
||||
// of Solaris has a safe usleep() function but please notice that usleep()
|
||||
|
||||
Reference in New Issue
Block a user