From 0acefd804b23a01e4a64ad57fa4d4a573b534daf Mon Sep 17 00:00:00 2001 From: Bartosz Szatkowski Date: Thu, 12 Aug 2010 14:06:20 +0200 Subject: [PATCH] Set number of thred to idealCount+1=cores number+1 --- debian/files | 2 +- trunk/src/base/backbone/backbone.cpp | 15 ++++++++++----- trunk/src/base/backbone/backbone.h | 4 +--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian/files b/debian/files index 3ff624b..57026b2 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -mdictionary_1.0.0-2_armel.deb user/education optional +mdictionary_1.0.0-2_i386.deb user/education optional diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp index 97b8857..d297fbc 100644 --- a/trunk/src/base/backbone/backbone.cpp +++ b/trunk/src/base/backbone/backbone.cpp @@ -39,7 +39,12 @@ class TranslationPtr { Translation* _tr; public: TranslationPtr(Translation* tr) :_tr(tr) {} - QString toHtml() const {return _tr->toHtml();} + QString toHtml() const { + QString trans; + trans = _tr->toHtml(); + return trans; + + } }; void Backbone::init() { @@ -69,6 +74,9 @@ void Backbone::init() { connect(&_timerHtmlSearch, SIGNAL(timeout()), this, SLOT(htmlTranslationReady())); + QThreadPool::globalInstance()->setMaxThreadCount( + QThreadPool::globalInstance()->maxThreadCount()+1); + _history = new History(5, this); } @@ -228,9 +236,6 @@ void Backbone::addDictionary(CommonDictInterface *dict, bool active) { -int Backbone::activeSearches() const { - return -1; //TODO -} @@ -238,6 +243,7 @@ void Backbone::translationReady() { if(!_innerResult.isFinished()) return; QFutureIterator > it(_innerResult); + _timerSearch.stop(); while(it.hasNext()) { QList list = it.next(); @@ -245,7 +251,6 @@ void Backbone::translationReady() { _result.insert(trans->key().toLower(), trans); } - _timerSearch.stop(); Q_EMIT ready(); } diff --git a/trunk/src/base/backbone/backbone.h b/trunk/src/base/backbone/backbone.h index a0b41b0..0ced6e4 100644 --- a/trunk/src/base/backbone/backbone.h +++ b/trunk/src/base/backbone/backbone.h @@ -40,6 +40,7 @@ #include #include #include +#include #include #include "../../includes/CommonDictInterface.h" #include "../../includes/settings.h" @@ -84,9 +85,6 @@ public: //! \return maximum number of word that plugin could find int searchLimit() const; - //! \return number of active searches - int activeSearches() const; - /*! Performs search for final translation (html/xml) form \param list of Translation* to be searched for */ -- 1.7.9.5