Skip to content

Commit b0a5deb

Browse files
TracerDSTracerDS
committed
Replaced SString() with SString{}
1 parent 63a3871 commit b0a5deb

File tree

11 files changed

+27
-29
lines changed

11 files changed

+27
-29
lines changed

‎Server/mods/deathmatch/logic/CAccessControlListRight.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@ SString CAccessControlListRight::GetAttributeValue(const SString& strAttributeNa
9292
else
9393
{
9494
SString* pResult = MapFind(m_ExtraAttributeMap, strAttributeName);
95-
return pResult ? *pResult : SString();
95+
return pResult ? *pResult : SString{};
9696
}
9797
}

‎Server/mods/deathmatch/logic/CConsoleCommands.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,9 +1587,9 @@ bool DoAclRequest(CConsole* pConsole, const char* szArguments, CClient* pClient,
15871587

15881588
std::vector<SString> parts;
15891589
SStringX(szArguments).Split(" ", parts);
1590-
const SString& strAction = parts.size() > 0 ? parts[0] : SString();
1591-
const SString& strResourceName = parts.size() > 1 ? parts[1] : SString();
1592-
const SString& strRightName = parts.size() > 2 ? parts[2] : SString();
1590+
const SString& strAction = parts.size() > 0 ? parts[0] : SString{};
1591+
const SString& strResourceName = parts.size() > 1 ? parts[1] : SString{};
1592+
const SString& strRightName = parts.size() > 2 ? parts[2] : SString{};
15931593

15941594
bool bList = strAction == "list";
15951595
bool bAllow = strAction == "allow";
@@ -1635,8 +1635,6 @@ bool DoAclRequest(CConsole* pConsole, const char* szArguments, CClient* pClient,
16351635
return false;
16361636
}
16371637

1638-
#include <filesystem>
1639-
16401638
bool CConsoleCommands::AclRequest(CConsole* pConsole, const char* szArguments, CClient* pClient, CClient* pEchoClient)
16411639
{
16421640
BeginConsoleOutputCapture(pEchoClient);
@@ -1659,8 +1657,8 @@ bool CConsoleCommands::AuthorizeSerial(CConsole* pConsole, const char* szArgumen
16591657

16601658
std::vector<SString> parts;
16611659
SStringX(szArguments).Split(" ", parts);
1662-
const SString& strAccountName = parts.size() > 0 ? parts[0] : SString();
1663-
const SString& strAction = parts.size() > 1 ? parts[1] : SString();
1660+
const SString& strAccountName = parts.size() > 0 ? parts[0] : SString{};
1661+
const SString& strAction = parts.size() > 1 ? parts[1] : SString{};
16641662

16651663
bool bList = strAction == "list";
16661664
bool bAllow = strAction == "";

‎Server/mods/deathmatch/logic/CGame.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ bool CGame::Start(int iArgumentCount, char* szArguments[])
709709
if (m_pMainConfig->IsHTTPEnabled())
710710
{
711711
// Slight hack for internal HTTPD: Listen on all IPs if multiple IPs declared
712-
SString strUseIP = strServerIP == strServerIPList ? strServerIP : SString("");
712+
SString strUseIP = strServerIP == strServerIPList ? strServerIP : SString{};
713713
if (!m_pHTTPD->StartHTTPD(strUseIP, m_pMainConfig->GetHTTPPort()))
714714
{
715715
CLogger::ErrorPrintf("Could not start HTTP server on interface '%s' and port '%u'!\n", strUseIP.c_str(), m_pMainConfig->GetHTTPPort());

‎Server/mods/deathmatch/logic/CPerfStat.BandwidthUsage.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ void CPerfStatBandwidthUsageImpl::GetStats(CPerfStatResult* pResult, const std::
626626
row[c++] = CPerfStatManager::GetScaledByteString(item.llGameRecv);
627627
row[c++] = CPerfStatManager::GetScaledByteString(item.llGameSent);
628628
if (bShowSentLoss[t])
629-
row[c++] = item.llGameResent ? CPerfStatManager::GetPercentString(item.llGameResent, item.llGameSent) : SString();
629+
row[c++] = item.llGameResent ? CPerfStatManager::GetPercentString(item.llGameResent, item.llGameSent) : SString{};
630630
row[c++] = CPerfStatManager::GetScaledByteString(item.llHttpSent);
631631
if (bShowBlocked[t])
632632
row[c++] = CPerfStatManager::GetScaledByteString(item.llGameRecvBlocked);

‎Server/mods/deathmatch/logic/CPerfStat.FunctionTiming.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,10 @@ void CPerfStatFunctionTimingImpl::GetStats(CPerfStatResult* pResult, const std::
421421
row[c++] = SString("%2.0f ms", prev5s.fPeakMs);
422422
row[c++] = SString("%2.0f ms (%s)", prev5s.fResBiggestMs, *prev5s.strResBiggestMsName);
423423

424-
row[c++] = prev5s.uiTotalBytes < 10 ? SString() : SString("%s", *CPerfStatManager::GetScaledByteString(prev5s.uiTotalBytes));
424+
row[c++] = prev5s.uiTotalBytes < 10 ? SString{} : SString("%s", *CPerfStatManager::GetScaledByteString(prev5s.uiTotalBytes));
425425
// row[c++] = prev5s.uiPeakBytes < 10 ? "" : SString ( "%s ", *CPerfStatManager::GetScaledByteString( prev5s.uiPeakBytes ) );
426426
row[c++] = prev5s.uiResBiggestBytes < 10
427-
? SString()
427+
? SString{}
428428
: SString("%s (%s)", *CPerfStatManager::GetScaledByteString(prev5s.uiResBiggestBytes), *prev5s.strResBiggestBytesName);
429429
}
430430

@@ -434,10 +434,10 @@ void CPerfStatFunctionTimingImpl::GetStats(CPerfStatResult* pResult, const std::
434434
row[c++] = SString("%2.0f ms", prev60s.fPeakMs);
435435
row[c++] = SString("%2.0f ms (%s)", prev60s.fResBiggestMs, *prev60s.strResBiggestMsName);
436436

437-
row[c++] = prev60s.uiTotalBytes < 10 ? SString() : SString("%s ", *CPerfStatManager::GetScaledByteString(prev60s.uiTotalBytes));
437+
row[c++] = prev60s.uiTotalBytes < 10 ? SString{} : SString("%s ", *CPerfStatManager::GetScaledByteString(prev60s.uiTotalBytes));
438438
// row[c++] = prev60s.uiPeakBytes < 10 ? "" : SString ( "%s ", *CPerfStatManager::GetScaledByteString( prev60s.uiPeakBytes ) );
439439
row[c++] = prev60s.uiResBiggestBytes < 10
440-
? SString()
440+
? SString{}
441441
: SString("%s (%s)", *CPerfStatManager::GetScaledByteString(prev60s.uiResBiggestBytes), *prev60s.strResBiggestBytesName);
442442
}
443443
}

‎Server/mods/deathmatch/logic/CPerfStat.LuaMemory.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,12 +321,12 @@ void CPerfStatLuaMemoryImpl::GetLuaMemoryStats(CPerfStatResult* pResult, const s
321321

322322
row[c++] = SString("%d KB", LuaMainMemory.Current);
323323
row[c++] = SString("%d KB", LuaMainMemory.Max);
324-
row[c++] = !LuaMainMemory.OpenXMLFiles ? SString("-") : SString("%d", LuaMainMemory.OpenXMLFiles);
325-
row[c++] = !LuaMainMemory.OpenFiles ? SString("-") : SString("%d", LuaMainMemory.OpenFiles);
326-
row[c++] = !LuaMainMemory.Refs ? SString("-") : SString("%d", LuaMainMemory.Refs);
327-
row[c++] = !LuaMainMemory.TimerCount ? SString("-") : SString("%d", LuaMainMemory.TimerCount);
328-
row[c++] = !LuaMainMemory.ElementCount ? SString("-") : SString("%d", LuaMainMemory.ElementCount);
329-
row[c++] = !LuaMainMemory.TextDisplayCount ? SString("-") : SString("%d", LuaMainMemory.TextDisplayCount);
330-
row[c++] = !LuaMainMemory.TextItemCount ? SString("-") : SString("%d", LuaMainMemory.TextItemCount);
324+
row[c++] = !LuaMainMemory.OpenXMLFiles ? SString{"-"} : SString("%d", LuaMainMemory.OpenXMLFiles);
325+
row[c++] = !LuaMainMemory.OpenFiles ? SString{"-"} : SString("%d", LuaMainMemory.OpenFiles);
326+
row[c++] = !LuaMainMemory.Refs ? SString{"-"} : SString("%d", LuaMainMemory.Refs);
327+
row[c++] = !LuaMainMemory.TimerCount ? SString{"-"} : SString("%d", LuaMainMemory.TimerCount);
328+
row[c++] = !LuaMainMemory.ElementCount ? SString{"-"} : SString("%d", LuaMainMemory.ElementCount);
329+
row[c++] = !LuaMainMemory.TextDisplayCount ? SString{"-"} : SString("%d", LuaMainMemory.TextDisplayCount);
330+
row[c++] = !LuaMainMemory.TextItemCount ? SString{"-"} : SString("%d", LuaMainMemory.TextItemCount);
331331
}
332332
}

‎Server/mods/deathmatch/logic/CPerfStat.LuaTiming.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,9 +430,9 @@ void CPerfStatLuaTimingImpl::OutputTimingBlock(CPerfStatResult* pResult, const C
430430

431431
double total_p = total_s / double(threshList[i]) * 100;
432432

433-
row[c++] = total_p > 0.005 ? SString("%2.2f%%", total_p) : SString("-");
434-
row[c++] = total_s > 0.0005 ? SString("%2.3f", total_s) : SString("-");
435-
row[c++] = p->prev.calls > 0 ? SString("%d", p->prev.calls) : SString();
433+
row[c++] = total_p > 0.005 ? SString("%2.2f%%", total_p) : SString{"-"};
434+
row[c++] = total_s > 0.0005 ? SString("%2.3f", total_s) : SString{"-"};
435+
row[c++] = p->prev.calls > 0 ? SString("%d", p->prev.calls) : SString{};
436436
row[c++] = avg_s > 0.0005 ? SString("%2.3f", avg_s).c_str() : bSubBlock ? "-" : "";
437437
row[c++] = max_s > 0.0005 ? SString("%2.3f", max_s).c_str() : bSubBlock ? "-" : "";
438438
}

‎Server/mods/deathmatch/logic/CResourceManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -840,11 +840,11 @@ void CResourceManager::ProcessQueue()
840840
}
841841
else if (sItem.eQueue == QUEUE_REFRESH)
842842
{
843-
Refresh(false, sItem.pResource ? sItem.pResource->GetName() : SString());
843+
Refresh(false, sItem.pResource ? sItem.pResource->GetName() : SString{});
844844
}
845845
else if (sItem.eQueue == QUEUE_REFRESHALL)
846846
{
847-
Refresh(true, sItem.pResource ? sItem.pResource->GetName() : SString());
847+
Refresh(true, sItem.pResource ? sItem.pResource->GetName() : SString{});
848848
}
849849
}
850850
}

‎Server/mods/deathmatch/logic/luadefs/CLuaDefs.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void CLuaDefs::DidUseFunction(lua_CFunction f, lua_State* luaVM)
231231
{
232232
CResource* pResource = g_pGame->GetResourceManager()->GetResourceFromLuaState(info.luaVM);
233233
CPerfStatFunctionTiming::GetSingleton()->UpdateTiming(
234-
pResource ? pResource->GetName() : SString("unknown"),
234+
pResource ? pResource->GetName() : SString{"unknown"},
235235
pFunction->GetName().c_str(), elapsedTime, uiDeltaBytes);
236236
}
237237
}

‎Server/mods/deathmatch/utils/CFunctionUseLogger.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void CFunctionUseLogger::OnFunctionUse(lua_State* luaVM, const char* szFunctionN
7474
return;
7575

7676
CResource* pResource = g_pGame->GetResourceManager()->GetResourceFromLuaState(luaVM);
77-
SString strResourceName = pResource ? pResource->GetName() : SString("Unknown");
77+
SString strResourceName = pResource ? pResource->GetName() : SString{"Unknown"};
7878

7979
SString strKey("%s-%s", szFunctionName, strResourceName.c_str());
8080

0 commit comments

Comments
 (0)