diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-11 11:35:44 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-11 12:28:44 +0000 |
| commit | 7044c0c82c1bccbff9f7ab0d8344c89fcf7cc043 (patch) | |
| tree | 2ae8b82ae09941990e726a821263da0edf049d65 /src | |
| parent | 7d7038d47a72cd203785080e997458f0d44f5e15 (diff) | |
Fix deprecation warnings
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 <ch.ehrlicher@gmx.de>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualization/engine/axisrendercache.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/utils/utils.cpp | 4 |
2 files changed, 3 insertions, 3 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; } |