diff options
Diffstat (limited to 'src/widgets/itemviews/qitemdelegate.cpp')
-rw-r--r-- | src/widgets/itemviews/qitemdelegate.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index 2972202406..fde800b1e8 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -111,24 +111,21 @@ public: return text; } - static QString valueToText(const QVariant &value, const QStyleOptionViewItemV4 &option); + static QString valueToText(const QVariant &value, const QStyleOptionViewItem &option); void _q_commitDataAndCloseEditor(QWidget *editor); QItemEditorFactory *f; bool clipPainting; - QRect textLayoutBounds(const QStyleOptionViewItemV2 &options) const; + QRect textLayoutBounds(const QStyleOptionViewItem &options) const; QSizeF doTextLayout(int lineWidth) const; mutable QTextLayout textLayout; mutable QTextOption textOption; const QWidget *widget(const QStyleOptionViewItem &option) const { - if (const QStyleOptionViewItemV3 *v3 = qstyleoption_cast<const QStyleOptionViewItemV3 *>(&option)) - return v3->widget; - - return 0; + return option.widget; } // ### temporary hack until we have QStandardItemDelegate @@ -146,10 +143,10 @@ void QItemDelegatePrivate::_q_commitDataAndCloseEditor(QWidget *editor) emit q->closeEditor(editor, QAbstractItemDelegate::SubmitModelCache); } -QRect QItemDelegatePrivate::textLayoutBounds(const QStyleOptionViewItemV2 &option) const +QRect QItemDelegatePrivate::textLayoutBounds(const QStyleOptionViewItem &option) const { QRect rect = option.rect; - const bool wrapText = option.features & QStyleOptionViewItemV2::WrapText; + const bool wrapText = option.features & QStyleOptionViewItem::WrapText; switch (option.decorationPosition) { case QStyleOptionViewItem::Left: case QStyleOptionViewItem::Right: @@ -353,7 +350,7 @@ void QItemDelegate::setClipping(bool clip) d->clipPainting = clip; } -QString QItemDelegatePrivate::valueToText(const QVariant &value, const QStyleOptionViewItemV4 &option) +QString QItemDelegatePrivate::valueToText(const QVariant &value, const QStyleOptionViewItem &option) { QString text; switch (value.userType()) { @@ -667,13 +664,13 @@ void QItemDelegate::drawDisplay(QPainter *painter, const QStyleOptionViewItem &o painter->restore(); } - const QStyleOptionViewItemV4 opt = option; + const QStyleOptionViewItem opt = option; const QWidget *widget = d->widget(option); QStyle *style = widget ? widget->style() : QApplication::style(); const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, widget) + 1; QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding - const bool wrapText = opt.features & QStyleOptionViewItemV2::WrapText; + const bool wrapText = opt.features & QStyleOptionViewItem::WrapText; d->textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::ManualWrap); d->textOption.setTextDirection(option.direction); d->textOption.setAlignment(QStyle::visualAlignment(option.direction, option.displayAlignment)); |