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/qtextformat.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/qtextformat.h')
-rw-r--r-- | src/gui/text/qtextformat.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index a6d1bf1d57..e12f033596 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -40,15 +40,16 @@ #ifndef QTEXTFORMAT_H #define QTEXTFORMAT_H -#include <QtGui/qtguiglobal.h> +#include <QtGui/qbrush.h> #include <QtGui/qcolor.h> #include <QtGui/qfont.h> -#include <QtCore/qshareddata.h> -#include <QtCore/qvector.h> -#include <QtCore/qvariant.h> #include <QtGui/qpen.h> -#include <QtGui/qbrush.h> #include <QtGui/qtextoption.h> +#include <QtGui/qtguiglobal.h> + +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE @@ -351,9 +352,9 @@ public: QPen penProperty(int propertyId) const; QBrush brushProperty(int propertyId) const; QTextLength lengthProperty(int propertyId) const; - QVector<QTextLength> lengthVectorProperty(int propertyId) const; + QList<QTextLength> lengthVectorProperty(int propertyId) const; - void setProperty(int propertyId, const QVector<QTextLength> &lengths); + void setProperty(int propertyId, const QList<QTextLength> &lengths); QMap<int, QVariant> properties() const; int propertyCount() const; @@ -952,10 +953,10 @@ public: { int cols = intProperty(TableColumns); if (cols == 0) cols = 1; return cols; } inline void setColumns(int columns); - inline void setColumnWidthConstraints(const QVector<QTextLength> &constraints) + inline void setColumnWidthConstraints(const QList<QTextLength> &constraints) { setProperty(TableColumnWidthConstraints, constraints); } - inline QVector<QTextLength> columnWidthConstraints() const + inline QList<QTextLength> columnWidthConstraints() const { return lengthVectorProperty(TableColumnWidthConstraints); } inline void clearColumnWidthConstraints() |