From 65b614a0d142e229206fbde22a25f4a3b20b1dbc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 2 Jun 2013 22:14:54 +0300
Subject: In drag and drop use ints and images but not pointer to item.

---
 src/gui/widgets/dropshortcutcontainer.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 2a65a57c1..ac2916c1d 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -214,11 +214,10 @@ void DropShortcutContainer::mousePressed(gcn::MouseEvent &event)
         }
         else
         {
-            Item *const selected = dragDrop.getSelected();
-            if (selected)
+            if (dragDrop.isSelected())
             {
-                dropShortcut->setItems(index, selected->getId(),
-                    selected->getColor());
+                dropShortcut->setItems(index, dragDrop.getSelected(),
+                    dragDrop.getSelectedColor());
                 dragDrop.deselect();
             }
         }
@@ -255,13 +254,10 @@ void DropShortcutContainer::mouseReleased(gcn::MouseEvent &event)
         }
         if (!dragDrop.isEmpty())
         {
-            Item *const item = dragDrop.getItem();
-            if (item)
-            {
-                dropShortcut->setItems(index, item->getId(), item->getColor());
-                dragDrop.clear();
-                dragDrop.deselect();
-            }
+            dropShortcut->setItems(index, dragDrop.getItem(),
+                dragDrop.getItemColor());
+            dragDrop.clear();
+            dragDrop.deselect();
         }
 
         mItemClicked = false;
-- 
cgit v1.2.3-70-g09d2