Do not return deleted icon view items after icon view deletion

This resolves Bug 1605
pull/2/head
Timothy Pearson 12 years ago
parent 32bd03533d
commit d2ab408c06

@ -2964,6 +2964,7 @@ QIconView::~QIconView()
d->toolTip = 0; d->toolTip = 0;
#endif #endif
delete d; delete d;
d = NULL;
} }
/*! /*!
@ -3227,8 +3228,13 @@ int QIconView::index( const QIconViewItem *item ) const
QIconViewItem *QIconView::firstItem() const QIconViewItem *QIconView::firstItem() const
{ {
if (d) {
return d->firstItem; return d->firstItem;
} }
else {
return NULL;
}
}
/*! /*!
Returns a pointer to the last item of the icon view, or 0 if there Returns a pointer to the last item of the icon view, or 0 if there
@ -3239,8 +3245,13 @@ QIconViewItem *QIconView::firstItem() const
QIconViewItem *QIconView::lastItem() const QIconViewItem *QIconView::lastItem() const
{ {
if (d) {
return d->lastItem; return d->lastItem;
} }
else {
return NULL;
}
}
/*! /*!
Returns a pointer to the current item of the icon view, or 0 if no Returns a pointer to the current item of the icon view, or 0 if no
@ -3251,8 +3262,13 @@ QIconViewItem *QIconView::lastItem() const
QIconViewItem *QIconView::currentItem() const QIconViewItem *QIconView::currentItem() const
{ {
if (d) {
return d->currentItem; return d->currentItem;
} }
else {
return NULL;
}
}
/*! /*!
Makes \a item the new current item of the icon view. Makes \a item the new current item of the icon view.

Loading…
Cancel
Save