diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 21:48:38 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-22 21:13:17 +0000 |
| commit | b1b3083dec617b34484ce577db2b2d896905b370 (patch) | |
| tree | 489b73d4ba1b1f120fa05b638625739f1aa7d523 /src/tools/qdoc | |
| parent | 14dde164dc0d69baf5af0efeb6703a7878b7d3da (diff) | |
qdoc: replace some inefficient QLists with QVector
The types are either too large or too small for QList, which
only has acceptable performance with movable types of size
= sizeof(void*).
Change-Id: I5a2354e9400baad44095f1eac18d76ef915f6545
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/qdoc')
| -rw-r--r-- | src/tools/qdoc/doc.cpp | 4 | ||||
| -rw-r--r-- | src/tools/qdoc/doc.h | 2 | ||||
| -rw-r--r-- | src/tools/qdoc/qdocindexfiles.h | 4 | ||||
| -rw-r--r-- | src/tools/qdoc/qmlmarkupvisitor.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp index f322bd9360..4ed5894543 100644 --- a/src/tools/qdoc/doc.cpp +++ b/src/tools/qdoc/doc.cpp @@ -308,7 +308,7 @@ public: Doc::Sections granularity_; Doc::Sections section_; // ### QList<Atom*> tableOfContents_; - QList<int> tableOfContentsLevels_; + QVector<int> tableOfContentsLevels_; QList<Atom*> keywords_; QList<Atom*> targets_; QStringMultiMap metaMap_; @@ -3087,7 +3087,7 @@ const QList<Atom *> &Doc::tableOfContents() const return priv->extra->tableOfContents_; } -const QList<int> &Doc::tableOfContentsLevels() const +const QVector<int> &Doc::tableOfContentsLevels() const { priv->constructExtra(); return priv->extra->tableOfContentsLevels_; diff --git a/src/tools/qdoc/doc.h b/src/tools/qdoc/doc.h index dd14e73e91..b064b5878e 100644 --- a/src/tools/qdoc/doc.h +++ b/src/tools/qdoc/doc.h @@ -168,7 +168,7 @@ public: bool hasKeywords() const; bool hasTargets() const; const QList<Atom *> &tableOfContents() const; - const QList<int> &tableOfContentsLevels() const; + const QVector<int> &tableOfContentsLevels() const; const QList<Atom *> &keywords() const; const QList<Atom *> &targets() const; const QStringMultiMap &metaTagMap() const; diff --git a/src/tools/qdoc/qdocindexfiles.h b/src/tools/qdoc/qdocindexfiles.h index 9a18639251..03f5a369c7 100644 --- a/src/tools/qdoc/qdocindexfiles.h +++ b/src/tools/qdoc/qdocindexfiles.h @@ -74,8 +74,8 @@ class QDocIndexFiles QDocDatabase* qdb_; Generator* gen_; QString project_; - QList<QPair<ClassNode*,QString> > basesList_; - QList<QPair<FunctionNode*,QString> > relatedList_; + QVector<QPair<ClassNode*,QString> > basesList_; + QVector<QPair<FunctionNode*,QString> > relatedList_; }; QT_END_NAMESPACE diff --git a/src/tools/qdoc/qmlmarkupvisitor.h b/src/tools/qdoc/qmlmarkupvisitor.h index e336f32929..ddd16209ab 100644 --- a/src/tools/qdoc/qmlmarkupvisitor.h +++ b/src/tools/qdoc/qmlmarkupvisitor.h @@ -157,7 +157,7 @@ private: QString sourceText(QQmlJS::AST::SourceLocation &location); QQmlJS::Engine *engine; - QList<ExtraType> extraTypes; + QVector<ExtraType> extraTypes; QVector<QQmlJS::AST::SourceLocation> extraLocations; QString source; QString output; |