refactor: modernize NULL to nullptr in WWLib headers and sources

Author: bobtista

Core/Libraries/Source/WWVegas/WWLib/BUFF.h

@@ -36,6 +36,7 @@
 
 #pragma once
 
+#include <Utility/CppMacros.h>
 /*
 **	The "bool" integral type was defined by the C++ committee in
 **	November of '94. Until the compiler supports this, use the following
@@ -52,7 +53,7 @@
 class Buffer {
 	public:
 		Buffer(char * ptr, long size=0);
-		Buffer(void * ptr=0, long size=0);
+		Buffer(void * ptr=nullptr, long size=0);
 		Buffer(void const * ptr, long size=0);
 		Buffer(long size);
 		Buffer(Buffer const & buffer);
@@ -65,7 +66,7 @@ class Buffer {
 		void Reset(void);
 		void * Get_Buffer(void) const {return(BufferPtr);}
 		long Get_Size(void) const {return(Size);}
-		bool Is_Valid(void) const {return(BufferPtr != 0);}
+		bool Is_Valid(void) const {return(BufferPtr != nullptr);}
 
 	protected:
 

Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.cpp

@@ -19,7 +19,7 @@
 #include "DbgHelpLoader.h"
 
 
-DbgHelpLoader* DbgHelpLoader::Inst = NULL;
+DbgHelpLoader* DbgHelpLoader::Inst = nullptr;
 CriticalSectionClass DbgHelpLoader::CriticalSection;
 
 DbgHelpLoader::DbgHelpLoader()
@@ -48,7 +48,7 @@ bool DbgHelpLoader::isLoaded()
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	return Inst != NULL && Inst->m_dllModule != HMODULE(0);
+	return Inst != nullptr && Inst->m_dllModule != HMODULE(0);
 }
 
 bool DbgHelpLoader::isLoadedFromSystem()
@@ -62,14 +62,14 @@ bool DbgHelpLoader::isFailed()
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	return Inst != NULL && Inst->m_failed;
+	return Inst != nullptr && Inst->m_failed;
 }
 
 bool DbgHelpLoader::load()
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst == NULL)
+	if (Inst == nullptr)
 	{
 		// Cannot use new/delete here when this is loaded during game memory initialization.
 		void* p = GlobalAlloc(GMEM_FIXED, sizeof(DbgHelpLoader));
@@ -133,7 +133,7 @@ void DbgHelpLoader::unload()
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst == NULL)
+	if (Inst == nullptr)
 		return;
 
 	if (--Inst->m_referenceCount != 0)
@@ -143,7 +143,7 @@ void DbgHelpLoader::unload()
 
 	Inst->~DbgHelpLoader();
 	GlobalFree(Inst);
-	Inst = NULL;
+	Inst = nullptr;
 }
 
 void DbgHelpLoader::freeResources()
@@ -233,7 +233,7 @@ BOOL DbgHelpLoader::symLoadModule(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symLoadModule)
+	if (Inst != nullptr && Inst->m_symLoadModule)
 		return Inst->m_symLoadModule(hProcess, hFile, ImageName, ModuleName, BaseOfDll, SizeOfDll);
 
 	return FALSE;
@@ -245,7 +245,7 @@ DWORD DbgHelpLoader::symGetModuleBase(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symGetModuleBase)
+	if (Inst != nullptr && Inst->m_symGetModuleBase)
 		return Inst->m_symGetModuleBase(hProcess, dwAddr);
 
 	return 0u;
@@ -257,7 +257,7 @@ BOOL DbgHelpLoader::symUnloadModule(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symUnloadModule)
+	if (Inst != nullptr && Inst->m_symUnloadModule)
 		return Inst->m_symUnloadModule(hProcess, BaseOfDll);
 
 	return FALSE;
@@ -271,7 +271,7 @@ BOOL DbgHelpLoader::symGetSymFromAddr(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symGetSymFromAddr)
+	if (Inst != nullptr && Inst->m_symGetSymFromAddr)
 		return Inst->m_symGetSymFromAddr(hProcess, Address, Displacement, Symbol);
 
 	return FALSE;
@@ -285,7 +285,7 @@ BOOL DbgHelpLoader::symGetLineFromAddr(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symGetLineFromAddr)
+	if (Inst != nullptr && Inst->m_symGetLineFromAddr)
 		return Inst->m_symGetLineFromAddr(hProcess, dwAddr, pdwDisplacement, Line);
 
 	return FALSE;
@@ -296,7 +296,7 @@ DWORD DbgHelpLoader::symSetOptions(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symSetOptions)
+	if (Inst != nullptr && Inst->m_symSetOptions)
 		return Inst->m_symSetOptions(SymOptions);
 
 	return 0u;
@@ -308,7 +308,7 @@ LPVOID DbgHelpLoader::symFunctionTableAccess(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symFunctionTableAccess)
+	if (Inst != nullptr && Inst->m_symFunctionTableAccess)
 		return Inst->m_symFunctionTableAccess(hProcess, AddrBase);
 
 	return NULL;
@@ -327,7 +327,7 @@ BOOL DbgHelpLoader::stackWalk(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_stackWalk)
+	if (Inst != nullptr && Inst->m_stackWalk)
 		return Inst->m_stackWalk(MachineType, hProcess, hThread, StackFrame, ContextRecord, ReadMemoryRoutine, FunctionTableAccessRoutine, GetModuleBaseRoutine, TranslateAddress);
 
 	return FALSE;

Core/Libraries/Source/WWVegas/WWLib/FastAllocator.h

@@ -36,6 +36,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Include files
 //
+
+#include <Utility/CppMacros.h>
 #include "always.h"
 #include "wwdebug.h"
 #include "mutex.h"
@@ -255,7 +257,7 @@ WWINLINE void* FastFixedAllocator::Alloc()
 {
 	TotalAllocationCount++;
 	TotalAllocatedSize+=esize;
-   if (head==0) {
+   if (head==nullptr) {
       grow();
 	}
    Link* p = head;
@@ -286,8 +288,8 @@ WWINLINE void FastFixedAllocator::Free(void* pAlloc)
 
 WWINLINE FastFixedAllocator::FastFixedAllocator(unsigned int n) : esize(1), TotalHeapSize(0), TotalAllocatedSize(0), TotalAllocationCount(0)
 {
-   head   = 0;
-   chunks = 0;
+   head   = nullptr;
+   chunks = nullptr;
    Init(n);
 }
 
@@ -336,7 +338,7 @@ WWINLINE void FastFixedAllocator::grow()
    char* last = &start[(nelem-1)*esize];
    for(char* p = start; p<last; p+=esize)
       reinterpret_cast<Link*>(p)->next = reinterpret_cast<Link*>(p+esize);
-   reinterpret_cast<Link*>(last)->next = 0;
+   reinterpret_cast<Link*>(last)->next = nullptr;
    head = reinterpret_cast<Link*>(start);
 }
 
@@ -507,7 +509,7 @@ WWINLINE void* FastAllocatorGeneral::Realloc(void* pAlloc, unsigned int n){
       return pNewAlloc;
    }
    Free(pAlloc);
-   return NULL;
+   return nullptr;
 }
 
 
@@ -586,7 +588,7 @@ WWINLINE void* FastAllocatorGeneral::Realloc(void* pAlloc, unsigned int n){
      pointer address(reference x) const             { return &x; }
      const_pointer address(const_reference x) const { return &x; }
 
-     T* allocate(size_type n, const void* = NULL) { return n != 0 ? static_cast<T*>(FastAllocatorGeneral::Get_Allocator()->Alloc(n*sizeof(T))) : NULL; }
+     T* allocate(size_type n, const void* = nullptr) { return n != 0 ? static_cast<T*>(FastAllocatorGeneral::Get_Allocator()->Alloc(n*sizeof(T))) : NULL; }
      void deallocate(pointer p, size_type n)      { FastAllocatorGeneral::Get_Allocator()->Free(p); }
      size_type max_size() const                   { return size_t(-1) / sizeof(T); }
      void construct(pointer p, const T& val)      { new(p) T(val); }

Core/Libraries/Source/WWVegas/WWLib/INI.h

@@ -38,6 +38,8 @@
 
 #include <wchar.h>
 
+#include <Utility/CppMacros.h>
+
 //#include	"listnode.h"
 //#include	"trect.h"
 //#include	"index.h"
@@ -107,19 +109,19 @@ class INIClass {
 		/*
 		**	Erase all data within this INI file manager.
 		*/
-		bool Clear(char const * section = NULL, char const * entry = NULL);
+		bool Clear(char const * section = nullptr, char const * entry = nullptr);
 
 //		int Line_Count(char const * section) const;
 		bool Is_Loaded(void) const;
 		int Size(void) const;
-		bool Is_Present(char const * section, char const * entry = NULL) const {if (entry == 0) return(Find_Section(section) != 0);return(Find_Entry(section, entry) != 0);}
+		bool Is_Present(char const * section, char const * entry = nullptr) const {if (entry == nullptr) return(Find_Section(section) != nullptr);return(Find_Entry(section, entry) != nullptr);}
 
 		/*
 		**	Fetch the number of sections in the INI file or verify if a specific
 		**	section is present.
 		*/
 		int Section_Count(void) const;
-		bool Section_Present(char const * section) const {return(Find_Section(section) != NULL);}
+		bool Section_Present(char const * section) const {return(Find_Section(section) != nullptr);}
 
 		/*
 		**	Fetch the number of entries in a section or get a particular entry in a section.

Core/Libraries/Source/WWVegas/WWLib/LISTNODE.h

@@ -36,6 +36,7 @@
 
 #pragma once
 
+#include <Utility/CppMacros.h>
 /*
 ** Includes
 */
@@ -55,7 +56,7 @@
 class GenericList;
 class GenericNode {
 	public:
-		GenericNode(void) : NextNode(0), PrevNode(0) {}
+		GenericNode(void) : NextNode(nullptr), PrevNode(nullptr) {}
 		virtual ~GenericNode(void) {Unlink();}
 		GenericNode(GenericNode & node) {node.Link(this);}
 		GenericNode & operator = (GenericNode & node) {
@@ -73,8 +74,8 @@ class GenericNode {
 			if (Is_Valid()) {
 				PrevNode->NextNode = NextNode;
 				NextNode->PrevNode = PrevNode;
-				PrevNode = 0;
-				NextNode = 0;
+				PrevNode = nullptr;
+				NextNode = nullptr;
 			}
 		}
 
@@ -96,13 +97,13 @@ class GenericNode {
 
 		GenericNode * Next(void) const {return(NextNode);}
 		GenericNode * Next_Valid(void) const {
-			return ((NextNode && NextNode->NextNode) ? NextNode : (GenericNode *)0);
+			return ((NextNode && NextNode->NextNode) ? NextNode : (GenericNode *)nullptr);
 		}
 		GenericNode * Prev(void) const {return(PrevNode);}
 		GenericNode * Prev_Valid(void) const {
-			return ((PrevNode && PrevNode->PrevNode) ? PrevNode : (GenericNode *)0);
+			return ((PrevNode && PrevNode->PrevNode) ? PrevNode : (GenericNode *)nullptr);
 		}
-		bool Is_Valid(void) const {return(this != (GenericNode *)0 && NextNode != (GenericNode *)0 && PrevNode != (GenericNode *)0);}
+		bool Is_Valid(void) const {return(this != (GenericNode *)nullptr && NextNode != (GenericNode *)nullptr && PrevNode != (GenericNode *)nullptr);}
 
 	protected:
 		GenericNode * NextNode;
@@ -131,14 +132,14 @@ class GenericList {
 		GenericNode * First_Valid(void) const
 		{
 			GenericNode *node = FirstNode.Next();
-			return (node->Next() ? node : (GenericNode *)0);
+			return (node->Next() ? node : (GenericNode *)nullptr);
 		}
 
 		GenericNode * Last(void) const {return(LastNode.Prev());}
 		GenericNode * Last_Valid(void) const
 		{
 			GenericNode *node = LastNode.Prev();
-			return (node->Prev() ? node : (GenericNode *)0);
+			return (node->Prev() ? node : (GenericNode *)nullptr);
 		}
 
 		bool Is_Empty(void) const {return(!FirstNode.Next()->Is_Valid());}

Core/Libraries/Source/WWVegas/WWLib/PIPE.h

@@ -36,6 +36,7 @@
 
 #pragma once
 
+#include <Utility/CppMacros.h>
 /*
 **	A "push through" pipe interface abstract class used for such purposes as compression
 **	and translation of data. In STL terms, this is functionally similar to an output
@@ -46,7 +47,7 @@
 class Pipe
 {
 	public:
-		Pipe(void) : ChainTo(0), ChainFrom(0) {}
+		Pipe(void) : ChainTo(nullptr), ChainFrom(nullptr) {}
 		virtual ~Pipe(void);
 
 		virtual int Flush(void);

Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h

@@ -36,6 +36,7 @@
 
 #pragma once
 
+#include <Utility/CppMacros.h>
 #include "WWFILE.h"
 
 
@@ -60,7 +61,7 @@ class RAMFileClass : public FileClass
 		virtual void Close(void);
 		virtual unsigned long Get_Date_Time(void) {return(0);}
 		virtual bool Set_Date_Time(unsigned long ) {return(true);}
-		virtual void Error(int , int = false, char const * =NULL) {}
+		virtual void Error(int , int = false, char const * =nullptr) {}
 		virtual void Bias(int start, int length=-1);
 
 		operator char const * () {return File_Name();}

Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h

@@ -46,6 +46,8 @@
 
 #define	NULL_HANDLE	 	NULL
 #define	HANDLE_TYPE		FILE*
+
+#include <Utility/CppMacros.h>
 #include "WWFILE.h"
 #include "wwstring.h"
 
@@ -98,7 +100,7 @@ class RawFileClass : public FileClass
 		virtual void Close(void);
 		virtual unsigned long Get_Date_Time(void);
 		virtual bool Set_Date_Time(unsigned long datetime);
-		virtual void Error(int error, int canretry = false, char const * filename=NULL);
+		virtual void Error(int error, int canretry = false, char const * filename=nullptr);
 		virtual void Bias(int start, int length=-1);
 		virtual void * Get_File_Handle(void) { return Handle; }
 

Core/Libraries/Source/WWVegas/WWLib/SLNODE.h

@@ -34,6 +34,7 @@
 
 #pragma once
 
+#include <Utility/CppMacros.h>
 #include "always.h"
 #include "mempool.h"
 
@@ -64,7 +65,7 @@ class	GenericSLNode : public AutoPoolClass<GenericSLNode, 256>
 		// created from anything but a friend or parent class.
 		//
 		GenericSLNode(void *obj)
-			{NodeData = obj; NodeNext = 0; };
+			{NodeData = obj; NodeNext = nullptr; };
 
 		//
 		//	You cannot declare a node class without giving it a data object.

Core/Libraries/Source/WWVegas/WWLib/STRAW.h

@@ -36,6 +36,7 @@
 
 #pragma once
 
+#include <Utility/CppMacros.h>
 /*
 **	This is a demand driven data carrier. It will retrieve the byte request by passing
 **	the request down the chain (possibly processing on the way) in order to fulfill the
@@ -46,7 +47,7 @@
 class Straw
 {
 	public:
-		Straw(void) : ChainTo(0), ChainFrom(0) {}
+		Straw(void) : ChainTo(nullptr), ChainFrom(nullptr) {}
 		virtual ~Straw(void);
 
 		virtual void Get_From(Straw * pipe);