mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 19:24:08 +00:00
07113d0bf6
* QString::toStdWString() and QString::toUCS4() will have wrong size when QString instances contain non-BMP characters. Close #320
37 lines
773 B
C++
37 lines
773 B
C++
#include "wstring_qt.hh"
|
|
#include <QVector>
|
|
|
|
namespace gd
|
|
{
|
|
#ifdef __WIN32
|
|
|
|
QString toQString( wstring const & in )
|
|
{
|
|
return QString::fromUcs4( in.c_str() );
|
|
}
|
|
|
|
#else
|
|
|
|
QString toQString( wstring const & in )
|
|
{
|
|
return QString::fromStdWString( in );
|
|
}
|
|
|
|
#endif
|
|
|
|
wstring toWString( QString const & in )
|
|
{
|
|
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() );
|
|
}
|
|
}
|