TreeViewDelegate: don't use deprecated API

TableView.modelIndex(column, row) was deprecated in Qt 6.4
(291d3ed0da) in favor of TableView.index(row, column). But the
TreeViewDelegates are still using the deprecated API for the
edit delegates (added in Qt 6.5, 21bf976a41), which will cause
warning messages to be printed.

This patch will rewrite the offending lines in the
TreeViewDelegates to use TableView.index(row, column)
instead.

Task-number: QTBUG-109542
Change-Id: I41c0c18934493611663b759c8eb3b4fed2510cc6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 218b908b6a9aa542866821b65044bc839472a397)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

5 files changed, 15 insertions, 15 deletions

diff --git a/src/quickcontrols/basic/TreeViewDelegate.qml b/src/quickcontrols/basic/TreeViewDelegate.qml
index 551e49b5a8..f1cf265467 100644
--- a/src/quickcontrols/basic/TreeViewDelegate.qml
+++ b/src/quickcontrols/basic/TreeViewDelegate.qml
@@ -73,7 +73,7 @@ T.TreeViewDelegate {
 
         readonly property int __role: {
             let model = control.treeView.model
-            let index = control.treeView.modelIndex(column, row)
+            let index = control.treeView.index(row, column)
             let editText = model.data(index, Qt.EditRole)
             return editText !== undefined ? Qt.EditRole : Qt.DisplayRole
         }
@@ -83,12 +83,12 @@ T.TreeViewDelegate {
             x: control.contentItem.x
             y: (parent.height - height) / 2
             width: control.contentItem.width
-            text: control.treeView.model.data(control.treeView.modelIndex(column, row), __role)
+            text: control.treeView.model.data(control.treeView.index(row, column), __role)
             focus: true
         }
 
         TableView.onCommit: {
-            let index = TableView.view.modelIndex(column, row)
+            let index = TableView.view.index(row, column)
             TableView.view.model.setData(index, textField.text, __role)
         }
 
diff --git a/src/quickcontrols/fusion/TreeViewDelegate.qml b/src/quickcontrols/fusion/TreeViewDelegate.qml
index 743b70eb61..195693614b 100644
--- a/src/quickcontrols/fusion/TreeViewDelegate.qml
+++ b/src/quickcontrols/fusion/TreeViewDelegate.qml
@@ -72,7 +72,7 @@ T.TreeViewDelegate {
 
         readonly property int __role: {
             let model = control.treeView.model
-            let index = control.treeView.modelIndex(column, row)
+            let index = control.treeView.index(row, column)
             let editText = model.data(index, Qt.EditRole)
             return editText !== undefined ? Qt.EditRole : Qt.DisplayRole
         }
@@ -82,12 +82,12 @@ T.TreeViewDelegate {
             x: control.contentItem.x
             y: (parent.height - height) / 2
             width: control.contentItem.width
-            text: control.treeView.model.data(control.treeView.modelIndex(column, row), __role)
+            text: control.treeView.model.data(control.treeView.index(row, column), __role)
             focus: true
         }
 
         TableView.onCommit: {
-            let index = TableView.view.modelIndex(column, row)
+            let index = TableView.view.index(row, column)
             TableView.view.model.setData(index, textField.text, __role)
         }
 
diff --git a/src/quickcontrols/ios/TreeViewDelegate.qml b/src/quickcontrols/ios/TreeViewDelegate.qml
index 231eb45941..5fc16bee07 100644
--- a/src/quickcontrols/ios/TreeViewDelegate.qml
+++ b/src/quickcontrols/ios/TreeViewDelegate.qml
@@ -86,7 +86,7 @@ T.TreeViewDelegate {
 
         readonly property int __role: {
             let model = control.treeView.model
-            let index = control.treeView.modelIndex(column, row)
+            let index = control.treeView.index(row, column)
             let editText = model.data(index, Qt.EditRole)
             return editText !== undefined ? Qt.EditRole : Qt.DisplayRole
         }
@@ -96,12 +96,12 @@ T.TreeViewDelegate {
             x: control.contentItem.x
             y: (parent.height - height) / 2
             width: control.contentItem.width
-            text: control.treeView.model.data(control.treeView.modelIndex(column, row), __role)
+            text: control.treeView.model.data(control.treeView.index(row, column), __role)
             focus: true
         }
 
         TableView.onCommit: {
-            let index = TableView.view.modelIndex(column, row)
+            let index = TableView.view.index(row, column)
             TableView.view.model.setData(index, textField.text, __role)
         }
 
diff --git a/src/quickcontrols/material/TreeViewDelegate.qml b/src/quickcontrols/material/TreeViewDelegate.qml
index 837d4ca2db..9f1d444383 100644
--- a/src/quickcontrols/material/TreeViewDelegate.qml
+++ b/src/quickcontrols/material/TreeViewDelegate.qml
@@ -72,7 +72,7 @@ T.TreeViewDelegate {
 
         readonly property int __role: {
             let model = control.treeView.model
-            let index = control.treeView.modelIndex(column, row)
+            let index = control.treeView.index(row, column)
             let editText = model.data(index, Qt.EditRole)
             return editText !== undefined ? Qt.EditRole : Qt.DisplayRole
         }
@@ -82,12 +82,12 @@ T.TreeViewDelegate {
             x: control.contentItem.x
             y: (parent.height - height) / 2
             width: control.contentItem.width
-            text: control.treeView.model.data(control.treeView.modelIndex(column, row), __role)
+            text: control.treeView.model.data(control.treeView.index(row, column), __role)
             focus: true
         }
 
         TableView.onCommit: {
-            let index = TableView.view.modelIndex(column, row)
+            let index = TableView.view.index(row, column)
             TableView.view.model.setData(index, textField.text, __role)
         }
 
diff --git a/src/quicknativestyle/controls/DefaultTreeViewDelegate.qml b/src/quicknativestyle/controls/DefaultTreeViewDelegate.qml
index 5f03226ec3..89130947bb 100644
--- a/src/quicknativestyle/controls/DefaultTreeViewDelegate.qml
+++ b/src/quicknativestyle/controls/DefaultTreeViewDelegate.qml
@@ -77,7 +77,7 @@ T.TreeViewDelegate {
 
         readonly property int __role: {
             let model = control.treeView.model
-            let index = control.treeView.modelIndex(column, row)
+            let index = control.treeView.index(row, column)
             let editText = model.data(index, Qt.EditRole)
             return editText !== undefined ? Qt.EditRole : Qt.DisplayRole
         }
@@ -87,12 +87,12 @@ T.TreeViewDelegate {
             x: control.contentItem.x
             y: (parent.height - height) / 2
             width: control.contentItem.width
-            text: control.treeView.model.data(control.treeView.modelIndex(column, row), __role)
+            text: control.treeView.model.data(control.treeView.index(row, column), __role)
             focus: true
         }
 
         TableView.onCommit: {
-            let index = TableView.view.modelIndex(column, row)
+            let index = TableView.view.index(row, column)
             TableView.view.model.setData(index, textField.text, __role)
         }