diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-08 15:18:56 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-06 08:39:56 +0000 |
| commit | d44f6ddba7b42bcc3fdd15274ef9bab19877f4f3 (patch) | |
| tree | aaa58bd7da17858ec530fe362827906f71e20bba /src/datavisualization/utils | |
| parent | 5a4f041e67c74b2a70ea1df78a9c56433276c065 (diff) | |
Fix QFont-related deprecation warnings
Replace QFontMetrics::width() by horizontalAdvance(), fixing:
utils/utils.cpp:87:43: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations] ^~~~~
utils/utils.cpp:139:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
engine/axisrendercache.cpp:204:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
Change-Id: I8cfc466cee55b14060feae9b16a087c1db92cf90
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Diffstat (limited to 'src/datavisualization/utils')
| -rw-r--r-- | src/datavisualization/utils/utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |