diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 06:37:10 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 06:37:10 (GMT) |
commit | c80302a19f43ed1c39675a979762499fc589743a (patch) | |
tree | b4f29d66fa335f28e07f2953fa8c48048f2203ab /src/gui/painting/qpainter.cpp | |
parent | 0c831b8cf84c72ee8673d1d38f4e93e350dddd5f (diff) | |
download | Qt-c80302a19f43ed1c39675a979762499fc589743a.zip Qt-c80302a19f43ed1c39675a979762499fc589743a.tar.gz Qt-c80302a19f43ed1c39675a979762499fc589743a.tar.bz2 |
spel
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
-rw-r--r-- | src/gui/painting/qpainter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 2ccb0c5..0762138 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -7487,8 +7487,8 @@ void qt_format_text(const QFont &fnt, const QRectF &_r, QFontMetricsF fm(fnt); QString text = str; int offset = 0; -start_lenghtVariant: - bool hasMoreLenghtVariants = false; +start_lengthVariant: + bool hasMoreLengthVariants = false; // compatible behaviour to the old implementation. Replace // tabs by spaces bool has_tab = false; @@ -7510,7 +7510,7 @@ start_lenghtVariant: has_tab = true; } else if (chr == QChar(ushort(0x9c))) { // string with multiple length variants - hasMoreLenghtVariants = true; + hasMoreLengthVariants = true; break; } } @@ -7634,9 +7634,9 @@ start_lenghtVariant: } QRectF bounds = QRectF(r.x() + xoff, r.y() + yoff, width, height); - if (hasMoreLenghtVariants && !(tf & Qt::TextLongestVariant) && !r.contains(bounds)) { + if (hasMoreLengthVariants && !(tf & Qt::TextLongestVariant) && !r.contains(bounds)) { offset++; - goto start_lenghtVariant; + goto start_lengthVariant; } if (brect) *brect = bounds; |