[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dolphin] src: DolphinContextMenu: Do not check if the clicked folder is in the Places
From:       Frank Reininghaus <frank78ac () googlemail ! com>
Date:       2016-02-10 21:38:27
Message-ID: E1aTcSx-0004yM-CY () scm ! kde ! org
[Download RAW message or body]

Git commit d094c8ffe64d226d5afef50693a3bb04b360ed7b by Frank Reininghaus.
Committed on 10/02/2016 at 21:36.
Pushed by freininghaus into branch 'master'.

DolphinContextMenu: Do not check if the clicked folder is in the Places

This prevents that the setup of the PlacesItemModel queries Solid for
the available devices, which can take some time.

Places can be added multiple times now using the context menu, but this
has always been possible with drag and drop anyway.

See https://forum.kde.org/viewtopic.php?f=223&t=130617 for a dicsussion
on this topic.

REVIEW: 126904

M  +5    -10   src/dolphincontextmenu.cpp

http://commits.kde.org/dolphin/d094c8ffe64d226d5afef50693a3bb04b360ed7b

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index af283cf..0830d4b 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -427,16 +427,11 @@ void DolphinContextMenu::addShowMenuBarAction()
 
 bool DolphinContextMenu::placeExists(const QUrl& url) const
 {
-    PlacesItemModel model;
-
-    const int count = model.count();
-    for (int i = 0; i < count; ++i) {
-        const QUrl placeUrl = model.placesItem(i)->url();
-        if (placeUrl.matches(url, QUrl::StripTrailingSlash)) {
-            return true;
-        }
-    }
-
+    // Creating up a PlacesItemModel to find out if 'url' is one of the Places
+    // can be expensive because the model asks Solid for the devices which are
+    // available, which can take some time.
+    // TODO: Consider restoring this check if the handling of Places and devices
+    // will be decoupled in the future.
     return false;
 }
 

[prev in list] [next in list] [prev in thread] [next in thread]