diff --git a/epwing.cc b/epwing.cc index d61ad57d..771496e8 100644 --- a/epwing.cc +++ b/epwing.cc @@ -173,8 +173,7 @@ private: string & articleHeadword, string & articleText, int & articlePage, - int & articleOffset, - QString word = 0 ); + int & articleOffset ); void loadArticle( int articlePage, int articleOffset, string & articleHeadword, string & articleText ); @@ -287,16 +286,8 @@ void EpwingDictionary::removeDirectory( QString const & directory ) dir.rmdir( directory ); } -void EpwingDictionary::loadArticle( quint32 address, - - string & articleHeadword, - - string & articleText, - - int & articlePage, - - int & articleOffset, - QString word) +void EpwingDictionary::loadArticle( + quint32 address, string & articleHeadword, string & articleText, int & articlePage, int & articleOffset ) { vector< char > chunk; @@ -316,7 +307,7 @@ void EpwingDictionary::loadArticle( quint32 address, try { Mutex::Lock _( eBook.getLibMutex() ); - eBook.getArticle( headword, text, articlePage, articleOffset, false, word ); + eBook.getArticle( headword, text, articlePage, articleOffset, false); } catch( std::exception & e ) { @@ -531,15 +522,10 @@ void EpwingArticleRequest::run() try { dict.loadArticle( chain[ x ].articleOffset, - headword, - articleText, - articlePage, - - articleOffset, - gd::toQString(word) ); + articleOffset ); } catch(...) { diff --git a/epwing_book.cc b/epwing_book.cc index 2e89be1d..21e1244e 100644 --- a/epwing_book.cc +++ b/epwing_book.cc @@ -1073,7 +1073,7 @@ void EpwingBook::fixHeadword( QString & headword ) } void EpwingBook::getArticle( QString & headword, QString & articleText, - int page, int offset, bool text_only, QString word) + int page, int offset, bool text_only) { error_string.clear(); char buffer[ TextBufferSize + 1 ]; diff --git a/epwing_book.hh b/epwing_book.hh index e5b00f0f..25b29c92 100644 --- a/epwing_book.hh +++ b/epwing_book.hh @@ -195,7 +195,7 @@ public: // Retrieve article from dictionary void getArticle( QString & headword, QString & articleText, - int page, int offset, bool text_only, QString word=0 ); + int page, int offset, bool text_only ); const char * beginDecoration( unsigned int code ); const char * endDecoration( unsigned int code );