From 6fd187e4df1133b273ee2e5c1bbb3b8a9f31e73e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 8 Mar 2013 06:32:00 +0000 Subject: [PATCH] code cleanup: 0 --> NULL --- .../audaspace/FX/AUD_CallbackIIRFilterReader.h | 2 +- intern/ghost/GHOST_ISystem.h | 2 +- intern/ghost/intern/GHOST_Event.h | 2 +- intern/ghost/intern/GHOST_EventManager.cpp | 2 +- intern/ghost/intern/GHOST_EventManager.h | 2 +- intern/ghost/intern/GHOST_Path-api.cpp | 6 +++--- intern/ghost/intern/GHOST_System.cpp | 16 ++++++++-------- intern/ghost/intern/GHOST_System.h | 2 +- intern/ghost/intern/GHOST_TimerManager.cpp | 2 +- intern/ghost/intern/GHOST_TimerTask.h | 2 +- intern/memutil/MEM_Allocator.h | 2 +- intern/memutil/MEM_CacheLimiter.h | 2 +- intern/memutil/intern/MEM_CacheLimiterC-Api.cpp | 2 +- intern/string/intern/STR_String.cpp | 2 +- .../blender/render/intern/raytrace/rayobject.cpp | 2 +- .../render/intern/raytrace/rayobject_rtbuild.cpp | 10 +++++----- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h b/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h index d9df65f03eb..66f82ba1a01 100644 --- a/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h +++ b/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h @@ -77,7 +77,7 @@ public: AUD_CallbackIIRFilterReader(boost::shared_ptr reader, int in, int out, doFilterIIR doFilter, endFilterIIR endFilter = 0, - void* data = 0); + void* data = NULL); virtual ~AUD_CallbackIIRFilterReader(); diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 37e82c29f80..137926b033c 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -201,7 +201,7 @@ public: virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay, GHOST_TUns64 interval, GHOST_TimerProcPtr timerProc, - GHOST_TUserDataPtr userData = 0) = 0; + GHOST_TUserDataPtr userData = NULL) = 0; /** * Removes a timer. diff --git a/intern/ghost/intern/GHOST_Event.h b/intern/ghost/intern/GHOST_Event.h index c9a51f29559..ea4d603be83 100644 --- a/intern/ghost/intern/GHOST_Event.h +++ b/intern/ghost/intern/GHOST_Event.h @@ -51,7 +51,7 @@ public: * \param window The generating window (or NULL if system event). */ 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) { } diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cpp index 014eef85aa8..2fddfe22c85 100644 --- a/intern/ghost/intern/GHOST_EventManager.cpp +++ b/intern/ghost/intern/GHOST_EventManager.cpp @@ -81,7 +81,7 @@ GHOST_TUns32 GHOST_EventManager::getNumEvents(GHOST_TEventType type) GHOST_IEvent *GHOST_EventManager::peekEvent() { - GHOST_IEvent *event = 0; + GHOST_IEvent *event = NULL; if (m_events.empty() == false) { event = m_events.back(); } diff --git a/intern/ghost/intern/GHOST_EventManager.h b/intern/ghost/intern/GHOST_EventManager.h index fea8214c7f2..8e513b4ee76 100644 --- a/intern/ghost/intern/GHOST_EventManager.h +++ b/intern/ghost/intern/GHOST_EventManager.h @@ -141,7 +141,7 @@ public: virtual void removeTypeEvents( GHOST_TEventType type, - GHOST_IWindow *window = 0 + GHOST_IWindow *window = NULL ); protected: diff --git a/intern/ghost/intern/GHOST_Path-api.cpp b/intern/ghost/intern/GHOST_Path-api.cpp index 2bc58517e75..b61d321216f 100644 --- a/intern/ghost/intern/GHOST_Path-api.cpp +++ b/intern/ghost/intern/GHOST_Path-api.cpp @@ -48,19 +48,19 @@ GHOST_TSuccess GHOST_DisposeSystemPaths(void) const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr) { 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) { 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() { 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) diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index 5405fe7efe8..023c5958c4f 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -46,10 +46,10 @@ GHOST_System::GHOST_System() : m_nativePixel(false), - m_displayManager(0), - m_timerManager(0), - m_windowManager(0), - m_eventManager(0) + m_displayManager(NULL), + m_timerManager(NULL), + m_windowManager(NULL), + m_eventManager(NULL) #ifdef WITH_INPUT_NDOF , m_ndofManager(0) #endif @@ -324,19 +324,19 @@ GHOST_TSuccess GHOST_System::exit() } if (m_displayManager) { delete m_displayManager; - m_displayManager = 0; + m_displayManager = NULL; } if (m_windowManager) { delete m_windowManager; - m_windowManager = 0; + m_windowManager = NULL; } if (m_timerManager) { delete m_timerManager; - m_timerManager = 0; + m_timerManager = NULL; } if (m_eventManager) { delete m_eventManager; - m_eventManager = 0; + m_eventManager = NULL; } #ifdef WITH_INPUT_NDOF if (m_ndofManager) { diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 0d18dfe532f..57aa0a31c94 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -100,7 +100,7 @@ public: virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay, GHOST_TUns64 interval, GHOST_TimerProcPtr timerProc, - GHOST_TUserDataPtr userData = 0); + GHOST_TUserDataPtr userData = NULL); /** * Removes a timer. diff --git a/intern/ghost/intern/GHOST_TimerManager.cpp b/intern/ghost/intern/GHOST_TimerManager.cpp index 601359984de..8cba0608f2b 100644 --- a/intern/ghost/intern/GHOST_TimerManager.cpp +++ b/intern/ghost/intern/GHOST_TimerManager.cpp @@ -90,7 +90,7 @@ GHOST_TSuccess GHOST_TimerManager::removeTimer(GHOST_TimerTask *timer) // Remove the timer task m_timers.erase(iter); delete timer; - timer = 0; + timer = NULL; success = GHOST_kSuccess; } else { diff --git a/intern/ghost/intern/GHOST_TimerTask.h b/intern/ghost/intern/GHOST_TimerTask.h index 0731bc066af..e8f5ecd9fbb 100644 --- a/intern/ghost/intern/GHOST_TimerTask.h +++ b/intern/ghost/intern/GHOST_TimerTask.h @@ -54,7 +54,7 @@ public: GHOST_TimerTask(GHOST_TUns64 start, GHOST_TUns64 interval, GHOST_TimerProcPtr timerProc, - GHOST_TUserDataPtr userData = 0) + GHOST_TUserDataPtr userData = NULL) : m_start(start), m_interval(interval), m_next(start), diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h index 0020094ebbb..b4c0559b511 100644 --- a/intern/memutil/MEM_Allocator.h +++ b/intern/memutil/MEM_Allocator.h @@ -63,7 +63,7 @@ struct MEM_Allocator // NB: __n is permitted to be 0. The C++ standard says nothing // about what the return value is when __n == 0. _Tp* allocate(size_type __n, const void* = 0) { - _Tp* __ret = 0; + _Tp* __ret = NULL; if (__n) __ret = static_cast<_Tp*>( MEM_mallocN(__n * sizeof(_Tp), diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h index daf66dc05b1..4e776929731 100644 --- a/intern/memutil/MEM_CacheLimiter.h +++ b/intern/memutil/MEM_CacheLimiter.h @@ -108,7 +108,7 @@ public: bool destroy_if_possible() { if (can_destroy()) { delete data; - data = 0; + data = NULL; unmanage(); return true; } diff --git a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp index 7a19543b2db..f946c970711 100644 --- a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp +++ b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp @@ -128,7 +128,7 @@ MEM_CacheLimiterCClass::~MEM_CacheLimiterCClass() { // should not happen, but don't leak memory in this case... for (list_t::iterator it = cclass_list.begin(); it != cclass_list.end(); it++) { - (*it)->set_data(0); + (*it)->set_data(NULL); delete *it; } diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp index 283b44380ee..4ea451311e4 100644 --- a/intern/string/intern/STR_String.cpp +++ b/intern/string/intern/STR_String.cpp @@ -106,7 +106,7 @@ STR_String::STR_String(const char *str) this->m_data[this->m_len] = 0; } else { - this->m_data = 0; + this->m_data = NULL; this->m_len = 0; this->m_max = 8; } diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp index b31aff82777..9e639501fdd 100644 --- a/source/blender/render/intern/raytrace/rayobject.cpp +++ b/source/blender/render/intern/raytrace/rayobject.cpp @@ -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) { - 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) diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index 4195b103811..1d67a8c4f44 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -50,15 +50,15 @@ static bool selected_node(RTBuilder::Object *node) static void rtbuild_init(RTBuilder *b) { b->split_axis = -1; - b->primitives.begin = 0; - b->primitives.end = 0; + b->primitives.begin = NULL; + b->primitives.end = NULL; b->primitives.maxsize = 0; for (int i = 0; i < RTBUILD_MAX_CHILDS; i++) b->child_offset[i] = 0; 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); } @@ -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]; } else { - tmp->sorted_begin[i] = 0; - tmp->sorted_end[i] = 0; + tmp->sorted_begin[i] = NULL; + tmp->sorted_end[i] = NULL; } return tmp;