refactor(core): modernize NULL to nullptr

Author: bobtista

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

@@ -55,7 +55,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 +73,8 @@ class GenericNode {
 			if (Is_Valid()) {
 				PrevNode->NextNode = NextNode;
 				NextNode->PrevNode = PrevNode;
-				PrevNode = 0;
-				NextNode = 0;
+				PrevNode = nullptr;
+				NextNode = nullptr;
 			}
 		}
 
@@ -96,13 +96,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 +131,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/SLNODE.h

@@ -64,7 +64,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/TARGA.cpp

@@ -102,8 +102,8 @@
 
 Targa::Targa(void)
 	{
-	mImage = NULL;
-	mPalette = NULL;
+	mImage = nullptr;
+	mPalette = nullptr;
 	Clear_File();
 	mAccess = TGA_READMODE;
 	mFlags = 0;
@@ -138,11 +138,11 @@ Targa::~Targa(void)
 	Close();
 
 	/* Free the palette buffer if we allocated it. */
-	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
+	if ((mPalette != nullptr) && (mFlags & TGAF_PAL))
 		free(mPalette);
 
 	/* Free the image buffer if we allocated it. */
-	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
+	if ((mImage != nullptr) && (mFlags & TGAF_IMAGE))
 		free(mImage);
 }
 
@@ -317,7 +317,7 @@ void Targa::Close(void)
 	if (TGAFile) {
 		TGAFile->Close();
 		_TheFileFactory->Return_File(TGAFile);
-		TGAFile = NULL;
+		TGAFile = nullptr;
 	}
 #else
 	/* Close the file if it is open. */
@@ -371,7 +371,7 @@ long Targa::Load(const char* name, char* palette, char* image,bool invert_image)
 			/* Load the palette from the TGA if a palette buffer is provided
 			 * otherwise we will skip it.
 			 */
-			if ((palette != NULL) && (Header.CMapLength > 0)) {
+			if ((palette != nullptr) && (Header.CMapLength > 0)) {
 
 				/* Adjust palette to the starting color entry. */
 				palette += (Header.CMapStart * depth);
@@ -391,7 +391,7 @@ long Targa::Load(const char* name, char* palette, char* image,bool invert_image)
 		/* Load the image data from the TGA if an image buffer is provided
 		 * otherwise we are done.
 		 */
-		if (!error && (image != NULL)) {
+		if (!error && (image != nullptr)) {
 
 			depth = TGA_BytesPerPixel(Header.PixelDepth);
 			size = ((Header.Width * Header.Height) * depth);
@@ -499,21 +499,21 @@ long Targa::Load(const char* name, long flags, bool invert_image)
 		if ((flags & TGAF_PAL) && (Header.ColorMapType == 1)) {
 
 			/* Dispose of any previous palette. */
-			if ((mPalette != NULL) && (mFlags & TGAF_PAL)) {
+			if ((mPalette != nullptr) && (mFlags & TGAF_PAL)) {
 				free(mPalette);
-				mPalette = NULL;
+				mPalette = nullptr;
 				mFlags &= ~TGAF_PAL;
 			}
 
 			/* Only allocate a palette if the client hasn't assigned one. */
-			if ((mPalette == NULL) && !(mFlags & TGAF_PAL)) {
+			if ((mPalette == nullptr) && !(mFlags & TGAF_PAL)) {
 
 				/* Compute the size of the palette from the targa header. */
 				size = (Header.CMapLength * (Header.CMapDepth >> 3));
 
 				if (size != 0) {
 					/* Allocate memory for the palette. */
-					if ((mPalette = (char *)malloc(size)) != NULL) {
+					if ((mPalette = (char *)malloc(size)) != nullptr) {
 						mFlags |= TGAF_PAL; /* We allocated the palette. */
 					} else {
 						error = TGAERR_NOMEM;
@@ -526,20 +526,20 @@ long Targa::Load(const char* name, long flags, bool invert_image)
 		if (!error && (flags & TGAF_IMAGE)) {
 
 			/* Dispose of any previous image. */
-			if ((mImage != NULL) && (mFlags & TGAF_IMAGE)) {
+			if ((mImage != nullptr) && (mFlags & TGAF_IMAGE)) {
 				free(mImage);
-				mImage = NULL;
+				mImage = nullptr;
 				mFlags &= ~TGAF_IMAGE;
 			}
 
 			/* Only allocate an image if the client hasn't assigned one. */
-			if ((mImage == NULL) && !(mFlags & TGAF_IMAGE)) {
+			if ((mImage == nullptr) && !(mFlags & TGAF_IMAGE)) {
 
 				/* Compute the size of the image data from the targa header. */
 				size = ((Header.Width * Header.Height) * TGA_BytesPerPixel(Header.PixelDepth));
 				if (size != 0) {
 					/* Allocate memory for the image. */
-					if ((mImage = (char *)malloc(size)) != NULL) {
+					if ((mImage = (char *)malloc(size)) != nullptr) {
 						mFlags |= TGAF_IMAGE; /* We allocated the image. */
 					} else {
 						error = TGAERR_NOMEM;
@@ -634,7 +634,7 @@ long Targa::Save(const char* name, long flags, bool addextension)
 		/*-----------------------------------------------------------------------
 		 * WRITE THE COLORMAP (PALETTE) DATA SECTION
 		 *---------------------------------------------------------------------*/
-		if (!error && (flags & TGAF_PAL) && (mPalette != NULL)
+		if (!error && (flags & TGAF_PAL) && (mPalette != nullptr)
 				&& (Header.CMapLength > 0))
 			{
 			/* Adjust palette to the starting color entry. */
@@ -643,7 +643,7 @@ long Targa::Save(const char* name, long flags, bool addextension)
 			size = (Header.CMapLength * depth);
 
 			/* Allocate temporary buffer for palette manipulation. */
-			if ((temppal = (char *)malloc(size)) != NULL)
+			if ((temppal = (char *)malloc(size)) != nullptr)
 				{
 				memcpy(temppal, palette, size);
 				ptr = temppal;
@@ -675,7 +675,7 @@ long Targa::Save(const char* name, long flags, bool addextension)
 		/*-----------------------------------------------------------------------
 		 * WRITE THE IMAGE DATA SECTION
 		 *---------------------------------------------------------------------*/
-		if (!error && (flags & TGAF_IMAGE) && (mImage != NULL))
+		if (!error && (flags & TGAF_IMAGE) && (mImage != nullptr))
 			{
 
 			bool imageinverted;
@@ -935,18 +935,18 @@ void Targa::YFlip(void)
 
 char *Targa::SetImage(char *buffer)
 {
-	char *oldbuffer = NULL;
+	char *oldbuffer = nullptr;
 
 	/* Free any image buffer before assigning another. */
-	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
+	if ((mImage != nullptr) && (mFlags & TGAF_IMAGE))
 	{
 		free(mImage);
-		mImage = NULL;
+		mImage = nullptr;
 		mFlags &= ~TGAF_IMAGE;
 	}
 
 	/* Get the old user buffer. */
-	if (mImage != NULL)
+	if (mImage != nullptr)
 		oldbuffer = mImage;
 
 	/* Assign the new image buffer. */
@@ -978,18 +978,18 @@ char *Targa::SetImage(char *buffer)
 
 char *Targa::SetPalette(char *buffer)
 {
-	char *oldbuffer = NULL;
+	char *oldbuffer = nullptr;
 
 	/* Free any image buffer before assigning another. */
-	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
+	if ((mPalette != nullptr) && (mFlags & TGAF_PAL))
 	{
 		free(mPalette);
-		mPalette = NULL;
+		mPalette = nullptr;
 		mFlags &= ~TGAF_PAL;
 	}
 
 	/* Get the old user buffer. */
-	if (mPalette != NULL)
+	if (mPalette != nullptr)
 		oldbuffer = mPalette;
 
 	/* Assign the new image buffer. */
@@ -1035,7 +1035,7 @@ TGA2Extension *Targa::GetExtension(void)
 	if (mFlags & TGAF_TGA2)
 		return (&mExtension);
 
-	return (NULL);
+	return (nullptr);
 	}
 
 
@@ -1170,7 +1170,7 @@ long Targa::EncodeImage()
 	depth = TGA_BytesPerPixel(Header.PixelDepth);
 
 	/* Allocate packet buffer to hold maximum encoded data run. */
-	if ((packet = (char *)malloc(128 * depth)) != NULL)
+	if ((packet = (char *)malloc(128 * depth)) != nullptr)
 		{
 		pixels = Header.Width * Header.Height;
 		start = mImage;
@@ -1339,15 +1339,15 @@ void Targa::InvertImage(void)
 void Targa::Clear_File(void)
 {
 #ifdef TGA_USES_WWLIB_FILE_CLASSES
-	TGAFile = NULL;
+	TGAFile = nullptr;
 #else
 	mFH = -1;
 #endif
 }
 bool Targa::Is_File_Open(void)
 {
 #ifdef TGA_USES_WWLIB_FILE_CLASSES
-	return (TGAFile != NULL);
+	return (TGAFile != nullptr);
 #else
 	return (mFH != -1);
 #endif

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

@@ -153,7 +153,7 @@ class VectorClass
  *=============================================================================================*/
 template<class T>
 VectorClass<T>::VectorClass(int size, T const * array) :
-	Vector(0),
+	Vector(nullptr),
 	VectorMax(size),
 	IsValid(true),
 	IsAllocated(false)
@@ -367,7 +367,7 @@ void VectorClass<T>::Clear(void)
 {
 	if (IsAllocated) {
 		delete[] Vector;
-		Vector = 0;
+		Vector = nullptr;
 	}
 	IsAllocated = false;
 	VectorMax = 0;
@@ -426,7 +426,7 @@ bool VectorClass<T>::Resize(int newsize, T const * array)
 		**	If there is an old vector, then it must be copied (as much as is feasible)
 		**	to the new vector.
 		*/
-		if (Vector != NULL) {
+		if (Vector != nullptr) {
 
 			/*
 			**	Copy as much of the old vector into the new vector as possible. This
@@ -446,7 +446,7 @@ bool VectorClass<T>::Resize(int newsize, T const * array)
 			*/
 			if (IsAllocated) {
 				delete[] Vector;
-				Vector = 0;
+				Vector = nullptr;
 			}
 		}
 
@@ -489,14 +489,14 @@ class DynamicVectorClass : public VectorClass<T>
 		using VectorClass<T>::Length;
 
 	public:
-		DynamicVectorClass(unsigned size=0, T const * array=0);
+		DynamicVectorClass(unsigned size=0, T const * array=nullptr);
 
 		// Stubbed equality operators so you can have dynamic vectors of dynamic vectors
 		bool operator== (const DynamicVectorClass &src)	{ return false; }
 		bool operator!= (const DynamicVectorClass &src)	{ return true; }
 
 		// Change maximum size of vector.
-		virtual bool Resize(int newsize, T const * array=0);
+		virtual bool Resize(int newsize, T const * array=nullptr);
 
 		// Resets and frees the vector array.
 		virtual void Clear(void) {ActiveCount = 0;VectorClass<T>::Clear();};
@@ -969,7 +969,7 @@ int First_False_Bit(void const * array);
 class BooleanVectorClass
 {
 	public:
-		BooleanVectorClass(unsigned size=0, unsigned char * array=0);
+		BooleanVectorClass(unsigned size=0, unsigned char * array=nullptr);
 		BooleanVectorClass(BooleanVectorClass const & vector);
 
 		// Assignment operator.