From: Peter Penz <peter.penz19@gmail.com>
Date: Thu, 3 Feb 2011 16:23:45 +0000 (+0100)
Subject: Use KUrl::isParentOf() instead of doing custom QString-operations
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/b1843402863d0473b00d872daec4ab382ddec030?ds=inline

Use KUrl::isParentOf() instead of doing custom QString-operations

This fixes the issue that a directory might be declared as indexed/non-indexed although it just starts with a similar name like another directory.
---

diff --git a/src/search/dolphinsearchinformation.cpp b/src/search/dolphinsearchinformation.cpp
index 2cba5a147..28863034b 100644
--- a/src/search/dolphinsearchinformation.cpp
+++ b/src/search/dolphinsearchinformation.cpp
@@ -53,15 +53,14 @@ bool DolphinSearchInformation::isIndexingEnabled() const
 bool DolphinSearchInformation::isPathIndexed(const KUrl& url) const
 {
 #ifdef HAVE_NEPOMUK
-    const QString path = url.path();
-
     const KConfig strigiConfig("nepomukstrigirc");
     const QStringList indexedFolders = strigiConfig.group("General").readPathEntry("folders", QStringList());
 
     // Check whether the path is part of an indexed folder
     bool isIndexed = false;
     foreach (const QString& indexedFolder, indexedFolders) {
-        if (path.startsWith(indexedFolder)) {
+        const KUrl indexedPath(indexedFolder);
+        if (indexedPath.isParentOf(url)) {
             isIndexed = true;
             break;
         }
@@ -72,7 +71,8 @@ bool DolphinSearchInformation::isPathIndexed(const KUrl& url) const
         // excluded folder is part of the path.
         const QStringList excludedFolders = strigiConfig.group("General").readPathEntry("exclude folders", QStringList());
         foreach (const QString& excludedFolder, excludedFolders) {
-            if (path.startsWith(excludedFolder)) {
+            const KUrl excludedPath(excludedFolder);
+            if (excludedPath.isParentOf(url)) {
                 isIndexed = false;
                 break;
             }