diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 11:44:14 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-29 19:19:47 +0200 |
commit | 9fa3cf15c8500fba5bbb861f1925160815ae2afd (patch) | |
tree | f779e08446bf302803b27130cf4c92fe46ba68b6 /src/gui/text/qtexthtmlparser_p.h | |
parent | c70c4e42665eb34e677fc51a49552c9af3f58d7a (diff) |
Use QList instead of QVector in gui
Applied to headers only. Source file to be changed separately.
Task-number: QTBUG-84469
Change-Id: Ic08a899321eaffc46b8461aaee3dbaa4d2c727a9
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/text/qtexthtmlparser_p.h')
-rw-r--r-- | src/gui/text/qtexthtmlparser_p.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h index 31f558709f..4bfdab124b 100644 --- a/src/gui/text/qtexthtmlparser_p.h +++ b/src/gui/text/qtexthtmlparser_p.h @@ -52,12 +52,14 @@ // #include <QtGui/private/qtguiglobal_p.h> -#include "QtCore/qvector.h" #include "QtGui/qbrush.h" #include "QtGui/qcolor.h" #include "QtGui/qfont.h" #include "QtGui/qtextdocument.h" #include "QtGui/qtextcursor.h" + +#include "QtCore/qlist.h" + #include "private/qtextformat_p.h" #include "private/qtextdocument_p.h" #include "private/qcssparser_p.h" @@ -167,7 +169,7 @@ struct QTextHtmlParserNode { QString text; QStringList attributes; int parent; - QVector<int> children; + QList<int> children; QTextHTMLElements id; QTextCharFormat charFormat; QTextBlockFormat blockFormat; @@ -251,10 +253,11 @@ struct QTextHtmlParserNode { void parseStyleAttribute(const QString &value, const QTextDocument *resourceProvider); #if QT_CONFIG(cssparser) - void applyCssDeclarations(const QVector<QCss::Declaration> &declarations, const QTextDocument *resourceProvider); + void applyCssDeclarations(const QList<QCss::Declaration> &declarations, + const QTextDocument *resourceProvider); - void setListStyle(const QVector<QCss::Value> &cssValues); -#endif + void setListStyle(const QList<QCss::Value> &cssValues); +# endif void applyForegroundImage(qint64 cacheKey, const QTextDocument *resourceProvider); void applyBackgroundImage(const QString &url, const QTextDocument *resourceProvider); @@ -305,7 +308,7 @@ public: static int lookupElement(const QString &element); protected: QTextHtmlParserNode *newNode(int parent); - QVector<QTextHtmlParserNode> nodes; + QList<QTextHtmlParserNode> nodes; QString txt; int pos, len; @@ -330,7 +333,7 @@ protected: #if QT_CONFIG(cssparser) - QVector<QCss::Declaration> declarationsForNode(int node) const; + QList<QCss::Declaration> declarationsForNode(int node) const; void resolveStyleSheetImports(const QCss::StyleSheet &sheet); void importStyleSheet(const QString &href); @@ -343,9 +346,9 @@ protected: QCss::StyleSheet sheet; }; friend class QTypeInfo<ExternalStyleSheet>; - QVector<ExternalStyleSheet> externalStyleSheets; - QVector<QCss::StyleSheet> inlineStyleSheets; -#endif + QList<ExternalStyleSheet> externalStyleSheets; + QList<QCss::StyleSheet> inlineStyleSheets; +# endif const QTextDocument *resourceProvider; }; |