diff --git a/kdeui/colors/kcolorcombo.cpp b/kdeui/colors/kcolorcombo.cpp index 4e682dbc..216c602a 100644 --- a/kdeui/colors/kcolorcombo.cpp +++ b/kdeui/colors/kcolorcombo.cpp @@ -80,7 +80,7 @@ void KColorComboDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o innercolor = option.palette.color(QPalette::Base); } // highlight selected item - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); opt.showDecorationSelected = true; QStyle *style = opt.widget ? opt.widget->style() : QApplication::style(); style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget); diff --git a/kdeui/colors/kcolordialog.cpp b/kdeui/colors/kcolordialog.cpp index f3966790..bd4d83da 100644 --- a/kdeui/colors/kcolordialog.cpp +++ b/kdeui/colors/kcolordialog.cpp @@ -142,7 +142,7 @@ public: KColorCellsItemDelegate(KColorCells *parent): QStyledItemDelegate(parent) {} virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const { - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); initStyleOption(&opt,index); //Get the current cell color diff --git a/kdeui/itemviews/kcategorizedview.cpp b/kdeui/itemviews/kcategorizedview.cpp index 2e0d42ff..48541b8c 100644 --- a/kdeui/itemviews/kcategorizedview.cpp +++ b/kdeui/itemviews/kcategorizedview.cpp @@ -125,9 +125,9 @@ bool KCategorizedView::Private::isCategorized() const return proxyModel && categoryDrawer && proxyModel->isCategorizedModel(); } -QStyleOptionViewItemV4 KCategorizedView::Private::blockRect(const QModelIndex &representative) +QStyleOptionViewItem KCategorizedView::Private::blockRect(const QModelIndex &representative) { - QStyleOptionViewItemV4 option(q->viewOptions()); + QStyleOptionViewItem option(q->viewOptions()); const int height = categoryDrawer->categoryHeight(representative, option); const QString categoryDisplay = representative.data(KCategorizedSortFilterProxyModel::CategoryDisplayRole).toString(); QPoint pos = blockPosition(categoryDisplay); @@ -797,9 +797,9 @@ void KCategorizedView::paintEvent(QPaintEvent *event) while (it != d->blocks.constEnd()) { const Private::Block &block = *it; const QModelIndex categoryIndex = d->proxyModel->index(block.firstIndex.row(), d->proxyModel->sortColumn(), rootIndex()); - QStyleOptionViewItemV4 option(viewOptions()); - option.features |= d->alternatingBlockColors && block.alternate ? QStyleOptionViewItemV4::Alternate - : QStyleOptionViewItemV4::None; + QStyleOptionViewItem option(viewOptions()); + option.features |= d->alternatingBlockColors && block.alternate ? QStyleOptionViewItem::Alternate + : QStyleOptionViewItem::None; option.state |= !d->collapsibleBlocks || !block.collapsed ? QStyle::State_Open : QStyle::State_None; const int height = d->categoryDrawer->categoryHeight(categoryIndex, option); @@ -845,13 +845,13 @@ void KCategorizedView::paintEvent(QPaintEvent *event) const QModelIndex index = d->proxyModel->index(i, modelColumn(), rootIndex()); const Qt::ItemFlags flags = d->proxyModel->flags(index); - QStyleOptionViewItemV4 option(viewOptions()); + QStyleOptionViewItem option(viewOptions()); option.rect = visualRect(index); option.widget = this; - option.features |= wordWrap() ? QStyleOptionViewItemV2::WrapText - : QStyleOptionViewItemV2::None; - option.features |= alternatingRowColors() && alternateItem ? QStyleOptionViewItemV4::Alternate - : QStyleOptionViewItemV4::None; + option.features |= wordWrap() ? QStyleOptionViewItem::WrapText + : QStyleOptionViewItem::None; + option.features |= alternatingRowColors() && alternateItem ? QStyleOptionViewItem::Alternate + : QStyleOptionViewItem::None; if (flags & Qt::ItemIsSelectable) { option.state |= selectionModel()->isSelected(index) ? QStyle::State_Selected : QStyle::State_None; @@ -958,7 +958,7 @@ void KCategorizedView::mouseMoveEvent(QMouseEvent *event) while (it != d->blocks.constEnd()) { const Private::Block &block = *it; const QModelIndex categoryIndex = d->proxyModel->index(block.firstIndex.row(), d->proxyModel->sortColumn(), rootIndex()); - QStyleOptionViewItemV4 option(viewOptions()); + QStyleOptionViewItem option(viewOptions()); const int height = d->categoryDrawer->categoryHeight(categoryIndex, option); QPoint pos = d->blockPosition(it.key()); pos.ry() -= height; @@ -970,7 +970,7 @@ void KCategorizedView::mouseMoveEvent(QMouseEvent *event) if (option.rect.contains(mousePos)) { if (d->categoryDrawer && d->hoveredBlock->height != -1 && *d->hoveredBlock != block) { const QModelIndex categoryIndex = d->proxyModel->index(d->hoveredBlock->firstIndex.row(), d->proxyModel->sortColumn(), rootIndex()); - const QStyleOptionViewItemV4 option = d->blockRect(categoryIndex); + const QStyleOptionViewItem option = d->blockRect(categoryIndex); d->categoryDrawer->mouseLeft(categoryIndex, option.rect); *d->hoveredBlock = block; d->hoveredCategory = it.key(); @@ -988,7 +988,7 @@ void KCategorizedView::mouseMoveEvent(QMouseEvent *event) } if (d->categoryDrawer && d->hoveredBlock->height != -1) { const QModelIndex categoryIndex = d->proxyModel->index(d->hoveredBlock->firstIndex.row(), d->proxyModel->sortColumn(), rootIndex()); - const QStyleOptionViewItemV4 option = d->blockRect(categoryIndex); + const QStyleOptionViewItem option = d->blockRect(categoryIndex); d->categoryDrawer->mouseLeft(categoryIndex, option.rect); *d->hoveredBlock = Private::Block(); d->hoveredCategory = QString(); @@ -1011,7 +1011,7 @@ void KCategorizedView::mousePressEvent(QMouseEvent *event) while (it != d->blocks.constEnd()) { const Private::Block &block = *it; const QModelIndex categoryIndex = d->proxyModel->index(block.firstIndex.row(), d->proxyModel->sortColumn(), rootIndex()); - const QStyleOptionViewItemV4 option = d->blockRect(categoryIndex); + const QStyleOptionViewItem option = d->blockRect(categoryIndex); const QPoint mousePos = viewport()->mapFromGlobal(QCursor::pos()); if (option.rect.contains(mousePos)) { d->categoryDrawer->mouseButtonPressed(categoryIndex, option.rect, event); @@ -1038,7 +1038,7 @@ void KCategorizedView::mouseReleaseEvent(QMouseEvent *event) while (it != d->blocks.constEnd()) { const Private::Block &block = *it; const QModelIndex categoryIndex = d->proxyModel->index(block.firstIndex.row(), d->proxyModel->sortColumn(), rootIndex()); - const QStyleOptionViewItemV4 option = d->blockRect(categoryIndex); + const QStyleOptionViewItem option = d->blockRect(categoryIndex); const QPoint mousePos = viewport()->mapFromGlobal(QCursor::pos()); if (option.rect.contains(mousePos)) { d->categoryDrawer->mouseButtonReleased(categoryIndex, option.rect, event); @@ -1062,7 +1062,7 @@ void KCategorizedView::leaveEvent(QEvent *event) } if (d->categoryDrawer && d->hoveredBlock->height != -1) { const QModelIndex categoryIndex = d->proxyModel->index(d->hoveredBlock->firstIndex.row(), d->proxyModel->sortColumn(), rootIndex()); - const QStyleOptionViewItemV4 option = d->blockRect(categoryIndex); + const QStyleOptionViewItem option = d->blockRect(categoryIndex); d->categoryDrawer->mouseLeft(categoryIndex, option.rect); *d->hoveredBlock = Private::Block(); d->hoveredCategory = QString(); diff --git a/kdeui/itemviews/kcategorizedview_p.h b/kdeui/itemviews/kcategorizedview_p.h index a3bd95cd..bc0b8356 100644 --- a/kdeui/itemviews/kcategorizedview_p.h +++ b/kdeui/itemviews/kcategorizedview_p.h @@ -44,7 +44,7 @@ public: /** * @return the block rect for the representative @p representative. */ - QStyleOptionViewItemV4 blockRect(const QModelIndex &representative); + QStyleOptionViewItem blockRect(const QModelIndex &representative); /** * Returns the first and last element that intersects with rect. diff --git a/kdeui/itemviews/kextendableitemdelegate.cpp b/kdeui/itemviews/kextendableitemdelegate.cpp index fa0c281f..dbf13dc0 100644 --- a/kdeui/itemviews/kextendableitemdelegate.cpp +++ b/kdeui/itemviews/kextendableitemdelegate.cpp @@ -200,24 +200,24 @@ void KExtendableItemDelegate::paint(QPainter *painter, const QStyleOptionViewIte int indicatorX = 0; int indicatorY = 0; - QStyleOptionViewItemV4 indicatorOption(option); + QStyleOptionViewItem indicatorOption(option); initStyleOption(&indicatorOption, index); if (index.column() == 0) { - indicatorOption.viewItemPosition = QStyleOptionViewItemV4::Beginning; + indicatorOption.viewItemPosition = QStyleOptionViewItem::Beginning; } else if (index.column() == index.model()->columnCount() - 1) { - indicatorOption.viewItemPosition = QStyleOptionViewItemV4::End; + indicatorOption.viewItemPosition = QStyleOptionViewItem::End; } else { - indicatorOption.viewItemPosition = QStyleOptionViewItemV4::Middle; + indicatorOption.viewItemPosition = QStyleOptionViewItem::Middle; } - QStyleOptionViewItemV4 itemOption(option); + QStyleOptionViewItem itemOption(option); initStyleOption(&itemOption, index); if (index.column() == 0) { - itemOption.viewItemPosition = QStyleOptionViewItemV4::Beginning; + itemOption.viewItemPosition = QStyleOptionViewItem::Beginning; } else if (index.column() == index.model()->columnCount() - 1) { - itemOption.viewItemPosition = QStyleOptionViewItemV4::End; + itemOption.viewItemPosition = QStyleOptionViewItem::End; } else { - itemOption.viewItemPosition = QStyleOptionViewItemV4::Middle; + itemOption.viewItemPosition = QStyleOptionViewItem::Middle; } const bool showExtensionIndicator = index.model()->data(index, ShowExtensionIndicatorRole).toBool(); @@ -277,7 +277,7 @@ void KExtendableItemDelegate::paint(QPainter *painter, const QStyleOptionViewIte //an extender is present - make two rectangles: one to paint the original item, one for the extender if (isExtended(index)) { - QStyleOptionViewItemV4 extOption(option); + QStyleOptionViewItem extOption(option); initStyleOption(&extOption, index); extOption.rect = extenderRect(d->extender, option, index); updateExtenderGeometry(d->extender, extOption, index); diff --git a/kdeui/itemviews/kwidgetitemdelegate.cpp b/kdeui/itemviews/kwidgetitemdelegate.cpp index 10fb3d5f..ceb69285 100644 --- a/kdeui/itemviews/kwidgetitemdelegate.cpp +++ b/kdeui/itemviews/kwidgetitemdelegate.cpp @@ -148,9 +148,9 @@ void KWidgetItemDelegatePrivate::updateRowRange(const QModelIndex &parent, int s } } -inline QStyleOptionViewItemV4 KWidgetItemDelegatePrivate::optionView(const QModelIndex &index) +inline QStyleOptionViewItem KWidgetItemDelegatePrivate::optionView(const QModelIndex &index) { - QStyleOptionViewItemV4 optionView; + QStyleOptionViewItem optionView; optionView.initFrom(itemView->viewport()); optionView.rect = itemView->visualRect(index); optionView.decorationSize = itemView->iconSize(); diff --git a/kdeui/itemviews/kwidgetitemdelegate_p.h b/kdeui/itemviews/kwidgetitemdelegate_p.h index 5f1cf90c..9b70d3bf 100644 --- a/kdeui/itemviews/kwidgetitemdelegate_p.h +++ b/kdeui/itemviews/kwidgetitemdelegate_p.h @@ -50,7 +50,7 @@ public: void _k_slotSelectionChanged (const QItemSelection &selected, const QItemSelection &deselected); void updateRowRange(const QModelIndex &parent, int start, int end, bool isRemoving); - QStyleOptionViewItemV4 optionView(const QModelIndex &index); + QStyleOptionViewItem optionView(const QModelIndex &index); public Q_SLOTS: void initializeModel(const QModelIndex &parent = QModelIndex()); diff --git a/kdeui/paged/kpageview_p.cpp b/kdeui/paged/kpageview_p.cpp index 68d47841..fc0c9d83 100644 --- a/kdeui/paged/kpageview_p.cpp +++ b/kdeui/paged/kpageview_p.cpp @@ -420,7 +420,7 @@ void KPageListViewDelegate::paint( QPainter *painter, const QStyleOptionViewItem if ( cg == QPalette::Normal && !(option.state & QStyle::State_Active) ) cg = QPalette::Inactive; - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); opt.showDecorationSelected = true; QStyle *style = opt.widget ? opt.widget->style() : QApplication::style(); style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget); diff --git a/kfile/kfileplacesview.cpp b/kfile/kfileplacesview.cpp index 40985391..2d7ea091 100644 --- a/kfile/kfileplacesview.cpp +++ b/kfile/kfileplacesview.cpp @@ -144,7 +144,7 @@ void KFilePlacesViewDelegate::paint(QPainter *painter, const QStyleOptionViewIte painter->setOpacity(m_disappearingOpacity); } - QStyleOptionViewItemV4 opt = option; + QStyleOptionViewItem opt = option; if (!m_showHoverIndication) { opt.state &= ~QStyle::State_MouseOver; } @@ -828,7 +828,7 @@ void KFilePlacesView::paintEvent(QPaintEvent* event) } } else { // draw indicator for copying/moving/linking to items - QStyleOptionViewItemV4 opt; + QStyleOptionViewItem opt; opt.initFrom(this); opt.rect = itemRect; opt.state = QStyle::State_Enabled | QStyle::State_MouseOver; diff --git a/kfile/kurlnavigatorbuttonbase.cpp b/kfile/kurlnavigatorbuttonbase.cpp index 5add1f26..968fd085 100644 --- a/kfile/kurlnavigatorbuttonbase.cpp +++ b/kfile/kurlnavigatorbuttonbase.cpp @@ -119,10 +119,10 @@ void KUrlNavigatorButtonBase::drawHoverBackground(QPainter* painter) if (backgroundColor != Qt::transparent) { // TODO: the backgroundColor should be applied to the style - QStyleOptionViewItemV4 option; + QStyleOptionViewItem option; option.initFrom(this); option.state = QStyle::State_Enabled | QStyle::State_MouseOver; - option.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; + option.viewItemPosition = QStyleOptionViewItem::OnlyOne; style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, painter, this); } } diff --git a/kio/kio/kfileitemdelegate.cpp b/kio/kio/kfileitemdelegate.cpp index d08a6b76..2f6f3ce8 100644 --- a/kio/kio/kfileitemdelegate.cpp +++ b/kio/kio/kfileitemdelegate.cpp @@ -60,18 +60,18 @@ class KFileItemDelegate::Private Private(); ~Private() {} - QSize decorationSizeHint(const QStyleOptionViewItemV4 &option, const QModelIndex &index) const; - QSize displaySizeHint(const QStyleOptionViewItemV4 &option, const QModelIndex &index) const; + QSize decorationSizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + QSize displaySizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; QString replaceNewlines(const QString &string) const; inline KFileItem fileItem(const QModelIndex &index) const; - QString elidedText(QTextLayout &layout, const QStyleOptionViewItemV4 &option, const QSize &maxSize) const; - QSize layoutText(QTextLayout &layout, const QStyleOptionViewItemV4 &option, + QString elidedText(QTextLayout &layout, const QStyleOptionViewItem &option, const QSize &maxSize) const; + QSize layoutText(QTextLayout &layout, const QStyleOptionViewItem &option, const QString &text, const QSize &constraints) const; QSize layoutText(QTextLayout &layout, const QString &text, int maxWidth) const; - inline void setLayoutOptions(QTextLayout &layout, const QStyleOptionViewItemV4 &options) const; - inline bool verticalLayout(const QStyleOptionViewItemV4 &option) const; - inline QBrush brush(const QVariant &value, const QStyleOptionViewItemV4 &option) const; - QBrush foregroundBrush(const QStyleOptionViewItemV4 &option, const QModelIndex &index) const; + inline void setLayoutOptions(QTextLayout &layout, const QStyleOptionViewItem &options) const; + inline bool verticalLayout(const QStyleOptionViewItem &option) const; + inline QBrush brush(const QVariant &value, const QStyleOptionViewItem &option) const; + QBrush foregroundBrush(const QStyleOptionViewItem &option, const QModelIndex &index) const; inline void setActiveMargins(Qt::Orientation layout); void setVerticalMargin(MarginType type, int left, int right, int top, int bottom); void setHorizontalMargin(MarginType type, int left, int right, int top, int bottom); @@ -82,19 +82,19 @@ class KFileItemDelegate::Private inline QSize addMargin(const QSize &size, MarginType type) const; inline QSize subtractMargin(const QSize &size, MarginType type) const; QString itemSize(const QModelIndex &index, const KFileItem &item) const; - QString information(const QStyleOptionViewItemV4 &option, const QModelIndex &index, const KFileItem &item) const; - bool isListView(const QStyleOptionViewItemV4 &option) const; + QString information(const QStyleOptionViewItem &option, const QModelIndex &index, const KFileItem &item) const; + bool isListView(const QStyleOptionViewItem &option) const; QString display(const QModelIndex &index) const; - QIcon decoration(const QStyleOptionViewItemV4 &option, const QModelIndex &index) const; - QPoint iconPosition(const QStyleOptionViewItemV4 &option) const; - QRect labelRectangle(const QStyleOptionViewItemV4 &option) const; - void layoutTextItems(const QStyleOptionViewItemV4 &option, const QModelIndex &index, + QIcon decoration(const QStyleOptionViewItem &option, const QModelIndex &index) const; + QPoint iconPosition(const QStyleOptionViewItem &option) const; + QRect labelRectangle(const QStyleOptionViewItem &option) const; + void layoutTextItems(const QStyleOptionViewItem &option, const QModelIndex &index, QTextLayout *labelLayout, QTextLayout *infoLayout, QRect *textBoundingRect) const; void drawTextItems(QPainter *painter, const QTextLayout &labelLayout, const QTextLayout &infoLayout, const QRect &textBoundingRect) const; QPixmap applyHoverEffect(const QPixmap &icon) const; - void initStyleOption(QStyleOptionViewItemV4 *option, const QModelIndex &index) const; - void drawFocusRect(QPainter *painter, const QStyleOptionViewItemV4 &option, const QRect &rect) const; + void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const; + void drawFocusRect(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect) const; public: KFileItemDelegate::InformationList informationList; @@ -212,7 +212,7 @@ QString KFileItemDelegate::Private::itemSize(const QModelIndex &index, const KFi // Returns the additional information string, if one should be shown, or an empty string otherwise -QString KFileItemDelegate::Private::information(const QStyleOptionViewItemV4 &option, const QModelIndex &index, +QString KFileItemDelegate::Private::information(const QStyleOptionViewItem &option, const QModelIndex &index, const KFileItem &item) const { QString string; @@ -317,7 +317,7 @@ QString KFileItemDelegate::Private::replaceNewlines(const QString &text) const // Lays the text out in a rectangle no larger than constraints, eliding it as necessary -QSize KFileItemDelegate::Private::layoutText(QTextLayout &layout, const QStyleOptionViewItemV4 &option, +QSize KFileItemDelegate::Private::layoutText(QTextLayout &layout, const QStyleOptionViewItem &option, const QString &text, const QSize &constraints) const { const QSize size = layoutText(layout, text, constraints.width()); @@ -362,14 +362,14 @@ QSize KFileItemDelegate::Private::layoutText(QTextLayout &layout, const QString // or word breaking the line if it's wider than the max width, and finally adding an // ellipses at the end of the last line, if there are more lines than will fit within // the vertical size constraints. -QString KFileItemDelegate::Private::elidedText(QTextLayout &layout, const QStyleOptionViewItemV4 &option, +QString KFileItemDelegate::Private::elidedText(QTextLayout &layout, const QStyleOptionViewItem &option, const QSize &size) const { const QString text = layout.text(); int maxWidth = size.width(); int maxHeight = size.height(); qreal height = 0; - bool wrapText = (option.features & QStyleOptionViewItemV2::WrapText); + bool wrapText = (option.features & QStyleOptionViewItem::WrapText); // If the string contains a single line of text that shouldn't be word wrapped if (!wrapText && text.indexOf(QChar::LineSeparator) == -1) @@ -412,25 +412,25 @@ QString KFileItemDelegate::Private::elidedText(QTextLayout &layout, const QStyle } -void KFileItemDelegate::Private::setLayoutOptions(QTextLayout &layout, const QStyleOptionViewItemV4 &option) const +void KFileItemDelegate::Private::setLayoutOptions(QTextLayout &layout, const QStyleOptionViewItem &option) const { QTextOption textoption; textoption.setTextDirection(option.direction); textoption.setAlignment(QStyle::visualAlignment(option.direction, option.displayAlignment)); - textoption.setWrapMode((option.features & QStyleOptionViewItemV2::WrapText) ? wrapMode : QTextOption::NoWrap); + textoption.setWrapMode((option.features & QStyleOptionViewItem::WrapText) ? wrapMode : QTextOption::NoWrap); layout.setFont(option.font); layout.setTextOption(textoption); } -QSize KFileItemDelegate::Private::displaySizeHint(const QStyleOptionViewItemV4 &option, +QSize KFileItemDelegate::Private::displaySizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { QString label = option.text; int maxWidth = 0; if (maximumSize.isEmpty()) { - maxWidth = verticalLayout(option) && (option.features & QStyleOptionViewItemV2::WrapText) + maxWidth = verticalLayout(option) && (option.features & QStyleOptionViewItem::WrapText) ? option.decorationSize.width() + 10 : 32757; } else { @@ -466,7 +466,7 @@ QSize KFileItemDelegate::Private::displaySizeHint(const QStyleOptionViewItemV4 & } -QSize KFileItemDelegate::Private::decorationSizeHint(const QStyleOptionViewItemV4 &option, +QSize KFileItemDelegate::Private::decorationSizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { Q_UNUSED(index) @@ -483,7 +483,7 @@ QSize KFileItemDelegate::Private::decorationSizeHint(const QStyleOptionViewItemV } -bool KFileItemDelegate::Private::verticalLayout(const QStyleOptionViewItemV4 &option) const +bool KFileItemDelegate::Private::verticalLayout(const QStyleOptionViewItem &option) const { return (option.decorationPosition == QStyleOptionViewItem::Top || option.decorationPosition == QStyleOptionViewItem::Bottom); @@ -491,7 +491,7 @@ bool KFileItemDelegate::Private::verticalLayout(const QStyleOptionViewItemV4 &op // Converts a QVariant of type Brush or Color to a QBrush -QBrush KFileItemDelegate::Private::brush(const QVariant &value, const QStyleOptionViewItemV4 &option) const +QBrush KFileItemDelegate::Private::brush(const QVariant &value, const QStyleOptionViewItem &option) const { if (value.userType() == qMetaTypeId()) return qvariant_cast(value).brush(option.palette); @@ -509,7 +509,7 @@ QBrush KFileItemDelegate::Private::brush(const QVariant &value, const QStyleOpti } -QBrush KFileItemDelegate::Private::foregroundBrush(const QStyleOptionViewItemV4 &option, const QModelIndex &index) const +QBrush KFileItemDelegate::Private::foregroundBrush(const QStyleOptionViewItem &option, const QModelIndex &index) const { QPalette::ColorGroup cg = QPalette::Active; if (!(option.state & QStyle::State_Enabled)) { @@ -531,7 +531,7 @@ QBrush KFileItemDelegate::Private::foregroundBrush(const QStyleOptionViewItemV4 } -bool KFileItemDelegate::Private::isListView(const QStyleOptionViewItemV4 &option) const +bool KFileItemDelegate::Private::isListView(const QStyleOptionViewItem &option) const { if (qobject_cast(option.widget) || verticalLayout(option)) return true; @@ -553,7 +553,7 @@ QPixmap KFileItemDelegate::Private::applyHoverEffect(const QPixmap &icon) const return icon; } -void KFileItemDelegate::Private::layoutTextItems(const QStyleOptionViewItemV4 &option, const QModelIndex &index, +void KFileItemDelegate::Private::layoutTextItems(const QStyleOptionViewItem &option, const QModelIndex &index, QTextLayout *labelLayout, QTextLayout *infoLayout, QRect *textBoundingRect) const { @@ -658,7 +658,7 @@ void KFileItemDelegate::Private::drawTextItems(QPainter *painter, const QTextLay } -void KFileItemDelegate::Private::initStyleOption(QStyleOptionViewItemV4 *option, +void KFileItemDelegate::Private::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const { const KFileItem item = fileItem(index); @@ -691,11 +691,11 @@ void KFileItemDelegate::Private::initStyleOption(QStyleOptionViewItemV4 *option, option->text = display(index); if (!option->text.isEmpty()) - option->features |= QStyleOptionViewItemV2::HasDisplay; + option->features |= QStyleOptionViewItem::HasDisplay; option->icon = decoration(*option, index); if (!option->icon.isNull()) - option->features |= QStyleOptionViewItemV2::HasDecoration; + option->features |= QStyleOptionViewItem::HasDecoration; // ### Make sure this value is always true for now option->showDecorationSelected = true; @@ -742,7 +742,7 @@ QSize KFileItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QMod if (value.isValid()) return qvariant_cast(value); - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); d->initStyleOption(&opt, index); d->setActiveMargins(d->verticalLayout(opt) ? Qt::Vertical : Qt::Horizontal); @@ -895,13 +895,13 @@ QTextOption::WrapMode KFileItemDelegate::wrapMode() const QRect KFileItemDelegate::iconRect(const QStyleOptionViewItem &option, const QModelIndex &index) const { - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); d->initStyleOption(&opt, index); return QRect(d->iconPosition(opt), opt.icon.actualSize(opt.decorationSize)); } -QIcon KFileItemDelegate::Private::decoration(const QStyleOptionViewItemV4 &option, const QModelIndex &index) const +QIcon KFileItemDelegate::Private::decoration(const QStyleOptionViewItem &option, const QModelIndex &index) const { const QVariant value = index.data(Qt::DecorationRole); QIcon icon; @@ -931,7 +931,7 @@ QIcon KFileItemDelegate::Private::decoration(const QStyleOptionViewItemV4 &optio } -QRect KFileItemDelegate::Private::labelRectangle(const QStyleOptionViewItemV4 &option) const +QRect KFileItemDelegate::Private::labelRectangle(const QStyleOptionViewItem &option) const { if (option.icon.isNull()) return subtractMargin(option.rect, Private::ItemMargin); @@ -964,7 +964,7 @@ QRect KFileItemDelegate::Private::labelRectangle(const QStyleOptionViewItemV4 &o } -QPoint KFileItemDelegate::Private::iconPosition(const QStyleOptionViewItemV4 &option) const +QPoint KFileItemDelegate::Private::iconPosition(const QStyleOptionViewItem &option) const { const QRect itemRect = subtractMargin(option.rect, Private::ItemMargin); Qt::Alignment alignment; @@ -1001,7 +1001,7 @@ QPoint KFileItemDelegate::Private::iconPosition(const QStyleOptionViewItemV4 &op } -void KFileItemDelegate::Private::drawFocusRect(QPainter *painter, const QStyleOptionViewItemV4 &option, +void KFileItemDelegate::Private::drawFocusRect(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect) const { if (!(option.state & QStyle::State_HasFocus)) @@ -1032,7 +1032,7 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt if (!index.isValid()) return; - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); d->initStyleOption(&opt, index); d->setActiveMargins(d->verticalLayout(opt) ? Qt::Vertical : Qt::Horizontal); @@ -1045,7 +1045,7 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt if (index.column() > 0) opt.state &= ~QStyle::State_MouseOver; else - opt.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; + opt.viewItemPosition = QStyleOptionViewItem::OnlyOne; qreal progress = ((opt.state & QStyle::State_MouseOver) && index.column() == KDirModel::Name) ? 1.0 : 0.0; @@ -1098,7 +1098,7 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt QWidget *KFileItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const { - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); d->initStyleOption(&opt, index); KTextEdit *edit = new KTextEdit(parent); @@ -1166,7 +1166,7 @@ void KFileItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, void KFileItemDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const { - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); d->initStyleOption(&opt, index); d->setActiveMargins(d->verticalLayout(opt) ? Qt::Vertical : Qt::Horizontal); @@ -1226,7 +1226,7 @@ bool KFileItemDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *view, co // in the case the tooltip information is the same as the display information, // show it only in the case the display information is elided - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); d->initStyleOption(&opt, index); d->setActiveMargins(d->verticalLayout(opt) ? Qt::Vertical : Qt::Horizontal); @@ -1245,7 +1245,7 @@ bool KFileItemDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *view, co QRegion KFileItemDelegate::shape(const QStyleOptionViewItem &option, const QModelIndex &index) { - QStyleOptionViewItemV4 opt(option); + QStyleOptionViewItem opt(option); d->initStyleOption(&opt, index); d->setActiveMargins(d->verticalLayout(opt) ? Qt::Vertical : Qt::Horizontal);