Avoid deprecation warnings with Qt 5.7

The versioned QStyleOption derivatives are deprecated in Qt 5,
and Qt 5.7 actually gets noisy about that. So remove these by
the unversioned class names.

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index dd1cbaf..0382a21 100644 (file)
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -657,7 +657,11 @@ bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, c
     if (!value.isValid())
         return QStyledItemDelegate::editorEvent(event, model, option, index);
 
     if (!value.isValid())
         return QStyledItemDelegate::editorEvent(event, model, option, index);
 

+#if QT_VERSION < 0x050000

     QStyleOptionViewItemV4 viewOpt(option);
     QStyleOptionViewItemV4 viewOpt(option);

+#else
+    QStyleOptionViewItem viewOpt(option);
+#endif

     initStyleOption(&viewOpt, index);
 
     QRect checkRect = viewOpt.widget->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, viewOpt.widget);
     initStyleOption(&viewOpt, index);
 
     QRect checkRect = viewOpt.widget->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, viewOpt.widget);

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 5ace7d6..31335d1 100644 (file)
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -185,7 +185,11 @@ void MultiLineEdit::updateSizeHint()
 
     // use the style to determine a decent size
     int h = qMin(qMax((int)document()->size().height() + scrollBarHeight, minPixelHeight), maxPixelHeight) + 2 * frameWidth();
 
     // use the style to determine a decent size
     int h = qMin(qMax((int)document()->size().height() + scrollBarHeight, minPixelHeight), maxPixelHeight) + 2 * frameWidth();

+#if QT_VERSION < 0x050000

     QStyleOptionFrameV2 opt;
     QStyleOptionFrameV2 opt;

+#else
+    QStyleOptionFrame opt;
+#endif

     opt.initFrom(this);
     opt.rect = QRect(0, 0, 100, h);
     opt.lineWidth = lineWidth();
     opt.initFrom(this);
     opt.rect = QRect(0, 0, 100, h);
     opt.lineWidth = lineWidth();