diff options
| author | 2016-04-30 18:48:40 +0100 | |
|---|---|---|
| committer | 2016-04-30 18:50:45 +0100 | |
| commit | 97ecdf6a1b7f95bc1b342b3eaf141cd460249680 (patch) | |
| tree | dfa139170f95eeda51f241580cc019ab0f4684d8 /src/modules/help | |
| parent | Apply clang-tidy: modernize-use-default (diff) | |
| download | KVIrc-97ecdf6a1b7f95bc1b342b3eaf141cd460249680.tar.gz KVIrc-97ecdf6a1b7f95bc1b342b3eaf141cd460249680.tar.bz2 KVIrc-97ecdf6a1b7f95bc1b342b3eaf141cd460249680.zip | |
Apply clang-tidy: modernize-loop-convert
Diffstat (limited to 'src/modules/help')
| -rw-r--r-- | src/modules/help/HelpIndex.cpp | 42 | ||||
| -rw-r--r-- | src/modules/help/HelpWindow.cpp | 8 |
2 files changed, 25 insertions, 25 deletions
diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp index bd5d772be..2504d1dc8 100644 --- a/src/modules/help/HelpIndex.cpp +++ b/src/modules/help/HelpIndex.cpp @@ -349,18 +349,18 @@ void HelpIndex::readDocumentList() QStringList HelpIndex::query(const QStringList & terms, const QStringList & termSeq, const QStringList & seqWords) { QList<Term> termList; - for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) + for(const auto & term : terms) { Entry * e = nullptr; - if((*it).contains(QLatin1Char('*'))) + if(term.contains(QLatin1Char('*'))) { - QVector<Document> wcts = setupDummyTerm(getWildcardTerms(*it)); + QVector<Document> wcts = setupDummyTerm(getWildcardTerms(term)); termList.append(Term(QLatin1String("dummy"), wcts.count(), wcts)); } - else if(dict[*it]) + else if(dict[term]) { - e = dict[*it]; - termList.append(Term(*it, e->documents.count(), e->documents)); + e = dict[term]; + termList.append(Term(term, e->documents.count(), e->documents)); } else { @@ -372,9 +372,9 @@ QStringList HelpIndex::query(const QStringList & terms, const QStringList & term qSort(termList); QVector<Document> minDocs = termList.takeFirst().documents; - for(QList<Term>::Iterator it = termList.begin(); it != termList.end(); ++it) + for(auto & it : termList) { - Term * t = &(*it); + Term * t = ⁢ QVector<Document> docs = t->documents; for(QVector<Document>::Iterator minDoc_it = minDocs.begin(); minDoc_it != minDocs.end();) { @@ -399,15 +399,15 @@ QStringList HelpIndex::query(const QStringList & terms, const QStringList & term qSort(minDocs); if(termSeq.isEmpty()) { - for(QVector<Document>::Iterator it = minDocs.begin(); it != minDocs.end(); ++it) - results << docList.at((int)(*it).docNumber); + for(auto & minDoc : minDocs) + results << docList.at((int)minDoc.docNumber); return results; } QString fileName; - for(QVector<Document>::Iterator it = minDocs.begin(); it != minDocs.end(); ++it) + for(auto & minDoc : minDocs) { - fileName = docList[(int)(*it).docNumber]; + fileName = docList[(int)minDoc.docNumber]; if(searchForPattern(termSeq, seqWords, fileName)) results << fileName; } @@ -531,13 +531,13 @@ QStringList HelpIndex::split(const QString & str) QVector<Document> HelpIndex::setupDummyTerm(const QStringList & terms) { QList<Term> termList; - for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) + for(const auto & term : terms) { Entry * e = nullptr; - if(dict[*it]) + if(dict[term]) { - e = dict[*it]; - termList.append(Term(*it, e->documents.count(), e->documents)); + e = dict[term]; + termList.append(Term(term, e->documents.count(), e->documents)); } } QVector<Document> maxList(0); @@ -546,14 +546,14 @@ QVector<Document> HelpIndex::setupDummyTerm(const QStringList & terms) qSort(termList); maxList = termList.takeLast().documents; - for(QList<Term>::Iterator it = termList.begin(); it != termList.end(); ++it) + for(auto & it : termList) { - Term * t = &(*it); + Term * t = ⁢ QVector<Document> docs = t->documents; - for(QVector<Document>::iterator docIt = docs.begin(); docIt != docs.end(); ++docIt) + for(auto & doc : docs) { - if(maxList.indexOf(*docIt) == -1) - maxList.append(*docIt); + if(maxList.indexOf(doc) == -1) + maxList.append(doc); } } return maxList; diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp index 541ca1ca8..0f1803eca 100644 --- a/src/modules/help/HelpWindow.cpp +++ b/src/modules/help/HelpWindow.cpp @@ -249,9 +249,9 @@ void HelpWindow::startSearch() m_terms.clear(); bool isPhrase = false; QString s = ""; - for(int i = 0; i < (int)buf.length(); ++i) + for(const auto & i : buf) { - if(buf[i] == '\"') + if(i == '\"') { isPhrase = !isPhrase; s = s.simplified(); @@ -259,7 +259,7 @@ void HelpWindow::startSearch() m_terms << s; s = ""; } - else if(buf[i] == ' ' && !isPhrase) + else if(i == ' ' && !isPhrase) { s = s.simplified(); if(!s.isEmpty()) @@ -267,7 +267,7 @@ void HelpWindow::startSearch() s = ""; } else - s += buf[i]; + s += i; } if(!s.isEmpty()) m_terms << s; |
