Do not return deleted icon view items after icon view deletion

This resolves Bug 1605 (cherry picked from commit d2ab408c06)
12 years ago · 3dccb6a206
parent 1ee1281a95
commit 3dccb6a206
1 changed files with 19 additions and 3 deletions
--- a/src/iconview/qiconview.cpp
+++ b/src/iconview/qiconview.cpp
@ -2959,6 +2959,7 @@ QIconView::~QIconView()
    d->toolTip = 0;
 #endif
    delete d;
+    d = NULL;
 }

 /*!
@ -3222,7 +3223,12 @@ int QIconView::index( const QIconViewItem *item ) const

 QIconViewItem *QIconView::firstItem() const
 {
+    if (d) {
        return d->firstItem;
+    }
+    else {
+        return NULL;
+    }
 }

 /*!
@ -3234,7 +3240,12 @@ QIconViewItem *QIconView::firstItem() const

 QIconViewItem *QIconView::lastItem() const
 {
+    if (d) {
        return d->lastItem;
+    }
+    else {
+        return NULL;
+    }
 }

 /*!
@ -3246,7 +3257,12 @@ QIconViewItem *QIconView::lastItem() const

 QIconViewItem *QIconView::currentItem() const
 {
+    if (d) {
        return d->currentItem;
+    }
+    else {
+        return NULL;
+    }
 }

 /*!