Removed warning, minor coding style update

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index d00c5c0770aff15960f3a8c582e7b22594b6980d..53171966c89f7f8e75a0de2d8bad4b56ed8101f0 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -32,6 +32,7 @@
 #include <KActionCollection>
 #include <KColorScheme>
 #include <KDirLister>
+#include <KDirModel>
 #include <KIconEffect>
 #include <KFileItem>
 #include <KFileItemListProperties>
@@ -702,18 +703,21 @@ void DolphinView::activate()
 
 void DolphinView::slotItemActivated(int index)
 {
-    KFileItemList items = selectedItems();
-    if (items.isEmpty())
+    Q_UNUSED(index);
+
+    const KFileItemList items = selectedItems();
+    if (items.isEmpty()) {
         return;
+    }
+
     if (items.count() == 1) {
         emit itemActivated(items.at(0)); // caught by DolphinViewContainer or DolphinPart
-    }
-    else {
-        foreach (const KFileItem& fileItem, items) {
-            if (fileItem.isDir()) {
-                emit tabRequested(fileItem.url());
+    } else {
+        foreach (const KFileItem& item, items) {
+            if (item.isDir()) {
+                emit tabRequested(item.url());
             } else {
-                emit itemActivated(fileItem);
+                emit itemActivated(item);
             }
         }
     }
@@ -862,7 +866,7 @@ bool DolphinView::isTabsForFilesEnabled() const
 
 bool DolphinView::itemsExpandable() const
 {
-    return false; //m_viewAccessor.itemsExpandable();
+    return m_mode == DetailsView;
 }
 
 void DolphinView::restoreState(QDataStream& stream)
@@ -1172,18 +1176,17 @@ void DolphinView::updateZoomLevel(int oldZoomLevel)
 
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
-    Q_ASSERT(false); // TODO
     KUrl::List urls;
-/*
+
     const KFileItemList items = selectedItems();
     foreach (const KFileItem &item, items) {
         urls.append(item.url());
     }
 
-
     if (itemsExpandable()) {
+        // TODO: Check if we still need KDirModel for this in KDE 5.0
         urls = KDirModel::simplifiedUrlList(urls);
-    }*/
+    }
 
     return urls;
 }