From 8158a43dfef9e420b66490adb0f1bfb8330749af Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Tue, 1 Jan 2013 19:38:17 -0800 Subject: [PATCH] Fully remove hsStlUtils, as it is now completely unused --- Sources/Plasma/CoreLib/CMakeLists.txt | 2 - Sources/Plasma/CoreLib/HeadSpin.cpp | 2 +- Sources/Plasma/CoreLib/hsSTLStream.h | 1 - Sources/Plasma/CoreLib/hsStlUtils.cpp | 187 ------------------ Sources/Plasma/CoreLib/hsStlUtils.h | 77 -------- Sources/Plasma/CoreLib/hsStream.cpp | 2 - Sources/Plasma/CoreLib/plGeneric.h | 1 - Sources/Plasma/CoreLib/plString.h | 11 +- .../pfAnimation/pfObjectFlocker.cpp | 1 - .../pfAnimation/plAnimDebugList.cpp | 1 - .../pfConsole/pfConsoleCommands.cpp | 1 - .../pfConsole/pfConsoleCommandsNet.cpp | 1 - .../FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h | 1 - .../pfGameGUIMgr/pfGUITextBoxMod.cpp | 1 - .../pfJournalBook/pfJournalBook.cpp | 1 - .../FeatureLib/pfJournalBook/pfJournalBook.h | 1 + .../pfLocalizationMgr/pfLocalizationMgr.h | 1 - Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h | 1 - .../pfPython/Games/Heek/pyHeekMsg.h | 1 + .../pfPython/Games/Marker/pyMarkerMsg.h | 1 + .../pfPython/Games/VarSync/pyVarSyncMsg.h | 1 + Sources/Plasma/FeatureLib/pfPython/Pch.h | 2 +- Sources/Plasma/FeatureLib/pfPython/cyAvatar.h | 2 +- Sources/Plasma/FeatureLib/pfPython/cyMisc.h | 1 + .../FeatureLib/pfPython/cyPythonInterface.h | 2 +- .../FeatureLib/pfPython/plPythonPack.cpp | 2 +- .../FeatureLib/pfPython/pyAgeInfoStruct.cpp | 1 + .../FeatureLib/pfPython/pyAgeInfoStruct.h | 1 - Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.h | 1 - Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp | 1 - .../FeatureLib/pfPython/pyJournalBook.h | 1 + Sources/Plasma/NucleusLib/inc/plPipeline.h | 1 - .../Plasma/NucleusLib/pnMessage/plClientMsg.h | 1 - .../Plasma/NucleusLib/pnMessage/plMessage.h | 2 +- .../NucleusLib/pnNetCommon/plGenericVar.cpp | 1 - .../NucleusLib/pnNetCommon/plGenericVar.h | 1 - .../NucleusLib/pnNetCommon/plNetAddress.h | 1 - .../NucleusLib/pnNetCommon/plNetApp.cpp | 1 - .../Plasma/NucleusLib/pnNetCommon/plNetApp.h | 1 - .../NucleusLib/pnNetCommon/plNetGroup.h | 2 +- .../NucleusLib/pnNetCommon/plNetSharedState.h | 3 +- .../NucleusLib/pnNetCommon/plSynchedObject.h | 1 - .../pnProduct/Private/pnPrProductId.cpp | 1 + Sources/Plasma/NucleusLib/pnUUID/pnUUID.h | 1 - .../plAgeDescription/plAgeDescription.cpp | 3 +- .../PubUtilLib/plAgeLoader/plAgeLoader.h | 1 - .../Plasma/PubUtilLib/plAudio/plAudioSystem.h | 3 +- .../PubUtilLib/plAvatar/plAGMasterMod.h | 1 - .../Plasma/PubUtilLib/plAvatar/plAGModifier.h | 1 - .../PubUtilLib/plAvatar/plAnimStage.cpp | 1 - .../PubUtilLib/plAvatar/plAvBrainCoop.h | 1 - .../PubUtilLib/plAvatar/plAvatarSDLModifier.h | 1 - .../PubUtilLib/plAvatar/plCritterCommands.h | 4 +- .../PubUtilLib/plAvatar/plMultistageBehMod.h | 1 - .../PubUtilLib/plCompression/plZlibStream.h | 2 +- .../PubUtilLib/plContainer/plConfigInfo.cpp | 1 - .../PubUtilLib/plContainer/plConfigInfo.h | 1 - .../PubUtilLib/plContainer/plContainer.h | 1 - .../Plasma/PubUtilLib/plFile/hsFiles_Unix.cpp | 2 +- .../PubUtilLib/plFile/plEncryptedStream.cpp | 1 + .../Plasma/PubUtilLib/plFile/plFileUtils.cpp | 1 - .../PubUtilLib/plFile/plSecureStream.cpp | 2 + .../PubUtilLib/plFile/plStreamSource.cpp | 1 + .../Plasma/PubUtilLib/plFile/plStreamSource.h | 2 +- Sources/Plasma/PubUtilLib/plGImage/plFont.cpp | 3 +- .../PubUtilLib/plInterp/plATCEaseCurves.cpp | 2 + .../PubUtilLib/plInterp/plAnimTimeConvert.cpp | 2 + .../PubUtilLib/plMessage/plLinkToAgeMsg.h | 2 +- .../PubUtilLib/plMessage/plNetOwnershipMsg.h | 1 - .../PubUtilLib/plMessage/plOneShotCallbacks.h | 1 - .../plModifier/plAxisAnimModifier.h | 1 - .../plModifier/plResponderModifier.cpp | 1 - .../plNetClient/plNetClientMsgHandler.h | 1 - .../plNetClient/plNetLinkingMgr.cpp | 2 +- .../PubUtilLib/plNetClient/plNetLinkingMgr.h | 1 - .../plNetClient/plNetObjectDebugger.h | 1 - .../PubUtilLib/plNetClient/plNetVoiceList.h | 1 - .../PubUtilLib/plNetCommon/plClientGuid.h | 1 - .../PubUtilLib/plNetCommon/plNetCommon.cpp | 1 - .../PubUtilLib/plNetCommon/plNetCommon.h | 1 - .../plNetCommon/plNetCommonHelpers.cpp | 1 - .../PubUtilLib/plNetCommon/plNetMember.h | 1 - .../plNetCommon/plNetServerSessionInfo.cpp | 1 - .../plNetCommon/plNetServerSessionInfo.h | 3 +- .../PubUtilLib/plNetCommon/plSpawnPointInfo.h | 1 - .../PubUtilLib/plNetMessage/plNetMessage.h | 1 - .../PubUtilLib/plNetMessage/plNetMsgHelpers.h | 1 - .../plNetTransport/plNetTransportMember.h | 1 - .../Plasma/PubUtilLib/plPipeline/plPlates.h | 3 +- .../PubUtilLib/plResMgr/plKeyFinder.cpp | 1 - .../Plasma/PubUtilLib/plResMgr/plKeyFinder.h | 1 - .../PubUtilLib/plResMgr/plRegistryNode.cpp | 1 - .../PubUtilLib/plResMgr/plResManager.cpp | 1 - .../Plasma/PubUtilLib/plSDL/plSDLDescriptor.h | 3 +- Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp | 1 - .../Plasma/PubUtilLib/plSDL/plSDLParser.cpp | 1 - .../PubUtilLib/plSDL/plStateDataRecord.cpp | 1 - .../PubUtilLib/plSDL/plStateVariable.cpp | 3 +- .../PubUtilLib/plSDL/plVarDescriptor.cpp | 1 - .../PubUtilLib/plScene/plRelevanceMgr.h | 1 - .../plStatGather/plProfileManagerFull.h | 3 +- .../PubUtilLib/plStatusLog/plLoggable.cpp | 1 - .../PubUtilLib/plStatusLog/plStatusLog.cpp | 2 - .../plStreamLogger/plStreamLogger.h | 1 + .../PubUtilLib/plSurface/plLayerAnimation.cpp | 2 + .../plUnifiedTime/plUnifiedTime.cpp | 1 - Sources/Plasma/PubUtilLib/plVault/Pch.h | 1 - .../PubUtilLib/plVault/plDniCoordinateInfo.h | 1 - .../PubUtilLib/plVault/plVaultNodeAccess.h | 6 - Sources/Tools/MaxComponent/plAutoUIParams.cpp | 1 + 110 files changed, 54 insertions(+), 373 deletions(-) delete mode 100644 Sources/Plasma/CoreLib/hsStlUtils.cpp delete mode 100644 Sources/Plasma/CoreLib/hsStlUtils.h diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt index 9d91b8b3..968ea4cf 100644 --- a/Sources/Plasma/CoreLib/CMakeLists.txt +++ b/Sources/Plasma/CoreLib/CMakeLists.txt @@ -27,7 +27,6 @@ set(CoreLib_SOURCES hsRefCnt.cpp hsSafeRefCnt.cpp hsSTLStream.cpp - hsStlUtils.cpp hsStream.cpp hsStringTokenizer.cpp hsTemplates.cpp @@ -71,7 +70,6 @@ set(CoreLib_HEADERS hsSafeRefCnt.h hsStlSortUtils.h hsSTLStream.h - hsStlUtils.h hsStream.h hsStringTokenizer.h hsTemplates.h diff --git a/Sources/Plasma/CoreLib/HeadSpin.cpp b/Sources/Plasma/CoreLib/HeadSpin.cpp index f2bfc045..b103a326 100644 --- a/Sources/Plasma/CoreLib/HeadSpin.cpp +++ b/Sources/Plasma/CoreLib/HeadSpin.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" #include "hsWindows.h" +#include #ifdef _MSC_VER # include #endif -#include "hsStlUtils.h" #include "hsTemplates.h" #include "plString.h" diff --git a/Sources/Plasma/CoreLib/hsSTLStream.h b/Sources/Plasma/CoreLib/hsSTLStream.h index b4144679..84add5da 100644 --- a/Sources/Plasma/CoreLib/hsSTLStream.h +++ b/Sources/Plasma/CoreLib/hsSTLStream.h @@ -44,7 +44,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _hsSTLStream_h_inc_ #include "hsStream.h" -#include "hsStlUtils.h" // // In-memory only diff --git a/Sources/Plasma/CoreLib/hsStlUtils.cpp b/Sources/Plasma/CoreLib/hsStlUtils.cpp deleted file mode 100644 index 5d30eba8..00000000 --- a/Sources/Plasma/CoreLib/hsStlUtils.cpp +++ /dev/null @@ -1,187 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -#include "hsStlUtils.h" - -// stl extensions -namespace xtl { - -//std::string -std::string & trimleft(std::string & s, const char * charset) -{ - s.erase(0, s.find_first_not_of(charset)); - return s; -} - -std::wstring & trimleft(std::wstring & s, const wchar_t * charset) -{ - s.erase(0, s.find_first_not_of(charset)); - return s; -} - -std::string & trimright(std::string & s, const char * charset) -{ - size_t idx = s.find_last_not_of(charset); - - if (std::string::npos == idx) - { - s.erase(); - } - else - { - char c = s.at(idx); - s.erase(idx, std::string::npos); - s.append(1, c); - } - - return s; -} - -std::wstring & trimright(std::wstring & s, const wchar_t * charset) -{ - size_t idx = s.find_last_not_of(charset); - - if (std::wstring::npos == idx) - { - s.erase(); - } - else - { - wchar_t c = s.at(idx); - s.erase(idx, std::string::npos); - s.append(1, c); - } - - return s; -} - -std::string & trim(std::string & s, const char * charset) -{ - trimleft(s,charset); - trimright(s,charset); - return s; -} - -std::wstring & trim(std::wstring & s, const wchar_t * charset) -{ - trimleft(s,charset); - trimright(s,charset); - return s; -} - -template bool GetStringGroup(const std::string& s, T& group, char sep) -{ - bool ret = false; - std::string::size_type oldpos = 0, newpos = 0; - - if (!(s.empty())) - { - do - { - newpos = s.find(',',oldpos); - group.insert(group.end(),s.substr(oldpos,newpos)); - if (newpos != s.npos) - oldpos = newpos+1; - } - while(newpos != s.npos); - ret = true; - } - - return ret; -} - -template bool GetStringGroup(const std::wstring& s, T& group, wchar_t sep) -{ - bool ret = false; - std::wstring::size_type oldpos = 0, newpos = 0; - - if (!(s.empty())) - { - do - { - newpos = s.find(L',',oldpos); - group.insert(group.end(),s.substr(oldpos,newpos)); - if (newpos != s.npos) - oldpos = newpos+1; - } while(newpos != s.npos); - ret = true; - } - - return ret; -} - -template bool GetStringGroupAsString(const T& group, std::string& s, char sep) -{ - typename T::const_iterator it = group.begin(); - bool fst = true; - while (it != group.end()) - { - if (!fst) - s += ","; - else - fst = false; - s+= (*it).c_str(); - it++; - } - - return true; -} - -template bool GetStringGroupAsString(const T& group, std::wstring& s, wchar_t sep) -{ - typename T::const_iterator it = group.begin(); - bool fst = true; - while (it != group.end()) - { - if (!fst) - s += L","; - else - fst = false; - s+= (*it).c_str(); - it++; - } - - return true; -} - - -} // namespace std - diff --git a/Sources/Plasma/CoreLib/hsStlUtils.h b/Sources/Plasma/CoreLib/hsStlUtils.h deleted file mode 100644 index 012fe9bb..00000000 --- a/Sources/Plasma/CoreLib/hsStlUtils.h +++ /dev/null @@ -1,77 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -#ifndef hsStlUtils_h_inc -#define hsStlUtils_h_inc - - -#include "HeadSpin.h" -#include - - -/***************************************************************************** -* -* stl extensions -* -***/ -namespace xtl -{ - -// std::string trim -std::string & trimleft(std::string & s, const char * charset=" \t\n\r"); -std::wstring & trimleft(std::wstring & s, const wchar_t * charset=L" \t\n\r"); -std::string & trimright(std::string & s, const char * charset=" \t\n\r"); -std::wstring & trimright(std::wstring & s, const wchar_t * charset=L" \t\n\r"); -std::string & trim(std::string & s, const char * charset=" \t\n\r"); -std::wstring & trim(std::wstring & s, const wchar_t * charset=L" \t\n\r"); - - -template bool GetStringGroup(const std::string& s, T& group, char sep = ','); -template bool GetStringGroup(const std::wstring& s, T& group, wchar_t sep = L','); -template bool GetStringGroupAsString(const T& group, std::string& s, char sep = ','); -template bool GetStringGroupAsString(const T& group, std::wstring& s, wchar_t sep = L','); - - -} // namespace xtl - - - -#endif // hsStlUtils_h_inc diff --git a/Sources/Plasma/CoreLib/hsStream.cpp b/Sources/Plasma/CoreLib/hsStream.cpp index a6316090..ba9610f6 100644 --- a/Sources/Plasma/CoreLib/hsStream.cpp +++ b/Sources/Plasma/CoreLib/hsStream.cpp @@ -45,7 +45,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" -#include "hsStlUtils.h" #if HS_BUILD_FOR_UNIX #include @@ -55,7 +54,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #if HS_BUILD_FOR_WIN32 #include #endif -#include "hsStlUtils.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/CoreLib/plGeneric.h b/Sources/Plasma/CoreLib/plGeneric.h index c73897a8..39d0f19b 100644 --- a/Sources/Plasma/CoreLib/plGeneric.h +++ b/Sources/Plasma/CoreLib/plGeneric.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define __PLGENERIC_H__ #include "hsStream.h" -#include "hsStlUtils.h" class plGeneric { diff --git a/Sources/Plasma/CoreLib/plString.h b/Sources/Plasma/CoreLib/plString.h index b387a541..bfecb1de 100644 --- a/Sources/Plasma/CoreLib/plString.h +++ b/Sources/Plasma/CoreLib/plString.h @@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com typedef unsigned int UniChar; #define SSO_CHARS (16) +#define WHITESPACE_CHARS " \t\n\r" template class plStringBuffer @@ -279,15 +280,15 @@ public: int Find(const plString &str, CaseSensitivity sense = kCaseSensitive) const { return Find(str.c_str(), sense); } - plString TrimLeft(const char *charset = " \t\n\r") const; - plString TrimRight(const char *charset = " \t\n\r") const; - plString Trim(const char *charset = " \t\n\r") const; + plString TrimLeft(const char *charset = WHITESPACE_CHARS) const; + plString TrimRight(const char *charset = WHITESPACE_CHARS) const; + plString Trim(const char *charset = WHITESPACE_CHARS) const; plString Substr(int start, size_t size = kSizeAuto) const; plString Left(size_t size) const { return Substr(0, size); } plString Right(size_t size) const { return Substr(GetSize() - size, size); } - // NOTE: Does ::Compare(blah, kCaseInsensitive) make more sense? If + // NOTE: Does Compare(blah, kCaseInsensitive) make more sense? If // so, use that instead -- it's faster and more efficient! plString ToUpper() const; plString ToLower() const; @@ -297,7 +298,7 @@ public: // all delimiters and only returns the pieces left between them), whereas // Split will split on a full string, returning whatever is left between. std::vector Split(const char *split, size_t maxSplits = kSizeAuto) const; - std::vector Tokenize(const char *delims = " \t\r\n\f\v") const; + std::vector Tokenize(const char *delims = WHITESPACE_CHARS) const; static plString Fill(size_t count, char c); diff --git a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp index 89227e2f..302a919b 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp @@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "hsStlUtils.h" #include "hsMatrix44.h" #include "hsGeometry3.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp index 3df1e750..cc1fa04b 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp @@ -39,7 +39,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "hsStlUtils.h" #include "hsResMgr.h" #include "hsTemplates.h" #include "hsTimer.h" diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp index 31f17977..e8f24c46 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp @@ -161,7 +161,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plStatusLog/plStatusLog.h" #include "pnTimer/pnBuildDates.h" -#include "hsStlUtils.h" #include "hsTemplates.h" #include "plResMgr/plResManagerHelper.h" diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp index b8e31b75..11cc95e0 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp @@ -88,7 +88,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plStatusLog/plStatusLog.h" -#include "hsStlUtils.h" #include "hsTemplates.h" #include "plVault/plVault.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h index 4968d3d3..a478142d 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h @@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pfGUIEditBoxMod_h #define _pfGUIEditBoxMod_h -#include "hsStlUtils.h" #include "pfGUIControlMod.h" #include "pnInputCore/plKeyDef.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp index b090c37d..e5f1f574 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp @@ -46,7 +46,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pfGUITextBoxMod.h" #include "pfGameGUIMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp index 0ff2c533..ec35082b 100644 --- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp +++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp @@ -51,7 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfJournalBook.h" #include -#include "hsStlUtils.h" #include "hsResMgr.h" #include "pcSmallRect.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h index 2ebbfa7d..4fdf7d61 100644 --- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h @@ -166,6 +166,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include +#include #include "hsTemplates.h" #include "hsColorRGBA.h" diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationMgr.h b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationMgr.h index 889b4ba9..ccb10063 100644 --- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationMgr.h +++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationMgr.h @@ -50,7 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfLocalizationMgr_h #include "HeadSpin.h" -#include "hsStlUtils.h" class pfLocalizationMgr { diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h index f7155e5b..de534a37 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h @@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfKIMsg_h #include "HeadSpin.h" -#include "hsStlUtils.h" #include "hsStream.h" #include "pnMessage/plMessage.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h index 589e77ae..dda02fc9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h @@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for Heek game messages // +#include #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h index b2ce74ca..f4d24064 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h @@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for Marker game messages // +#include #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h index 481ff126..27eced1e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h @@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for VarSync game messages // +#include #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Pch.h b/Sources/Plasma/FeatureLib/pfPython/Pch.h index 4a41f08b..dc2fe84c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Pch.h +++ b/Sources/Plasma/FeatureLib/pfPython/Pch.h @@ -52,6 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #include +#include // Platform Library Includes #include @@ -70,7 +71,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsQuat.h" #include "hsResMgr.h" #include "hsStlSortUtils.h" -#include "hsStlUtils.h" #include "hsStream.h" #include "hsTemplates.h" #include "hsTimer.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h index 2d64705f..e5610de3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper to map animation functions to plasma2 message // -#include "hsStlUtils.h" +#include #include "hsTemplates.h" #include "pnKeyedObject/plKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h index 2011c167..f89b6d58 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h @@ -59,6 +59,7 @@ class pyPoint3; #include "HeadSpin.h" #include +#include class pyGUIDialog; class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h index 2df041d7..686011a0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // only be one instance of this interface. // #include "HeadSpin.h" -#include "hsStlUtils.h" #include "plString.h" +#include #if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE) #include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp index 920b4031..80e18272 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp @@ -45,9 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #include +#include #include "HeadSpin.h" -#include "hsStlUtils.h" #include "hsStream.h" #include "hsStlSortUtils.h" #pragma hdrstop diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp index 4e76ff5c..b506b914 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp @@ -41,6 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include +#include #pragma hdrstop #include "pyAgeInfoStruct.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h index c240675b..d28ab403 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyAgeInfoStruct_h_inc #define pyAgeInfoStruct_h_inc -#include "hsStlUtils.h" #include "plNetCommon/plNetServerSessionInfo.h" #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.h b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.h index 8d060696..39ea0281 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.h @@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pfCCR/plCCRMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp b/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp index 99b23128..cda95b17 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp @@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include -#include "hsStlUtils.h" #include "pyGlueHelpers.h" #pragma hdrstop diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h index 6dc6e1ab..e2bfc04b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h @@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include +#include class cyAnimation; class pyImage; diff --git a/Sources/Plasma/NucleusLib/inc/plPipeline.h b/Sources/Plasma/NucleusLib/inc/plPipeline.h index 6c9c30cc..6d09ee84 100644 --- a/Sources/Plasma/NucleusLib/inc/plPipeline.h +++ b/Sources/Plasma/NucleusLib/inc/plPipeline.h @@ -46,7 +46,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnFactory/plCreatable.h" #include "hsGMatState.h" #include "hsTemplates.h" -#include "hsStlUtils.h" #define MIN_WIDTH 640 #define MIN_HEIGHT 480 diff --git a/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h index 508f06e4..a7c8f8ad 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h @@ -47,7 +47,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsResMgr.h" -#include "hsStlUtils.h" #include "pnKeyedObject/plUoid.h" // diff --git a/Sources/Plasma/NucleusLib/pnMessage/plMessage.h b/Sources/Plasma/NucleusLib/pnMessage/plMessage.h index b229dee7..ba97b1b1 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plMessage.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plMessage.h @@ -43,10 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMessage_inc #define plMessage_inc +#include #include "pnFactory/plCreatable.h" #include "pnKeyedObject/plKey.h" #include "hsTemplates.h" -#include "hsStlUtils.h" class plKey; class hsStream; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.cpp index d685b3bb..0d71e07c 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.cpp @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plGenericVar.h" #include "hsMemory.h" -#include "hsStlUtils.h" ////////////////////////////////////////////////////// // plGenericType diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h b/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h index ab18d9ef..b3ff533b 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h @@ -44,7 +44,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pnFactory/plCreatable.h" class hsStream; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetAddress.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetAddress.h index 17b64cda..837a1f80 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetAddress.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetAddress.h @@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" // FIXME #include "plString.h" -#include "hsStlUtils.h" #include "hsStream.h" #if defined(HS_BUILD_FOR_WIN32) diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp index 774c6211..af69b9e7 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp @@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetApp.h" -#include "hsStlUtils.h" #include "pnMessage/plMessage.h" plNetApp* plNetApp::fInstance = nil; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h index 602e04c6..6e5fb76e 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetApp_h #include "HeadSpin.h" -#include "hsStlUtils.h" #include "hsBitVector.h" #include "plNetGroup.h" diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h index b4e65bd7..8f74183b 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetGroup_h #define plNetGroup_h +#include #include "pnKeyedObject/plUoid.h" #include "hsStream.h" -#include "hsStlUtils.h" class plNetGroupId { diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.h index 2733b05b..042d4aaa 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.h @@ -43,8 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetSharedState_inc #include "HeadSpin.h" - -#include "hsStlUtils.h" +#include class hsStream; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h index c01a0c98..0fa8995f 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h @@ -45,7 +45,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/plKey.h" -#include "hsStlUtils.h" #include "plNetGroup.h" ///////////////////////////////////// diff --git a/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.cpp b/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.cpp index 5f928da1..05b76957 100644 --- a/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.cpp +++ b/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.cpp @@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ***/ #include "../Pch.h" +#include #pragma hdrstop diff --git a/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h index 567fd0b5..4f68e0ee 100644 --- a/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h +++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pnUUID_h_inc #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pnUtils/pnUtUuid.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp index e7ae52e6..c18d46ea 100644 --- a/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp +++ b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plAgeDescription.h" -#include "hsStlUtils.h" #include "plFile/hsFiles.h" #include "plFile/plInitFileReader.h" #include "plFile/plEncryptedStream.h" @@ -162,7 +161,7 @@ char *plAgePage::GetAsString( void ) const // // static -char plAgeDescription::kAgeDescPath[]={"dat"PATH_SEPARATOR_STR}; +char plAgeDescription::kAgeDescPath[] = { "dat" PATH_SEPARATOR_STR }; const char* plAgeDescription::fCommonPages[] = { "Textures", "BuiltIn" }; // Also gotta init the separators for our helper reading function diff --git a/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h index a395e098..09998288 100644 --- a/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h +++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAgeLoader_h #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pnUtils/pnUtils.h" #include "pnNetBase/pnNetBase.h" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h index 15c81c58..57b279fe 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h @@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAudioSystem_h #include "HeadSpin.h" -#include "hsStlUtils.h" +#include + #include "hsTemplates.h" #include "hsGeometry3.h" #include "pnKeyedObject/hsKeyedObject.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h index 4cdb376f..32292f96 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h @@ -59,7 +59,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnKeyedObject/plMsgForwarder.h" // templates -#include "hsStlUtils.h" #include "hsStlSortUtils.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h index 8ebff9db..912002d2 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h @@ -54,7 +54,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatar/plScalarChannel.h" // stl -#include "hsStlUtils.h" #include "hsStlSortUtils.h" class plSceneObject; diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp index 12065848..e7e39ce2 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp @@ -54,7 +54,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // global -#include "hsStlUtils.h" #include "hsResMgr.h" #include "hsTimer.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.h index c0291986..eb7a392c 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.h @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLAVBRAINGENERIC_H #define PLAVBRAINGENERIC_H -#include "hsStlUtils.h" #include "plAvBrainGeneric.h" /** \class plAvBrainCoop diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h index dfe1f969..8b1ca4a7 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAvatarSDLModifier_inc #include "HeadSpin.h" -#include "hsStlUtils.h" #include "plModifier/plSDLModifier.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plCritterCommands.h b/Sources/Plasma/PubUtilLib/plAvatar/plCritterCommands.h index c7810f42..f58d517b 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plCritterCommands.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plCritterCommands.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef __PLCRITTERCMDS_H__ #define __PLCRITTERCMDS_H__ -#include "hsStlUtils.h" - +#include +#include typedef std::vector VCharArray; diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h index 275e820f..467dba2c 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plMultistageBehMod_h_inc #include "pnModifier/plSingleModifier.h" -#include "hsStlUtils.h" class plAnimStageVec; diff --git a/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.h b/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.h index e543aef3..a387402e 100644 --- a/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.h +++ b/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plZlibStream_h_inc #include "hsStream.h" -#include "hsStlUtils.h" +#include // // This is for reading a .gz file from a buffer, and writing the uncompressed data to a file. diff --git a/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.cpp b/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.cpp index 09949990..b7097eb0 100644 --- a/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.cpp @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plConfigInfo.h" #include "HeadSpin.h" -#include "hsStlUtils.h" #include #include #include diff --git a/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.h b/Sources/Plasma/PubUtilLib/plContainer/plConfigInfo.h index 0df3c0ce..f7b23293 100644 --- 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 "hsStlUtils.h" #include ///////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plContainer/plContainer.h b/Sources/Plasma/PubUtilLib/plContainer/plContainer.h index c59ff697..b6eecccc 100644 --- a/Sources/Plasma/PubUtilLib/plContainer/plContainer.h +++ b/Sources/Plasma/PubUtilLib/plContainer/plContainer.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plContainer_h_inc #include "HeadSpin.h" -#include "hsStlUtils.h" template < class T > class plDataContainerT diff --git a/Sources/Plasma/PubUtilLib/plFile/hsFiles_Unix.cpp b/Sources/Plasma/PubUtilLib/plFile/hsFiles_Unix.cpp index d95cfa84..5864f42a 100644 --- a/Sources/Plasma/PubUtilLib/plFile/hsFiles_Unix.cpp +++ b/Sources/Plasma/PubUtilLib/plFile/hsFiles_Unix.cpp @@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #include +#include #include "hsTemplates.h" #include "plFileUtils.h" -#include "hsStlUtils.h" struct hsFolderIterator_Data { glob_t fGlobBuf; diff --git a/Sources/Plasma/PubUtilLib/plFile/plEncryptedStream.cpp b/Sources/Plasma/PubUtilLib/plFile/plEncryptedStream.cpp index 0ea7c9da..60367d58 100644 --- a/Sources/Plasma/PubUtilLib/plFile/plEncryptedStream.cpp +++ b/Sources/Plasma/PubUtilLib/plFile/plEncryptedStream.cpp @@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsSTLStream.h" #include +#include static const uint32_t kDefaultKey[4] = { 0x6c0a5452, 0x3827d0f, 0x3a170b92, 0x16db7fc2 }; static const int kEncryptChunkSize = 8; diff --git a/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp b/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp index d582f345..81a176d6 100644 --- a/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp +++ b/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp @@ -52,7 +52,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsWindows.h" -#include "hsStlUtils.h" #include "plFileUtils.h" #include "hsFiles.h" #include "hsStringTokenizer.h" diff --git a/Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp b/Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp index eef375fd..2b138543 100644 --- a/Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp +++ b/Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp @@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ +#include + #include "plSecureStream.h" #include "hsWindows.h" diff --git a/Sources/Plasma/PubUtilLib/plFile/plStreamSource.cpp b/Sources/Plasma/PubUtilLib/plFile/plStreamSource.cpp index 8c57804c..d7b18dfd 100644 --- a/Sources/Plasma/PubUtilLib/plFile/plStreamSource.cpp +++ b/Sources/Plasma/PubUtilLib/plFile/plStreamSource.cpp @@ -40,6 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include #include "hsFiles.h" #include "plStreamSource.h" #include "plSecureStream.h" diff --git a/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h b/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h index 4f010042..817e2901 100644 --- a/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h +++ b/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plStreamSource_h_inc #include +#include #include "hsStream.h" -#include "hsStlUtils.h" // A class for holding and accessing file streams. The preloader will insert // files in here once they are loaded. In internal builds, if a requested file diff --git a/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp b/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp index be1e74ba..155f2ec0 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plFont.cpp @@ -63,7 +63,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com /////////////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "hsStlUtils.h" +#include + #include "plFont.h" #include "plMipmap.h" diff --git a/Sources/Plasma/PubUtilLib/plInterp/plATCEaseCurves.cpp b/Sources/Plasma/PubUtilLib/plInterp/plATCEaseCurves.cpp index 0f26b4da..9d01c783 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plATCEaseCurves.cpp +++ b/Sources/Plasma/PubUtilLib/plInterp/plATCEaseCurves.cpp @@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ +#include + #include "plAnimEaseTypes.h" #include "plAnimTimeConvert.h" diff --git a/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp b/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp index b5ca6f50..b0865cfe 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp +++ b/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp @@ -40,6 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#include + #include "plAnimEaseTypes.h" #include "plAnimTimeConvert.h" #include "plAvatar/plAGAnim.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h index e5c0128d..079e30fe 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h @@ -64,7 +64,7 @@ class plLinkToAgeMsg : public plMessage public: plLinkToAgeMsg(); plLinkToAgeMsg( const plAgeLinkStruct * link ); - ~plLinkToAgeMsg(); + virtual ~plLinkToAgeMsg(); CLASSNAME_REGISTER( plLinkToAgeMsg ); GETINTERFACE_ANY( plLinkToAgeMsg, plMessage ); diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h index b91d720b..2f55cef0 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetOwnershipMsg_INC #define plNetOwnershipMsg_INC -#include "hsStlUtils.h" #include "pnMessage/plMessage.h" #include "plNetMessage/plNetMessage.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h b/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h index ec46c548..ee086776 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h @@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "hsStlUtils.h" #include "hsRefCnt.h" #include "pnKeyedObject/plKey.h" diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h index 0e5ad23b..f0acf9b4 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAxisAnimMod_inc #define plAxisAnimMod_inc -#include "hsStlUtils.h" #include "pnModifier/plSingleModifier.h" #include "plString.h" diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp index 7def6966..5e71bba2 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp @@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "hsStlUtils.h" #include "hsTimer.h" #include "plResponderModifier.h" #include "plResponderSDLModifier.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h index efe8cbff..cbac09c3 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetClientMsgHandler_inc #include "plNetCommon/plNetMsgHandler.h" -#include "hsStlUtils.h" /////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp index 8ee10b3a..cfaa2077 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp @@ -301,7 +301,7 @@ void plNetLinkingMgr::SetEnabled( bool b ) std::string plNetLinkingMgr::GetProperAgeName( const char * ageName ) { plNetClientMgr * nc = plNetClientMgr::GetInstance(); - hsFolderIterator it("dat"PATH_SEPARATOR_STR"*.age", true); + hsFolderIterator it("dat" PATH_SEPARATOR_STR "*.age", true); while ( it.NextFile() ) { std::string work = it.GetFileName(); diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h index 161f57cc..8cf62260 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetLinkingMgr_h_inc #include "HeadSpin.h" -#include "hsStlUtils.h" #include "hsBitVector.h" #include "plNetCommon/plNetServerSessionInfo.h" #include "plNetCommon/plNetCommon.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h index 88b39bd9..622806ab 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetObjectDebugger_inc #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pnKeyedObject/plUoid.h" #include "pnNetCommon/plNetApp.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.h index 35083a36..1ae1739b 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetVoiceList_h #include "HeadSpin.h" -#include "hsStlUtils.h" // // a simple class used by the net client code to hold listenLists and talkLists diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h index 0583cda7..3c2818af 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plClientGuid_h_inc #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pnFactory/plCreatable.h" #include "pnUUID/pnUUID.h" diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp index aebec2f9..01f3aaaa 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp @@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetCommon.h" -#include "hsStlUtils.h" #include "pnUUID/pnUUID.h" #include diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h index b32ac2f1..aac0258f 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h @@ -45,7 +45,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLNETCOMMON_CONSTANTS_ONLY #include "plNetServerSessionInfo.h" -#include "hsStlUtils.h" #endif // PLNETCOMMON_CONSTANTS_ONLY diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp index bfc3fad8..e59d2ccc 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsStream.h" -#include "hsStlUtils.h" #include "plNetCommonHelpers.h" #include "pnNetCommon/plGenericVar.h" #include "plCompression/plZlibCompress.h" diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h index 6e0aafff..a393a366 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h @@ -44,7 +44,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pnFactory/plCreatable.h" class plNetApp; diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp index 89ea7bb7..150bd7f2 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "pnMessage/plMessage.h" #include "plNetServerSessionInfo.h" -#include "hsStlUtils.h" #include "plNetCommon.h" #include "plVault/plVault.h" diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h index 9fcfe1ce..e9c0cb68 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h @@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetServerSessionInfo_h_inc #include "HeadSpin.h" -#include "hsStlUtils.h" +#include + #include "pnFactory/plCreatable.h" #include "pnNetCommon/plNetServers.h" #include "plNetCommon/plSpawnPointInfo.h" diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.h b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.h index 46f92d08..100fe397 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.h @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSpawnPointInfo_h_inc #define plSpawnPointInfo_h_inc -#include "hsStlUtils.h" #include "plString.h" /////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h index ac91f2da..987eb9a5 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h @@ -44,7 +44,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "hsStlUtils.h" #include "hsStream.h" #include "hsBitVector.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h index 5bb77581..691f77f6 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h @@ -50,7 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsStream.h" -#include "hsStlUtils.h" #include "pnNetCommon/pnNetCommon.h" #include "pnFactory/plCreatable.h" #include "pnKeyedObject/plUoid.h" diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h index 294292b6..77671355 100644 --- a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h +++ b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetTransportMember_h #include "HeadSpin.h" -#include "hsStlUtils.h" #include "plNetCommon/plNetMember.h" #include "pnKeyedObject/plKey.h" #include "plString.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plPlates.h b/Sources/Plasma/PubUtilLib/plPipeline/plPlates.h index 6d92eaaa..8513f0e7 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plPlates.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plPlates.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plPlates_h #include "HeadSpin.h" -#include "hsStlUtils.h" +#include + #include "hsColorRGBA.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp index c8cea5da..1204b3fe 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plKeyFinder.h" #include "hsTemplates.h" -#include "hsStlUtils.h" #include "hsResMgr.h" #include "plResManager.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h index ca86b50b..5fe471d2 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h @@ -66,7 +66,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plUoid.h" -#include "hsStlUtils.h" #include class plLocation; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp index 380743c0..21136278 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp @@ -47,7 +47,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plStatusLog/plStatusLog.h" #include "pnFactory/plFactory.h" #include "plFile/plFileUtils.h" -#include "hsStlUtils.h" #include "plVersion.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp index 02c1ad4e..ad7205fd 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp @@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "pnTimer/plTimerCallbackManager.h" -#include "hsStlUtils.h" #include "plScene/plSceneNode.h" #include "pnKeyedObject/hsKeyedObject.h" diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDLDescriptor.h b/Sources/Plasma/PubUtilLib/plSDL/plSDLDescriptor.h index 8cdc077c..12dff703 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDLDescriptor.h +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDLDescriptor.h @@ -48,9 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "HeadSpin.h" - -#include "hsStlUtils.h" #include "plString.h" +#include // // Describes a variable in a state descriptor. diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp b/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp index a88c42f4..004c88c9 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp @@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsStream.h" -#include "hsStlUtils.h" #include "plSDL.h" #include "pnNetCommon/plNetApp.h" #include "pnNetCommon/pnNetCommon.h" diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp b/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp index f32b7ef9..a3ad5f61 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp @@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "hsStlUtils.h" #include "plSDL.h" #include "plFile/hsFiles.h" #include "plFile/plStreamSource.h" diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp index b742b5c2..894e77d9 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "hsTemplates.h" #include "hsStream.h" -#include "hsStlUtils.h" #include "plSDL.h" #include "plNetMessage/plNetMessage.h" diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp index 8465ad08..ddaa182e 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "hsStream.h" #include "hsTimer.h" -#include "hsStlUtils.h" #include "plSDL.h" #include "pnProduct/pnProduct.h" @@ -1186,7 +1185,7 @@ bool plSimpleStateVariable::ConvertTo(plSimpleVarDescriptor* toVar, bool force ) return true; hsLogEntry( plNetApp::StaticDebugMsg( "SSV(%p) converting %s from %s to %s", - this, fVar.GetName(), fVar.GetTypeString(), toVar->GetTypeString() ) ); + this, fVar.GetName().c_str(), fVar.GetTypeString().c_str(), toVar->GetTypeString().c_str() ) ); switch(fVar.GetType()) // original type { diff --git a/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp b/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp index 7c1cf0a3..16a61076 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp @@ -41,7 +41,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsStream.h" #include "plSDL.h" -#include "hsStlUtils.h" #include "pnKeyedObject/plUoid.h" #include "pnNetCommon/plNetApp.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h index b509ce10..90de1ded 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h +++ b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h @@ -46,7 +46,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsTemplates.h" #include "hsBitVector.h" -#include "hsStlUtils.h" class plRelevanceRegion; diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h b/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h index 900ba531..bfb85062 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h +++ b/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h @@ -43,6 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plProfileManagerFull_h_inc #include +#include #include "plProfileManager.h" @@ -128,4 +129,4 @@ public: }; -#endif // plProfileManagerFull_h_inc \ No newline at end of file +#endif // plProfileManagerFull_h_inc diff --git a/Sources/Plasma/PubUtilLib/plStatusLog/plLoggable.cpp b/Sources/Plasma/PubUtilLib/plStatusLog/plLoggable.cpp index 92944f90..6ae717d4 100644 --- a/Sources/Plasma/PubUtilLib/plStatusLog/plLoggable.cpp +++ b/Sources/Plasma/PubUtilLib/plStatusLog/plLoggable.cpp @@ -41,7 +41,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plLoggable.h" #include "plStatusLog.h" -#include "hsStlUtils.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp index b739e962..2c1c7aa6 100644 --- a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp +++ b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp @@ -60,10 +60,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsThread.h" #include "hsTemplates.h" #include "hsTimer.h" -#include "hsStlUtils.h" #include "plFile/plFileUtils.h" #include "plStatusLog.h" -#include "hsStlUtils.h" #include "plFile/hsFiles.h" #include "plUnifiedTime/plUnifiedTime.h" #include "pnProduct/pnProduct.h" diff --git a/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h b/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h index 15a2f894..01f5632c 100644 --- a/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h +++ b/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h @@ -43,6 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PL_STREAM_LOGGER #include +#include #include "hsStream.h" #include "pnNetCommon/plGenericVar.h" diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp index 3af0080c..dff15914 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#include + #include "hsTimer.h" #include "plLayerAnimation.h" #include "pnKeyedObject/plKey.h" diff --git a/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp b/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp index 16e79e9e..6910ba7e 100644 --- a/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp +++ b/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #include "plUnifiedTime.h" -#include "hsStlUtils.h" #include "hsWindows.h" diff --git a/Sources/Plasma/PubUtilLib/plVault/Pch.h b/Sources/Plasma/PubUtilLib/plVault/Pch.h index 9b751c76..47082c0f 100644 --- a/Sources/Plasma/PubUtilLib/plVault/Pch.h +++ b/Sources/Plasma/PubUtilLib/plVault/Pch.h @@ -63,7 +63,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #pragma warning(push, 0) #include #include -#include "hsStlUtils.h" #include "hsStringTokenizer.h" #include "hsGeometry3.h" #include "plSDL/plSDL.h" diff --git a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h index 9956a6ff..4c265451 100644 --- a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h +++ b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plDniCoordinateInfo_h_inc #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pnFactory/plCreatable.h" /////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plVault/plVaultNodeAccess.h b/Sources/Plasma/PubUtilLib/plVault/plVaultNodeAccess.h index 4dd999ef..a2dd1386 100644 --- a/Sources/Plasma/PubUtilLib/plVault/plVaultNodeAccess.h +++ b/Sources/Plasma/PubUtilLib/plVault/plVaultNodeAccess.h @@ -50,12 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #endif #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLVAULT_PLVAULTNODEACCESS_H -// 'Old' system is full of compiler warnings at /W4, so just hide them -#pragma warning(push, 0) -#include "hsStlUtils.h" -#pragma warning(pop) - - /***************************************************************************** * * VaultNode field access strutures diff --git a/Sources/Tools/MaxComponent/plAutoUIParams.cpp b/Sources/Tools/MaxComponent/plAutoUIParams.cpp index a7973d62..2c689d56 100644 --- a/Sources/Tools/MaxComponent/plAutoUIParams.cpp +++ b/Sources/Tools/MaxComponent/plAutoUIParams.cpp @@ -41,6 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#include #include #include "plComponentBase.h"