diff options
author | Thorbjørn Lund Martsum <tmartsum@gmail.com> | 2011-12-15 16:48:51 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 01:56:03 +0100 |
commit | 15f253a46aa45e2a9fa1055799fa2768ba49b9a3 (patch) | |
tree | 46156f4e7ed503d9c0596b74ef58361f14ceb90f /src/widgets/itemviews/qabstractitemview_p.h | |
parent | efecd011897e8852cf67ce119dafa879fc671b9c (diff) |
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>
Diffstat (limited to 'src/widgets/itemviews/qabstractitemview_p.h')
-rw-r--r-- | src/widgets/itemviews/qabstractitemview_p.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h index ab2fc67ade..3826f3b4e9 100644 --- a/src/widgets/itemviews/qabstractitemview_p.h +++ b/src/widgets/itemviews/qabstractitemview_p.h @@ -200,13 +200,18 @@ public: // reimplemented in subclasses virtual void adjustViewOptionsForIndex(QStyleOptionViewItemV4*, const QModelIndex&) const {} - inline void releaseEditor(QWidget *editor) const { + inline void releaseEditor(QWidget *editor, const QModelIndex &index = QModelIndex()) const { if (editor) { QObject::disconnect(editor, SIGNAL(destroyed(QObject*)), q_func(), SLOT(editorDestroyed(QObject*))); editor->removeEventFilter(itemDelegate); editor->hide(); - editor->deleteLater(); + QAbstractItemDelegate *delegate = delegateForIndex(index); + + if (delegate) + delegate->destroyEditor(editor, index); + else + editor->deleteLater(); } } |