summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-04-16 21:05:39 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-06-25 00:17:17 +0000
commit7082c20e4a35e287c7cbbfe581fec49c47532906 (patch)
tree365e0f75493d9751c9dc2bae63df1033d90123f5
parentec8c1dcf147ac71ea3c0105d67c2575ab733d348 (diff)
[QFontMetrics] Mark obsolete charWidth() method for deletion in 6.0
It was obsoleted for quite a while already and we forgot to get rid of it the last time. Change-Id: Ib15e71829e80648aa667a6b0af31698460b99cc1 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
-rw-r--r--src/gui/text/qfontmetrics.cpp2
-rw-r--r--src/gui/text/qfontmetrics.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index c2d4b64152..e351d4d2c5 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -582,6 +582,7 @@ int QFontMetrics::width(QChar ch) const
return qRound(advance);
}
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
/*! \obsolete
Returns the width of the character at position \a pos in the
@@ -634,6 +635,7 @@ int QFontMetrics::charWidth(const QString &text, int pos) const
}
return width;
}
+#endif
/*!
Returns the bounding rectangle of the characters in the string
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index 65ec219a99..2031f022d4 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -86,7 +86,9 @@ public:
int width(const QString &, int len, int flags) const;
int width(QChar) const;
- int charWidth(const QString &str, int pos) const;
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+ QT_DEPRECATED int charWidth(const QString &str, int pos) const;
+#endif
QRect boundingRect(QChar) const;