build: add CppMacros.h includes for VC6 nullptr compatibility

refactor(core): modernize NULL to nullptr

refactor(generalsMD): modernize NULL to nullptr

refactor(generals): modernize NULL to nullptr

build: remove unnecessary includes

refactor: modernize NULL to nullptr with clang-tidy --fix-errors

refactor: Convert NULL to nullptr in Tools directories via clang-tidy

use a script to convert remaining NULLs to nullptrs

Author: bobtista

Core/GameEngine/Include/Common/ArchiveFileSystem.h

@@ -156,8 +156,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/GameAudio.h

@@ -134,7 +134,7 @@ class AudioManager : public SubsystemInterface
 		AudioManager();
 		virtual ~AudioManager();
 #if defined(RTS_DEBUG)
-		virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = NULL ) = 0;
+		virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = nullptr ) = 0;
 #endif
 
 		// From SubsystemInterface

Core/GameEngine/Include/Common/GameMemory.h

@@ -321,7 +321,7 @@ class MemoryPool
 	void addToList(MemoryPool **pHead);				///< add this pool to head of the linked list
 	void removeFromList(MemoryPool **pHead);	///< remove this pool from the linked list
 	#ifdef MEMORYPOOL_DEBUG
-		static void debugPoolInfoReport( MemoryPool *pool, FILE *fp = NULL );	///< dump a report about this pool to the logfile
+		static void debugPoolInfoReport( MemoryPool *pool, FILE *fp = nullptr );	///< dump a report about this pool to the logfile
 		const char *debugGetBlockTagString(void *pBlock);		///< return the tagstring for the given block (assumed to belong to this pool)
 		void debugMemoryVerifyPool();												///< perform internal consistency check on this pool.
 		Int debugPoolReportLeaks( const char* owner );
@@ -421,7 +421,7 @@ class DynamicMemoryAllocator
 		Int debugCalcRawBlockBytes(Int *numBlocks);												///< calculate the number of bytes in "raw" (non-subpool) blocks
 		void debugMemoryVerifyDma();												///< perform internal consistency check
 		const char *debugGetBlockTagString(void *pBlock);		///< return the tagstring for the given block (assumed to belong to this dma)
-		void debugDmaInfoReport( FILE *fp = NULL );					///< dump a report about this pool to the logfile
+		void debugDmaInfoReport( FILE *fp = nullptr );					///< dump a report about this pool to the logfile
 		Int debugDmaReportLeaks();
 	#endif
 	#ifdef MEMORYPOOL_CHECKPOINTING
@@ -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
 
@@ -559,7 +559,7 @@ class MemoryPoolFactory
 		const char *debugGetBlockTagString(void *pBlock);
 
 		/// dump a report with the given options to the logfile.
-		void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = NULL );
+		void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = nullptr );
 
 		void debugSetInitFillerIndex(Int index);
 
@@ -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/GameMemoryNull.h

@@ -64,11 +64,11 @@ class MemoryPoolFactory
 {
 public:
 
-	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = NULL );
+	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = nullptr );
 
 #ifdef MEMORYPOOL_DEBUG
 
-	void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = NULL );
+	void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = nullptr );
 	void debugSetInitFillerIndex(Int index);
 
 #endif

Core/GameEngine/Include/Common/LocalFile.h

@@ -103,7 +103,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

@@ -94,7 +94,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

@@ -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

@@ -90,7 +90,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; }

Core/GameEngine/Include/Common/file.h

@@ -183,7 +183,7 @@ class File : public MemoryPoolObject
 																																				*  END: means seek the specified number of bytes back from the end of the file
 																																				*/
 		virtual Bool	flush() = 0;											///< flush data to disk
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0) = 0;		///< reads until it reaches a new-line character
+		virtual void	nextLine(Char *buf = nullptr, Int bufSize = 0) = 0;		///< reads until it reaches a new-line character
 
 		virtual Bool	scanInt(Int &newInt) = 0;														///< read an integer from the current file position.
 		virtual Bool	scanReal(Real &newReal) = 0;												///< read a real number from the current file position.

Core/GameEngine/Include/GameClient/TerrainVisual.h

@@ -75,7 +75,7 @@ struct SeismicSimulationNode
     m_region.hi.x = 0;
     m_region.hi.y = 0;
     m_clean = FALSE;
-    callbackFilter = NULL;
+    callbackFilter = nullptr;
     m_life = 0;
     m_magnitude = DEFAULT_SEISMIC_SIMULATION_MAGNITUDE;
 
@@ -95,7 +95,7 @@ struct SeismicSimulationNode
     m_magnitude   = ssn.m_magnitude;
 
   }
-  SeismicSimulationNode( const Coord3D* ctr, Real rad, Real mag, SeismicSimulationFilterBase *cbf = NULL )
+  SeismicSimulationNode( const Coord3D* ctr, Real rad, Real mag, SeismicSimulationFilterBase *cbf = nullptr )
   {
     m_center.x    = REAL_TO_INT_FLOOR(ctr->x/MAP_XY_FACTOR);
     m_center.y    = REAL_TO_INT_FLOOR(ctr->y/MAP_XY_FACTOR);
@@ -114,7 +114,7 @@ struct SeismicSimulationNode
 
   SeismicSimulationFilterBase::SeismicSimStatusCode handleFilterCallback( WorldHeightMapInterfaceClass *heightMap )
   {
-    if ( callbackFilter == NULL )
+    if ( callbackFilter == nullptr )
       return SeismicSimulationFilterBase::SEISMIC_STATUS_INVALID;
 
     ++m_life;
@@ -126,7 +126,7 @@ struct SeismicSimulationNode
   {
     DEBUG_ASSERTCRASH( callbackFilter, ("SeismicSimulationNode::applyGravity() has no callback filter!") );
 
-    if ( callbackFilter == NULL )
+    if ( callbackFilter == nullptr )
       return velocityIn;//oops, we have no callback!
 
     return callbackFilter->applyGravityCallback( velocityIn );