diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-03 15:56:00 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-15 19:49:39 +0100 |
| commit | 3dccb6a206768044f9f5852de5f74d4a86b2a0e0 (patch) | |
| tree | 8324f0d45061c790d2d801fb61b3d8e5a0663185 | |
| parent | 1ee1281a959e2afbc26fb45fefe91a62612be0e4 (diff) | |
| download | qt3-3dccb6a206768044f9f5852de5f74d4a86b2a0e0.tar.gz qt3-3dccb6a206768044f9f5852de5f74d4a86b2a0e0.zip | |
Do not return deleted icon view items after icon view deletion
This resolves Bug 1605
(cherry picked from commit d2ab408c068de5c4841e3a7d5fb4dce2e1a66ea9)
| -rw-r--r-- | src/iconview/qiconview.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/iconview/qiconview.cpp b/src/iconview/qiconview.cpp index f175b1f..335ca22 100644 --- 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 { - return d->firstItem; + if (d) { + return d->firstItem; + } + else { + return NULL; + } } /*! @@ -3234,7 +3240,12 @@ QIconViewItem *QIconView::firstItem() 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 { - return d->currentItem; + if (d) { + return d->currentItem; + } + else { + return NULL; + } } /*! |