From 2ee5449aca803d998d5ed18da69f366af01e5580 Mon Sep 17 00:00:00 2001 From: Wang Peng Date: Thu, 27 Aug 2020 18:34:21 +0800 Subject: QCompleterItemDelegate: replace QItemDelegate with QStyledItemDelegate Resolve remaining Qt6 TODOs Change-Id: Ice8dae2f1cbd3ed452ab78d5d7735127d7662900 Reviewed-by: Volker Hilsheimer --- src/widgets/util/qcompleter_p.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/widgets/util') diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h index 2ca5a11231..ad10a4480b 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -58,7 +58,7 @@ #include "QtWidgets/qabstractitemview.h" #include "QtCore/qabstractproxymodel.h" #include "qcompleter.h" -#include "QtWidgets/qitemdelegate.h" +#include "qstyleditemdelegate.h" #include "QtGui/qpainter.h" #include "private/qabstractproxymodel_p.h" @@ -194,18 +194,17 @@ private: const QIndexMapper& iv, QMatchData* m); }; -// ### Qt6: QStyledItemDelegate -class QCompleterItemDelegate : public QItemDelegate +class QCompleterItemDelegate : public QStyledItemDelegate { public: QCompleterItemDelegate(QAbstractItemView *view) - : QItemDelegate(view), view(view) { } + : QStyledItemDelegate(view), view(view) { } void paint(QPainter *p, const QStyleOptionViewItem& opt, const QModelIndex& idx) const override { QStyleOptionViewItem optCopy = opt; optCopy.showDecorationSelected = true; if (view->currentIndex() == idx) optCopy.state |= QStyle::State_HasFocus; - QItemDelegate::paint(p, optCopy, idx); + QStyledItemDelegate::paint(p, optCopy, idx); } private: -- cgit v1.2.3