Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Add Path::string8 (which returns a UTF-8 encoded std::string).

Browse Source 
This saves the hassle of writing utf8_from_wstring(path.string()) in
places like log messages, and can be extended to better handle
non-ISO-8859-1 paths on Linux.

This was SVN commit r16185.
This commit is contained in:
Ykkrosh 2015-01-22 20:33:11 +00:00
parent e9a33b71ae
commit b90bc147c9
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/lib/path.h
View File

@ -41,6 +41,8 @@
# include "boost/functional/hash.hpp"
#endif
#include "lib/utf8.h"
#include <cstring>
namespace ERR
@ -125,6 +127,21 @@ public:
return path;
}
/**
* Return a UTF-8 version of the path, in a human-readable but potentially
* lossy form. It is *not* safe to take this string and construct a new
* Path object from it (it may fail for some non-ASCII paths) - it should
* only be used for displaying paths to users.
*/
std::string string8() const
{
// TODO: On Unixes, this will only be correct for ASCII or ISO-8859-1
// encoded paths; we should probably assume UTF-8 encoding by default
// (but take care to handle non-valid-UTF-8 paths safely).
return utf8_from_wstring(path);
}
bool operator<(const Path& rhs) const
{
return path < rhs.path;