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

huge cleanup and conversion of most string handling (especially paths) to unicode

Browse Source 
please note: format strings must be %hs for char* arguments and %ls for
wchar_t*

This was SVN commit r7161.
This commit is contained in:
janwas
2009-11-03 21:46:35 +00:00
parent a46f3432f3
commit 8a52113e60
317 changed files with 2517 additions and 2588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/network/NetLog.cpp
+8 -6
View File
@@ -258,8 +258,8 @@ CNetLogFileSink::CNetLogFileSink( void )
CNetLogger::GetStringTime( time );
// Make relative path
fs::path path(fs::path(psLogDir())/"net_log");
path /= time+".txt";
fs::wpath path(psLogDir()/L"net_log");
path /= CStrW(time)+L".txt";
m_FileName = path.external_file_string();
m_Append = true;
}
@@ -268,7 +268,7 @@ CNetLogFileSink::CNetLogFileSink( void )
// Name: CNetLogFileSink()
// Desc: Constructor
//-----------------------------------------------------------------------------
CNetLogFileSink::CNetLogFileSink( const CStr& filename )
CNetLogFileSink::CNetLogFileSink( const fs::wpath& filename )
{
m_FileName = filename;
m_Append = true;
@@ -278,7 +278,7 @@ CNetLogFileSink::CNetLogFileSink( const CStr& filename )
// Name: CNetLogFileSink()
// Desc: Constructor
//-----------------------------------------------------------------------------
CNetLogFileSink::CNetLogFileSink( const CStr& filename, bool append )
CNetLogFileSink::CNetLogFileSink( const fs::wpath& filename, bool append )
{
m_FileName = filename;
m_Append = append;
@@ -368,13 +368,13 @@ void CNetLogFileSink::Write( char c )
// Name: OpenFile()
// Desc: Open the file where the logging will output
//-----------------------------------------------------------------------------
void CNetLogFileSink::OpenFile( const CStr& fileName, bool append )
void CNetLogFileSink::OpenFile( const fs::wpath& fileName, bool append )
{
// Close any open file
if ( m_File.is_open() ) m_File.close();
// Open the file and log start
m_File.open( fileName.c_str(), append ? std::ios::app : std::ios::out );
m_File.open( fileName.string().c_str(), append ? std::ios::app : std::ios::out );
if ( !m_File.is_open() )
{
// throw std::ios_base::failure
@@ -931,6 +931,8 @@ void CNetLogger::RemoveAllSinks( void )
{
CScopeLock lock( m_Mutex );
for ( size_t i = 0; i < GetSinkCount(); i++ )
delete m_Sinks[i];
m_Sinks.clear();
}