Force a root-expansion level for the trash protocol

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 04ec349665aba7e6b607072d001c35ac7f7a223a..2e583d05e2434b46ede6a6eb8eadcb4c08f9da19 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -1149,8 +1149,10 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item)
         if (m_rootExpansionLevel == UninitializedRootExpansionLevel && m_dirLister.data()) {
             const KUrl rootUrl = m_dirLister.data()->url();
             const QString protocol = rootUrl.protocol();
         if (m_rootExpansionLevel == UninitializedRootExpansionLevel && m_dirLister.data()) {
             const KUrl rootUrl = m_dirLister.data()->url();
             const QString protocol = rootUrl.protocol();

-            const bool isSearchUrl = (protocol.contains("search") || protocol == QLatin1String("nepomuk"));
-            if (isSearchUrl) {
+            const bool forceRootExpansionLevel = (protocol == QLatin1String("trash") ||
+                                                  protocol == QLatin1String("nepomuk") ||
+                                                  protocol.contains(QLatin1String("search")));
+            if (forceRootExpansionLevel) {

                 m_rootExpansionLevel = ForceRootExpansionLevel;
             } else {
                 const QString rootDir = rootUrl.directory(KUrl::AppendTrailingSlash);
                 m_rootExpansionLevel = ForceRootExpansionLevel;
             } else {
                 const QString rootDir = rootUrl.directory(KUrl::AppendTrailingSlash);