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

fix merge conflict

Browse source
This commit is contained in:
Xiao YiFang 2022-07-02 19:13:53 +08:00
parent 9f5218b305 d8d3002329
commit 4d81b3b9e0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
articleview.cc
View file

@ -2495,10 +2495,13 @@ void ArticleView::highlightFTSResults()
{ {
const QUrl & url = ui.definition->url(); const QUrl & url = ui.definition->url();
bool ignoreDiacritics = Utils::Url::hasQueryItem( url, "ignore_diacritics" );
QString regString = Utils::Url::queryItemValue( url, "regexp" ); QString regString = Utils::Url::queryItemValue( url, "regexp" );
if( ignoreDiacritics ) if( regString.isEmpty() )
return;
bool ignoreDiacritics = Utils::Url::hasQueryItem( url, "ignore_diacritics" );
if( ignoreDiacritics )
regString = gd::toQString( Folding::applyDiacriticsOnly( gd::toWString( regString ) ) ); regString = gd::toQString( Folding::applyDiacriticsOnly( gd::toWString( regString ) ) );
else else
regString = regString.remove( AccentMarkHandler::accentMark() ); regString = regString.remove( AccentMarkHandler::accentMark() );