Fix merge to master and add shortcut

2 files changed, 6 insertions, 6 deletions

diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index d3729da94..922576ec5 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -121,7 +121,7 @@ DrawingItem::DrawingItem(Drawing &drawing)
     , _fill_pattern(nullptr)
     , _stroke_pattern(nullptr)
     , _filter(nullptr)
-    , _item(nullptr)
+    , _user_data(nullptr)
     , _cache(nullptr)
     , _state(0)
     , _child_type(CHILD_ORPHAN)
@@ -1031,9 +1031,10 @@ DrawingItem::pick(Geom::Point const &p, double delta, unsigned flags)
 Glib::ustring
 DrawingItem::name()
 {
-    if (_item) {
-        if (_item->getId())
-            return _item->getId();
+    SPObject *object = static_cast<SPObject *>(_user_data);
+    if (object) {
+        if(object->getId())
+            return object->getId();
         else
             return "No object id";
     } else {
diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h
index 2481a01a1..8cf7604c9 100644
--- a/src/display/drawing-item.h
+++ b/src/display/drawing-item.h
@@ -131,7 +131,6 @@ public:
 
     void setKey(unsigned key) { _key = key; }
     unsigned key() const { return _key; }
-
     void setData(void *data) { _user_data = data; }
     void *data() const { return _user_data; }
 
@@ -205,7 +204,7 @@ protected:
     DrawingPattern *_fill_pattern;
     DrawingPattern *_stroke_pattern;
     Inkscape::Filters::Filter *_filter;
-    SPItem *_item; ///< Used to associate DrawingItems with SPItems that created them
+    void *_user_data; ///< Used to associate DrawingItems with SPItems that created them
     DrawingCache *_cache;
 
     CacheList::iterator _cache_iterator;