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/qtextlayout.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/qtextlayout.h')
| -rw-r--r-- | src/gui/text/qtextlayout.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index 2fc0fcd55a..0fc41802de 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -39,17 +39,18 @@ #ifndef QTEXTLAYOUT_H #define QTEXTLAYOUT_H -#include <QtGui/qtguiglobal.h> -#include <QtCore/qstring.h> -#include <QtCore/qnamespace.h> -#include <QtCore/qrect.h> -#include <QtCore/qvector.h> #include <QtGui/qcolor.h> -#include <QtCore/qobject.h> #include <QtGui/qevent.h> -#include <QtGui/qtextformat.h> #include <QtGui/qglyphrun.h> #include <QtGui/qtextcursor.h> +#include <QtGui/qtextformat.h> +#include <QtGui/qtguiglobal.h> + +#include <QtCore/qlist.h> +#include <QtCore/qnamespace.h> +#include <QtCore/qobject.h> +#include <QtCore/qrect.h> +#include <QtCore/qstring.h> QT_BEGIN_NAMESPACE @@ -155,8 +156,8 @@ public: QT_DEPRECATED_X("Use formats()") QList<FormatRange> additionalFormats() const; QT_DEPRECATED_X("Use clearFormats()") void clearAdditionalFormats(); #endif - void setFormats(const QVector<FormatRange> &overrides); - QVector<FormatRange> formats() const; + void setFormats(const QList<FormatRange> &overrides); + QList<FormatRange> formats() const; void clearFormats(); void setCacheEnabled(bool enable); @@ -185,7 +186,8 @@ public: int leftCursorPosition(int oldPos) const; int rightCursorPosition(int oldPos) const; - void draw(QPainter *p, const QPointF &pos, const QVector<FormatRange> &selections = QVector<FormatRange>(), + void draw(QPainter *p, const QPointF &pos, + const QList<FormatRange> &selections = QList<FormatRange>(), const QRectF &clip = QRectF()) const; void drawCursor(QPainter *p, const QPointF &pos, int cursorPosition) const; void drawCursor(QPainter *p, const QPointF &pos, int cursorPosition, int width) const; |