QQuickTableView: combine layouts and rebuilds into the same code path

Rather than handle relayouts differenty than rebuilds, we
can make it a part of the rebuild structure instead, since
they overlap a lot. That way we can collect everything
that needs to be updated into a single variable (rebuildOptions).
This will simplify the upcoming work for synchronizing tableviews.

Change-Id: I8bb2638612c86194a854e6fefc998eae22357a7a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/quick/items/qquicktableview_p_p.h b/src/quick/items/qquicktableview_p_p.h
index 53bd6ec973..acf537198b 100644
--- a/src/quick/items/qquicktableview_p_p.h
+++ b/src/quick/items/qquicktableview_p_p.h
@@ -188,10 +188,11 @@ public:
 
     enum class RebuildOption {
         None = 0,
-        ViewportOnly = 0x1,
-        CalculateNewTopLeftRow = 0x2,
-        CalculateNewTopLeftColumn = 0x4,
-        All = 0x8,
+        LayoutOnly = 0x1,
+        ViewportOnly = 0x2,
+        CalculateNewTopLeftRow = 0x4,
+        CalculateNewTopLeftColumn = 0x8,
+        All = 0x10,
     };
     Q_DECLARE_FLAGS(RebuildOptions, RebuildOption)
 
@@ -246,7 +247,6 @@ public:
     QQmlTableInstanceModel::ReusableFlag reusableFlag = QQmlTableInstanceModel::Reusable;
 
     bool blockItemCreatedCallback = false;
-    bool columnRowPositionsInvalid = false;
     bool layoutWarningIssued = false;
     bool polishing = false;
 
@@ -356,7 +356,6 @@ public:
     void layoutAfterLoadingInitialTable();
 
     void scheduleRebuildTable(QQuickTableViewPrivate::RebuildOptions options);
-    void invalidateColumnRowPositions();
 
     int resolveImportVersion();
     void createWrapperModel();