diff options
Diffstat (limited to 'src/widgets/itemviews/qtableview_p.h')
-rw-r--r-- | src/widgets/itemviews/qtableview_p.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h index d55462c28b..8f174351d2 100644 --- a/src/widgets/itemviews/qtableview_p.h +++ b/src/widgets/itemviews/qtableview_p.h @@ -53,12 +53,13 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/QList> -#include <QtCore/QLinkedList> #include <QtCore/QMap> #include <QtCore/QSet> #include <QtCore/QDebug> #include "private/qabstractitemview_p.h" +#include <list> + QT_REQUIRE_CONFIG(tableview); QT_BEGIN_NAMESPACE @@ -104,7 +105,7 @@ public: void updateSpan(Span *span, int old_height); Span *spanAt(int x, int y) const; void clear(); - QList<Span *> spansInRect(int x, int y, int w, int h) const; + QSet<Span *> spansInRect(int x, int y, int w, int h) const; void updateInsertedRows(int start, int end); void updateInsertedColumns(int start, int end); @@ -115,7 +116,7 @@ public: bool checkConsistency() const; #endif - typedef QLinkedList<Span *> SpanList; + typedef std::list<Span *> SpanList; SpanList spans; //lists of all spans private: //the indexes are negative so the QMap::lowerBound do what i need. @@ -137,7 +138,7 @@ public: : showGrid(true), gridStyle(Qt::SolidLine), rowSectionAnchor(-1), columnSectionAnchor(-1), columnResizeTimerID(0), rowResizeTimerID(0), - horizontalHeader(0), verticalHeader(0), + horizontalHeader(nullptr), verticalHeader(nullptr), sortingEnabled(false), geometryRecursionBlock(false), visualCursor(QPoint()) { @@ -210,7 +211,7 @@ public: return span(row, column).width(); } inline bool hasSpans() const { - return !spans.spans.isEmpty(); + return !spans.spans.empty(); } inline int rowSpanHeight(int row, int span) const { return sectionSpanSize(verticalHeader, row, span); |