refactor: modernize NULL to nullptr across entire codebase

Author: bobtista

Core/GameEngine/Include/Common/ArchiveFileSystem.h

@@ -49,6 +49,7 @@
 //           Includes
 //----------------------------------------------------------------------------
 
+#include <Utility/CppMacros.h>
 #include "Common/SubsystemInterface.h"
 #include "Common/AsciiString.h"
 #include "Common/FileSystem.h" // for typedefs, etc.
@@ -156,8 +157,8 @@ class ArchiveFileSystem : public SubsystemInterface
 protected:
 	struct ArchivedDirectoryInfoResult
 	{
-		ArchivedDirectoryInfoResult() : dirInfo(NULL) {}
-		Bool valid() const { return dirInfo != NULL; }
+		ArchivedDirectoryInfoResult() : dirInfo(nullptr) {}
+		Bool valid() const { return dirInfo != nullptr; }
 
 		ArchivedDirectoryInfo* dirInfo;
 		AsciiString lastToken; ///< Synonymous for file name if the search directory was a file path

Core/GameEngine/Include/Common/AsciiString.h

@@ -353,7 +353,7 @@ class AsciiString
 		token was found. (note that this modifies 'this' as well, stripping
 		the token off!)
 	*/
-	Bool nextToken(AsciiString* token, const char* seps = NULL);
+	Bool nextToken(AsciiString* token, const char* seps = nullptr);
 
 	/**
 		return true iff the string is "NONE" (case-insensitive).
@@ -390,7 +390,7 @@ inline char* AsciiString::peek() const
 }
 
 // -----------------------------------------------------
-inline AsciiString::AsciiString() : m_data(0)
+inline AsciiString::AsciiString() : m_data(nullptr)
 {
 	validate();
 }
@@ -420,7 +420,7 @@ inline int AsciiString::getByteCount() const
 inline Bool AsciiString::isEmpty() const
 {
 	validate();
-	return m_data == NULL || peek()[0] == 0;
+	return m_data == nullptr || peek()[0] == 0;
 }
 
 // -----------------------------------------------------
@@ -501,14 +501,14 @@ inline int AsciiString::compare(const char* s) const
 inline int AsciiString::compareNoCase(const AsciiString& stringSrc) const
 {
 	validate();
-	return _stricmp(this->str(), stringSrc.str());
+	return strcmp(this->str(), stringSrc.str());
 }
 
 // -----------------------------------------------------
 inline int AsciiString::compareNoCase(const char* s) const
 {
 	validate();
-	return _stricmp(this->str(), s);
+	return strcmp(this->str(), s);
 }
 
 // -----------------------------------------------------

Core/GameEngine/Include/Common/AudioEventInfo.h

@@ -28,6 +28,7 @@
 
 #pragma once
 
+#include <Utility/CppMacros.h>
 #include "Common/AsciiString.h"
 #include "Common/GameMemory.h"
 #include "Common/STLTypedefs.h"
@@ -123,8 +124,8 @@ struct AudioEventInfo : public MemoryPoolObject
 
   // DynamicAudioEventInfo interfacing functions
   virtual Bool isLevelSpecific() const { return false; } ///< If true, this sound is only defined on the current level and can be deleted when that level ends
-  virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() { return NULL; }  ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
-  virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const { return NULL; } ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
+  virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() { return nullptr; }  ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
+  virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const { return nullptr; } ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
 
   /// Is this a permenant sound? That is, if I start this sound up, will it ever end
   /// "on its own" or only if I explicitly kill it?

Core/GameEngine/Include/Common/GameAudio.h

@@ -395,7 +395,7 @@ class AudioManagerDummy : public AudioManager
 	virtual AsciiString getMusicTrackName() const { return ""; }
 	virtual void openDevice() {}
 	virtual void closeDevice() {}
-	virtual void* getDevice() { return NULL; }
+	virtual void* getDevice() { return nullptr; }
 	virtual void notifyOfAudioCompletion(UnsignedInt audioCompleted, UnsignedInt flags) {}
 	virtual UnsignedInt getProviderCount(void) const { return 0; };
 	virtual AsciiString getProviderName(UnsignedInt providerNum) const { return ""; }
@@ -416,7 +416,7 @@ class AudioManagerDummy : public AudioManager
 	virtual void removePlayingAudio(AsciiString eventName) {}
 	virtual void removeAllDisabledAudio() {}
 	virtual Bool has3DSensitiveStreamsPlaying(void) const { return false; }
-	virtual void* getHandleForBink(void) { return NULL; }
+	virtual void* getHandleForBink(void) { return nullptr; }
 	virtual void releaseHandleForBink(void) {}
 	virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) {}
 	virtual void setPreferredProvider(AsciiString providerNdx) {}

Core/GameEngine/Include/Common/GameMemory.h

@@ -545,7 +545,7 @@ class MemoryPoolFactory
 	/// destroy the contents of all pools and dmas. (the pools and dma's are not destroyed, just reset)
 	void reset();
 
-	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = NULL );
+	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = nullptr );
 
 	#ifdef MEMORYPOOL_DEBUG
 
@@ -743,7 +743,7 @@ class MemoryPoolObject
 	virtual ~MemoryPoolObject() { }
 
 protected:
-	inline void *operator new(size_t s) { DEBUG_CRASH(("This should be impossible")); return 0; }
+	inline void *operator new(size_t s) { DEBUG_CRASH(("This should be impossible")); return nullptr; }
 	inline void operator delete(void *p) { DEBUG_CRASH(("This should be impossible")); }
 
 protected:
@@ -902,9 +902,9 @@ class MemoryPoolObjectHolder
 private:
 	MemoryPoolObject *m_mpo;
 public:
-	MemoryPoolObjectHolder(MemoryPoolObject *mpo = NULL) : m_mpo(mpo) { }
+	MemoryPoolObjectHolder(MemoryPoolObject *mpo = nullptr) : m_mpo(mpo) { }
 	void hold(MemoryPoolObject *mpo) { DEBUG_ASSERTCRASH(!m_mpo, ("already holding")); m_mpo = mpo; }
-	void release() { m_mpo = NULL; }
+	void release() { m_mpo = nullptr; }
 	~MemoryPoolObjectHolder() { deleteInstance(m_mpo); }
 };
 

Core/GameEngine/Include/Common/LocalFile.h

@@ -47,6 +47,7 @@
 //           Includes
 //----------------------------------------------------------------------------
 
+#include <Utility/CppMacros.h>
 #include "Common/file.h"
 
 #if USE_BUFFERED_IO
@@ -103,7 +104,7 @@ class LocalFile : public File
 		virtual Int		writeChar( const WideChar* character );							///< Write a wide character to the file
 		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
 		virtual Bool	flush();													///< flush data to disk
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0);				///< moves file position to after the next new-line
+		virtual void	nextLine(Char *buf = nullptr, Int bufSize = 0);				///< moves file position to after the next new-line
 		virtual Bool	scanInt(Int &newInt);																///< return what gets read in as an integer at the current file position.
 		virtual Bool	scanReal(Real &newReal);														///< return what gets read in as a float at the current file position.
 		virtual	Bool	scanString(AsciiString &newString);									///< return what gets read in as a string at the current file position.

Core/GameEngine/Include/Common/RAMFile.h

@@ -47,6 +47,7 @@
 //           Includes
 //----------------------------------------------------------------------------
 
+#include <Utility/CppMacros.h>
 #include "Common/file.h"
 
 //----------------------------------------------------------------------------
@@ -94,7 +95,7 @@ class RAMFile : public File
 		virtual Int		writeChar( const WideChar* character );							///< Write a wide character to the file
 		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
 		virtual Bool	flush();													///< flush data to disk
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0);				///< moves current position to after the next new-line
+		virtual void	nextLine(Char *buf = nullptr, Int bufSize = 0);				///< moves current position to after the next new-line
 
 		virtual Bool	scanInt(Int &newInt);																///< return what gets read as an integer from the current memory position.
 		virtual Bool	scanReal(Real &newReal);														///< return what gets read as a float from the current memory position.

Core/GameEngine/Include/Common/Radar.h

@@ -143,7 +143,7 @@ static const char *const RadarPriorityNames[] =
 	"UNIT",													// unit level drawing priority
 	"LOCAL_UNIT_ONLY",							// unit priority, but only on the radar if controlled by the local player
 
-	NULL
+	nullptr
 };
 static_assert(ARRAY_SIZE(RadarPriorityNames) == RADAR_PRIORITY_NUM_PRIORITIES + 1, "Incorrect array size");
 #endif  // DEFINE_RADAR_PRIOTITY_NAMES
@@ -165,7 +165,7 @@ class Radar : public Snapshot,
 	virtual void update( void );														///< subsystem per frame update
 
 	// is the game window parameter the radar window
-	Bool isRadarWindow( GameWindow *window ) { return (m_radarWindow == window) && (m_radarWindow != NULL); }
+	Bool isRadarWindow( GameWindow *window ) { return (m_radarWindow == window) && (m_radarWindow != nullptr); }
 
 	Bool radarToWorld( const ICoord2D *radar, Coord3D *world );		///< radar point to world point on terrain
 	Bool radarToWorld2D( const ICoord2D *radar, Coord3D *world );		///< radar point to world point (x,y only!)

Core/GameEngine/Include/Common/StreamingArchiveFile.h

@@ -47,6 +47,7 @@
 //           Includes
 //----------------------------------------------------------------------------
 
+#include <Utility/CppMacros.h>
 #include "Common/RAMFile.h"
 
 //----------------------------------------------------------------------------
@@ -90,7 +91,7 @@ class StreamingArchiveFile : public RAMFile
 		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
 
 		// Ini's should not be parsed with streaming files, that's just dumb.
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0) { DEBUG_CRASH(("Should not call nextLine on a streaming file.")); }
+		virtual void	nextLine(Char *buf = nullptr, Int bufSize = 0) { DEBUG_CRASH(("Should not call nextLine on a streaming file.")); }
 		virtual Bool	scanInt(Int &newInt) { DEBUG_CRASH(("Should not call scanInt on a streaming file."));  return FALSE; }
 		virtual Bool	scanReal(Real &newReal) { DEBUG_CRASH(("Should not call scanReal on a streaming file.")); return FALSE; }
 		virtual Bool	scanString(AsciiString &newString) { DEBUG_CRASH(("Should not call scanString on a streaming file.")); return FALSE; }
@@ -99,7 +100,7 @@ class StreamingArchiveFile : public RAMFile
 		virtual Bool	openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size); ///< copy file data from the given file at the given offset for the given size.
 		virtual Bool	copyDataToFile(File *localFile) { DEBUG_CRASH(("Are you sure you meant to copyDataToFile on a streaming file?")); return FALSE; }
 
-		virtual char* readEntireAndClose() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return NULL; }
+		virtual char* readEntireAndClose() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return nullptr; }
 		virtual File* convertToRAMFile() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return this; }
 };
 

Core/GameEngine/Include/Common/UnicodeString.h

@@ -364,7 +364,7 @@ inline WideChar* UnicodeString::peek() const
 }
 
 // -----------------------------------------------------
-inline UnicodeString::UnicodeString() : m_data(0)
+inline UnicodeString::UnicodeString() : m_data(nullptr)
 {
 	validate();
 }
@@ -394,7 +394,7 @@ inline int UnicodeString::getByteCount() const
 inline Bool UnicodeString::isEmpty() const
 {
 	validate();
-	return m_data == NULL || peek()[0] == 0;
+	return m_data == nullptr || peek()[0] == 0;
 }
 
 // -----------------------------------------------------
@@ -475,14 +475,14 @@ inline int UnicodeString::compare(const WideChar* s) const
 inline int UnicodeString::compareNoCase(const UnicodeString& stringSrc) const
 {
 	validate();
-	return _wcsicmp(this->str(), stringSrc.str());
+	return strcasecmp(this->str(), stringSrc.str());
 }
 
 // -----------------------------------------------------
 inline int UnicodeString::compareNoCase(const WideChar* s) const
 {
 	validate();
-	return _wcsicmp(this->str(), s);
+	return strcasecmp(this->str(), s);
 }
 
 // -----------------------------------------------------