GIT_SILENT made messages (after extraction)

[dolphin.git] / src / search / dolphinquery.cpp

diff --git a/src/search/dolphinquery.cpp b/src/search/dolphinquery.cpp
index 0e69cbf65b01480e417b8c67b08a63a7770f64d5..ed2a6a766b98a6d988aa23b721629e5e5c73654f 100644 (file)
--- a/src/search/dolphinquery.cpp
+++ b/src/search/dolphinquery.cpp
@@ -8,70 +8,68 @@
 
 #include <QRegularExpression>
 
 
 #include <QRegularExpression>
 

-#include <config-baloo.h>
-#ifdef HAVE_BALOO
+#include "config-dolphin.h"
+#if HAVE_BALOO

 #include <Baloo/Query>
 #endif
 
 #include <Baloo/Query>
 #endif
 

-namespace {
-#ifdef HAVE_BALOO
-    /** Checks if a given term in the Baloo::Query::searchString() is a special search term
-     * @return: the specific search token of the term, or an empty QString() if none is found
-     */
-    QString searchTermToken(const QString& term)
-    {
-        static const QLatin1String searchTokens[] {
-            QLatin1String("filename:"),
-            QLatin1String("modified>="),
-            QLatin1String("rating>="),
-            QLatin1String("tag:"), QLatin1String("tag=")
-        };
-
-        for (const auto &searchToken : searchTokens) {
-            if (term.startsWith(searchToken)) {
-                return searchToken;
-            }
+namespace
+{
+#if HAVE_BALOO
+/** Checks if a given term in the Baloo::Query::searchString() is a special search term
+ * @return: the specific search token of the term, or an empty QString() if none is found
+ */
+QString searchTermToken(const QString &term)
+{
+    static const QLatin1String searchTokens[]{QLatin1String("filename:"),
+                                              QLatin1String("modified>="),
+                                              QLatin1String("rating>="),
+                                              QLatin1String("tag:"),
+                                              QLatin1String("tag=")};
+
+    for (const auto &searchToken : searchTokens) {
+        if (term.startsWith(searchToken)) {
+            return searchToken;

         }
         }

-        return QString();

     }
     }

+    return QString();
+}

 
 

-    QString stripQuotes(const QString& text)
-    {
-        if (text.length() >= 2 && text.at(0) == QLatin1Char('"')
-                               && text.back() == QLatin1Char('"')) {
-            return text.mid(1, text.size() - 2);
-        }
-        return text;
+QString stripQuotes(const QString &text)
+{
+    if (text.length() >= 2 && text.at(0) == QLatin1Char('"') && text.back() == QLatin1Char('"')) {
+        return text.mid(1, text.size() - 2);

     }
     }

+    return text;
+}

 
 

-    QStringList splitOutsideQuotes(const QString& text)
-    {
-        // Match groups on 3 possible conditions:
-        //   - Groups with two leading quotes must close both on them (filename:""abc xyz" tuv")
-        //   - Groups enclosed in quotes
-        //   - Words separated by spaces
-        const QRegularExpression subTermsRegExp("(\\S*?\"\"[^\"]+\"[^\"]+\"+|\\S*?\"[^\"]+\"+|(?<=\\s|^)\\S+(?=\\s|$))");
-        auto subTermsMatchIterator = subTermsRegExp.globalMatch(text);
-
-        QStringList textParts;
-        while (subTermsMatchIterator.hasNext()) {
-            textParts << subTermsMatchIterator.next().captured(0);
-        }
-        return textParts;
+QStringList splitOutsideQuotes(const QString &text)
+{
+    // Match groups on 3 possible conditions:
+    //   - Groups with two leading quotes must close both on them (filename:""abc xyz" tuv")
+    //   - Groups enclosed in quotes
+    //   - Words separated by spaces
+    static const QRegularExpression subTermsRegExp("(\\S*?\"\"[^\"]+\"[^\"]+\"+|\\S*?\"[^\"]+\"+|(?<=\\s|^)\\S+(?=\\s|$))");
+    auto subTermsMatchIterator = subTermsRegExp.globalMatch(text);
+
+    QStringList textParts;
+    while (subTermsMatchIterator.hasNext()) {
+        textParts << subTermsMatchIterator.next().captured(0);

     }
     }

+    return textParts;
+}

 #endif
 
 #endif
 

-    QString trimChar(const QString& text, const QLatin1Char aChar)
-    {
-        const int start = text.startsWith(aChar) ? 1 : 0;
-        const int end = (text.length() > 1 && text.endsWith(aChar)) ? 1 : 0;
+QString trimChar(const QString &text, const QLatin1Char aChar)
+{
+    const int start = text.startsWith(aChar) ? 1 : 0;
+    const int end = (text.length() > 1 && text.endsWith(aChar)) ? 1 : 0;

 
 

-        return text.mid(start, text.length() - start - end);
-    }
+    return text.mid(start, text.length() - start - end);
+}

 }
 
 }
 

-
-DolphinQuery DolphinQuery::fromSearchUrl(const QUrl& searchUrl)
+DolphinQuery DolphinQuery::fromSearchUrl(const QUrl &searchUrl)

 {
     DolphinQuery model;
     model.m_searchUrl = searchUrl;
 {
     DolphinQuery model;
     model.m_searchUrl = searchUrl;


@@ -87,7 +85,7 @@ DolphinQuery DolphinQuery::fromSearchUrl(const QUrl& searchUrl)
     return model;
 }
 
     return model;
 }
 

-bool DolphinQuery::supportsScheme(const QString& urlScheme)
+bool DolphinQuery::supportsScheme(const QString &urlScheme)

 {
     static const QStringList supportedSchemes = {
         QStringLiteral("baloosearch"),
 {
     static const QStringList supportedSchemes = {
         QStringLiteral("baloosearch"),


@@ -99,7 +97,7 @@ bool DolphinQuery::supportsScheme(const QString& urlScheme)
 
 void DolphinQuery::parseBalooQuery()
 {
 
 void DolphinQuery::parseBalooQuery()
 {

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

     const Baloo::Query query = Baloo::Query::fromSearchUrl(m_searchUrl);
 
     m_includeFolder = query.includeFolder();
     const Baloo::Query query = Baloo::Query::fromSearchUrl(m_searchUrl);
 
     m_includeFolder = query.includeFolder();


@@ -111,7 +109,7 @@ void DolphinQuery::parseBalooQuery()
     QString fileName;
 
     const QStringList subTerms = splitOutsideQuotes(query.searchString());
     QString fileName;
 
     const QStringList subTerms = splitOutsideQuotes(query.searchString());

-    foreach (const QString& subTerm, subTerms) {
+    for (const QString &subTerm : subTerms) {

         const QString token = searchTermToken(subTerm);
         const QString value = stripQuotes(subTerm.mid(token.length()));
 
         const QString token = searchTermToken(subTerm);
         const QString value = stripQuotes(subTerm.mid(token.length()));
 


@@ -144,7 +142,6 @@ void DolphinQuery::parseBalooQuery()
 #endif
 }
 
 #endif
 }
 

-

 QUrl DolphinQuery::searchUrl() const
 {
     return m_searchUrl;
 QUrl DolphinQuery::searchUrl() const
 {
     return m_searchUrl;