diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2012-03-06 22:41:26 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 08:04:12 +0100 |
commit | b8112c8526a6e261c6e00bdb4fe6ceef3876d01f (patch) | |
tree | 414d6b322275bfe454ade0d224c2dc04131d3ccc /src/gui/text/qfontmetrics.cpp | |
parent | 91248b0f3b40aaebb0e02a127ee936b581b10eab (diff) |
QtGui: make some constructors explicit
This is a semi-automatic search, so I'm
reasonably sure that all the exported ones
have been caught.
Change-Id: I5b122db2498dbb2aee50c7ad95c67e708aade45b
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui/text/qfontmetrics.cpp')
-rw-r--r-- | src/gui/text/qfontmetrics.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 7209fbdfc3..fe9e1d16c7 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -535,7 +535,7 @@ int QFontMetrics::width(const QString &text, int len, int flags) const return qRound(width); } - QStackTextEngine layout(text, d.data()); + QStackTextEngine layout(text, QFont(d.data())); layout.ignoreBidi = true; return qRound(layout.width(0, len)); } @@ -611,7 +611,7 @@ int QFontMetrics::charWidth(const QString &text, int pos) const int from = qMax(0, pos - 8); int to = qMin(text.length(), pos + 8); QString cstr = QString::fromRawData(text.unicode() + from, to - from); - QStackTextEngine layout(cstr, d.data()); + QStackTextEngine layout(cstr, QFont(d.data())); layout.ignoreBidi = true; layout.itemize(); width = qRound(layout.width(pos-from, 1)); @@ -660,7 +660,7 @@ QRect QFontMetrics::boundingRect(const QString &text) const if (text.length() == 0) return QRect(); - QStackTextEngine layout(text, d.data()); + QStackTextEngine layout(text, QFont(d.data())); layout.ignoreBidi = true; layout.itemize(); glyph_metrics_t gm = layout.boundingBox(0, text.length()); @@ -830,7 +830,7 @@ QRect QFontMetrics::tightBoundingRect(const QString &text) const if (text.length() == 0) return QRect(); - QStackTextEngine layout(text, d.data()); + QStackTextEngine layout(text, QFont(d.data())); layout.ignoreBidi = true; layout.itemize(); glyph_metrics_t gm = layout.tightBoundingBox(0, text.length()); @@ -1364,7 +1364,7 @@ qreal QFontMetricsF::width(const QString &text) const int pos = text.indexOf(QLatin1Char('\x9c')); int len = (pos != -1) ? pos : text.length(); - QStackTextEngine layout(text, d.data()); + QStackTextEngine layout(text, QFont(d.data())); layout.ignoreBidi = true; layout.itemize(); return layout.width(0, len).toReal(); @@ -1441,7 +1441,7 @@ QRectF QFontMetricsF::boundingRect(const QString &text) const if (len == 0) return QRectF(); - QStackTextEngine layout(text, d.data()); + QStackTextEngine layout(text, QFont(d.data())); layout.ignoreBidi = true; layout.itemize(); glyph_metrics_t gm = layout.boundingBox(0, len); @@ -1614,7 +1614,7 @@ QRectF QFontMetricsF::tightBoundingRect(const QString &text) const if (text.length() == 0) return QRect(); - QStackTextEngine layout(text, d.data()); + QStackTextEngine layout(text, QFont(d.data())); layout.ignoreBidi = true; layout.itemize(); glyph_metrics_t gm = layout.tightBoundingBox(0, text.length()); |