From 68a778e19684bcdae1334ad080e1630064af4a29 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Wed, 15 May 2013 13:58:58 +0200
Subject: [PATCH] Rename sortColumnIndex to sortIndicatorColumn
We are removing all references to index in the api
and sortColumnIndex should be renamed as well.
Change-Id: Ia8f0758e3ee4df161488aefff52bdb7b518a1f50
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
---
src/controls/TableView.qml | 20 ++++++++++----------
tests/manual/testbench/main.qml | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index e48885ff7..cf8051512 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -88,9 +88,9 @@ import QtQuick.Controls.Styles 1.0
on the model, and enable sort indicators on headers.
\list
- \li sortColumnIndex - The index of the current sort column
- \li sortIndicatorVisible - Whether the sort indicator should be enabled
- \li sortIndicatorOrder - Qt.AscendingOrder or Qt.DescendingOrder depending on state
+ \li int sortIndicatorColumn - The index of the current sort column
+ \li bool sortIndicatorVisible - Whether the sort indicator should be enabled
+ \li enum sortIndicatorOrder - Qt.AscendingOrder or Qt.DescendingOrder depending on state
\endlist
*/
@@ -171,7 +171,7 @@ ScrollView {
/*! Index of the current sort column.
The default value is \c {0}. */
- property int sortColumnIndex
+ property int sortIndicatorColumn
/*! This property shows or hides the sort indicator
The default value is \c false.
@@ -539,7 +539,7 @@ ScrollView {
anchors.left: parent.left
anchors.right: parent.right
property string itemValue: columns[index].title
- property string itemSort: (sortIndicatorVisible && index == sortColumnIndex) ? (sortIndicatorOrder == Qt.AscendingOrder ? "up" : "down") : "";
+ property string itemSort: (sortIndicatorVisible && index == sortIndicatorColumn) ? (sortIndicatorOrder == Qt.AscendingOrder ? "up" : "down") : "";
property bool itemPressed: headerClickArea.pressed
property bool itemContainsMouse: headerClickArea.containsMouse
property string itemPosition: columns.length === 1 ? "only" :
@@ -561,9 +561,9 @@ ScrollView {
hoverEnabled: true
anchors.fill: parent
onClicked: {
- if (sortColumnIndex == index)
+ if (sortIndicatorColumn == index)
sortIndicatorOrder = sortIndicatorOrder == Qt.AscendingOrder ? Qt.DescendingOrder : Qt.AscendingOrder
- sortColumnIndex = index
+ sortIndicatorColumn = index
}
// Here we handle moving header sections
// NOTE: the direction is different from the master branch
@@ -593,8 +593,8 @@ ScrollView {
items.splice(index, 1);
items.splice(repeater.targetIndex, 0, columns[index]);
columns = items
- if (sortColumnIndex == index)
- sortColumnIndex = repeater.targetIndex
+ if (sortIndicatorColumn == index)
+ sortIndicatorColumn = repeater.targetIndex
}
repeater.targetIndex = -1
}
@@ -606,7 +606,7 @@ ScrollView {
Loader {
id: draghandle
property string itemValue: columns[index].title
- property string itemSort: (sortIndicatorVisible && index == sortColumnIndex) ? (sortIndicatorOrder == Qt.AscendingOrder ? "up" : "down") : "";
+ property string itemSort: (sortIndicatorVisible && index == sortIndicatorColumn) ? (sortIndicatorOrder == Qt.AscendingOrder ? "up" : "down") : "";
property bool itemPressed: headerClickArea.pressed
property bool itemContainsMouse: headerClickArea.containsMouse
property string itemPosition
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index 6dbe44408..be2ab0c9c 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -222,7 +222,7 @@ ApplicationWindow {
case "MinimumValue":
case "Decimals":
case "CurrentIndex":
- case "SortColumnIndex":
+ case "SortIndicatorColumn":
layout = layouts.intLayout
typeName = "Int"
break;
--
GitLab