[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kio] src: Replace obsolete QStyleOption subclasses
From: Christoph Feck <cfeck () kde ! org>
Date: 2016-06-16 17:11:25
Message-ID: E1bDapB-0003KQ-GL () scm ! kde ! org
[Download RAW message or body]
Git commit 47983cc093f923fbe6b223ce516b1d77a67c41dd by Christoph Feck.
Committed on 16/06/2016 at 17:10.
Pushed by cfeck into branch 'master'.
Replace obsolete QStyleOption subclasses
REVIEW: 128208
M +2 -2 src/filewidgets/kfileplacesview.cpp
M +2 -2 src/filewidgets/kurlnavigatorbuttonbase.cpp
M +49 -49 src/widgets/kfileitemdelegate.cpp
http://commits.kde.org/kio/47983cc093f923fbe6b223ce516b1d77a67c41dd
diff --git a/src/filewidgets/kfileplacesview.cpp \
b/src/filewidgets/kfileplacesview.cpp index 5d5fa9d..08378d5 100644
--- a/src/filewidgets/kfileplacesview.cpp
+++ b/src/filewidgets/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;
}
@@ -826,7 +826,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/src/filewidgets/kurlnavigatorbuttonbase.cpp \
b/src/filewidgets/kurlnavigatorbuttonbase.cpp index 69ce0ad..c30100a 100644
--- a/src/filewidgets/kurlnavigatorbuttonbase.cpp
+++ b/src/filewidgets/kurlnavigatorbuttonbase.cpp
@@ -116,10 +116,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/src/widgets/kfileitemdelegate.cpp b/src/widgets/kfileitemdelegate.cpp
index 11254d2..9a40b7c 100644
--- a/src/widgets/kfileitemdelegate.cpp
+++ b/src/widgets/kfileitemdelegate.cpp
@@ -69,18 +69,18 @@ public:
Private(KFileItemDelegate *parent);
~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); @@ -91,27 +91,27 @@ public:
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;
- KIO::AnimationState *animationState(const QStyleOptionViewItemV4 &option, const \
QModelIndex &index, + KIO::AnimationState *animationState(const \
QStyleOptionViewItem &option, const QModelIndex &index,
const QAbstractItemView *view) const;
void restartAnimation(KIO::AnimationState *state);
QPixmap applyHoverEffect(const QPixmap &icon) const;
QPixmap transition(const QPixmap &from, const QPixmap &to, qreal amount) 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;
void gotNewIcon(const QModelIndex &index);
- void paintJobTransfers(QPainter *painter, const qreal &jobAnimationAngle, const \
QPoint &iconPos, const QStyleOptionViewItemV4 &opt); + void \
paintJobTransfers(QPainter *painter, const qreal &jobAnimationAngle, const QPoint \
&iconPos, const QStyleOptionViewItem &opt);
public:
KFileItemDelegate::InformationList informationList;
@@ -221,7 +221,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;
@@ -326,7 +326,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());
@@ -367,14 +367,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) {
@@ -415,24 +415,24 @@ QString KFileItemDelegate::Private::elidedText(QTextLayout \
&layout, const QStyle return elided;
}
-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 {
const Margin &itemMargin = activeMargins[ItemMargin];
@@ -466,7 +466,7 @@ QSize KFileItemDelegate::Private::displaySizeHint(const \
QStyleOptionViewItemV4 & return addMargin(size, TextMargin);
}
-QSize KFileItemDelegate::Private::decorationSizeHint(const QStyleOptionViewItemV4 \
&option, +QSize KFileItemDelegate::Private::decorationSizeHint(const \
QStyleOptionViewItem &option, const QModelIndex &index) const
{
Q_UNUSED(index)
@@ -484,14 +484,14 @@ QSize KFileItemDelegate::Private::decorationSizeHint(const \
QStyleOptionViewItemV return addMargin(iconSize, IconMargin);
}
-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);
}
// 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<KStatefulBrush>()) {
return qvariant_cast<KStatefulBrush>(value).brush(option.palette);
@@ -508,7 +508,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 return option.palette.brush(cg, QPalette::Text);
}
-bool KFileItemDelegate::Private::isListView(const QStyleOptionViewItemV4 &option) \
const +bool KFileItemDelegate::Private::isListView(const QStyleOptionViewItem \
&option) const {
if (qobject_cast<const QListView *>(option.widget) || verticalLayout(option)) {
return true;
@@ -564,7 +564,7 @@ void \
KFileItemDelegate::Private::restartAnimation(KIO::AnimationState *state) \
animationHandler->restartAnimation(state); }
-KIO::AnimationState *KFileItemDelegate::Private::animationState(const \
QStyleOptionViewItemV4 &option, +KIO::AnimationState \
*KFileItemDelegate::Private::animationState(const QStyleOptionViewItem &option, \
const QModelIndex &index, const QAbstractItemView *view) const
{
@@ -692,7 +692,7 @@ QPixmap KFileItemDelegate::Private::transition(const QPixmap \
&from, const QPixma }
}
-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
{
@@ -792,7 +792,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);
@@ -828,19 +828,19 @@ 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;
}
-void KFileItemDelegate::Private::paintJobTransfers(QPainter *painter, const qreal \
&jobAnimationAngle, const QPoint &iconPos, const QStyleOptionViewItemV4 &opt) +void \
KFileItemDelegate::Private::paintJobTransfers(QPainter *painter, const qreal \
&jobAnimationAngle, const QPoint &iconPos, const QStyleOptionViewItem &opt) {
painter->save();
QSize iconSize = opt.icon.actualSize(opt.decorationSize);
@@ -916,7 +916,7 @@ QSize KFileItemDelegate::sizeHint(const QStyleOptionViewItem \
&option, const QMod return qvariant_cast<QSize>(value);
}
- QStyleOptionViewItemV4 opt(option);
+ QStyleOptionViewItem opt(option);
d->initStyleOption(&opt, index);
d->setActiveMargins(d->verticalLayout(opt) ? Qt::Vertical : Qt::Horizontal);
@@ -1048,7 +1048,7 @@ 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));
}
@@ -1064,7 +1064,7 @@ bool KFileItemDelegate::jobTransfersVisible() const
return d->jobTransfersVisible;
}
-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;
@@ -1092,7 +1092,7 @@ QIcon KFileItemDelegate::Private::decoration(const \
QStyleOptionViewItemV4 &optio return icon;
}
-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);
@@ -1124,7 +1124,7 @@ QRect KFileItemDelegate::Private::labelRectangle(const \
QStyleOptionViewItemV4 &o return QStyle::visualRect(option.direction, option.rect, \
textArea); }
-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;
@@ -1159,7 +1159,7 @@ QPoint KFileItemDelegate::Private::iconPosition(const \
QStyleOptionViewItemV4 &op return iconRect.topLeft();
}
-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)) {
@@ -1191,7 +1191,7 @@ void KFileItemDelegate::paint(QPainter *painter, const \
QStyleOptionViewItem &opt return;
}
- QStyleOptionViewItemV4 opt(option);
+ QStyleOptionViewItem opt(option);
d->initStyleOption(&opt, index);
d->setActiveMargins(d->verticalLayout(opt) ? Qt::Vertical : Qt::Horizontal);
@@ -1203,7 +1203,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;
}
const QAbstractItemView *view = qobject_cast<const QAbstractItemView \
*>(opt.widget); @@ -1376,7 +1376,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);
QTextEdit *edit = new QTextEdit(parent);
@@ -1441,7 +1441,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);
@@ -1498,7 +1498,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);
@@ -1517,7 +1517,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);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic