FCL/sf/mw/qt: comparison tools/assistant/lib/qhelpsearchindexreader

equal deleted inserted replaced

-:41300fa6a67c
+:2f34d5167611
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.
 **
 #include <QtCore/QDataStream>
 #include <QtCore/QTextStream>
 QT_BEGIN_NAMESPACE
-namespace qt {
+namespace fulltextsearch {
-namespace fulltextsearch {
+namespace std {
-namespace std {
 namespace {
 QStringList split( const QString &str )
 {
 QStringList lst;
 searchIndexTable.clear();
 for(IndexTable::ConstIterator it = indexTable.begin(); it != indexTable.end(); ++it) {
 const QString fileName = it.key();
 bool containsAll = true;
 QStringList split = fileName.split(QLatin1String("@"));
-foreach (const QString attribute, attributes) {
+foreach (const QString &attribute, attributes) {
 if (!split.contains(attribute, Qt::CaseInsensitive)) {
 containsAll = false;
 break;
 }
 }
 }
 }
 void Reader::setIndexFile(const QString &namespaceName, const QString &attributes)
 {
-QString extention = namespaceName + QLatin1String("@") + attributes;
+QString extension = namespaceName + QLatin1String("@") + attributes;
-indexFile = indexPath + QLatin1String("/indexdb40.") + extention;
+indexFile = indexPath + QLatin1String("/indexdb40.") + extension;
-documentFile = indexPath + QLatin1String("/indexdoc40.") + extention;
+documentFile = indexPath + QLatin1String("/indexdoc40.") + extension;
 }
 bool Reader::splitSearchTerm(const QString &searchTerm, QStringList *terms,
 QStringList *termSeq, QStringList *seqWords)
 {
 return true;
 }
 void Reader::searchInIndex(const QStringList &terms)
 {
-foreach (const QString term, terms) {
+foreach (const QString &term, terms) {
 QVector<Document> documents;
 for(IndexTable::ConstIterator it = searchIndexTable.begin();
 it != searchIndexTable.end(); ++it) {
 EntryTable entryTable = it.value().first;
 if (!documents.isEmpty()) {
 DocumentInfo info;
 QString title, url;
 QVector<DocumentInfo> documentsInfo;
-foreach(const Document doc, documents) {
+foreach(const Document &doc, documents) {
 info.docNumber = doc.docNumber;
 info.frequency = doc.frequency;
 info.documentUrl = documentList.at(doc.docNumber).at(1);
 info.documentTitle = documentList.at(doc.docNumber).at(0);
 documentsInfo.append(info);
 const QString indexPath = m_indexFilesFolder;
 mutex.unlock();
 QString queryTerm;
-foreach (const QHelpSearchQuery query, queryList) {
+foreach (const QHelpSearchQuery &query, queryList) {
 if (query.fieldName == QHelpSearchQuery::DEFAULT) {
 queryTerm = query.wordList.at(0);
 break;
 }
 }
 emit searchingStarted();
 // setup the reader
 m_reader.setIndexPath(indexPath);
-foreach(const QString namespaceName, registeredDocs) {
+foreach(const QString &namespaceName, registeredDocs) {
 mutex.lock();
 if (m_cancel) {
 mutex.unlock();
 searchingFinished(0);   // TODO: check this ???
 return;
 mutex.unlock();
 const QList<QStringList> attributeSets =
 engine.filterAttributeSets(namespaceName);
-foreach (QStringList attributes, attributeSets) {
+foreach (const QStringList &attributes, attributeSets) {
 // read all index files
 m_reader.setIndexFile(namespaceName, attributes.join(QLatin1String("@")));
 if (!m_reader.readIndex()) {
 qWarning("Full Text Search, could not read file for namespace: %s.",
 namespaceName.toUtf8().constData());
 m_reader.searchInIndex(terms);    // TODO: should this be interruptible as well ???
 QVector<DocumentInfo> hits = m_reader.hits();
 if (!hits.isEmpty()) {
 if (termSeq.isEmpty()) {
-foreach (const DocumentInfo docInfo, hits) {
+foreach (const DocumentInfo &docInfo, hits) {
 mutex.lock();
 if (m_cancel) {
 mutex.unlock();
 searchingFinished(0);   // TODO: check this, speed issue while locking???
 return;
 }
 mutex.unlock();
 hitList.append(qMakePair(docInfo.documentTitle, docInfo.documentUrl));
 }
 } else {
-foreach (const DocumentInfo docInfo, hits) {
+foreach (const DocumentInfo &docInfo, hits) {
 mutex.lock();
 if (m_cancel) {
 mutex.unlock();
 searchingFinished(0);   // TODO: check this, speed issue while locking???
 return;
 }
 emit searchingFinished(hitList.count());
 }
 }   // namespace std
 }   // namespace fulltextsearch
-}   // namespace qt
 QT_END_NAMESPACE

changeset 18	2f34d5167611
parent 0	1918ee327afb