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

opt: iconv remove unused parameter

Browse source 
In GoldenDict, the application uses utf-8 as the default encoding. There should be no other use.
This commit is contained in:
YiFang Xiao 2023-06-03 13:35:16 +08:00 committed by xiaoyifang
parent ceef189a15
commit 49c6ae7032
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/iconv.cc
View file

@ -13,10 +13,11 @@ char const * const Iconv::Utf8 = "UTF-8";
using gd::wchar; using gd::wchar;
Iconv::Iconv( char const * to, char const * from ) Iconv::Iconv( char const * from )
#ifdef USE_ICONV #ifdef USE_ICONV
// the to encoding must be UTF8 // the to encoding must be UTF8
:state( iconv_open( Utf8, from ) ) :
state( iconv_open( Utf8, from ) )
#endif #endif
{ {
#ifdef USE_ICONV #ifdef USE_ICONV
@ -116,7 +117,7 @@ gd::wstring Iconv::toWstring( char const * fromEncoding, void const * fromData,
if ( !dataSize ) if ( !dataSize )
return {}; return {};
Iconv ic( Utf8, fromEncoding ); Iconv ic( fromEncoding );
QString outStr = ic.convert(fromData, dataSize); QString outStr = ic.convert(fromData, dataSize);
return gd::toWString(outStr); return gd::toWString(outStr);
@ -131,7 +132,7 @@ std::string Iconv::toUtf8( char const * fromEncoding, void const * fromData,
if ( !dataSize ) if ( !dataSize )
return {}; return {};
Iconv ic( Utf8, fromEncoding ); Iconv ic( fromEncoding );
const QString outStr = ic.convert(fromData, dataSize); const QString outStr = ic.convert(fromData, dataSize);
return outStr.toStdString(); return outStr.toStdString();

2
src/common/iconv.hh
View file

@ -34,7 +34,7 @@ public:
static char const * const Utf16Le; static char const * const Utf16Le;
static char const * const Utf8; static char const * const Utf8;
Iconv( char const * to, char const * from ); Iconv( char const * from );
~Iconv(); ~Iconv();

2
src/dict/bgl_babylon.cc
View file

@ -760,7 +760,7 @@ void Babylon::convertToUtf8( std::string &s, unsigned int type )
if( charset == "UTF-8" ) if( charset == "UTF-8" )
return; return;
Iconv conv_("UTF-8", charset.c_str()); Iconv conv_( charset.c_str() );
size_t inbufbytes = s.size(); size_t inbufbytes = s.size();

4
src/dict/hunspell.cc
View file

@ -645,7 +645,7 @@ void getSuggestionsForExpression( wstring const & expression,
string encodeToHunspell( Hunspell & hunspell, wstring const & str ) string encodeToHunspell( Hunspell & hunspell, wstring const & str )
{ {
Iconv conv( hunspell.get_dic_encoding(), Iconv::GdWchar ); Iconv conv( Iconv::GdWchar );
void const * in = str.data(); void const * in = str.data();
size_t inLeft = str.size() * sizeof( wchar ); size_t inLeft = str.size() * sizeof( wchar );
@ -663,7 +663,7 @@ string encodeToHunspell( Hunspell & hunspell, wstring const & str )
wstring decodeFromHunspell( Hunspell & hunspell, char const * str ) wstring decodeFromHunspell( Hunspell & hunspell, char const * str )
{ {
Iconv conv( Iconv::GdWchar, hunspell.get_dic_encoding() ); Iconv conv( hunspell.get_dic_encoding() );
void const * in = str; void const * in = str;
size_t inLeft = strlen( str ); size_t inLeft = strlen( str );