Standardize on C++ headers.

Also removes a bunch of duplicate #includes of stuff that's already pulled in by HeadSpin.h.
11 years ago · b01aab4a39
33 changed files with 22 additions and 60 deletions
--- a/Sources/Plasma/Apps/plClient/winmain.cpp
+++ b/Sources/Plasma/Apps/plClient/winmain.cpp
@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include "hsWindows.h"

-#include <stdio.h>
 #include <direct.h>     // windows directory handling fxns (for chdir)
 #include <process.h>
 #include <shellapi.h>   // ShellExecuteA
--- a/Sources/Plasma/CoreLib/HeadSpin.h
+++ b/Sources/Plasma/CoreLib/HeadSpin.h
@ -54,8 +54,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <cstdlib>
 #include <cstring>
 #include <cctype>
-#include <stdarg.h>
-#include <stdint.h>
+#include <cstdarg>
+#include <cstdint>

 //======================================
 // Winblows Hacks
@ -77,7 +77,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
    // even more bloated than before!
    struct HWND__; typedef struct HWND__ *HWND;
    struct HINSTANCE__; typedef struct HINSTANCE__ *HINSTANCE;
-    
+
    typedef HWND hsWindowHndl;
    typedef HINSTANCE hsWindowInst;
    typedef HINSTANCE HMODULE;
--- a/Sources/Plasma/CoreLib/hsBitVector.cpp
+++ b/Sources/Plasma/CoreLib/hsBitVector.cpp
@ -45,8 +45,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsBitVector.h"
 #include "hsTemplates.h"

-#include <stdarg.h>
-
 hsBitVector::hsBitVector(int b, ...)
 :   fBitVectors(nil),
    fNumBitVectors(0)
--- a/Sources/Plasma/CoreLib/hsMemory.cpp
+++ b/Sources/Plasma/CoreLib/hsMemory.cpp
@ -40,8 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 *==LICENSE==*/

-#include <string.h>
-
 #include "hsMemory.h"
 #include "hsExceptions.h"

--- a/Sources/Plasma/CoreLib/hsStream.cpp
+++ b/Sources/Plasma/CoreLib/hsStream.cpp
@ -39,18 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include <ctype.h>
 #include "hsStream.h"
 #include "hsMemory.h"

-
 #include "hsTemplates.h"

 #if HS_BUILD_FOR_UNIX
 #include <unistd.h>
 #endif

-
 #if HS_BUILD_FOR_WIN32
 #include <io.h>
 #endif
--- a/Sources/Plasma/CoreLib/hsStream.h
+++ b/Sources/Plasma/CoreLib/hsStream.h
@ -42,8 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef hsStream_Defined
 #define hsStream_Defined

-#include <stdarg.h> // Included for GCC 3.2.2+
-
 #include "HeadSpin.h"
 #include "hsMemory.h"
 #include "plFileSystem.h"
--- a/Sources/Plasma/CoreLib/hsTemplates.h
+++ b/Sources/Plasma/CoreLib/hsTemplates.h
@ -46,8 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsMemory.h"
 #include "hsRefCnt.h"

-
-#include <stdarg.h>
+#include <cstdarg>


 #ifdef HS_DEBUGGING
--- a/Sources/Plasma/CoreLib/hsThread_Unix.cpp
+++ b/Sources/Plasma/CoreLib/hsThread_Unix.cpp
@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <string.h>
+#include <cstring>

 #define NO_POSIX_CLOCK 1

@ -146,8 +146,8 @@ void hsThread::ThreadYield()
 //#define MUTEX_TIMING
 #ifdef MUTEX_TIMING

-#include <time.h>
-#include <stdio.h>
+#include <ctime>
+#include <cstdio>
 #include <unistd.h>
 #include "hsWide.h"

@ -168,8 +168,8 @@ static void InitMutexTimerFile()
 //#define EVENT_LOGGING
 #ifdef EVENT_LOGGING

-#include <time.h>
-#include <stdio.h>
+#include <ctime>
+#include <cstdio>
 #include <unistd.h>
 #include "NucleusLib/inc/hsTimer.h"

--- a/Sources/Plasma/CoreLib/plProduct.h
+++ b/Sources/Plasma/CoreLib/plProduct.h
@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 *==LICENSE==*/

-#include <stdint.h>
+#include <cstdint>

 class plString;

--- a/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp
+++ b/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp
@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 *==LICENSE==*/

-#include <stdlib.h>
 #include <cmath>

 #include "HeadSpin.h"
--- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp
+++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp
@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////

-#include <stdlib.h>
 #include "hsTimer.h"
 #include "HeadSpin.h"
 #include "pfGameGUIMgr.h"
--- a/Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
+++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"

 #include "plUoid.h"
-#include <string.h>

 #include "plFixedKey.h"
 #include "plCreatableIndex.h"
--- a/Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp
+++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp
@ -50,7 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include "plKey.h"
 #include "plUoid.h"
-#include <string.h>
 #include "hsResMgr.h"

 #define TRACK_REFS 0 // MEMLEAKFISH
--- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
+++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
@ -46,14 +46,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsBitVector.h"
 #include "plNetGroup.h"

-#include "pnKeyedObject/hsKeyedObject.h"        
+#include "pnKeyedObject/hsKeyedObject.h"
 #include "pnKeyedObject/plUoid.h"

-
 #include "plStatusLog/plLoggable.h"

-#include <stdarg.h>
-
 #define plVerifyConditionRet(NetApp,cond,ret,str)   \
    do {    \
        if (!(cond)) {  \
--- a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp
+++ b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp
@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 # include <netinet/in.h>
 # include <arpa/inet.h>
 # include <netdb.h>
-# include <string.h>  // for memcpy
+# include <cstring>  // for memcpy
 #elif !defined(HS_BUILD_FOR_WIN32)
 #error "Not implemented for this platform"
 #endif
--- a/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp
+++ b/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp
@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //  3.5.2001 - Created by mcn.                                              //
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////
-#include <string.h>

 #include "HeadSpin.h"
 #include "plAudioFileReader.h"
--- a/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.cpp
+++ b/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.cpp
@ -52,9 +52,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////

-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include "HeadSpin.h"
 #include "plBufferedFileReader.h"
 #include "plFileSystem.h"
--- a/Sources/Plasma/PubUtilLib/plAudioCore/plFastWavReader.cpp
+++ b/Sources/Plasma/PubUtilLib/plAudioCore/plFastWavReader.cpp
@ -51,9 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////

-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include "HeadSpin.h"
 #include "plFastWavReader.h"

--- a/Sources/Plasma/PubUtilLib/plAudioCore/plSoundDeswizzler.cpp
+++ b/Sources/Plasma/PubUtilLib/plAudioCore/plSoundDeswizzler.cpp
@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #include "HeadSpin.h"
 #include "plSoundDeswizzler.h"
-#include <string.h>


 plSoundDeswizzler::plSoundDeswizzler( void *srcPtr, uint32_t srcLength, uint8_t numChannels, uint32_t sampleSize )
--- a/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
+++ b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
@ -39,7 +39,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include <stdio.h>
 #include "plWavFile.h"

 #ifdef BUILDING_MAXPLUGIN
@ -52,8 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #include <dsound.h>

-#include <stdio.h>
-
 #pragma comment(lib, "winmm.lib")
 #ifdef PATCHER
 #define DXTRACE_ERR(str,hr) hr      // I'm not linking in directx stuff to the just for this
--- a/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp
+++ b/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp
@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 *==LICENSE==*/
 #include "hsStringTable.h"
-#include <stdlib.h>
+
 #if HS_BUILD_FOR_UNIX
-#include <ctype.h>
+#include <cctype>
 #endif
+
 //
 // hsStringTable
 //
--- a/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.cpp
+++ b/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.cpp
@ -44,7 +44,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include <fstream>
 #include <algorithm>
-#include <stdarg.h>
 #include <sstream>

 const plString& plConfigInfo::GlobalSection()
--- a/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.h
+++ b/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.h
@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plConfigInfo_h_inc

 #include "plKeysAndValues.h"
-#include <stdarg.h>

 /////////////////////////////////////////////////

--- a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h
+++ b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h
@ -170,7 +170,7 @@ protected:
 #define SIM_VERBOSE

 #ifdef SIM_VERBOSE
-#include <stdarg.h>     // only include when we need to call plSimulationMgr::Log
+#include <cstdarg>     // only include when we need to call plSimulationMgr::Log

 inline void SimLog(const char *str, ...)
 {
@ -189,4 +189,4 @@ inline void SimLog(const char *str, ...)

 #endif

-#endif
+#endif
--- a/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.h
+++ b/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.h
@ -447,7 +447,6 @@ public:
 //
 ///////////////////////////////////////////////////////////////////////////////

-#include <stdio.h>
 #include "HeadSpin.h"

 class plDemoDebugFile
--- a/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp
+++ b/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp
@ -49,15 +49,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////

-#include <stdlib.h>
 #include "HeadSpin.h"
 #include "plProgressMgr.h"
 #include "hsTimer.h"

 #include "plPipeline/plPlates.h"

-#include <string.h>
-

 //////////////////////////////////////////////////////////////////////////////
 //// plProgressMgr Functions /////////////////////////////////////////////////
--- a/Sources/Plasma/PubUtilLib/plSockets/plBufferedSocketReader.cpp
+++ b/Sources/Plasma/PubUtilLib/plSockets/plBufferedSocketReader.cpp
@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "plBufferedSocketReader.h"
 #include "plTcpSocket.h"
-#include <string.h>
+#include <cstring>


 plBufferedSocketReader::plBufferedSocketReader(int size)
--- a/Sources/Plasma/PubUtilLib/plStatusLog/plEncryptLogLine.cpp
+++ b/Sources/Plasma/PubUtilLib/plStatusLog/plEncryptLogLine.cpp
@ -51,8 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #include "plEncryptLogLine.h"

-#include <string.h>
-
 void    plStatusEncrypt::Decrypt( uint8_t *line, int32_t len, uint8_t hint )
 {
    // Da reverse, of course!
--- a/Sources/Plasma/PubUtilLib/plStatusLog/plLoggable.h
+++ b/Sources/Plasma/PubUtilLib/plStatusLog/plLoggable.h
@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plLoggable_inc
 #define plLoggable_inc

-#include <stdio.h>
 #include "HeadSpin.h"
 #include "plString.h"

--- a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
+++ b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////

-#include <stdarg.h>
-#include <stdlib.h>
+#include <cstdarg>
+#include <cstdlib>
 #include "hsThread.h"
 #include "hsTemplates.h"
 #include "hsTimer.h"
--- a/Sources/Tools/MaxConvert/Pch.h
+++ b/Sources/Tools/MaxConvert/Pch.h
@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <algorithm>
 #include <float.h>
 #include <math.h>
-#include <string.h>
+#include <cstring>
 #include <vector>

 // Core Plasma
--- a/Sources/Tools/MaxConvert/StringTokenizer.cpp
+++ b/Sources/Tools/MaxConvert/StringTokenizer.cpp
@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 *==LICENSE==*/

-#include <string.h>
+#include <cstring>
 #pragma hdrstop

 #include "StringTokenizer.h"
--- a/Sources/Tools/plLocalizationEditor/plLocalizationEditor.cpp
+++ b/Sources/Tools/plLocalizationEditor/plLocalizationEditor.cpp
@ -66,7 +66,6 @@ REGISTER_CREATABLE(plInitialAgeStateLoadedMsg);

 #include "HeadSpin.h"
 #include <Commdlg.h>
-#include <stdio.h>
 #include <commctrl.h>
 #include <shlwapi.h>
 #include <shlobj.h>