OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 03:09:13 +00:00
Code Releases Activity

Convert many of the now-deprecated plString::Format calls to plFormat

Browse Source
This commit is contained in:
Michael Hansen
2014-05-24 23:46:54 -07:00
parent 89a9bbb3c4
commit 1debf8180b
98 changed files with 404 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp
View File

@ -280,7 +280,7 @@ int plMsgStdStringHelper::Peek(std::string & stringref, hsStream* stream, const
stringref.resize(strlen);
if (strlen){
stream->LogRead(strlen,(void*)stringref.data(),"StdString");
stream->LogStringString(plString::Format("Value: %s", stringref.data()).c_str());
stream->LogStringString(plFormat("Value: {}", stringref).c_str());
}
}
else
@ -302,7 +302,7 @@ int plMsgStdStringHelper::PeekBig(std::string & stringref, hsStream* stream, co
stringref.resize(bufsz);
if (bufsz){
stream->LogRead(bufsz,(void*)stringref.data(),"StdString");
stream->LogStringString(plString::Format("Value: %s", stringref.data()).c_str());
stream->LogStringString(plFormat("Value: {}", stringref).c_str());
}
}
else
@ -357,7 +357,7 @@ int plMsgCStringHelper::Peek(char *& str, hsStream* stream, const uint32_t peekO
str[strlen] = '\0';
if (strlen) {
stream->LogRead(strlen,str,"CString");
stream->LogStringString(plString::Format("Value: %s",str).c_str());
stream->LogStringString(plFormat("Value: {}", str).c_str());
}
}
}

9
Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.cpp
View File

@ -237,15 +237,16 @@ plString plGenericType::GetAsString() const
switch (fType)
{
case kInt :
return plString::Format("%d", fI);
return plFormat("{}", fI);
case kBool :
case kUInt :
return plString::Format("%u", fType==kBool?fB:fU);
return plFormat("{}", fB ? 1 : 0);
case kUInt:
return plFormat("{}", fU);
case kFloat :
case kDouble :
return plString::Format("%f", fType==kDouble?fD:fF);
case kChar :
return plString::Format("%c", fC);
return plFormat("{}", fC);
case kAny :
case kString :
return fS;

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

@ -63,7 +63,7 @@ plString GetTextAddr(uint32_t binAddr)
{
in_addr in;
memcpy(&in, &binAddr, sizeof(binAddr));
return plString::Format("%s", inet_ntoa(in));
return plString::FromUtf8(inet_ntoa(in));
}
// NOTE: On Win32, WSAStartup() must be called before GetBinAddr() will work.