Merge pull request #8 from OutpostUniverse/addPragmaOnce

DanRStevens · web-flow · commit 188f360faef0 · 2025-11-18T18:12:02.000-07:00
Add pragma once
diff --git a/CClmReader.cpp b/CClmReader.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CClmReader.h"
 #include "CMemoryStreamReader.h"
@@ -41,7 +40,6 @@ HRESULT __stdcall CClmReader::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
 // ArchiveReader
 // *************
 
@@ -142,8 +140,6 @@ HRESULT CClmReader::OpenStreamRead(BSTR fileName, StreamReader **stream)
 }
 
 
-
-
 // Class specific
 // **************
 
diff --git a/CClmReader.h b/CClmReader.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #include "OP2Editor.h"
 
diff --git a/CClmWriter.cpp b/CClmWriter.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CClmWriter.h"
 
@@ -39,7 +38,6 @@ HRESULT __stdcall CClmWriter::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
 // ArchiveWriter
 // *************
 
diff --git a/CClmWriter.h b/CClmWriter.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #include "OP2Editor.h"
 
diff --git a/CFileStreamReader.cpp b/CFileStreamReader.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CFileStreamReader.h"
 
@@ -41,7 +40,6 @@ HRESULT __stdcall CFileStreamReader::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
 // StreamReader
 // ************
 
@@ -106,8 +104,6 @@ HRESULT CFileStreamReader::Seek(int offset)
 }
 
 
-
-
 // Class specific
 // **************
 
diff --git a/CFileStreamReader.h b/CFileStreamReader.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #include "OP2Editor.h"
 
diff --git a/CFileStreamWriter.cpp b/CFileStreamWriter.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CFileStreamWriter.h"
 
@@ -39,8 +38,6 @@ HRESULT __stdcall CFileStreamWriter::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
-
 CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1)
 {
 	// Initialize class variables
diff --git a/CFileStreamWriter.h b/CFileStreamWriter.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #include "OP2Editor.h"
 
diff --git a/CMapFile.cpp b/CMapFile.cpp
@@ -1,5 +1,3 @@
-
-
 #include "stdafx.h"
 #include "CMapFile.h"
 #include "GlobalFunctions.h"
@@ -166,7 +164,6 @@ HRESULT CMapFile::Draw(int destDC, int sourcePixelX, int sourcePixelY, int pixel
 }
 
 
-
 // MapFile functions
 // *****************
 
@@ -179,7 +176,6 @@ HRESULT CMapFile::get_AroundTheWorld(int *bAroundTheWorld)
 }
 
 
-
 HRESULT CMapFile::get_TileData(
 	/* [in] */ int tileX,
 	/* [in] */ int tileY,
@@ -1118,9 +1114,6 @@ HRESULT CMapFile::SaveMap(StreamWriter *stream, enum MapLoadSaveFormat saveFlags
 }
 
 
-
-
-
 // ISupportErrorInfo
 // *****************
 
@@ -1133,11 +1126,9 @@ HRESULT CMapFile::InterfaceSupportsErrorInfo(REFIID riid)
 }
 
 
-
 // Constructors/Destructor
 // ***********************
 
-
 CMapFile::CMapFile(TileSetSource *tileSetSource, int width, int height) :
 		m_cRef(1)
 {
diff --git a/CMapFile.h b/CMapFile.h
@@ -1,7 +1,8 @@
+#pragma once
 
 #include "OP2Editor.h"
 #include "CTileGroup.h"
-//#include "CTileSetManager.h"
+#include "CTileSetManager.h"
 
 
 class CMapFile : public MapFile, public ISupportErrorInfo
diff --git a/CMemoryStreamReader.cpp b/CMemoryStreamReader.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CMemoryStreamReader.h"
 
@@ -41,7 +40,6 @@ HRESULT __stdcall CMemoryStreamReader::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
 // StreamReader
 // ************
 
diff --git a/CMemoryStreamReader.h b/CMemoryStreamReader.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #include "OP2Editor.h"
 
diff --git a/CResourceManager.cpp b/CResourceManager.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CResourceManager.h"
 #include "CFileStreamReader.h"
@@ -46,9 +45,6 @@ HRESULT __stdcall CResourceManager::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
-
-
 CResourceManager::CResourceManager(BSTR gamePath) : m_cRef(1)
 {
 	// Initilize linked list of archives in search path
@@ -103,7 +99,6 @@ CResourceManager::~CResourceManager()
 }
 
 
-
 HRESULT CResourceManager::get_RootPath(BSTR *path)
 {
 	SysReAllocString(path, this->path);
@@ -141,9 +136,6 @@ HRESULT CResourceManager::put_RootPath(BSTR newPath)
 }
 
 
-
-
-
 HRESULT CResourceManager::OpenStreamRead(
 	/* [in] */ BSTR fileName,
 	/* [retval][out] */ StreamReader **stream)
@@ -265,8 +257,6 @@ HRESULT CResourceManager::OpenStreamWrite(
 }
 
 
-
-
 HRESULT CResourceManager::LoadMapFile(BSTR fileName, enum MapLoadSaveFormat loadFlags, MapFile **mapFile)
 {
 	StreamReader *inStream;
@@ -341,8 +331,6 @@ HRESULT CResourceManager::CreateNewMap(int width, int height, MapFile** newMap)
 }
 
 
-
-
 HRESULT CResourceManager::LoadTileSetFile(BSTR fileName, TileSet **tileSet)
 {
 	StreamReader *inStream;
@@ -417,8 +405,6 @@ HRESULT CResourceManager::CreateTileSet(int numTiles, int bitDepth, int width, T
 }
 
 
-
-
 HRESULT CResourceManager::LoadVolFile(BSTR fileName, int bAttachToStream, ArchiveReader **volReader)
 {
 	StreamReader *inStream;
@@ -639,8 +625,6 @@ HRESULT CResourceManager::ClearSearchPath()
 }
 
 
-
-
 // ISupportErrorInfo
 // *****************
 
diff --git a/CResourceManager.h b/CResourceManager.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #include "OP2Editor.h"
 #include "CTileSetSource.h"
diff --git a/CResourceManagerFactory.cpp b/CResourceManagerFactory.cpp
@@ -1,10 +1,8 @@
-
 #include "stdafx.h"
 #include "CResourceManagerFactory.h"
 #include "CResourceManager.h"
 
 
-
 ULONG CResourceManagerFactory::AddRef()
 {
 	return ++m_cRef;
@@ -34,7 +32,6 @@ HRESULT CResourceManagerFactory::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
 HRESULT CResourceManagerFactory::CreateInstance(IUnknown *pUnknownOuter,
 	REFIID riid, void** ppv)
 {
diff --git a/CResourceManagerFactory.h b/CResourceManagerFactory.h
@@ -1,3 +1,4 @@
+#pragma once
 
 extern int g_cLocks;
 
diff --git a/CTileGroup.cpp b/CTileGroup.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CTileGroup.h"
 #include "GlobalFunctions.h"
@@ -138,7 +137,6 @@ HRESULT CTileGroup::Draw(int destDC, int sourcePixelX, int sourcePixelY, int pix
 }
 
 
-
 // Class specific
 // **************
 
diff --git a/CTileGroup.h b/CTileGroup.h
@@ -1,4 +1,4 @@
-
+#pragma once
 
 #include "OP2Editor.h"
 #include "CTileSetManager.h"
diff --git a/CTileSet.cpp b/CTileSet.cpp
@@ -101,7 +101,6 @@ HRESULT CTileSet::put_PaletteEntry(int index, int palEntry)
 }
 
 
-
 HRESULT CTileSet::SetNumTiles(int newNumTiles)
 {
 	HBITMAP newTileSet;
@@ -217,11 +216,9 @@ HRESULT CTileSet::SaveTileSet(StreamWriter *stream, enum TileSetSaveFormat saveF
 }
 
 
-
 // Private functions
 // *****************
 
-
 // Constructors
 // ************
 
diff --git a/CTileSet.h b/CTileSet.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #include "OP2Editor.h"
 
diff --git a/CTileSetManager.cpp b/CTileSetManager.cpp
@@ -1,9 +1,9 @@
-
 #include "stdafx.h"
 #include "OP2Editor.h"
 #include "CTileSetManager.h"
 #include "GlobalFunctions.h"
 
+
 extern int g_cLocks;
 
 
diff --git a/CTileSetManager.h b/CTileSetManager.h
@@ -1,3 +1,4 @@
+#pragma once
 
 
 class CTileSetManager : public TileSetManager, public ISupportErrorInfo
diff --git a/CTileSetSource.cpp b/CTileSetSource.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CTileSetSource.h"
 
@@ -36,8 +35,6 @@ HRESULT __stdcall CTileSetSource::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
-
 CTileSetSource::CTileSetSource(IResourceManager *resourceManager) : m_cRef(1)
 {
 	head = NULL;	// Initialize linked list of loaded files to empty
diff --git a/CTileSetSource.h b/CTileSetSource.h
@@ -1,7 +1,9 @@
+#pragma once
 
 #include "OP2Editor.h"
 #include "CTileSet.h"
 
+
 class CTileSetSource : public TileSetSource
 {
 public:
diff --git a/CVolReader.cpp b/CVolReader.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CVolReader.h"
 #include "CMemoryStreamReader.h"
@@ -38,7 +37,6 @@ HRESULT __stdcall CVolReader::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
 // ArchiveReader
 // *************
 
diff --git a/CVolReader.h b/CVolReader.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #include "OP2Editor.h"
 
diff --git a/CVolWriter.cpp b/CVolWriter.cpp
@@ -1,4 +1,3 @@
-
 #include "stdafx.h"
 #include "CVolWriter.h"
 
@@ -36,7 +35,6 @@ HRESULT __stdcall CVolWriter::QueryInterface(REFIID riid, void** ppv)
 }
 
 
-
 // ArchiveWriter
 // *************
 
diff --git a/CVolWriter.h b/CVolWriter.h
@@ -1,3 +1,4 @@
+#pragma once
 
 #include "OP2Editor.h"
 
diff --git a/GlobalFunctions.cpp b/GlobalFunctions.cpp
@@ -1,9 +1,7 @@
-
 #include "stdafx.h"
 #include "GlobalFunctions.h"
 
 
-
 void PostErrorMsg(WCHAR *errorMsg)
 {
 	// Provide rich error information
diff --git a/GlobalFunctions.h b/GlobalFunctions.h
@@ -1,5 +1,4 @@
-
-
+#pragma once
 
 
 void PostErrorMsg(WCHAR *errorMsg);
diff --git a/OP2Editor.idl b/OP2Editor.idl
diff --git a/OP2Editor.rc b/OP2Editor.rc
diff --git a/StdAfx.cpp b/StdAfx.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`#include "stdafx.h"`
`3`	`2`	`#include "CClmReader.h"`
`4`	`3`	`#include "CMemoryStreamReader.h"`
`@@ -41,7 +40,6 @@ HRESULT __stdcall CClmReader::QueryInterface(REFIID riid, void** ppv)`
`41`	`40`	`}`
`42`	`41`
`43`	`42`
`44`		`-`
`45`	`43`	`// ArchiveReader`
`46`	`44`	`// *************`
`47`	`45`
`@@ -142,8 +140,6 @@ HRESULT CClmReader::OpenStreamRead(BSTR fileName, StreamReader **stream)`
`142`	`140`	`}`
`143`	`141`
`144`	`142`
`145`		`-`
`146`		`-`
`147`	`143`	`// Class specific`
`148`	`144`	`// **************`
`149`	`145`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#pragma once`
`1`	`2`
`2`	`3`	`#include "OP2Editor.h"`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`#include "stdafx.h"`
`3`	`2`	`#include "CClmWriter.h"`
`4`	`3`
`@@ -39,7 +38,6 @@ HRESULT __stdcall CClmWriter::QueryInterface(REFIID riid, void** ppv)`
`39`	`38`	`}`
`40`	`39`
`41`	`40`
`42`		`-`
`43`	`41`	`// ArchiveWriter`
`44`	`42`	`// *************`
`45`	`43`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`#include "stdafx.h"`
`3`	`2`	`#include "CFileStreamReader.h"`
`4`	`3`
`@@ -41,7 +40,6 @@ HRESULT __stdcall CFileStreamReader::QueryInterface(REFIID riid, void** ppv)`
`41`	`40`	`}`
`42`	`41`
`43`	`42`
`44`		`-`
`45`	`43`	`// StreamReader`
`46`	`44`	`// ************`
`47`	`45`
`@@ -106,8 +104,6 @@ HRESULT CFileStreamReader::Seek(int offset)`
`106`	`104`	`}`
`107`	`105`
`108`	`106`
`109`		`-`
`110`		`-`
`111`	`107`	`// Class specific`
`112`	`108`	`// **************`
`113`	`109`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`#include "stdafx.h"`
`3`	`2`	`#include "CFileStreamWriter.h"`
`4`	`3`
`@@ -39,8 +38,6 @@ HRESULT __stdcall CFileStreamWriter::QueryInterface(REFIID riid, void** ppv)`
`39`	`38`	`}`
`40`	`39`
`41`	`40`
`42`		`-`
`43`		`-`
`44`	`41`	`CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1)`
`45`	`42`	`{`
`46`	`43`	`// Initialize class variables`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-`
`2`		`-`
`3`	`1`	`#include "stdafx.h"`
`4`	`2`	`#include "CMapFile.h"`
`5`	`3`	`#include "GlobalFunctions.h"`
`@@ -166,7 +164,6 @@ HRESULT CMapFile::Draw(int destDC, int sourcePixelX, int sourcePixelY, int pixel`
`166`	`164`	`}`
`167`	`165`
`168`	`166`
`169`		`-`
`170`	`167`	`// MapFile functions`
`171`	`168`	`// *****************`
`172`	`169`
`@@ -179,7 +176,6 @@ HRESULT CMapFile::get_AroundTheWorld(int *bAroundTheWorld)`
`179`	`176`	`}`
`180`	`177`
`181`	`178`
`182`		`-`
`183`	`179`	`HRESULT CMapFile::get_TileData(`
`184`	`180`	`/* [in] */ int tileX,`
`185`	`181`	`/* [in] */ int tileY,`
`@@ -1118,9 +1114,6 @@ HRESULT CMapFile::SaveMap(StreamWriter *stream, enum MapLoadSaveFormat saveFlags`
`1118`	`1114`	`}`
`1119`	`1115`
`1120`	`1116`
`1121`		`-`
`1122`		`-`
`1123`		`-`
`1124`	`1117`	`// ISupportErrorInfo`
`1125`	`1118`	`// *****************`
`1126`	`1119`
`@@ -1133,11 +1126,9 @@ HRESULT CMapFile::InterfaceSupportsErrorInfo(REFIID riid)`
`1133`	`1126`	`}`
`1134`	`1127`
`1135`	`1128`
`1136`		`-`
`1137`	`1129`	`// Constructors/Destructor`
`1138`	`1130`	`// ***********************`
`1139`	`1131`
`1140`		`-`
`1141`	`1132`	`CMapFile::CMapFile(TileSetSource *tileSetSource, int width, int height) :`
`1142`	`1133`	`m_cRef(1)`
`1143`	`1134`	`{`