OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00:00
Code Releases Activity

Standardize on C++ headers.

Browse Source 
Also removes a bunch of duplicate #includes of stuff that's already
pulled in by HeadSpin.h.
This commit is contained in:
Darryl Pogue
2013-01-28 23:15:54 -08:00
parent 43ca24e167
commit b01aab4a39
33 changed files with 22 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsWindows.h" #include "hsWindows.h"
#include <stdio.h>
#include <direct.h> // windows directory handling fxns (for chdir) #include <direct.h> // windows directory handling fxns (for chdir)
#include <process.h> #include <process.h>
#include <shellapi.h> // ShellExecuteA #include <shellapi.h> // ShellExecuteA

6
Sources/Plasma/CoreLib/HeadSpin.h
View File

@ -54,8 +54,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <cctype> #include <cctype>
#include <stdarg.h> #include <cstdarg>
#include <stdint.h> #include <cstdint>
//====================================== //======================================
// Winblows Hacks // Winblows Hacks
@ -77,7 +77,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// even more bloated than before! // even more bloated than before!
struct HWND__; typedef struct HWND__ *HWND; struct HWND__; typedef struct HWND__ *HWND;
struct HINSTANCE__; typedef struct HINSTANCE__ *HINSTANCE; struct HINSTANCE__; typedef struct HINSTANCE__ *HINSTANCE;
typedef HWND hsWindowHndl; typedef HWND hsWindowHndl;
typedef HINSTANCE hsWindowInst; typedef HINSTANCE hsWindowInst;
typedef HINSTANCE HMODULE; typedef HINSTANCE HMODULE;

2
Sources/Plasma/CoreLib/hsBitVector.cpp
View File

@ -45,8 +45,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsBitVector.h" #include "hsBitVector.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include <stdarg.h>
hsBitVector::hsBitVector(int b, ...) hsBitVector::hsBitVector(int b, ...)
: fBitVectors(nil), : fBitVectors(nil),
fNumBitVectors(0) fNumBitVectors(0)

2
Sources/Plasma/CoreLib/hsMemory.cpp
View File

@ -40,8 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include <string.h>
#include "hsMemory.h" #include "hsMemory.h"
#include "hsExceptions.h" #include "hsExceptions.h"

3
Sources/Plasma/CoreLib/hsStream.cpp
View File

@ -39,18 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021 Mead, WA 99021
*==LICENSE==*/ *==LICENSE==*/
#include <ctype.h>
#include "hsStream.h" #include "hsStream.h"
#include "hsMemory.h" #include "hsMemory.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#if HS_BUILD_FOR_UNIX #if HS_BUILD_FOR_UNIX
#include <unistd.h> #include <unistd.h>
#endif #endif
#if HS_BUILD_FOR_WIN32 #if HS_BUILD_FOR_WIN32
#include <io.h> #include <io.h>
#endif #endif

2
Sources/Plasma/CoreLib/hsStream.h
View File

@ -42,8 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef hsStream_Defined #ifndef hsStream_Defined
#define hsStream_Defined #define hsStream_Defined
#include <stdarg.h> // Included for GCC 3.2.2+
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsMemory.h" #include "hsMemory.h"
#include "plFileSystem.h" #include "plFileSystem.h"

3
Sources/Plasma/CoreLib/hsTemplates.h
View File

@ -46,8 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsMemory.h" #include "hsMemory.h"
#include "hsRefCnt.h" #include "hsRefCnt.h"
#include <cstdarg>
#include <stdarg.h>
#ifdef HS_DEBUGGING #ifdef HS_DEBUGGING

10
Sources/Plasma/CoreLib/hsThread_Unix.cpp
View File

@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <cstring>
#define NO_POSIX_CLOCK 1 #define NO_POSIX_CLOCK 1
@ -146,8 +146,8 @@ void hsThread::ThreadYield()
//#define MUTEX_TIMING //#define MUTEX_TIMING
#ifdef MUTEX_TIMING #ifdef MUTEX_TIMING
#include <time.h> #include <ctime>
#include <stdio.h> #include <cstdio>
#include <unistd.h> #include <unistd.h>
#include "hsWide.h" #include "hsWide.h"
@ -168,8 +168,8 @@ static void InitMutexTimerFile()
//#define EVENT_LOGGING //#define EVENT_LOGGING
#ifdef EVENT_LOGGING #ifdef EVENT_LOGGING
#include <time.h> #include <ctime>
#include <stdio.h> #include <cstdio>
#include <unistd.h> #include <unistd.h>
#include "NucleusLib/inc/hsTimer.h" #include "NucleusLib/inc/hsTimer.h"

2
Sources/Plasma/CoreLib/plProduct.h
View File

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include <stdint.h> #include <cstdint>
class plString; class plString;

1
Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp
View File

@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include <stdlib.h>
#include <cmath> #include <cmath>
#include "HeadSpin.h" #include "HeadSpin.h"

1
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp
View File

@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// // // //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include <stdlib.h>
#include "hsTimer.h" #include "hsTimer.h"
#include "HeadSpin.h" #include "HeadSpin.h"
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"

1
Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
View File

@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h" #include "HeadSpin.h"
#include "plUoid.h" #include "plUoid.h"
#include <string.h>
#include "plFixedKey.h" #include "plFixedKey.h"
#include "plCreatableIndex.h" #include "plCreatableIndex.h"

1
Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp
View File

@ -50,7 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h" #include "HeadSpin.h"
#include "plKey.h" #include "plKey.h"
#include "plUoid.h" #include "plUoid.h"
#include <string.h>
#include "hsResMgr.h" #include "hsResMgr.h"
#define TRACK_REFS 0 // MEMLEAKFISH #define TRACK_REFS 0 // MEMLEAKFISH

5
Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
View File

@ -46,14 +46,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsBitVector.h" #include "hsBitVector.h"
#include "plNetGroup.h" #include "plNetGroup.h"
#include "pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/plUoid.h" #include "pnKeyedObject/plUoid.h"
#include "plStatusLog/plLoggable.h" #include "plStatusLog/plLoggable.h"
#include <stdarg.h>
#define plVerifyConditionRet(NetApp,cond,ret,str) \ #define plVerifyConditionRet(NetApp,cond,ret,str) \
do { \ do { \
if (!(cond)) { \ if (!(cond)) { \

2
Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp
View File

@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
# include <netinet/in.h> # include <netinet/in.h>
# include <arpa/inet.h> # include <arpa/inet.h>
# include <netdb.h> # include <netdb.h>
# include <string.h> // for memcpy # include <cstring> // for memcpy
#elif !defined(HS_BUILD_FOR_WIN32) #elif !defined(HS_BUILD_FOR_WIN32)
#error "Not implemented for this platform" #error "Not implemented for this platform"
#endif #endif

1
Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp
View File

@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// 3.5.2001 - Created by mcn. // // 3.5.2001 - Created by mcn. //
// // // //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include <string.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "plAudioFileReader.h" #include "plAudioFileReader.h"

3
Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.cpp
View File

@ -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 "HeadSpin.h"
#include "plBufferedFileReader.h" #include "plBufferedFileReader.h"
#include "plFileSystem.h" #include "plFileSystem.h"

3
Sources/Plasma/PubUtilLib/plAudioCore/plFastWavReader.cpp
View File

@ -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 "HeadSpin.h"
#include "plFastWavReader.h" #include "plFastWavReader.h"

1
Sources/Plasma/PubUtilLib/plAudioCore/plSoundDeswizzler.cpp
View File

@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h" #include "HeadSpin.h"
#include "plSoundDeswizzler.h" #include "plSoundDeswizzler.h"
#include <string.h>
plSoundDeswizzler::plSoundDeswizzler( void *srcPtr, uint32_t srcLength, uint8_t numChannels, uint32_t sampleSize ) plSoundDeswizzler::plSoundDeswizzler( void *srcPtr, uint32_t srcLength, uint8_t numChannels, uint32_t sampleSize )

3
Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
View File

@ -39,7 +39,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021 Mead, WA 99021
*==LICENSE==*/ *==LICENSE==*/
#include <stdio.h>
#include "plWavFile.h" #include "plWavFile.h"
#ifdef BUILDING_MAXPLUGIN #ifdef BUILDING_MAXPLUGIN
@ -52,8 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <dsound.h> #include <dsound.h>
#include <stdio.h>
#pragma comment(lib, "winmm.lib") #pragma comment(lib, "winmm.lib")
#ifdef PATCHER #ifdef PATCHER
#define DXTRACE_ERR(str,hr) hr // I'm not linking in directx stuff to the just for this #define DXTRACE_ERR(str,hr) hr // I'm not linking in directx stuff to the just for this

5
Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp
View File

@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsStringTable.h" #include "hsStringTable.h"
#include <stdlib.h>
#if HS_BUILD_FOR_UNIX #if HS_BUILD_FOR_UNIX
#include <ctype.h> #include <cctype>
#endif #endif
// //
// hsStringTable // hsStringTable
// //

1
Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.cpp
View File

@ -44,7 +44,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h" #include "HeadSpin.h"
#include <fstream> #include <fstream>
#include <algorithm> #include <algorithm>
#include <stdarg.h>
#include <sstream> #include <sstream>
const plString& plConfigInfo::GlobalSection() const plString& plConfigInfo::GlobalSection()

1
Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.h
View File

@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plConfigInfo_h_inc #define plConfigInfo_h_inc
#include "plKeysAndValues.h" #include "plKeysAndValues.h"
#include <stdarg.h>
///////////////////////////////////////////////// /////////////////////////////////////////////////

4
Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h
View File

@ -170,7 +170,7 @@ protected:
#define SIM_VERBOSE #define SIM_VERBOSE
#ifdef 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, ...) inline void SimLog(const char *str, ...)
{ {
@ -189,4 +189,4 @@ inline void SimLog(const char *str, ...)
#endif #endif
#endif #endif

1
Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.h
View File

@ -447,7 +447,6 @@ public:
// //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#include <stdio.h>
#include "HeadSpin.h" #include "HeadSpin.h"
class plDemoDebugFile class plDemoDebugFile

3
Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp
View File

@ -49,15 +49,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// // // //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include <stdlib.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "plProgressMgr.h" #include "plProgressMgr.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "plPipeline/plPlates.h" #include "plPipeline/plPlates.h"
#include <string.h>
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
//// plProgressMgr Functions ///////////////////////////////////////////////// //// plProgressMgr Functions /////////////////////////////////////////////////

2
Sources/Plasma/PubUtilLib/plSockets/plBufferedSocketReader.cpp
View File

@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "plBufferedSocketReader.h" #include "plBufferedSocketReader.h"
#include "plTcpSocket.h" #include "plTcpSocket.h"
#include <string.h> #include <cstring>
plBufferedSocketReader::plBufferedSocketReader(int size) plBufferedSocketReader::plBufferedSocketReader(int size)

2
Sources/Plasma/PubUtilLib/plStatusLog/plEncryptLogLine.cpp
View File

@ -51,8 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plEncryptLogLine.h" #include "plEncryptLogLine.h"
#include <string.h>
void plStatusEncrypt::Decrypt( uint8_t *line, int32_t len, uint8_t hint ) void plStatusEncrypt::Decrypt( uint8_t *line, int32_t len, uint8_t hint )
{ {
// Da reverse, of course! // Da reverse, of course!

1
Sources/Plasma/PubUtilLib/plStatusLog/plLoggable.h
View File

@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLoggable_inc #ifndef plLoggable_inc
#define plLoggable_inc #define plLoggable_inc
#include <stdio.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "plString.h" #include "plString.h"

4
Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
View File

@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// // // //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include <stdarg.h> #include <cstdarg>
#include <stdlib.h> #include <cstdlib>
#include "hsThread.h" #include "hsThread.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include "hsTimer.h" #include "hsTimer.h"

2
Sources/Tools/MaxConvert/Pch.h
View File

@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <algorithm> #include <algorithm>
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <string.h> #include <cstring>
#include <vector> #include <vector>
// Core Plasma // Core Plasma

2
Sources/Tools/MaxConvert/StringTokenizer.cpp
View File

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include <string.h> #include <cstring>
#pragma hdrstop #pragma hdrstop
#include "StringTokenizer.h" #include "StringTokenizer.h"

1
Sources/Tools/plLocalizationEditor/plLocalizationEditor.cpp
View File

@ -66,7 +66,6 @@ REGISTER_CREATABLE(plInitialAgeStateLoadedMsg);
#include "HeadSpin.h" #include "HeadSpin.h"
#include <Commdlg.h> #include <Commdlg.h>
#include <stdio.h>
#include <commctrl.h> #include <commctrl.h>
#include <shlwapi.h> #include <shlwapi.h>
#include <shlobj.h> #include <shlobj.h>