Changeset 769 for trunk/tools/assistant/lib/qhelpsearchindexreader_default.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/assistant/lib/qhelpsearchindexreader_default.cpp (modified) (11 diffs)

trunk/tools/assistant/lib/qhelpsearchindexreader_default.cpp

@@ -53 +53 @@
 QT_BEGIN_NAMESPACE
 
-namespace qt {
-    namespace fulltextsearch {
-        namespace std {
+namespace fulltextsearch {
+namespace std {
 
 namespace {
@@ -167 +166 @@
         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;
@@ -181 +180 @@
 void Reader::setIndexFile(const QString &namespaceName, const QString &attributes)
 {
-    QString extention = namespaceName + QLatin1String("@") + attributes;
-    indexFile = indexPath + QLatin1String("/indexdb40.") + extention;
-    documentFile = indexPath + QLatin1String("/indexdoc40.") + extention;
+    QString extenion = namespaceName + QLatin1String("@") + attributes;
+    indexFile = indexPath + QLatin1String("/indexdb40.") + extenion;
+    documentFile = indexPath + QLatin1String("/indexdoc40.") + extenion;
 }
 
@@ -236 +235 @@
 void Reader::searchInIndex(const QStringList &terms)
 {
-    foreach (const QString term, terms) {
+    foreach (const QString term, terms) {
         QVector<Document> documents;
 
@@ -255 +254 @@
                 QString title, url;
                 QVector<DocumentInfo> documentsInfo;
-                foreach(const Document doc, documents) {
+                foreach(const Document doc, documents) {
                     info.docNumber = doc.docNumber;
                     info.frequency = doc.frequency;
@@ -520 +519 @@
 
     QString queryTerm;
-    foreach (const QHelpSearchQuery query, queryList) {
+    foreach (const QHelpSearchQuery query, queryList) {
         if (query.fieldName == QHelpSearchQuery::DEFAULT) {
             queryTerm = query.wordList.at(0);
@@ -542 +541 @@
     // setup the reader
     m_reader.setIndexPath(indexPath);
-    foreach(const QString namespaceName, registeredDocs) {
+    foreach(const QString namespaceName, registeredDocs) {
         mutex.lock();
         if (m_cancel) {
@@ -554 +553 @@
             engine.filterAttributeSets(namespaceName);
 
-        foreach (QStringList attributes, attributeSets) {
+        foreach (attributes, attributeSets) {
             // read all index files
             m_reader.setIndexFile(namespaceName, attributes.join(QLatin1String("@")));
@@ -578 +577 @@
         if (!hits.isEmpty()) {
             if (termSeq.isEmpty()) {
-                foreach (const DocumentInfo docInfo, hits) {
+                foreach (const DocumentInfo docInfo, hits) {
                     mutex.lock();
                     if (m_cancel) {
@@ -589 +588 @@
                 }
             } else {
-                foreach (const DocumentInfo docInfo, hits) {
+                foreach (const DocumentInfo docInfo, hits) {
                     mutex.lock();
                     if (m_cancel) {
@@ -608 +607 @@
 }
 
-        }   // namespace std
-    }   // namespace fulltextsearch
-}   // namespace qt
+}   // namespace std
+}   // namespace fulltextsearch
 
 QT_END_NAMESPACE