mirrors/0ad
1
0 Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-11-08 12:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use fmt::format for LOGWARNING

Browse Source 
The format string can be checked at compile time. It will be easier to
transition to `std::format`.
This commit is contained in:
phosit committed 2026-10-05 20:29:25 +02:00
1 parent d686708c92
commit ba158aa3ff
42 files changed
+160 -90
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

source/gui/GUIStringConversions.cpp
+15 -9
View File
@@ -82,20 +82,22 @@ bool CGUI::ParseString<CRect>(const CGUI*, const CStrW& Value, CRect& Output)
{
if (stream.eof())
{
LOGWARNING("Too few CRect parameters (min %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
LOGWARNING("Too few CRect parameters (min {}). Your input: '{}'", NUM_COORDS,
Value.ToUTF8());
return false;
}
stream >> coords[i];
if ((stream.rdstate() & std::wstringstream::failbit) != 0)
{
LOGWARNING("Unable to parse CRect parameters. Your input: '%s'", Value.ToUTF8().c_str());
LOGWARNING("Unable to parse CRect parameters. Your input: '{}'", Value.ToUTF8());
return false;
}
}
if (!stream.eof())
{
LOGWARNING("Too many CRect parameters (max %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
LOGWARNING("Too many CRect parameters (max {}). Your input: '{}'", NUM_COORDS,
Value.ToUTF8());
return false;
}
@@ -129,13 +131,14 @@ bool CGUI::ParseString<CSize2D>(const CGUI*, const CStrW& Value, CSize2D& Output
{
if (stream.eof())
{
LOGWARNING("Too few CSize2D parameters (min %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
LOGWARNING("Too few CSize2D parameters (min {}). Your input: '{}'", NUM_COORDS,
Value.ToUTF8());
return false;
}
stream >> coords[i];
if ((stream.rdstate() & std::wstringstream::failbit) != 0)
{
LOGWARNING("Unable to parse CSize2D parameters. Your input: '%s'", Value.ToUTF8().c_str());
LOGWARNING("Unable to parse CSize2D parameters. Your input: '{}'", Value.ToUTF8());
return false;
}
}
@@ -145,7 +148,8 @@ bool CGUI::ParseString<CSize2D>(const CGUI*, const CStrW& Value, CSize2D& Output
if (!stream.eof())
{
LOGWARNING("Too many CSize2D parameters (max %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
LOGWARNING("Too many CSize2D parameters (max {}). Your input: '{}'", NUM_COORDS,
Value.ToUTF8());
return false;
}
@@ -164,13 +168,14 @@ bool CGUI::ParseString<CVector2D>(const CGUI*, const CStrW& Value, CVector2D& Ou
{
if (stream.eof())
{
LOGWARNING("Too few CVector2D parameters (min %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
LOGWARNING("Too few CVector2D parameters (min {}). Your input: '{}'", NUM_COORDS,
Value.ToUTF8());
return false;
}
stream >> coords[i];
if ((stream.rdstate() & std::wstringstream::failbit) != 0)
{
LOGWARNING("Unable to parse CVector2D parameters. Your input: '%s'", Value.ToUTF8().c_str());
LOGWARNING("Unable to parse CVector2D parameters. Your input: '{}'", Value.ToUTF8());
return false;
}
}
@@ -180,7 +185,8 @@ bool CGUI::ParseString<CVector2D>(const CGUI*, const CStrW& Value, CVector2D& Ou
if (!stream.eof())
{
LOGWARNING("Too many CVector2D parameters (max %i). Your input: '%s'", NUM_COORDS, Value.ToUTF8().c_str());
LOGWARNING("Too many CVector2D parameters (max {}). Your input: '{}'", NUM_COORDS,
Value.ToUTF8());
return false;
}