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

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2022-05-30 20:38:01 +08:00
parent 99876e6680 71b5d3e6ba
commit 8e65958ee0
4 changed files with 5 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dsl.cc
View file

@ -128,11 +128,7 @@ struct InsidedCard
InsidedCard( uint32_t _offset, uint32_t _size, QVector< wstring > const & words ) : InsidedCard( uint32_t _offset, uint32_t _size, QVector< wstring > const & words ) :
offset( _offset ), size( _size ), headwords( words ) offset( _offset ), size( _size ), headwords( words )
{} {}
InsidedCard( InsidedCard const & e ) :
offset( e.offset ), size( e.size ), headwords( e.headwords )
{}
InsidedCard() {} InsidedCard() {}
}; };
bool indexIsOldOrBad( string const & indexFile, bool hasZipFile ) bool indexIsOldOrBad( string const & indexFile, bool hasZipFile )

5
ftshelpers.cc
View file

@ -399,11 +399,6 @@ bool isCJKChar( ushort ch )
return false; return false;
} }
void FTSResultsRequestRunnable::run()
{
r.run();
}
void FTSResultsRequest::checkArticles( QVector< uint32_t > const & offsets, void FTSResultsRequest::checkArticles( QVector< uint32_t > const & offsets,
QStringList const & words, QStringList const & words,
QRegExp const & searchRegexp ) QRegExp const & searchRegexp )

29
ftshelpers.hh
View file

@ -65,28 +65,6 @@ void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancell
bool isCJKChar( ushort ch ); bool isCJKChar( ushort ch );
class FTSResultsRequest;
class FTSResultsRequestRunnable : public QRunnable
{
FTSResultsRequest & r;
QSemaphore & hasExited;
public:
FTSResultsRequestRunnable( FTSResultsRequest & r_,
QSemaphore & hasExited_ ) : r( r_ ),
hasExited( hasExited_ )
{}
~FTSResultsRequestRunnable()
{
hasExited.release();
}
virtual void run();
};
class FTSResultsRequest : public Dictionary::DataRequest class FTSResultsRequest : public Dictionary::DataRequest
{ {
BtreeIndexing::BtreeDictionary & dict; BtreeIndexing::BtreeDictionary & dict;
@ -102,7 +80,6 @@ class FTSResultsRequest : public Dictionary::DataRequest
int wordsInIndex; int wordsInIndex;
QAtomicInt isCancelled; QAtomicInt isCancelled;
QSemaphore hasExited;
QList< FTS::FtsHeadword > * foundHeadwords; QList< FTS::FtsHeadword > * foundHeadwords;
@ -149,11 +126,10 @@ public:
searchString = gd::toQString( Folding::applyDiacriticsOnly( gd::toWString( searchString_ ) ) ); searchString = gd::toQString( Folding::applyDiacriticsOnly( gd::toWString( searchString_ ) ) );
foundHeadwords = new QList< FTS::FtsHeadword >; foundHeadwords = new QList< FTS::FtsHeadword >;
QThreadPool::globalInstance()->start( QThreadPool::globalInstance()->start( [ this ]() { this->run(); }, -100 );
new FTSResultsRequestRunnable( *this, hasExited ), -100 );
} }
void run(); // Run from another thread by DslResourceRequestRunnable void run();
virtual void cancel() virtual void cancel()
{ {
@ -165,7 +141,6 @@ public:
isCancelled.ref(); isCancelled.ref();
if( foundHeadwords ) if( foundHeadwords )
delete foundHeadwords; delete foundHeadwords;
hasExited.acquire();
} }
}; };

7
goldendict.pro
View file

@ -65,6 +65,8 @@ LIBS += \
CONFIG+=utf8_source CONFIG+=utf8_source
CONFIG+=force_debug_info
win32 { win32 {
TARGET = GoldenDict TARGET = GoldenDict
@ -78,10 +80,7 @@ win32 {
# silence the warning C4290: C++ exception specification ignored # silence the warning C4290: C++ exception specification ignored
QMAKE_CXXFLAGS += /wd4290 /Zc:__cplusplus /std:c++17 /permissive- QMAKE_CXXFLAGS += /wd4290 /Zc:__cplusplus /std:c++17 /permissive-
# QMAKE_LFLAGS_RELEASE += /OPT:REF /OPT:ICF # QMAKE_LFLAGS_RELEASE += /OPT:REF /OPT:ICF
# QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO /DEBUG
CONFIG+=force_debug_info
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
# QMAKE_CXXFLAGS_RELEASE += /GL # slows down the linking significantly # QMAKE_CXXFLAGS_RELEASE += /GL # slows down the linking significantly
LIBS += -lshell32 -luser32 -lsapi -lole32 LIBS += -lshell32 -luser32 -lsapi -lole32
Debug: LIBS+= -lhunspelld Debug: LIBS+= -lhunspelld