diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 14:52:01 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-02 21:57:06 +0200 |
commit | 2a6cdec718934ca2cc7f6f9c616ebe62f6912123 (patch) | |
tree | c8b9ed8db47912dccd2e8d125d23760936820c29 /src/widgets/itemviews/qheaderview.cpp | |
parent | d4c04acc65657d29df5b790281a8d1ba896dd868 (diff) |
Use QList instead of QVector in widgets
Task-number: QTBUG-84469
Change-Id: I3007734f8e4f164ece9dd8850ef007cbef9e12ef
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/widgets/itemviews/qheaderview.cpp')
-rw-r--r-- | src/widgets/itemviews/qheaderview.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp index 60020e2072..7751c756fe 100644 --- a/src/widgets/itemviews/qheaderview.cpp +++ b/src/widgets/itemviews/qheaderview.cpp @@ -39,25 +39,25 @@ #include "qheaderview.h" +#include <qabstractitemdelegate.h> +#include <qapplication.h> #include <qbitarray.h> #include <qbrush.h> #include <qdebug.h> #include <qevent.h> +#include <qlist.h> #include <qpainter.h> #include <qscrollbar.h> +#include <qstyle.h> +#include <qstyleoption.h> #if QT_CONFIG(tooltip) #include <qtooltip.h> #endif +#include <qvarlengtharray.h> +#include <qvariant.h> #if QT_CONFIG(whatsthis) #include <qwhatsthis.h> #endif -#include <qstyle.h> -#include <qstyleoption.h> -#include <qvector.h> -#include <qapplication.h> -#include <qvarlengtharray.h> -#include <qabstractitemdelegate.h> -#include <qvariant.h> #include <private/qheaderview_p.h> #include <private/qabstractitemmodel_p.h> @@ -3050,7 +3050,8 @@ void QHeaderView::scrollContentsBy(int dx, int dy) \reimp \internal */ -void QHeaderView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) +void QHeaderView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles) { Q_D(QHeaderView); if (!roles.isEmpty()) { @@ -3979,8 +3980,8 @@ bool QHeaderViewPrivate::read(QDataStream &in) int sortIndicatorSectionIn; bool sortIndicatorShownIn; int lengthIn; - QVector<int> visualIndicesIn; - QVector<int> logicalIndicesIn; + QList<int> visualIndicesIn; + QList<int> logicalIndicesIn; QHash<int, int> hiddenSectionSizeIn; bool movableSectionsIn; bool clickableSectionsIn; @@ -3991,7 +3992,7 @@ bool QHeaderViewPrivate::read(QDataStream &in) int contentsSectionsIn; int defaultSectionSizeIn; int minimumSectionSizeIn; - QVector<SectionItem> sectionItemsIn; + QList<SectionItem> sectionItemsIn; in >> orient; in >> order; @@ -4031,7 +4032,7 @@ bool QHeaderViewPrivate::read(QDataStream &in) // In Qt4 we had a vector of spans where one span could hold information on more sections. // Now we have an itemvector where one items contains information about one section // For backward compatibility with Qt4 we do the following - QVector<SectionItem> newSectionItems; + QList<SectionItem> newSectionItems; for (int u = 0; u < sectionItemsIn.count(); ++u) { int count = sectionItemsIn.at(u).tmpDataStreamSectionCount; if (count > 1) |