whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCalendarDelegate: replace QItemDelegate with QStyledItemDelegate 

Resolve remaining Qt6 TODOs

Change-Id: I018ef5e3761816dce052a78be3dcd07ede866135
Reviewed-by: JiDe Zhang <zccrs@live.com>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Wang Peng 2020-08-27 18:57:43 +08:00
parent 7505422bbf
commit bb3cdd6e3a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/widgets/qcalendarwidget.cpp
View File

@ -40,7 +40,7 @@
#include "qcalendarwidget.h"
#include <qabstractitemmodel.h>
#include <qitemdelegate.h>
#include <qstyleditemdelegate.h>
#include <qdatetime.h>
#include <qtableview.h>
#include <qlayout.h>
@ -1583,13 +1583,12 @@ void QCalendarView::mouseReleaseEvent(QMouseEvent *event)
}
}
// ### Qt6: QStyledItemDelegate
class QCalendarDelegate : public QItemDelegate
class QCalendarDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
QCalendarDelegate(QCalendarWidgetPrivate *w, QObject *parent = nullptr)
: QItemDelegate(parent), calendarWidgetPrivate(w)
: QStyledItemDelegate(parent), calendarWidgetPrivate(w)
{ }
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
@ -1706,7 +1705,7 @@ void QCalendarDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
QRect rect = option.rect;
calendarWidgetPrivate->paintCell(painter, rect, date);
} else {
QItemDelegate::paint(painter, option, index);
QStyledItemDelegate::paint(painter, option, index);
}
}
@ -1717,7 +1716,7 @@ void QCalendarDelegate::paintCell(QPainter *painter, const QRect &rect, QDate da
int col = -1;
calendarWidgetPrivate->m_model->cellForDate(date, &row, &col);
QModelIndex idx = calendarWidgetPrivate->m_model->index(row, col);
QItemDelegate::paint(painter, storedOption, idx);
QStyledItemDelegate::paint(painter, storedOption, idx);
}
QCalendarWidgetPrivate::QCalendarWidgetPrivate()