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 --- examples/script/context2d/context2d.cpp | 8 ++++---- examples/script/qstetrix/tetrixboard.cpp | 6 +++--- src/scripttools/debugging/qscriptedit.cpp | 8 ++++---- tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp | 6 +++--- tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp index 831e017..5b8b9f6 100644 --- a/examples/script/context2d/context2d.cpp +++ b/examples/script/context2d/context2d.cpp @@ -470,7 +470,7 @@ void Context2D::clearRect(qreal x, qreal y, qreal w, qreal h) { beginPainting(); m_painter.save(); - m_painter.setMatrix(m_state.matrix, false); + m_painter.setTransform(QTransform(m_state.matrix), false); m_painter.setCompositionMode(QPainter::CompositionMode_Source); m_painter.fillRect(QRectF(x, y, w, h), QColor(0, 0, 0, 0)); m_painter.restore(); @@ -483,7 +483,7 @@ void Context2D::fillRect(qreal x, qreal y, qreal w, qreal h) { beginPainting(); m_painter.save(); - m_painter.setMatrix(m_state.matrix, false); + m_painter.setTransform(QTransform(m_state.matrix), false); m_painter.fillRect(QRectF(x, y, w, h), m_painter.brush()); m_painter.restore(); scheduleChange(); @@ -497,7 +497,7 @@ void Context2D::strokeRect(qreal x, qreal y, qreal w, qreal h) path.addRect(x, y, w, h); beginPainting(); m_painter.save(); - m_painter.setMatrix(m_state.matrix, false); + m_painter.setTransform(QTransform(m_state.matrix), false); m_painter.strokePath(path, m_painter.pen()); m_painter.restore(); scheduleChange(); @@ -624,7 +624,7 @@ void Context2D::stroke() { beginPainting(); m_painter.save(); - m_painter.setMatrix(m_state.matrix, false); + m_painter.setTransform(QTransform(m_state.matrix), false); QPainterPath tmp = m_state.matrix.inverted().map(m_path); m_painter.strokePath(tmp, m_painter.pen()); m_painter.restore(); diff --git a/examples/script/qstetrix/tetrixboard.cpp b/examples/script/qstetrix/tetrixboard.cpp index f92e9a7..914c6df 100644 --- a/examples/script/qstetrix/tetrixboard.cpp +++ b/examples/script/qstetrix/tetrixboard.cpp @@ -101,7 +101,7 @@ void TetrixBoard::showNextPiece(int width, int height) QPixmap pixmap(width * squareWidth(), height * squareHeight()); QPainter painter(&pixmap); - painter.fillRect(pixmap.rect(), nextPieceLabel()->palette().background()); + painter.fillRect(pixmap.rect(), nextPieceLabel()->palette().window()); emit paintNextPieceRequested(&painter); @@ -127,11 +127,11 @@ void TetrixBoard::drawSquare(QPainter *painter, int x, int y, int shape) painter->fillRect(x + 1, y + 1, squareWidth() - 2, squareHeight() - 2, color); - painter->setPen(color.light()); + painter->setPen(color.lighter()); painter->drawLine(x, y + squareHeight() - 1, x, y); painter->drawLine(x, y, x + squareWidth() - 1, y); - painter->setPen(color.dark()); + painter->setPen(color.darker()); painter->drawLine(x + 1, y + squareHeight() - 1, x + squareWidth() - 1, y + squareHeight() - 1); painter->drawLine(x + squareWidth() - 1, y + squareHeight() - 1, 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 diff --git a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp index 2161bec..4dc1c66 100644 --- a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp +++ b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp @@ -340,9 +340,9 @@ void tst_QScriptEngineDebugger::consoleCommands() debugger.attachTo(&engine); QWidget *consoleWidget = debugger.widget(QScriptEngineDebugger::ConsoleWidget); - QLineEdit *inputEdit = qFindChild(consoleWidget); + QLineEdit *inputEdit = consoleWidget->findChild(); QVERIFY(inputEdit != 0); - QPlainTextEdit *outputEdit = qFindChild(consoleWidget); + QPlainTextEdit *outputEdit = consoleWidget->findChild(); QVERIFY(outputEdit != 0); QVERIFY(outputEdit->toPlainText().startsWith("Welcome to the Qt Script debugger.")); @@ -351,7 +351,7 @@ void tst_QScriptEngineDebugger::consoleCommands() // print() { QWidget *debugOutputWidget = debugger.widget(QScriptEngineDebugger::DebugOutputWidget); - QPlainTextEdit *debugOutputEdit = qFindChild(debugOutputWidget); + QPlainTextEdit *debugOutputEdit = debugOutputWidget->findChild(); QVERIFY(debugOutputEdit != 0); QVERIFY(debugOutputEdit->toPlainText().isEmpty()); diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 47e040e..195fe0c 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -1267,7 +1267,7 @@ void tst_QScriptValue::toVariant() { QVariant var = qobject.toVariant(); QCOMPARE(var.userType(), int(QMetaType::QObjectStar)); - QCOMPARE(qVariantValue(var), (QObject *)this); + QCOMPARE(qvariant_cast(var), (QObject *)this); } { -- cgit v1.2.1