From 7044c0c82c1bccbff9f7ab0d8344c89fcf7cc043 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 11 Feb 2019 11:35:44 +0100 Subject: Fix deprecation warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit utils/utils.cpp:87:43: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] utils/utils.cpp:139:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] engine/axisrendercache.cpp:204:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] volumetrictest.cpp:384:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations] volumetrictest.cpp:538:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations] Change-Id: I59d0ce39584b11ec239cbdadf067c30cf37ca05a Reviewed-by: Christian Ehrlicher Reviewed-by: Allan Sandfeld Jensen --- src/datavisualization/engine/axisrendercache.cpp | 2 +- src/datavisualization/utils/utils.cpp | 4 ++-- tests/manual/volumetrictest/volumetrictest.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp index 1c5913d1..06f6d9eb 100644 --- a/src/datavisualization/engine/axisrendercache.cpp +++ b/src/datavisualization/engine/axisrendercache.cpp @@ -201,7 +201,7 @@ int AxisRenderCache::maxLabelWidth(const QStringList &labels) const labelFont.setPointSize(textureFontSize); QFontMetrics labelFM(labelFont); for (int i = 0; i < labels.size(); i++) { - int newWidth = labelFM.width(labels.at(i)); + int newWidth = labelFM.horizontalAdvance(labels.at(i)); if (labelWidth < newWidth) labelWidth = newWidth; } diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index f80cf45f..d5850d86 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -84,7 +84,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo QFont valueFont = font; valueFont.setPointSize(textureFontSize); QFontMetrics valueFM(valueFont); - int valueStrWidth = valueFM.width(text); + int valueStrWidth = valueFM.horizontalAdvance(text); // ES2 needs to use maxLabelWidth always (when given) because of the power of 2 -issue. if (maxLabelWidth && (labelBackground || Utils::isOpenGLES())) @@ -136,7 +136,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo if (maxLabelWidth && (labelBackground || Utils::isOpenGLES())) valueStrWidth = maxLabelWidth * fontRatio; else - valueStrWidth = currentValueFM.width(text); + valueStrWidth = currentValueFM.horizontalAdvance(text); valueStrHeight = currentValueFM.height(); valueStrWidth += paddingWidth / 2; } diff --git a/tests/manual/volumetrictest/volumetrictest.cpp b/tests/manual/volumetrictest/volumetrictest.cpp index 09dae433..6b2a57a8 100644 --- a/tests/manual/volumetrictest/volumetrictest.cpp +++ b/tests/manual/volumetrictest/volumetrictest.cpp @@ -381,7 +381,7 @@ void VolumetricModifier::createVolume() logo.load(QStringLiteral(":/logo_no_padding.png")); //logo.load(QStringLiteral(":/logo.png")); qDebug() << "image dimensions:" << logo.width() << logo.height() - << logo.byteCount() << (logo.width() * logo.height()) + << logo.sizeInBytes() << (logo.width() * logo.height()) << logo.bytesPerLine(); QVector imageArray(imageCount); @@ -535,7 +535,7 @@ void VolumetricModifier::createAnotherVolume() //logo.load(QStringLiteral(":/logo.png")); logo = logo.convertToFormat(QImage::Format_ARGB8555_Premultiplied); qDebug() << "second image dimensions:" << logo.width() << logo.height() - << logo.byteCount() << (logo.width() * logo.height()) + << logo.sizeInBytes() << (logo.width() * logo.height()) << logo.bytesPerLine(); logo.save("d:/qt/goobar.png"); -- cgit v1.2.3