Changeset 769 for trunk/tools/assistant/lib/qhelpsearchengine.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/qhelpsearchengine.cpp (modified) (4 diffs)

trunk/tools/assistant/lib/qhelpsearchengine.cpp

@@ -64 +64 @@
 
 #if defined(QT_CLUCENE_SUPPORT)
-    using namespace qt::fulltextsearch::clucene;
+    using namespace fulltextsearch::clucene;
 #else
-    using namespace qt::fulltextsearch::std;
+    using namespace fulltextsearch::std;
 #endif
 
@@ -196 +196 @@
     QHelpSearchResultWidget *resultWidget;
 
-    qt::fulltextsearch::QHelpSearchIndexReader *indexReader;
+    fulltextsearch::QHelpSearchIndexReader *indexReader;
     QHelpSearchIndexWriter *indexWriter;
 
@@ -215 +215 @@
 
     The QHelpSearchQuery class contains the field name and the associated search
-    term. Depending on the field the search term might get split up into seperate
+    term. Depending on the field the search term might get split up into separate
     terms to be parsed differently by the search engine.
 
@@ -239 +239 @@
     \value DEFAULT  the default field provided by the search widget, several terms should be
                     split and stored in the word list except search terms enclosed in quotes.
-    \value FUZZY    a field only provided in use with clucene. Terms should be split in seperate
+    \value FUZZY    a field only provided in use with clucene. Terms should be split in separate
                     words and passed to the search engine.
-    \value WITHOUT  a field only provided in use with clucene. Terms should be split in seperate
+    \value WITHOUT  a field only provided in use with clucene. Terms should be split in separate
                     words and passed to the search engine.
-    \value PHRASE   a field only provided in use with clucene. Terms should not be split in seperate
+    \value PHRASE   a field only provided in use with clucene. Terms should not be split in separate
                     words.
-    \value ALL      a field only provided in use with clucene. Terms should be split in seperate
+    \value ALL      a field only provided in use with clucene. Terms should be split in separate
                     words and passed to the search engine
-    \value ATLEAST  a field only provided in use with clucene. Terms should be split in seperate
+    \value ATLEAST  a field only provided in use with clucene. Terms should be split in separate
                     words and passed to the search engine
 */