Do not return deleted icon view items after icon view deletion

This resolves Bug 1605
(cherry picked from commit d2ab408c06)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent 1ee1281a95
commit 3dccb6a206

@ -2959,6 +2959,7 @@ QIconView::~QIconView()
d->toolTip = 0; d->toolTip = 0;
#endif #endif
delete d; delete d;
d = NULL;
} }
/*! /*!
@ -3222,7 +3223,12 @@ int QIconView::index( const QIconViewItem *item ) const
QIconViewItem *QIconView::firstItem() const QIconViewItem *QIconView::firstItem() const
{ {
return d->firstItem; if (d) {
return d->firstItem;
}
else {
return NULL;
}
} }
/*! /*!
@ -3234,7 +3240,12 @@ QIconViewItem *QIconView::firstItem() const
QIconViewItem *QIconView::lastItem() const QIconViewItem *QIconView::lastItem() const
{ {
return d->lastItem; if (d) {
return d->lastItem;
}
else {
return NULL;
}
} }
/*! /*!
@ -3246,7 +3257,12 @@ QIconViewItem *QIconView::lastItem() const
QIconViewItem *QIconView::currentItem() const QIconViewItem *QIconView::currentItem() const
{ {
return d->currentItem; if (d) {
return d->currentItem;
}
else {
return NULL;
}
} }
/*! /*!

Loading…
Cancel
Save