code cleanup: 0 --> NULL

This commit is contained in:
Campbell Barton 2013-03-08 06:32:00 +00:00
parent 1d5b7bc1f7
commit 6fd187e4df
16 changed files with 29 additions and 29 deletions

@ -77,7 +77,7 @@ public:
AUD_CallbackIIRFilterReader(boost::shared_ptr<AUD_IReader> reader, int in, int out, AUD_CallbackIIRFilterReader(boost::shared_ptr<AUD_IReader> reader, int in, int out,
doFilterIIR doFilter, doFilterIIR doFilter,
endFilterIIR endFilter = 0, endFilterIIR endFilter = 0,
void* data = 0); void* data = NULL);
virtual ~AUD_CallbackIIRFilterReader(); virtual ~AUD_CallbackIIRFilterReader();

@ -201,7 +201,7 @@ public:
virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay, virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay,
GHOST_TUns64 interval, GHOST_TUns64 interval,
GHOST_TimerProcPtr timerProc, GHOST_TimerProcPtr timerProc,
GHOST_TUserDataPtr userData = 0) = 0; GHOST_TUserDataPtr userData = NULL) = 0;
/** /**
* Removes a timer. * Removes a timer.

@ -51,7 +51,7 @@ public:
* \param window The generating window (or NULL if system event). * \param window The generating window (or NULL if system event).
*/ */
GHOST_Event(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow *window) GHOST_Event(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow *window)
: m_type(type), m_time(msec), m_window(window), m_data(0) : m_type(type), m_time(msec), m_window(window), m_data(NULL)
{ {
} }

@ -81,7 +81,7 @@ GHOST_TUns32 GHOST_EventManager::getNumEvents(GHOST_TEventType type)
GHOST_IEvent *GHOST_EventManager::peekEvent() GHOST_IEvent *GHOST_EventManager::peekEvent()
{ {
GHOST_IEvent *event = 0; GHOST_IEvent *event = NULL;
if (m_events.empty() == false) { if (m_events.empty() == false) {
event = m_events.back(); event = m_events.back();
} }

@ -141,7 +141,7 @@ public:
virtual void virtual void
removeTypeEvents( removeTypeEvents(
GHOST_TEventType type, GHOST_TEventType type,
GHOST_IWindow *window = 0 GHOST_IWindow *window = NULL
); );
protected: protected:

@ -48,19 +48,19 @@ GHOST_TSuccess GHOST_DisposeSystemPaths(void)
const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr) const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr)
{ {
GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get(); GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
return systemPaths ? systemPaths->getSystemDir(version, versionstr) : 0; return systemPaths ? systemPaths->getSystemDir(version, versionstr) : NULL;
} }
const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr) const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr)
{ {
GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get(); GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
return systemPaths ? systemPaths->getUserDir(version, versionstr) : 0; /* shouldn't be NULL */ return systemPaths ? systemPaths->getUserDir(version, versionstr) : NULL; /* shouldn't be NULL */
} }
const GHOST_TUns8 *GHOST_getBinaryDir() const GHOST_TUns8 *GHOST_getBinaryDir()
{ {
GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get(); GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
return systemPaths ? systemPaths->getBinaryDir() : 0; /* shouldn't be NULL */ return systemPaths ? systemPaths->getBinaryDir() : NULL; /* shouldn't be NULL */
} }
void GHOST_addToSystemRecentFiles(const char *filename) void GHOST_addToSystemRecentFiles(const char *filename)

@ -46,10 +46,10 @@
GHOST_System::GHOST_System() GHOST_System::GHOST_System()
: m_nativePixel(false), : m_nativePixel(false),
m_displayManager(0), m_displayManager(NULL),
m_timerManager(0), m_timerManager(NULL),
m_windowManager(0), m_windowManager(NULL),
m_eventManager(0) m_eventManager(NULL)
#ifdef WITH_INPUT_NDOF #ifdef WITH_INPUT_NDOF
, m_ndofManager(0) , m_ndofManager(0)
#endif #endif
@ -324,19 +324,19 @@ GHOST_TSuccess GHOST_System::exit()
} }
if (m_displayManager) { if (m_displayManager) {
delete m_displayManager; delete m_displayManager;
m_displayManager = 0; m_displayManager = NULL;
} }
if (m_windowManager) { if (m_windowManager) {
delete m_windowManager; delete m_windowManager;
m_windowManager = 0; m_windowManager = NULL;
} }
if (m_timerManager) { if (m_timerManager) {
delete m_timerManager; delete m_timerManager;
m_timerManager = 0; m_timerManager = NULL;
} }
if (m_eventManager) { if (m_eventManager) {
delete m_eventManager; delete m_eventManager;
m_eventManager = 0; m_eventManager = NULL;
} }
#ifdef WITH_INPUT_NDOF #ifdef WITH_INPUT_NDOF
if (m_ndofManager) { if (m_ndofManager) {

@ -100,7 +100,7 @@ public:
virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay, virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay,
GHOST_TUns64 interval, GHOST_TUns64 interval,
GHOST_TimerProcPtr timerProc, GHOST_TimerProcPtr timerProc,
GHOST_TUserDataPtr userData = 0); GHOST_TUserDataPtr userData = NULL);
/** /**
* Removes a timer. * Removes a timer.

@ -90,7 +90,7 @@ GHOST_TSuccess GHOST_TimerManager::removeTimer(GHOST_TimerTask *timer)
// Remove the timer task // Remove the timer task
m_timers.erase(iter); m_timers.erase(iter);
delete timer; delete timer;
timer = 0; timer = NULL;
success = GHOST_kSuccess; success = GHOST_kSuccess;
} }
else { else {

@ -54,7 +54,7 @@ public:
GHOST_TimerTask(GHOST_TUns64 start, GHOST_TimerTask(GHOST_TUns64 start,
GHOST_TUns64 interval, GHOST_TUns64 interval,
GHOST_TimerProcPtr timerProc, GHOST_TimerProcPtr timerProc,
GHOST_TUserDataPtr userData = 0) GHOST_TUserDataPtr userData = NULL)
: m_start(start), : m_start(start),
m_interval(interval), m_interval(interval),
m_next(start), m_next(start),

@ -63,7 +63,7 @@ struct MEM_Allocator
// NB: __n is permitted to be 0. The C++ standard says nothing // NB: __n is permitted to be 0. The C++ standard says nothing
// about what the return value is when __n == 0. // about what the return value is when __n == 0.
_Tp* allocate(size_type __n, const void* = 0) { _Tp* allocate(size_type __n, const void* = 0) {
_Tp* __ret = 0; _Tp* __ret = NULL;
if (__n) if (__n)
__ret = static_cast<_Tp*>( __ret = static_cast<_Tp*>(
MEM_mallocN(__n * sizeof(_Tp), MEM_mallocN(__n * sizeof(_Tp),

@ -108,7 +108,7 @@ public:
bool destroy_if_possible() { bool destroy_if_possible() {
if (can_destroy()) { if (can_destroy()) {
delete data; delete data;
data = 0; data = NULL;
unmanage(); unmanage();
return true; return true;
} }

@ -128,7 +128,7 @@ MEM_CacheLimiterCClass::~MEM_CacheLimiterCClass()
{ {
// should not happen, but don't leak memory in this case... // should not happen, but don't leak memory in this case...
for (list_t::iterator it = cclass_list.begin(); it != cclass_list.end(); it++) { for (list_t::iterator it = cclass_list.begin(); it != cclass_list.end(); it++) {
(*it)->set_data(0); (*it)->set_data(NULL);
delete *it; delete *it;
} }

@ -106,7 +106,7 @@ STR_String::STR_String(const char *str)
this->m_data[this->m_len] = 0; this->m_data[this->m_len] = 0;
} }
else { else {
this->m_data = 0; this->m_data = NULL;
this->m_len = 0; this->m_len = 0;
this->m_max = 8; this->m_max = 8;
} }

@ -87,7 +87,7 @@ MALWAYS_INLINE void rayface_from_vlak(RayFace *rayface, ObjectInstanceRen *obi,
RayObject *RE_rayface_from_vlak(RayFace *rayface, ObjectInstanceRen *obi, VlakRen *vlr) RayObject *RE_rayface_from_vlak(RayFace *rayface, ObjectInstanceRen *obi, VlakRen *vlr)
{ {
return rayface_from_coords(rayface, obi, vlr, vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4 ? vlr->v4->co : 0); return rayface_from_coords(rayface, obi, vlr, vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4 ? vlr->v4->co : NULL);
} }
RayObject *RE_rayface_from_coords(RayFace *rayface, void *ob, void *face, float *v1, float *v2, float *v3, float *v4) RayObject *RE_rayface_from_coords(RayFace *rayface, void *ob, void *face, float *v1, float *v2, float *v3, float *v4)

@ -50,15 +50,15 @@ static bool selected_node(RTBuilder::Object *node)
static void rtbuild_init(RTBuilder *b) static void rtbuild_init(RTBuilder *b)
{ {
b->split_axis = -1; b->split_axis = -1;
b->primitives.begin = 0; b->primitives.begin = NULL;
b->primitives.end = 0; b->primitives.end = NULL;
b->primitives.maxsize = 0; b->primitives.maxsize = 0;
for (int i = 0; i < RTBUILD_MAX_CHILDS; i++) for (int i = 0; i < RTBUILD_MAX_CHILDS; i++)
b->child_offset[i] = 0; b->child_offset[i] = 0;
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
b->sorted_begin[i] = b->sorted_end[i] = 0; b->sorted_begin[i] = b->sorted_end[i] = NULL;
INIT_MINMAX(b->bb, b->bb + 3); INIT_MINMAX(b->bb, b->bb + 3);
} }
@ -178,8 +178,8 @@ RTBuilder *rtbuild_get_child(RTBuilder *b, int child, RTBuilder *tmp)
tmp->sorted_end[i] = b->sorted_begin[i] + b->child_offset[child + 1]; tmp->sorted_end[i] = b->sorted_begin[i] + b->child_offset[child + 1];
} }
else { else {
tmp->sorted_begin[i] = 0; tmp->sorted_begin[i] = NULL;
tmp->sorted_end[i] = 0; tmp->sorted_end[i] = NULL;
} }
return tmp; return tmp;