From 037945e957508d399b34db5ca19fd5c9efa22db6 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Sat, 22 Nov 2014 04:28:21 +0400
Subject: [TextLayout] Drop unused member

QStaticTextItem never uses `chars` and `numChars`.
A respective change to QStaticText will follow.

Change-Id: I004a2e5d61841de63775d8207b5fd0bdf416f4c7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/declarative/graphicsitems/qdeclarativetextlayout.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
index 647bbee9..7abfd13e 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
@@ -54,7 +54,6 @@ public:
     QVector<QStaticTextItem> items;
     QVector<QFixedPoint> positions;
     QVector<glyph_t> glyphs;
-    QVector<QChar> chars;
 };
 
 namespace {
@@ -80,7 +79,6 @@ class DrawTextItemRecorder: public QPaintEngine
         {
             int glyphOffset = m_inertText->glyphs.size(); // Store offset into glyph pool
             int positionOffset = m_inertText->glyphs.size(); // Offset into position pool
-            int charOffset = m_inertText->chars.size();
 
             const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);
 
@@ -91,9 +89,6 @@ class DrawTextItemRecorder: public QPaintEngine
                 if (last.fontEngine() == ti.fontEngine && last.font == ti.font() &&
                     (!m_dirtyPen || last.color == state->pen().color())) {
                     needFreshCurrentItem = false;
-
-                    last.numChars += ti.num_chars;
-
                 }
             }
 
@@ -102,8 +97,6 @@ class DrawTextItemRecorder: public QPaintEngine
 
                 currentItem.setFontEngine(ti.fontEngine);
                 currentItem.font = ti.font();
-                currentItem.charOffset = charOffset;
-                currentItem.numChars = ti.num_chars;
                 currentItem.numGlyphs = 0;
                 currentItem.glyphOffset = glyphOffset;
                 currentItem.positionOffset = positionOffset;
@@ -129,17 +122,12 @@ class DrawTextItemRecorder: public QPaintEngine
 
             m_inertText->glyphs.resize(m_inertText->glyphs.size() + size);
             m_inertText->positions.resize(m_inertText->glyphs.size());
-            m_inertText->chars.resize(m_inertText->chars.size() + ti.num_chars);
 
             glyph_t *glyphsDestination = m_inertText->glyphs.data() + glyphOffset;
             memcpy(glyphsDestination, glyphs.constData(), sizeof(glyph_t) * size);
 
             QFixedPoint *positionsDestination = m_inertText->positions.data() + positionOffset;
             memcpy(positionsDestination, positions.constData(), sizeof(QFixedPoint) * size);
-
-            QChar *charsDestination = m_inertText->chars.data() + charOffset;
-            memcpy(charsDestination, ti.chars, sizeof(QChar) * ti.num_chars);
-
         }
 
         virtual void drawPolygon(const QPointF *, int , PolygonDrawMode )
@@ -278,7 +266,6 @@ void QDeclarativeTextLayout::beginLayout()
         d->items.clear();
         d->positions.clear();
         d->glyphs.clear();
-        d->chars.clear();
         d->position = QPointF();
     }
     QTextLayout::beginLayout();
@@ -291,7 +278,6 @@ void QDeclarativeTextLayout::clearLayout()
         d->items.clear();
         d->positions.clear();
         d->glyphs.clear();
-        d->chars.clear();
         d->position = QPointF();
     }
     QTextLayout::clearLayout();
@@ -310,14 +296,12 @@ void QDeclarativeTextLayout::prepare()
 
         glyph_t *glyphPool = d->glyphs.data();
         QFixedPoint *positionPool = d->positions.data();
-        QChar *charPool = d->chars.data();
 
         int itemCount = d->items.count();
         for (int ii = 0; ii < itemCount; ++ii) {
             QStaticTextItem &item = d->items[ii];
             item.glyphs = glyphPool + item.glyphOffset;
             item.glyphPositions = positionPool + item.positionOffset;
-            item.chars = charPool + item.charOffset;
         }
 
         d->cached = true;
-- 
cgit v1.2.3