browser items parent (moving to thread) fix (crash when dragging post…

…gres layer)
qgis · Dec 16, 2014 · 9fbcc7e24875c2f22874f9e2b9e8bfb487b31bc7 · 9fbcc7e
1 parent 79e1236
commit 9fbcc7e24875c2f22874f9e2b9e8bfb487b31bc7
Unified Split

Showing with 2 additions and 4 deletions.

+1 −2 src/core/qgsdataitem.cpp

+1 −2 src/core/qgsdataitem.h
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -160,15 +160,14 @@ QgsDataItem::QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, QString n
     : QObject()
     , mType( type )
     , mCapabilities( NoCapabilities )
-    , mParent( 0 ) // items are created without parent, parent is set later by setParent()
+    , mParent( parent )
     , mState( NotPopulated )
     , mPopulated( false )
     , mName( name )
     , mPath( path )
     , mDeferredDelete( false )
     , mFutureWatcher( 0 )
 {
-  Q_UNUSED( parent );
 }
 
 QgsDataItem::~QgsDataItem()

diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -54,8 +54,7 @@ class CORE_EXPORT QgsDataItem : public QObject
       Favourites
     };
 
-    /** Create new data item.
-     * @param parent - the param is ignored, children created by createChildren() do not have parent, parent is set later by setParent if the item really becomes a parent child */
+    /** Create new data item. */
     QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, QString name, QString path );
     virtual ~QgsDataItem();