Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 1e2e66f5aa6a7d92bf473b7a2f45a91caf8b8a0a..61179a3ac4446c2d97a73b44b49124b8f151e317 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -215,17 +215,12 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
     const QModelIndex index = indexAt(event->pos());
     setDirtyRegion(m_dropRect);
 
     const QModelIndex index = indexAt(event->pos());
     setDirtyRegion(m_dropRect);
 

-    if(!index.isValid()) {
-        m_dropRect.setSize(QSize()); // set as invalid
-    } else {
-        KFileItem item = itemForIndex(index);
-        if (item.isNull()) {
-            kWarning(7007) << "Invalid item returned for index";
-        } else if (itemForIndex(index).isDir()) {
+    m_dropRect.setSize(QSize()); // set as invalid
+    if (index.isValid()) {
+        const KFileItem item = itemForIndex(index);
+        if (!item.isNull() && item.isDir()) {

             m_dropRect = visualRect(index);
             m_dropRect = visualRect(index);

-        } else {
-            m_dropRect.setSize(QSize()); // set as invalid
-       }
+        }

     }
     setDirtyRegion(m_dropRect);
 }
     }
     setDirtyRegion(m_dropRect);
 }