Browse Source

Replace deprecated classes

adaptive-webui-19844
Chocobo1 8 years ago
parent
commit
ce3c53b3c4
  1. 8
      src/gui/previewlistdelegate.h
  2. 2
      src/gui/properties/peerlistdelegate.h
  3. 8
      src/gui/properties/proplistdelegate.cpp
  4. 4
      src/gui/search/searchlistdelegate.cpp
  5. 6
      src/gui/transferlistdelegate.cpp

8
src/gui/previewlistdelegate.h

@ -32,8 +32,8 @@ @@ -32,8 +32,8 @@
#define PREVIEWLISTDELEGATE_H
#include <QItemDelegate>
#include <QStyleOptionProgressBarV2>
#include <QStyleOptionViewItemV2>
#include <QStyleOptionProgressBar>
#include <QStyleOptionViewItem>
#include <QModelIndex>
#include <QPainter>
#include <QApplication>
@ -59,7 +59,7 @@ class PreviewListDelegate: public QItemDelegate { @@ -59,7 +59,7 @@ class PreviewListDelegate: public QItemDelegate {
void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const {
painter->save();
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
switch(index.column()) {
case PreviewSelect::SIZE:
@ -67,7 +67,7 @@ class PreviewListDelegate: public QItemDelegate { @@ -67,7 +67,7 @@ class PreviewListDelegate: public QItemDelegate {
QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong()));
break;
case PreviewSelect::PROGRESS:{
QStyleOptionProgressBarV2 newopt;
QStyleOptionProgressBar newopt;
qreal progress = index.data().toDouble()*100.;
newopt.rect = opt.rect;
newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");

2
src/gui/properties/peerlistdelegate.h

@ -50,7 +50,7 @@ public: @@ -50,7 +50,7 @@ public:
void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const {
painter->save();
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
switch(index.column()) {
case TOT_DOWN:
case TOT_UP:

8
src/gui/properties/proplistdelegate.cpp

@ -28,8 +28,8 @@ @@ -28,8 +28,8 @@
* Contact : chris@qbittorrent.org
*/
#include <QStyleOptionProgressBarV2>
#include <QStyleOptionViewItemV2>
#include <QStyleOptionProgressBar>
#include <QStyleOptionViewItem>
#include <QStyleOptionComboBox>
#include <QComboBox>
#include <QModelIndex>
@ -60,7 +60,7 @@ PropListDelegate::PropListDelegate(PropertiesWidget *properties, QObject *parent @@ -60,7 +60,7 @@ PropListDelegate::PropListDelegate(PropertiesWidget *properties, QObject *parent
void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
painter->save();
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
switch(index.column()) {
case PCSIZE:
@ -78,7 +78,7 @@ void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti @@ -78,7 +78,7 @@ void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
break;
case PROGRESS:
if (index.data().toDouble() >= 0) {
QStyleOptionProgressBarV2 newopt;
QStyleOptionProgressBar newopt;
qreal progress = index.data().toDouble() * 100.;
newopt.rect = opt.rect;
newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");

4
src/gui/search/searchlistdelegate.cpp

@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
* Contact : chris@qbittorrent.org
*/
#include <QStyleOptionViewItemV2>
#include <QStyleOptionViewItem>
#include <QModelIndex>
#include <QPainter>
#include <QProgressBar>
@ -46,7 +46,7 @@ void SearchListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op @@ -46,7 +46,7 @@ void SearchListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
{
painter->save();
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
switch(index.column()) {
case SearchSortModel::SIZE:
QItemDelegate::drawBackground(painter, opt, index);

6
src/gui/transferlistdelegate.cpp

@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
#include "transferlistdelegate.h"
#include <QModelIndex>
#include <QStyleOptionViewItemV2>
#include <QStyleOptionViewItem>
#include <QApplication>
#include <QPainter>
#include "base/utils/misc.h"
@ -67,7 +67,7 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem @@ -67,7 +67,7 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem
}
const bool hideValues = Preferences::instance()->getHideZeroValues() & isHideState;
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
QItemDelegate::drawBackground(painter, opt, index);
switch (index.column()) {
case TorrentModel::TR_AMOUNT_DOWNLOADED:
@ -162,7 +162,7 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem @@ -162,7 +162,7 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem
break;
}
case TorrentModel::TR_PROGRESS: {
QStyleOptionProgressBarV2 newopt;
QStyleOptionProgressBar newopt;
qreal progress = index.data().toDouble() * 100.;
newopt.rect = opt.rect;
newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");

Loading…
Cancel
Save