Convert ReadSafe(W)String* to the plString variants, and remove the now

unneeded _TEMP variants.  All safe strings read from hsStreams are
now plStringified :)

Sources/Plasma/Apps/plClient/winmain.cpp

@@ -891,7 +891,7 @@ static void LoadUserPass (LoginDialogParam *pLoginParam)
 
         if (memcmp(cryptKey, savedKey, sizeof(savedKey)) == 0)
         {
-            temp = stream->ReadSafeString_TEMP();
+            temp = stream->ReadSafeString();
 
             if (!temp.IsEmpty())
             {

Sources/Plasma/CoreLib/hsStream.cpp

@@ -158,7 +158,7 @@ uint32_t hsStream::WriteSafeWStringLong(const plString &string)
     return 0;
 }
 
-plString hsStream::ReadSafeStringLong_TEMP()
+plString hsStream::ReadSafeStringLong()
 {
     plStringBuffer<char> name;
     uint32_t numChars = ReadLE32();
@@ -179,15 +179,7 @@ plString hsStream::ReadSafeStringLong_TEMP()
     return name;
 }
 
-char *hsStream::ReadSafeStringLong()
+plString hsStream::ReadSafeWStringLong()
-{
-    plString name = ReadSafeStringLong_TEMP();
-    char *buff = new char[name.GetSize() + 1];
-    memcpy(buff, name.c_str(), name.GetSize() + 1);
-    return buff;
-}
-
-plString hsStream::ReadSafeWStringLong_TEMP()
 {
     plStringBuffer<uint16_t> retVal;
     uint32_t numChars = ReadLE32();
@@ -209,17 +201,6 @@ plString hsStream::ReadSafeWStringLong_TEMP()
     return plString::FromUtf16(retVal);
 }
 
-wchar_t *hsStream::ReadSafeWStringLong()
-{
-    // Horribly inefficient (convert to UTF-8 and then back to UTF-16), which
-    // is why this should go away completely after plString has taken over
-    // the world^H^H^H^H^HPlasma
-    plStringBuffer<wchar_t> retVal = ReadSafeWStringLong_TEMP().ToWchar();
-    wchar_t *buff = new wchar_t[retVal.GetSize() + 1];
-    memcpy(buff, retVal.GetData(), retVal.GetSize() + 1);
-    return buff;
-}
-
 uint32_t hsStream::WriteSafeString(const plString &string)
 {
     int len = string.GetSize();
@@ -261,7 +242,7 @@ uint32_t hsStream::WriteSafeWString(const plString &string)
     return 0;
 }
 
-plString hsStream::ReadSafeString_TEMP()
+plString hsStream::ReadSafeString()
 {
     plStringBuffer<char> name;
     uint16_t numChars = ReadLE16();
@@ -293,15 +274,7 @@ plString hsStream::ReadSafeString_TEMP()
     return name;
 }
 
-char *hsStream::ReadSafeString()
+plString hsStream::ReadSafeWString()
-{
-    plString name = ReadSafeString_TEMP();
-    char *buff = new char[name.GetSize() + 1];
-    memcpy(buff, name.c_str(), name.GetSize() + 1);
-    return buff;
-}
-
-plString hsStream::ReadSafeWString_TEMP()
 {
     plStringBuffer<uint16_t> retVal;
     uint32_t numChars = ReadLE16();
@@ -326,17 +299,6 @@ plString hsStream::ReadSafeWString_TEMP()
     return plString::FromUtf16(retVal);
 }
 
-wchar_t *hsStream::ReadSafeWString()
-{
-    // Horribly inefficient (convert to UTF-8 and then back to UTF-16), which
-    // is why this should go away completely after plString has taken over
-    // the world^H^H^H^H^HPlasma
-    plStringBuffer<wchar_t> retVal = ReadSafeWString_TEMP().ToWchar();
-    wchar_t *buff = new wchar_t[retVal.GetSize() + 1];
-    memcpy(buff, retVal.GetData(), retVal.GetSize() + 1);
-    return buff;
-}
-
 bool  hsStream::Read4Bytes(void *pv)  // Virtual, faster version in sub classes
 {
     int knt = this->Read(sizeof(uint32_t), pv);

Sources/Plasma/CoreLib/hsStream.h

@@ -55,7 +55,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define hsReadOnlyLoggingStream hsReadOnlyStream
 #define LogRead(byteCount, buffer, desc) Read(byteCount, buffer)
 #define LogReadSafeString() ReadSafeString()
-#define LogReadSafeString_TEMP() ReadSafeString_TEMP()
 #define LogReadSafeStringLong() ReadSafeStringLong();
 #define LogSkip(deltaByteCount, desc) Skip(deltaByteCount)
 #define LogReadLE(value, desc) ReadLE(value)
@@ -126,18 +125,13 @@ public:
 
     uint32_t        WriteSafeStringLong(const plString &string);    // uses 4 bytes for length
     uint32_t        WriteSafeWStringLong(const plString &string);
-    char *          ReadSafeStringLong();
+    plString        ReadSafeStringLong();
-    wchar_t *       ReadSafeWStringLong();
+    plString        ReadSafeWStringLong();
 
     uint32_t        WriteSafeString(const plString &string);        // uses 2 bytes for length
     uint32_t        WriteSafeWString(const plString &string);
-    char *          ReadSafeString();
+    plString        ReadSafeString();
-    wchar_t *       ReadSafeWString();
+    plString        ReadSafeWString();
-
-    plString        ReadSafeStringLong_TEMP();
-    plString        ReadSafeWStringLong_TEMP();
-    plString        ReadSafeString_TEMP();
-    plString        ReadSafeWString_TEMP();
 
     bool            GetToken(char *s, uint32_t maxLen=uint32_t(-1), const char beginComment=kComment, const char endComment=kEolnCode);
     bool            ReadLn(char* s, uint32_t maxLen=uint32_t(-1), const char beginComment=kComment, const char endComment=kEolnCode);

Sources/Plasma/CoreLib/plGeneric.cpp

@@ -144,7 +144,7 @@ int plGeneric::Read(hsStream* stream)
         break;
 
     case kString:
-        fStringVal = stream->ReadSafeWString_TEMP();
+        fStringVal = stream->ReadSafeWString();
         break;
     }
     return stream->GetPosition();

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp

@@ -196,13 +196,13 @@ void    pfGUIButtonMod::Read( hsStream *s, hsResMgr *mgr )
     uint32_t i, count = s->ReadLE32();
     for( i = 0; i < count; i++ )
         fAnimationKeys.Append( mgr->ReadKey( s ) );
-    fAnimName = s->ReadSafeString_TEMP();
+    fAnimName = s->ReadSafeString();
 
     fMouseOverAnimKeys.Reset();
     count = s->ReadLE32();
     for( i = 0; i < count; i++ )
         fMouseOverAnimKeys.Append( mgr->ReadKey( s ) );
-    fMouseOverAnimName = s->ReadSafeString_TEMP();
+    fMouseOverAnimName = s->ReadSafeString();
 
     fNotifyType = s->ReadLE32();
     mgr->ReadKeyNotifyMe( s, new plGenRefMsg( GetKey(), plRefMsg::kOnCreate, -1, kRefDraggable ), plRefFlags::kActiveRef );

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp

@@ -96,7 +96,7 @@ void    pfGUICheckBoxCtrl::Read( hsStream *s, hsResMgr *mgr )
     for( i = 0; i < count; i++ )
         fAnimationKeys.Append( mgr->ReadKey( s ) );
 
-    fAnimName = s->ReadSafeString_TEMP();
+    fAnimName = s->ReadSafeString();
     fChecked = s->ReadBool();
 }
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp

@@ -118,7 +118,7 @@ void    pfGUIColorScheme::Read( hsStream *s )
     fSelBackColor.Read( s );
     fTransparent = s->ReadBOOL();
 
-    fFontFace = s->ReadSafeString_TEMP();
+    fFontFace = s->ReadSafeString();
     s->ReadLE( &fFontSize );
     s->ReadLE( &fFontFlags );
 }

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp

@@ -106,7 +106,7 @@ void    pfGUIKnobCtrl::Read( hsStream *s, hsResMgr *mgr )
     uint32_t i, count = s->ReadLE32();
     for( i = 0; i < count; i++ )
         fAnimationKeys.Append( mgr->ReadKey( s ) );
-    fAnimName = s->ReadSafeString_TEMP();
+    fAnimName = s->ReadSafeString();
 
     fAnimTimesCalced = false;
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp

@@ -93,7 +93,7 @@ void    pfGUIListText::Read( hsStream *s, hsResMgr *mgr )
 {
     pfGUIListElement::Read( s, mgr );
 
-    fText = s->ReadSafeString_TEMP();
+    fText = s->ReadSafeString();
 }
 
 void    pfGUIListText::Write( hsStream *s, hsResMgr *mgr )
@@ -274,7 +274,7 @@ void    pfGUIListTreeRoot::Read( hsStream *s, hsResMgr *mgr )
 {
     pfGUIListElement::Read( s, mgr );
 
-    fText = s->ReadSafeString_TEMP();
+    fText = s->ReadSafeString();
 }
 
 void    pfGUIListTreeRoot::Write( hsStream *s, hsResMgr *mgr )

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp

@@ -108,7 +108,7 @@ void    pfGUIProgressCtrl::Read( hsStream *s, hsResMgr *mgr )
     uint32_t i, count = s->ReadLE32();
     for( i = 0; i < count; i++ )
         fAnimationKeys.Append( mgr->ReadKey( s ) );
-    fAnimName = s->ReadSafeString_TEMP();
+    fAnimName = s->ReadSafeString();
 
     fAnimTimesCalced = false;
 }

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp

@@ -169,7 +169,7 @@ void    pfGUITextBoxMod::Read( hsStream *s, hsResMgr *mgr )
     fUseLocalizationPath = s->ReadBool();
     if (fUseLocalizationPath)
     {
-        fLocalizationPath = s->ReadSafeWString_TEMP();
+        fLocalizationPath = s->ReadSafeWString();
     }
 }
 

Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h

@@ -74,8 +74,8 @@ class pfBackdoorMsg : public plMessage
         virtual void Read(hsStream* s, hsResMgr* mgr) 
         { 
             plMessage::IMsgRead( s, mgr ); 
-            fTarget = s->ReadSafeString_TEMP();
+            fTarget = s->ReadSafeString();
-            fString = s->ReadSafeString_TEMP();
+            fString = s->ReadSafeString();
         }
         
         virtual void Write(hsStream* s, hsResMgr* mgr) 

Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h

@@ -84,7 +84,7 @@ class pfGameGUIMsg : public plMessage
             s->Read(sizeof(buffer), buffer);
             buffer[GAME_GUI_MSG_STRING_SIZE - 1] = 0;
             fString = buffer;
-            fAge = s->ReadSafeString_TEMP();
+            fAge = s->ReadSafeString();
         }
         
         virtual void Write(hsStream* s, hsResMgr* mgr) 

Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h

@@ -188,9 +188,9 @@ class pfKIMsg : public plMessage
         { 
             plMessage::IMsgRead( s, mgr ); 
             s->ReadLE( &fCommand );
-            fUser = s->ReadSafeString_TEMP();
+            fUser = s->ReadSafeString();
             fPlayerID = s->ReadLE32();
-            fString = s->ReadSafeWString_TEMP();
+            fString = s->ReadSafeWString();
             fFlags = s->ReadLE32();
             fDelay = s->ReadLEScalar();
             fValue = s->ReadLE32();

Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.cpp

@@ -49,7 +49,7 @@ void pfMovieEventMsg::Read(hsStream* stream, hsResMgr* mgr)
 
     fReason = (Reason)stream->ReadByte();
 
-    fMovieName = stream->ReadSafeString_TEMP();
+    fMovieName = stream->ReadSafeString();
 }
 
 void pfMovieEventMsg::Write(hsStream* stream, hsResMgr* mgr)

Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp

@@ -2989,7 +2989,7 @@ void plPythonFileMod::Read(hsStream* stream, hsResMgr* mgr)
     plMultiModifier::Read(stream, mgr);
 
     // read in the compile python code (pyc)
-    fPythonFile = stream->ReadSafeString_TEMP();
+    fPythonFile = stream->ReadSafeString();
 
     // then read in the list of receivers that want to be notified
     int nRcvs = stream->ReadLE32();

Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp

@@ -148,7 +148,7 @@ bool plPythonPack::Open()
             for (int i = 0; i < numFiles; i++)
             {
                 // and pack the index into our own data structure
-                plString pythonName = fPackStream->ReadSafeString_TEMP();
+                plString pythonName = fPackStream->ReadSafeString();
                 uint32_t offset = fPackStream->ReadLE32();
 
                 plPackOffsetInfo offsetInfo;

Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.cpp

@@ -169,7 +169,7 @@ void plUoid::Read(hsStream* s)
     s->LogReadLE(&fClassType, "ClassType");
     s->LogReadLE(&fObjectID, "ObjectID");
     s->LogSubStreamPushDesc("ObjectName");
-    fObjectName = s->LogReadSafeString_TEMP();
+    fObjectName = s->LogReadSafeString();
 
     // conditional cloneIDs read
     if (contents & kHasCloneIDs)

Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp

@@ -1351,7 +1351,7 @@ void proVariableEventData::IWriteNumber(hsStream * stream) {
 
 void proVariableEventData::IRead(hsStream* stream, hsResMgr* mgr)
 {
-    fName = stream->ReadSafeString_TEMP();
+    fName = stream->ReadSafeString();
     fDataType = stream->ReadLE32();
     IReadNumber(stream);
     fKey = mgr->ReadKey(stream);
@@ -1379,7 +1379,7 @@ void proVariableEventData::IReadVersion(hsStream* s, hsResMgr* mgr)
     contentFlags.Read(s);
 
     if (contentFlags.IsBitSet(kProVariableName))
-        fName = s->ReadSafeString_TEMP();
+        fName = s->ReadSafeString();
     if (contentFlags.IsBitSet(kProVariableDataType))
         fDataType = s->ReadLE32();
     if (contentFlags.IsBitSet(kProVariableNumber))

Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.cpp

@@ -154,7 +154,7 @@ void    plGenericType::Read(hsStream* s)
     {
     case kString:
     case kAny:
-        fS=s->ReadSafeString_TEMP();
+        fS=s->ReadSafeString();
         break;
     case kBool:
         {int8_t b;
@@ -219,7 +219,7 @@ void    plGenericType::Write(hsStream* s)
 ///////////////////////////////////////////////////
 void    plGenericVar::Read(hsStream* s)
 {
-    fName = s->ReadSafeString_TEMP();
+    fName = s->ReadSafeString();
     fValue.Read(s);
 }
 

Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp

@@ -219,7 +219,7 @@ void    plSoundBuffer::Read( hsStream *s, hsResMgr *mgr )
 
     s->ReadLE( &fFlags );
     s->ReadLE( &fDataLength );
-    fFileName = s->ReadSafeString_TEMP();
+    fFileName = s->ReadSafeString();
 
     s->ReadLE( &fHeader.fFormatTag );
     s->ReadLE( &fHeader.fNumChannels );

Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp

@@ -217,7 +217,7 @@ void plAGAnim::Read(hsStream *stream, hsResMgr *mgr)
     plSynchedObject::Read(stream, mgr);
 
     // read in the name of the animation itself
-    fName = stream->ReadSafeString_TEMP();
+    fName = stream->ReadSafeString();
 
     fStart = stream->ReadLEScalar();
     fEnd = stream->ReadLEScalar();
@@ -412,7 +412,7 @@ void plATCAnim::Read(hsStream *stream, hsResMgr *mgr)
     int numMarkers = stream->ReadLE32();
     for (i = 0; i < numMarkers; i++)
     {
-        plString name = stream->ReadSafeString_TEMP();
+        plString name = stream->ReadSafeString();
         float time = stream->ReadLEFloat();
         fMarkers[name] = time;
     }
@@ -420,7 +420,7 @@ void plATCAnim::Read(hsStream *stream, hsResMgr *mgr)
     int numLoops = stream->ReadLE32();
     for (i = 0; i < numLoops; i++)
     {
-        plString name = stream->ReadSafeString_TEMP();
+        plString name = stream->ReadSafeString();
         float begin = stream->ReadLEScalar();
         float end = stream->ReadLEScalar();
         fLoops[name] = std::pair<float,float>(begin,end);
@@ -681,7 +681,7 @@ void plAgeGlobalAnim::Read(hsStream *stream, hsResMgr *mgr)
 {
     plAGAnim::Read(stream, mgr);
 
-    fGlobalVarName = stream->ReadSafeString_TEMP();
+    fGlobalVarName = stream->ReadSafeString();
 }
 
 // Write ---------------------------------------------------

Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.cpp

@@ -138,7 +138,7 @@ void plAGApplicator::Read(hsStream *stream, hsResMgr *mgr)
 
     fEnabled = stream->ReadBool();
     fChannel = nil; // Whatever is reading this applicator in should know what channel to assign it
-    fChannelName = stream->ReadSafeString_TEMP();
+    fChannelName = stream->ReadSafeString();
 }
 
 // IGETxI

Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.cpp

@@ -119,7 +119,7 @@ void plAGChannel::Read(hsStream *stream, hsResMgr *mgr)
 {
     plCreatable::Read(stream, mgr);
 
-    fName = stream->ReadSafeString_TEMP();
+    fName = stream->ReadSafeString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp

@@ -269,7 +269,7 @@ void plAGModifier::Read(hsStream *stream, hsResMgr *mgr)
     plSingleModifier::Read(stream, mgr);
 
     // read in the name of the modifier
-    fChannelName = stream->ReadSafeString_TEMP();
+    fChannelName = stream->ReadSafeString();
 }
 
 // WRITE

Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp

@@ -741,7 +741,7 @@ void plAnimStage::DumpDebug(bool active, int &x, int &y, int lineHeight, plDebug
 // READ
 void plAnimStage::Read(hsStream *stream, hsResMgr *mgr)
 {
-    fAnimName = stream->ReadSafeString_TEMP();
+    fAnimName = stream->ReadSafeString();
     fNotify = stream->ReadByte();
     fForwardType = (ForwardType)stream->ReadLE32();
     fBackType = (BackType)stream->ReadLE32();

Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp

@@ -1756,7 +1756,7 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
     fMeshKeys.push_back(mgr->ReadKey(stream));
 
     // read the root name string
-    fRootName = stream->ReadSafeString_TEMP();
+    fRootName = stream->ReadSafeString();
 
     // read in the brains
     int nBrains = stream->ReadLE32();
@@ -1821,9 +1821,9 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
     fPhysHeight = stream->ReadLEFloat();
     fPhysWidth = stream->ReadLEFloat();
 
-    fAnimationPrefix = stream->ReadSafeString_TEMP();
+    fAnimationPrefix = stream->ReadSafeString();
-    fBodyAgeName = stream->ReadSafeString_TEMP();
+    fBodyAgeName = stream->ReadSafeString();
-    fBodyFootstepSoundPage = stream->ReadSafeString_TEMP();
+    fBodyFootstepSoundPage = stream->ReadSafeString();
 
     plgDispatch::Dispatch()->RegisterForExactType(plAvatarStealthModeMsg::Index(), GetKey());
 }

Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp

@@ -160,14 +160,14 @@ void plClothingItem::Read(hsStream *s, hsResMgr *mgr)
 {
     hsKeyedObject::Read(s, mgr);
 
-    fName = s->ReadSafeString_TEMP();
+    fName = s->ReadSafeString();
     fGroup = s->ReadByte();
     fType = s->ReadByte();
     fTileset = s->ReadByte();
     fSortOrder = s->ReadByte();
 
-    fCustomText = s->ReadSafeString_TEMP();
+    fCustomText = s->ReadSafeString();
-    fDescription = s->ReadSafeString_TEMP();
+    fDescription = s->ReadSafeString();
     if (s->ReadBool())
         mgr->ReadKeyNotifyMe(s, new plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1), plRefFlags::kActiveRef); // thumbnail
 
@@ -175,7 +175,7 @@ void plClothingItem::Read(hsStream *s, hsResMgr *mgr)
     int i, j;
     for (i = 0; i < tileCount; i++)
     {
-        fElementNames.Append(s->ReadSafeString_TEMP());
+        fElementNames.Append(s->ReadSafeString());
 
         int layerCount = s->ReadByte();
         for (j = 0; j < layerCount; j++)
@@ -375,10 +375,10 @@ void plClothingBase::Read(hsStream* s, hsResMgr* mgr)
 {
     hsKeyedObject::Read(s, mgr);
 
-    fName = s->ReadSafeString_TEMP();
+    fName = s->ReadSafeString();
     if (s->ReadBool())
         mgr->ReadKeyNotifyMe(s, new plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1), plRefFlags::kActiveRef);
-    fLayoutName = s->ReadSafeString_TEMP();
+    fLayoutName = s->ReadSafeString();
 }
 
 void plClothingBase::Write(hsStream* s, hsResMgr* mgr)

Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp

@@ -465,7 +465,7 @@ void plAvAnimTask::LeaveAge(plArmatureMod *avatar)
 // READ
 void plAvAnimTask::Read(hsStream *stream, hsResMgr *mgr)
 {
-    fAnimName = stream->ReadSafeString_TEMP();
+    fAnimName = stream->ReadSafeString();
     fInitialBlend = stream->ReadLEScalar();
     fTargetBlend = stream->ReadLEScalar();
     fFadeSpeed = stream->ReadLEScalar();
@@ -802,8 +802,8 @@ void plAvOneShotLinkTask::Write(hsStream *stream, hsResMgr *mgr)
 void plAvOneShotLinkTask::Read(hsStream *stream, hsResMgr *mgr)
 {
     plAvOneShotTask::Read(stream, mgr);
-    fAnimName = stream->ReadSafeString_TEMP();
+    fAnimName = stream->ReadSafeString();
-    fMarkerName = stream->ReadSafeString_TEMP();
+    fMarkerName = stream->ReadSafeString();
 }
 
 void plAvOneShotLinkTask::SetMarkerName(const plString &name)

Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp

@@ -398,7 +398,7 @@ void plCoopCoordinator::Read(hsStream *stream, hsResMgr *mgr)
     else
         fGuestAcceptMsg = nil;
 
-    fSynchBone = stream->ReadSafeString_TEMP();
+    fSynchBone = stream->ReadSafeString();
     fAutoStartGuest = stream->ReadBool();
     
     fInitiatorID = fHostBrain->GetInitiatorID();

Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp

@@ -128,8 +128,8 @@ void plNPCSpawnMod::Read(hsStream *stream, hsResMgr *mgr)
 {
     plSingleModifier::Read(stream, mgr);
 
-    fModelName = stream->ReadSafeString_TEMP();
+    fModelName = stream->ReadSafeString();
-    fAccountName = stream->ReadSafeString_TEMP();
+    fAccountName = stream->ReadSafeString();
     fAutoSpawn = stream->ReadBool();
     if(stream->ReadBool())
         fNotify = plNotifyMsg::ConvertNoRef(mgr->ReadCreatable(stream));

Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp

@@ -154,7 +154,7 @@ void plOneShotMod::Read(hsStream *stream, hsResMgr *mgr)
     plMultiModifier::Read(stream, mgr);
 
     // read in the name of the animation itself
-    fAnimName = stream->ReadSafeString_TEMP();
+    fAnimName = stream->ReadSafeString();
     fSeekDuration = stream->ReadLEScalar();
     fDrivable = stream->ReadBool();
     fReversable = stream->ReadBool();

Sources/Plasma/PubUtilLib/plClientResMgr/plClientResMgr.cpp

@@ -89,7 +89,7 @@ void plClientResMgr::ILoadResources(const plFileName& resfile)
                 for (int i = 0; i < num_resources; i++) {
                     plMipmap* res_data = NULL;
                     uint32_t res_size = 0;
-                    plString res_name = in.ReadSafeStringLong_TEMP();
+                    plString res_name = in.ReadSafeStringLong();
                     plString res_type = res_name.Substr(res_name.GetSize() - 4, 4);
 
                     // Version 1 doesn't encode format, so we'll try some simple

Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp

@@ -68,7 +68,7 @@ void plAIMsg::Read(hsStream* stream, hsResMgr* mgr)
 {
     plMessage::IMsgRead(stream, mgr);
 
-    fBrainUserStr = stream->ReadSafeString_TEMP();
+    fBrainUserStr = stream->ReadSafeString();
 }
 
 void plAIMsg::Write(hsStream* stream, hsResMgr* mgr)

Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp

@@ -86,8 +86,8 @@ void plAnimCmdMsg::Read(hsStream* stream, hsResMgr* mgr)
     stream->ReadLE(&fSpeedChangeRate);
     stream->ReadLE(&fTime);
 
-    fAnimName = stream->ReadSafeString_TEMP();
+    fAnimName = stream->ReadSafeString();
-    fLoopName = stream->ReadSafeString_TEMP();
+    fLoopName = stream->ReadSafeString();
 }
 
 void plAnimCmdMsg::Write(hsStream* stream, hsResMgr* mgr)
@@ -134,7 +134,7 @@ void plAGCmdMsg::Read(hsStream* stream, hsResMgr* mgr)
     stream->ReadLE(&fAmp);
     stream->ReadLE(&fAmpRate);
 
-    fAnimName = stream->ReadSafeString_TEMP();
+    fAnimName = stream->ReadSafeString();
 }
 
 void plAGCmdMsg::Write(hsStream* stream, hsResMgr* mgr)

Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp

@@ -236,7 +236,7 @@ void plAvSeekMsg::Read(hsStream *stream, hsResMgr *mgr)
 
     fDuration = stream->ReadLEScalar();
     fSmartSeek = stream->ReadBool();
-    fAnimName = stream->ReadSafeString_TEMP();
+    fAnimName = stream->ReadSafeString();
     fAlignType = static_cast<plAvAlignment>(stream->ReadLE16());
     fNoSeek = stream->ReadBool();
     fFlags = stream->ReadByte();
@@ -313,7 +313,7 @@ void plAvOneShotMsg::Read(hsStream *stream, hsResMgr *mgr)
 {
     plAvSeekMsg::Read(stream, mgr);
 
-    fAnimName = stream->ReadSafeString_TEMP();
+    fAnimName = stream->ReadSafeString();
     fDrivable = stream->ReadBool();
     fReversible = stream->ReadBool();
 }

Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.cpp

@@ -216,7 +216,7 @@ void    plDynamicTextMsg::Read( hsStream *s, hsResMgr *mgr )
     fClearColor.Read( s );
     fColor.Read( s );
 
-    fString = s->ReadSafeWString_TEMP();
+    fString = s->ReadSafeWString();
     fImageKey = mgr->ReadKey( s );
 
     s->ReadLE( &fFlags );
@@ -301,7 +301,7 @@ void plDynamicTextMsg::ReadVersion(hsStream* s, hsResMgr* mgr)
     if (contentFlags.IsBitSet(kDynTextMsgColor))
         fColor.Read( s );
     if (contentFlags.IsBitSet(kDynTextMsgString))
-        fString = s->ReadSafeWString_TEMP();
+        fString = s->ReadSafeWString();
     if (contentFlags.IsBitSet(kDynTextMsgImageKey))
         fImageKey = mgr->ReadKey( s );
     if (contentFlags.IsBitSet(kDynTextMsgFlags))

Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h

@@ -102,9 +102,9 @@ class plInputIfaceMgrMsg : public plMessage
             plMessage::IMsgRead( s, mgr ); 
             s->ReadLE( &fCommand );
             s->ReadLE( &fPageID );
-            ageName = s->ReadSafeString_TEMP();
+            ageName = s->ReadSafeString();
-            ageFileName = s->ReadSafeString_TEMP();
+            ageFileName = s->ReadSafeString();
-            spawnPoint = s->ReadSafeString_TEMP();
+            spawnPoint = s->ReadSafeString();
             fAvKey = mgr->ReadKey(s);
         }
         

Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp

@@ -79,7 +79,7 @@ void plLinkToAgeMsg::Read(hsStream* stream, hsResMgr* mgr)
     plMessage::IMsgRead( stream, mgr );
     fFlags = stream->ReadByte();
     fAgeLink.Read( stream, mgr );
-    fLinkInAnimName = stream->ReadSafeString_TEMP();
+    fLinkInAnimName = stream->ReadSafeString();
 }
 
 void plLinkToAgeMsg::Write(hsStream* stream, hsResMgr* mgr) 
@@ -106,7 +106,7 @@ void plLinkToAgeMsg::ReadVersion(hsStream* s, hsResMgr* mgr)
     if ( contentFlags.IsBitSet( kLinkToAgeAgeLinkStruct ) )
         fAgeLink.Read( s, mgr );
     if ( contentFlags.IsBitSet( kLinkToAgeLinkAnimName ) )
-        fLinkInAnimName = s->ReadSafeString_TEMP();
+        fLinkInAnimName = s->ReadSafeString();
 }
 
 void plLinkToAgeMsg::WriteVersion(hsStream* s, hsResMgr* mgr)   

Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.cpp

@@ -99,7 +99,7 @@ void plLoadAgeMsg::ReadVersion(hsStream* s, hsResMgr* mgr)
     if (contentFlags.IsBitSet(kLoadAgeAgeName))
     {
         // read agename
-        fAgeFilename = s->ReadSafeString_TEMP();
+        fAgeFilename = s->ReadSafeString();
     }
 
     if (contentFlags.IsBitSet(kLoadAgeUnload))

Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp

@@ -93,7 +93,7 @@ void plLoadAvatarMsg::Read(hsStream* stream, hsResMgr* mgr)
     {
         fInitialTask = plAvTask::ConvertNoRef(mgr->ReadCreatable(stream));
     }
-    fUserStr = stream->ReadSafeString_TEMP();
+    fUserStr = stream->ReadSafeString();
 }
 
 void plLoadAvatarMsg::Write(hsStream *stream, hsResMgr *mgr)
@@ -132,7 +132,7 @@ void plLoadAvatarMsg::ReadVersion(hsStream* stream, hsResMgr* mgr)
         fSpawnPoint = mgr->ReadKey(stream);
 
     if (contentFlags.IsBitSet(kLoadAvatarMsgUserStr))
-        fUserStr = stream->ReadSafeString_TEMP();
+        fUserStr = stream->ReadSafeString();
 }
 
 void plLoadAvatarMsg::WriteVersion(hsStream* stream, hsResMgr* mgr)

Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.cpp

@@ -74,7 +74,7 @@ void plOneShotCallbacks::Read(hsStream* stream, hsResMgr* mgr)
     fCallbacks.reserve(size);
     for (int i = 0; i < size; i++)
     {
-        plString marker = stream->ReadSafeString_TEMP();
+        plString marker = stream->ReadSafeString();
         plKey receiver = mgr->ReadKey(stream);
         int16_t user = stream->ReadLE16();
 

Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp

@@ -59,7 +59,7 @@ plCloneSpawnModifier::plCloneSpawnModifier() : fExportTime(false)
 
 void plCloneSpawnModifier::Read(hsStream *s, hsResMgr *mgr)
 {
-    fTemplateName = s->ReadSafeString_TEMP();
+    fTemplateName = s->ReadSafeString();
     plSingleModifier::Read(s, mgr);
 }
 

Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp

@@ -439,7 +439,7 @@ void plDynamicEnvMap::Read(hsStream* s, hsResMgr* mgr)
     nVis = s->ReadLE32();
     for( i = 0; i < nVis; i++)
     {
-        plKey key = plKeyFinder::Instance().StupidSearch("", "", plVisRegion::Index(), s->ReadSafeString_TEMP());
+        plKey key = plKeyFinder::Instance().StupidSearch("", "", plVisRegion::Index(), s->ReadSafeString());
         if (key)
             hsgResMgr::ResMgr()->AddViaNotify(key, new plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, kRefVisSet), plRefFlags::kActiveRef);
     }
@@ -928,7 +928,7 @@ void plDynamicCamMap::Read(hsStream* s, hsResMgr* mgr)
     nVis = s->ReadLE32();
     for( i = 0; i < nVis; i++)
     {
-        plKey key = plKeyFinder::Instance().StupidSearch("", "", plVisRegion::Index(), s->ReadSafeString_TEMP());
+        plKey key = plKeyFinder::Instance().StupidSearch("", "", plVisRegion::Index(), s->ReadSafeString());
         if (key)
             hsgResMgr::ResMgr()->AddViaNotify(key, new plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, kRefVisSet), plRefFlags::kActiveRef);
     }

Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp

@@ -133,10 +133,10 @@ void plPageInfo::Read( hsStream *s )
     if (version >= 5)
     {
         fLocation.Read( s );
-        fAge = s->ReadSafeString_TEMP();
+        fAge = s->ReadSafeString();
         if (version < 6)
-            s->ReadSafeString_TEMP(); // fChapter was never used, and always "District".
+            s->ReadSafeString(); // fChapter was never used, and always "District".
-        fPage = s->ReadSafeString_TEMP();
+        fPage = s->ReadSafeString();
 
         s->ReadLE( &fMajorVersion );
 

Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp

@@ -403,7 +403,7 @@ bool plStateDataRecord::ReadStreamHeader(hsStream* s, plString* name, int* versi
         return false;       // bad version
     }
 
-    *name = s->ReadSafeString_TEMP();
+    *name = s->ReadSafeString();
     *version = s->ReadLE16();
     
     if (objUoid)

Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp

@@ -94,7 +94,7 @@ bool plStateDescriptor::Read(hsStream* s)
 
     IDeInit();
 
-    fName = s->ReadSafeString_TEMP();
+    fName = s->ReadSafeString();
 
     uint16_t version=s->ReadLE16();
     fVersion=version;

Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp

@@ -107,7 +107,7 @@ public:
 void plStateVarNotificationInfo::Read(hsStream* s, uint32_t readOptions)
 {
     uint8_t saveFlags=s->ReadByte();  // unused
-    plString hint=s->ReadSafeString_TEMP();
+    plString hint=s->ReadSafeString();
     if (!hint.IsNull() && !(readOptions & plSDL::kSkipNotificationInfo))
         fHintString = hint;
 }

Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp

@@ -157,7 +157,7 @@ bool plVarDescriptor::Read(hsStream* s)
         return false;
     }
 
-    fName=s->ReadSafeString_TEMP();
+    fName=s->ReadSafeString();
 
     plMsgStdStringHelper::Peek(fDisplayOptions, s);
 
@@ -165,7 +165,7 @@ bool plVarDescriptor::Read(hsStream* s)
 
     fType=(Type)s->ReadByte();
 
-    fDefault = s->ReadSafeString_TEMP();
+    fDefault = s->ReadSafeString();
 
     fFlags = s->ReadLE32();
     return true;
@@ -372,7 +372,7 @@ bool plSDVarDescriptor::Read(hsStream* s)
     if (!plVarDescriptor::Read(s))
         return false;
 
-    plString sdName=s->ReadSafeString_TEMP();
+    plString sdName=s->ReadSafeString();
     uint16_t version = s->ReadLE16();
     plStateDescriptor* sd=plSDLMgr::GetInstance()->FindDescriptor(sdName, version);
     hsAssert( sd, plString::Format("Failed to find sdl descriptor: %s,%d. Missing legacy descriptor?", sdName.c_str(), version ).c_str() );

Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp

@@ -736,7 +736,7 @@ void plLayerSDLAnimation::Read(hsStream* s, hsResMgr* mgr)
 {
     plLayerAnimationBase::Read(s, mgr);
 
-    fVarName = s->ReadSafeString_TEMP();
+    fVarName = s->ReadSafeString();
 }
 
 void plLayerSDLAnimation::Write(hsStream* s, hsResMgr* mgr)

Sources/Tools/MaxComponent/plMultistageStage.cpp

@@ -96,7 +96,7 @@ plString plBaseStage::GetName()
 void plBaseStage::Read(hsStream *stream)
 {
     stream->ReadLE16();
-    fName = stream->ReadSafeString_TEMP();
+    fName = stream->ReadSafeString();
 }
 
 void plBaseStage::Write(hsStream *stream)
@@ -137,7 +137,7 @@ void plStandardStage::Read(hsStream *stream)
 
     uint16_t version = stream->ReadLE16();
 
-    fAnimName = stream->ReadSafeString_TEMP();
+    fAnimName = stream->ReadSafeString();
     fNumLoops = stream->ReadLE32();
     fLoopForever = stream->ReadBool();
     fForward = stream->ReadByte();