hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-23 20:14:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Revert "clean code: win return std::string directly"

Browse source 
This reverts commit 0669455298.

Revert "clean code:remove old temporary fix"

This reverts commit c941a5bfc3.
This commit is contained in:
xiaoyifang 2022-04-07 19:56:29 +08:00
parent 67c74136e8
commit 4c32f756e5
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fsencoding.cc
View file

@ -21,7 +21,7 @@ string encode( wstring const & str )
string encode( string const & str )
{
#ifdef __WIN32
return str;
return string( str );
#else
return string( QString::fromUtf8( str.c_str() ).toLocal8Bit().data() );
#endif

12
wstring_qt.cc
View file

@ -10,7 +10,17 @@ namespace gd
wstring toWString( QString const & in )
{
return in.toStdU32String();
QVector< unsigned int > v = in.toUcs4();
// Fix for QString instance which contains non-BMP characters
// Qt will created unexpected null characters may confuse btree indexer.
// Related: https://bugreports.qt-project.org/browse/QTBUG-25536
int n = v.size();
while ( n > 0 && v[ n - 1 ] == 0 ) n--;
if ( n != v.size() )
v.resize( n );
return wstring( ( const wchar * ) v.constData(), v.size() );
}
wstring normalize( const wstring & str )