]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Revert some hunks from previous commit
authorKevin Funk <kfunk@kde.org>
Tue, 21 Nov 2017 10:00:07 +0000 (11:00 +0100)
committerKevin Funk <kfunk@kde.org>
Tue, 21 Nov 2017 10:00:07 +0000 (11:00 +0100)
Changes in folderspanel.cpp in 464b13f3828e5cdd03438d0881c3a62c7cda6333 were unintended.

src/panels/folders/folderspanel.cpp

index 6659c7c91bbd4a2dd7ca9463785123ae222fa218..eef27ce4725c0cb363302a8e760eb3523b6541d9 100644 (file)
@@ -91,7 +91,7 @@ void FoldersPanel::setLimitFoldersPanelToHome(bool enable)
 
 bool FoldersPanel::limitFoldersPanelToHome() const
 {
-    return limitFoldersPanelToHome();
+    return FoldersPanelSettings::limitFoldersPanelToHome();
 }
 
 void FoldersPanel::setAutoScrolling(bool enable)
@@ -325,7 +325,7 @@ void FoldersPanel::loadTree(const QUrl& url)
     QUrl baseUrl;
     if (url.isLocalFile()) {
         const bool isInHomeFolder = Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url);
-        if (limitFoldersPanelToHome() && isInHomeFolder) {
+        if (FoldersPanelSettings::limitFoldersPanelToHome() && isInHomeFolder) {
             baseUrl = Dolphin::homeUrl();
         } else {
             // Use the root directory as base for local URLs (#150941)