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

[dolphin.git] / src / draganddrophelper.cpp

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index d9188675a5561f667c9195ee7b845b65b302b3f2..39af6a3ce559a3add600c2d7683817081f0f4c42 100644 (file)
--- a/src/draganddrophelper.cpp
+++ b/src/draganddrophelper.cpp
@@ -49,7 +49,7 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView, Qt::DropActions s
             const KFileItem item = dirModel->itemForIndex(index);
             pixmap = item.pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
         } else {
             const KFileItem item = dirModel->itemForIndex(index);
             pixmap = item.pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
         } else {

-            pixmap = KIcon("item-drag-multiple").pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium);
+            pixmap = KIcon("document-multiple").pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium);

         }
         drag->setPixmap(pixmap);
         drag->setMimeData(data);
         }
         drag->setPixmap(pixmap);
         drag->setMimeData(data);


@@ -61,6 +61,10 @@ void DragAndDropHelper::drawHoverIndication(QWidget* widget,
                                             const QRect& bounds,
                                             const QBrush& brush)
 {
                                             const QRect& bounds,
                                             const QBrush& brush)
 {

+    if (bounds.isEmpty()) {
+        return;
+    }
+

     QPainter painter(widget);
     painter.save();
     QBrush blendedBrush(brush);
     QPainter painter(widget);
     painter.save();
     QBrush blendedBrush(brush);