diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-08 15:27:34 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-08 15:51:05 +0000 |
commit | ede9a8285858873e644083bbad9a71da26276dce (patch) | |
tree | 2941cc9b59e616e8dcaa888a68ff7031e91cd6fc /src/quick/items | |
parent | b84927dc2b91429e2aa1bdd290a8b16b9d24ca58 (diff) |
Fix QFont-related deprecation warnings
Replace QFontMetrics::width() by horizontalAdvance(), fixing:
items/qquicktextcontrol.cpp:1001:80: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
items/qquicktextinput.cpp:880:60: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
items/qquicktextinput.cpp:1380:60: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
items/context2d/qquickcontext2d.cpp:2980:57: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
items/context2d/qquickcontext2d.cpp:4060:36: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
items/context2d/qquickcontext2d.cpp:4063:36: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
Change-Id: Ie97be4a6cf1ce087caeb4d83fe016fa1a471f3ec
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/items')
-rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 6 | ||||
-rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 32336b5baf..cb4e7ab918 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -2977,7 +2977,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_measureText(const QV4::Fun if (argc >= 1) { QFontMetrics fm(r->d()->context->state.font); - uint width = fm.width(argv[0].toQStringNoThrow()); + uint width = fm.horizontalAdvance(argv[0].toQStringNoThrow()); QV4::ScopedObject tm(scope, scope.engine->newObject()); tm->put(QV4::ScopedString(scope, scope.engine->newIdentifier(QStringLiteral("width"))).getPointer(), QV4::ScopedValue(scope, QV4::Value::fromDouble(width))); @@ -4057,10 +4057,10 @@ static int textAlignOffset(QQuickContext2D::TextAlignType value, const QFontMetr value = QGuiApplication::layoutDirection() == Qt::LeftToRight ? QQuickContext2D::Right: QQuickContext2D::Left; switch (value) { case QQuickContext2D::Center: - offset = metrics.width(text)/2; + offset = metrics.horizontalAdvance(text) / 2; break; case QQuickContext2D::Right: - offset = metrics.width(text); + offset = metrics.horizontalAdvance(text); case QQuickContext2D::Left: default: break; diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index 38ca7283b4..a7a90c9134 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -998,7 +998,7 @@ QRectF QQuickTextControlPrivate::rectForPosition(int position) const if (relativePos < line.textLength() - line.textStart()) w = line.cursorToX(relativePos + 1) - x; else - w = QFontMetrics(block.layout()->font()).width(QLatin1Char(' ')); // in sync with QTextLine::draw() + w = QFontMetrics(block.layout()->font()).horizontalAdvance(QLatin1Char(' ')); // in sync with QTextLine::draw() } r = QRectF(layoutPos.x() + x, layoutPos.y() + line.y(), textCursorWidth + w, line.height()); } else { diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index a0ac884fef..a52cd81ef3 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -877,7 +877,7 @@ QRectF QQuickTextInput::cursorRectangle() const if (c < text().length()) w = l.cursorToX(c + 1) - x; else - w = QFontMetrics(font()).width(QLatin1Char(' ')); // in sync with QTextLine::draw() + w = QFontMetrics(font()).horizontalAdvance(QLatin1Char(' ')); // in sync with QTextLine::draw() } return QRectF(x, y, w, l.height()); } @@ -1377,7 +1377,7 @@ QRectF QQuickTextInput::positionToRectangle(int pos) const if (pos < text().length()) w = l.cursorToX(pos + 1) - x; else - w = QFontMetrics(font()).width(QLatin1Char(' ')); // in sync with QTextLine::draw() + w = QFontMetrics(font()).horizontalAdvance(QLatin1Char(' ')); // in sync with QTextLine::draw() } return QRectF(x, y, w, l.height()); } |