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

trunk/tools/assistant/lib/qhelpsearchquerywidget.cpp

@@ -149 +149 @@
 
         // make sure we won't end up with an empty string
-        foreach (const QString escapeChar, escapableCharsList) {
+        foreach (const QString escapeChar, escapableCharsList) {
             if (retValue.contains(escapeChar))
                 retValue.replace(escapeChar, QLatin1String(""));
@@ -156 +156 @@
             return retValue;
 
-        retValue = text; // now realy escape the string...
-        foreach (const QString escapeChar, escapableCharsList) {
+        retValue = text; // now realy escape the string...
+        foreach (const QString escapeChar, escapableCharsList) {
             if (retValue.contains(escapeChar))
                 retValue.replace(escapeChar, escape + escapeChar);
@@ -318 +318 @@
             if (!lst.isEmpty()) {
                 QStringList fuzzy;
-                foreach (const QString term, lst)
+                foreach (const QString term, lst)
                     fuzzy += buildTermList(escapeString(term));
                 queryList.append(QHelpSearchQuery(QHelpSearchQuery::FUZZY, fuzzy));
@@ -326 +326 @@
             if (!lst.isEmpty()) {
                 QStringList without;
-                foreach (const QString term, lst)
+                foreach (const QString term, lst)
                     without.append(escapeString(term));
                 queryList.append(QHelpSearchQuery(QHelpSearchQuery::WITHOUT, without));
@@ -340 +340 @@
             if (!lst.isEmpty()) {
                 QStringList all;
-                foreach (const QString term, lst)
+                foreach (const QString term, lst)
                     all.append(escapeString(term));
                 queryList.append(QHelpSearchQuery(QHelpSearchQuery::ALL, all));
@@ -348 +348 @@
             if (!lst.isEmpty()) {
                 QStringList atLeast;
-                foreach (const QString term, lst)
+                foreach (const QString term, lst)
                     atLeast += buildTermList(escapeString(term));
                 queryList.append(QHelpSearchQuery(QHelpSearchQuery::ATLEAST, atLeast));
@@ -534 +534 @@
 
 /*!
-    Returns a list of querys to use in combination with the search engines
+    Returns a list of quers to use in combination with the search engines
     search(QList<QHelpSearchQuery> &query) function.
 */