mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-10 06:02:57 +00:00
Code Issues Releases Wiki Activity

Switch from deprecated QStyleOptionViewItemV* to QStyleOptionViewItem

Browse source
This commit is contained in:
Mike Gelfand 2017-02-11 14:04:26 +03:00
parent 03034b5015
commit 4b397ebfc0
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt/FileTreeDelegate.cc
View file

@ -69,8 +69,8 @@ FileTreeDelegate::paint (QPainter * painter,
}
else if(column == FileTreeModel::COL_WANTED)
{
QStyleOptionViewItemV4 vi (option);
vi.features |= QStyleOptionViewItemV4::HasCheckIndicator;
QStyleOptionViewItem vi (option);
vi.features |= QStyleOptionViewItem::HasCheckIndicator;
QRect checkRect = style->subElementRect (QStyle::SE_ItemViewItemCheckIndicator, &vi, nullptr);
checkRect.moveCenter (option.rect.center ());
drawCheck (painter, vi, checkRect, static_cast<Qt::CheckState> (index.data ().toInt ()));

5
qt/FilterBarComboBoxDelegate.cc
View file

@ -54,9 +54,8 @@ FilterBarComboBoxDelegate::paint (QPainter * painter,
if (isSeparator (index))
{
QRect rect = option.rect;
if (const QStyleOptionViewItemV3 *v3 = qstyleoption_cast<const QStyleOptionViewItemV3*> (&option))
if (const QAbstractItemView *view = qobject_cast<const QAbstractItemView*> (v3->widget))
rect.setWidth (view->viewport ()->width ());
if (const QAbstractItemView *view = qobject_cast<const QAbstractItemView*> (option.widget))
rect.setWidth (view->viewport ()->width ());
QStyleOption opt;
opt.rect = rect;
myCombo->style ()->drawPrimitive (QStyle::PE_IndicatorToolBarSeparator, &opt, painter, myCombo);

4
qt/Utils.cc
View file

@ -170,9 +170,9 @@ Utils::removeTrailingDirSeparator (const QString& path)
int
Utils::measureViewItem (QAbstractItemView * view, const QString& text)
{
QStyleOptionViewItemV4 option;
QStyleOptionViewItem option;
option.initFrom (view);
option.features = QStyleOptionViewItemV2::HasDisplay;
option.features = QStyleOptionViewItem::HasDisplay;
option.text = text;
option.textElideMode = Qt::ElideNone;
option.font = view->font ();