From 255f569a43ae63fe214ac06da81abf4ed2a8cf3c Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Wed, 2 Nov 2011 13:30:38 +0200 Subject: Renamed QTextLayout member variable for readability Class complex enough already without int i as member variable. Furthermore, some methods use loop variable with same name, shadowing the member one. Change-Id: Idf2f5e34f130a60eb6121480e596e443f23641dd Reviewed-by: Jiang Jiang --- src/gui/text/qtextlayout.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/text/qtextlayout.h') diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index 04f8d6ed6c..f1bfdc75db 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -197,7 +197,7 @@ private: class Q_GUI_EXPORT QTextLine { public: - inline QTextLine() : i(0), eng(0) {} + inline QTextLine() : index(0), eng(0) {} inline bool isValid() const { return eng; } QRectF rect() const; @@ -240,7 +240,7 @@ public: int textStart() const; int textLength() const; - int lineNumber() const { return i; } + int lineNumber() const { return index; } void draw(QPainter *p, const QPointF &point, const QTextLayout::FormatRange *selection = 0) const; @@ -249,12 +249,12 @@ public: #endif private: - QTextLine(int line, QTextEngine *e) : i(line), eng(e) {} + QTextLine(int line, QTextEngine *e) : index(line), eng(e) {} void layout_helper(int numGlyphs); friend class QTextLayout; friend class QTextFragment; - int i; + int index; QTextEngine *eng; }; -- cgit v1.2.3