From da2f08af67916ce09daf6dea185a118e0f8bcd6b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 6 Feb 2019 15:13:17 +0100 Subject: Fix some deprecation warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit debugging/qscriptedit.cpp:286:39: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] debugging/qscriptedit.cpp:309:48: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:309:48: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:315:49: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:315:49: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:318:45: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:318:45: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] tst_qscriptvalue.cpp:1270:45: warning: ‘T qVariantValue(const QVariant&) [with T = QObject*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:343:64: warning: ‘T qFindChild(const QObject*, const QString&) [with T = QLineEdit*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:345:75: warning: ‘T qFindChild(const QObject*, const QString&) [with T = QPlainTextEdit*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:354:88: warning: ‘T qFindChild(const QObject*, const QString&) [with T = QPlainTextEdit*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:836:33: warning: ignoring return value of ‘bool QTest::qWaitForWindowExposed(QWidget*, int)’, declared with attribute nodiscard [-Wunused-result] context2d.cpp:473:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] context2d.cpp:486:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] context2d.cpp:500:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] context2d.cpp:627:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] tetrixboard.cpp:104:76: warning: ‘const QBrush& QPalette::background() const’ is deprecated: Use QPalette::window() instead [-Wdeprecated-declarations] tetrixboard.cpp:130:33: warning: ‘QColor QColor::light(int) const’ is deprecated: Use QColor::lighter() instead [-Wdeprecated-declarations] tetrixboard.cpp:134:32: warning: ‘QColor QColor::dark(int) const’ is deprecated: Use QColor::darker() instead [-Wdeprecated-declarations] Change-Id: I795c140c476541bba9c653effdcda0a50cbe9acd Reviewed-by: Christian Ehrlicher --- src/scripttools/debugging/qscriptedit.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp index d3d533f..c012a76 100644 --- a/src/scripttools/debugging/qscriptedit.cpp +++ b/src/scripttools/debugging/qscriptedit.cpp @@ -283,7 +283,7 @@ int QScriptEdit::extraAreaWidth() const max /= 10; ++digits; } - space += fm.width(QLatin1Char('9')) * digits; + space += fm.horizontalAdvance(QLatin1Char('9')) * digits; int markWidth = fm.lineSpacing(); space += markWidth; @@ -306,16 +306,16 @@ void QScriptEdit::extraAreaPaintEvent(QPaintEvent *e) int extraAreaWidth = m_extraArea->width(); QLinearGradient gradient(QPointF(extraAreaWidth - 10, 0), QPointF(extraAreaWidth, 0)); - gradient.setColorAt(0, pal.color(QPalette::Background)); + gradient.setColorAt(0, pal.color(QPalette::Window)); gradient.setColorAt(1, pal.color(QPalette::Base)); painter.fillRect(rect, gradient); QLinearGradient gradient2(QPointF(0, 0), QPointF(markWidth, 0)); gradient2.setColorAt(0, pal.color(QPalette::Dark)); - gradient2.setColorAt(1, pal.color(QPalette::Background)); + gradient2.setColorAt(1, pal.color(QPalette::Window)); painter.fillRect(rect.intersected(QRect(rect.x(), rect.y(), markWidth, rect.height())), gradient2); - painter.setPen(QPen(pal.color(QPalette::Background), 2)); + painter.setPen(QPen(pal.color(QPalette::Window), 2)); if (isLeftToRight()) painter.drawLine(rect.x() + extraAreaWidth-1, rect.top(), rect.x() + extraAreaWidth-1, rect.bottom()); else -- cgit v1.2.1