QTextFormatCollection *collection = this->formats();
specialData->resolvedFormatIndices.clear();
- QVarLengthArray<int> indices(layoutData->items.count());
+ QStdVector<int> indices(layoutData->items.count());
for (int i = 0; i < layoutData->items.count(); ++i) {
QTextCharFormat f = format(&layoutData->items.at(i));
indices[i] = collection->indexForFormat(f);
// We mean it.
//
-#include "qvarlengtharray.h"
+#include "qstdcontainers_p.h"
#include "qfont_p.h"
#include "qpaintengine.h"
#include "qtextdocument_p.h"
void grow(char *address, int totalGlyphs);
};
-class QVarLengthGlyphLayoutArray : private QVarLengthArray<void *>, public QGlyphLayout
+class QVarLengthGlyphLayoutArray : private QStdVector<void *>, public QGlyphLayout
{
private:
- typedef QVarLengthArray<void *> Array;
+ typedef QStdVector<void *> Array;
public:
QVarLengthGlyphLayoutArray(int totalGlyphs)
: Array(QSPACEFORGLYPHS(totalGlyphs) / QT_POINTER_SIZE + 1)
QFixed height() const { return ascent + descent + 1; }
};
-typedef QVarLengthArray<QScriptItem> QScriptItemArray;
+typedef QVector<QScriptItem> QScriptItemArray;
struct Q_AUTOTEST_EXPORT QScriptLine
{
length += other.length;
}
-typedef QVarLengthArray<QScriptLine> QScriptLineArray;
+typedef QStdVector<QScriptLine> QScriptLineArray;
class QFontPrivate;
class QTextFormatCollection;
struct SpecialData {
QList<QTextLayout::FormatRange> addFormats;
- QVarLengthArray<int> addFormatIndices;
- QVarLengthArray<int> resolvedFormatIndices;
+ QStdVector<int> addFormatIndices;
+ QStdVector<int> resolvedFormatIndices;
};
SpecialData *specialData;