mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-16 05:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Uses std::string_view for UTF-8 conversions

Browse Source
This commit is contained in:
Vladislav Belov
2026-07-14 00:14:27 +02:00
parent ef5088e595
commit 2a6f17fbae
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/lib/utf8.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -215,7 +215,7 @@ private:
//-----------------------------------------------------------------------------
std::string utf8_from_wstring(const std::wstring& src, Status* err)
std::string utf8_from_wstring(const std::wstring_view src, Status* err)
{
if(err)
*err = INFO::OK;
@@ -232,7 +232,7 @@ std::string utf8_from_wstring(const std::wstring& src, Status* err)
}
std::wstring wstring_from_utf8(const std::string& src, Status* err)
std::wstring wstring_from_utf8(const std::string_view src, Status* err)
{
if(err)
*err = INFO::OK;
source/lib/utf8.h
+4 -3
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -26,6 +26,7 @@
#include "lib/status.h"
#include <string>
#include <string_view>
// note: error codes are returned via optional output parameter.
namespace ERR
@@ -46,11 +47,11 @@ namespace ERR
* otherwise, the function raises a warning dialog for every
* error/warning.
**/
std::wstring wstring_from_utf8(const std::string& s, Status* err = 0);
std::wstring wstring_from_utf8(const std::string_view s, Status* err = 0);
/**
* opposite of wstring_from_utf8
**/
std::string utf8_from_wstring(const std::wstring& s, Status* err = 0);
std::string utf8_from_wstring(const std::wstring_view s, Status* err = 0);
#endif // #ifndef INCLUDED_UTF8