From 252a3f89c61ae9a14427f66788b26597e6d24a6c Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 8 Aug 2016 15:32:56 +0200 Subject: [PATCH] Fix wrong code in list/table model templates rowCount should return 0 if the parent *is* valid, and return the actual number of rows when queried with an invalid index. Change-Id: I00e3d4ea79e1aaf0be1974da876c5a871d3924e6 Reviewed-by: Alessandro Portale --- .../templates/wizards/classes/itemmodel/listmodel.cpp | 2 +- .../templates/wizards/classes/itemmodel/tablemodel.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/templates/wizards/classes/itemmodel/listmodel.cpp b/share/qtcreator/templates/wizards/classes/itemmodel/listmodel.cpp index 5d7fa72875f..2881513ab68 100644 --- a/share/qtcreator/templates/wizards/classes/itemmodel/listmodel.cpp +++ b/share/qtcreator/templates/wizards/classes/itemmodel/listmodel.cpp @@ -28,7 +28,7 @@ bool %{CN}::setHeaderData(int section, Qt::Orientation orientation, const QVaria int %{CN}::rowCount(const QModelIndex &parent) const { - if (!parent.isValid()) + if (parent.isValid()) return 0; // FIXME: Implement me! diff --git a/share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp b/share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp index fb452feace5..80bedf58990 100644 --- a/share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp +++ b/share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp @@ -29,7 +29,7 @@ bool %{CN}::setHeaderData(int section, Qt::Orientation orientation, const QVaria int %{CN}::rowCount(const QModelIndex &parent) const { - if (!parent.isValid()) + if (parent.isValid()) return 0; // FIXME: Implement me! @@ -37,7 +37,7 @@ int %{CN}::rowCount(const QModelIndex &parent) const int %{CN}::columnCount(const QModelIndex &parent) const { - if (!parent.isValid()) + if (parent.isValid()) return 0; // FIXME: Implement me!