From: Peter Hedlund Date: Thu, 21 Jul 2005 01:24:13 +0000 (+0000) Subject: Remove unused parameter X-Git-Tag: v3.80.2~237^2~17 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=7b5a31322c14b8ce858ac40a3ea0c157fb563217;p=libqmvoc.git Remove unused parameter svn path=/branches/work/kwordquiz/src/keduvocdocument.h; revision=437131 --- diff --git a/kwordquiz/keduvocdocument.cpp b/kwordquiz/keduvocdocument.cpp index 9f7a17a..1f21fa8 100644 --- a/kwordquiz/keduvocdocument.cpp +++ b/kwordquiz/keduvocdocument.cpp @@ -949,48 +949,42 @@ void KEduVocDocument::setFont(QFont* font) } -int KEduVocDocument::search(QString substr, int id, - int first, int last, - bool word_start, - bool) +int KEduVocDocument::search(QString substr, int id, int first, int last, bool word_start) { - if (last >= numEntries() - || last < 0 ) - last = numEntries(); - - if (first < 0) - first = 0; - - if (id >= numIdentifiers() - || last < first - ) - return -1; - - if (id == 0) { - for (int i = first; i < last; i++) { - if (word_start) { - if (entry(i)->original().find (substr, 0, false) == 0) // case insensitive - return i; - } - else { - if (entry(i)->original().find (substr, 0, false) > -1) // case insensitive - return i; - } - } - } - else { - for (int i = first; i < last; i++) { - if (word_start) { - if (entry(i)->translation(id).find (substr, 0, false) == 0) // case insensitive - return i; - } - else { - if (entry(i)->translation(id).find (substr, 0, false) > -1) // case insensitive - return i; - } - } - } - return -1; + if (last >= numEntries() || last < 0) + last = numEntries(); + + if (first < 0) + first = 0; + + if (id >= numIdentifiers() || last < first) + return -1; + + if (id == 0) { + for (int i = first; i < last; i++) { + if (word_start) { + if (entry(i)->original().find(substr, 0, false) == 0) // case insensitive + return i; + } + else { + if (entry(i)->original().find(substr, 0, false) > -1) // case insensitive + return i; + } + } + } + else { + for (int i = first; i < last; i++) { + if (word_start) { + if (entry(i)->translation(id).find(substr, 0, false) == 0) // case insensitive + return i; + } + else { + if (entry(i)->translation(id).find(substr, 0, false) > -1) // case insensitive + return i; + } + } + } + return -1; } diff --git a/kwordquiz/keduvocdocument.h b/kwordquiz/keduvocdocument.h index cf42eab..35637fe 100644 --- a/kwordquiz/keduvocdocument.h +++ b/kwordquiz/keduvocdocument.h @@ -484,10 +484,9 @@ class KEduVocDocument : public QObject * @param last index of last entry, -1 goes till end * @param word_start false: search partial string, * true:always from beginning of word - * @param tolerant * @result index of found entry, -1 if none */ - int search(QString substr, int id, int first=0, int last=-1, bool word_start = false, bool tolerant=false); + int search(QString substr, int id, int first=0, int last=-1, bool word_start = false); /** returns url of xml file */ inline KURL URL() const {return m_url; }