Introduce QItemDelegate::destroyEditor virtual invoked at editor close

This provides a stronger mechanism e.g when inheriting QItemDelegate.

It makes some things much easier e.g avoid delete of an editor
and maybe only delete depending on what the editor says itself.

This introduces a new virtual function.

Task-number: QTBUG-2299

Change-Id: I8410f8199775987dbacffd99e4c354fdadcdd21f
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index e6ba21e701..98a17a5178 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -1098,7 +1098,7 @@ void QAbstractItemView::reset()
     d->delayedReset.stop(); //make sure we stop the timer
     foreach (const QEditorInfo &info, d->indexEditorHash) {
         if (info.widget)
-            d->releaseEditor(info.widget.data());
+            d->releaseEditor(info.widget.data(), d->indexForEditor(info.widget.data()));
     }
     d->editorIndexHash.clear();
     d->indexEditorHash.clear();
@@ -2778,7 +2778,7 @@ void QAbstractItemView::closeEditor(QWidget *editor, QAbstractItemDelegate::EndE
         editor = ed;
 
         if (!isPersistent && editor)
-            d->releaseEditor(editor);
+            d->releaseEditor(editor, index);
     }
 
     // The EndEditHint part
@@ -3102,7 +3102,7 @@ void QAbstractItemView::closePersistentEditor(const QModelIndex &index)
             closeEditor(editor, QAbstractItemDelegate::RevertModelCache);
         d->persistent.remove(editor);
         d->removeEditor(editor);
-        d->releaseEditor(editor);
+        d->releaseEditor(editor, index);
     }
 }
 
@@ -3314,7 +3314,7 @@ void QAbstractItemView::rowsAboutToBeRemoved(const QModelIndex &parent, int star
             QEditorInfo info = d->indexEditorHash.take(index);
             i = d->editorIndexHash.erase(i);
             if (info.widget)
-                d->releaseEditor(editor);
+                d->releaseEditor(editor, index);
         } else {
             ++i;
         }
@@ -3393,7 +3393,7 @@ void QAbstractItemViewPrivate::_q_columnsAboutToBeRemoved(const QModelIndex &par
             QEditorInfo info = indexEditorHash.take(it.value());
             it = editorIndexHash.erase(it);
             if (info.widget)
-                releaseEditor(editor);
+                releaseEditor(editor, index);
         } else {
             ++it;
         }