From 9a08d3e79fee46b33a75d17f76f0ff63687a648e Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Thu, 19 Jan 2012 09:51:18 +1000
Subject: [PATCH] Fix range checking in AbstractItemModel examples
Fix range checking in AbstractItemModel examples
Task-number: QTBUG-23574
Change-Id: I6f2d4c18e1fb33ee369ebc75f501e524e8e63615
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
examples/declarative/modelviews/abstractitemmodel/model.cpp | 2 +-
.../declarative/qtquick1/modelviews/abstractitemmodel/model.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/declarative/modelviews/abstractitemmodel/model.cpp b/examples/declarative/modelviews/abstractitemmodel/model.cpp
index f2397c3380..2e4c7e2a15 100644
--- a/examples/declarative/modelviews/abstractitemmodel/model.cpp
+++ b/examples/declarative/modelviews/abstractitemmodel/model.cpp
@@ -77,7 +77,7 @@ int AnimalModel::rowCount(const QModelIndex & parent) const {
}
QVariant AnimalModel::data(const QModelIndex & index, int role) const {
- if (index.row() < 0 || index.row() > m_animals.count())
+ if (index.row() < 0 || index.row() >= m_animals.count())
return QVariant();
const Animal &animal = m_animals[index.row()];
diff --git a/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp b/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp
index f2397c3380..2e4c7e2a15 100644
--- a/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp
+++ b/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp
@@ -77,7 +77,7 @@ int AnimalModel::rowCount(const QModelIndex & parent) const {
}
QVariant AnimalModel::data(const QModelIndex & index, int role) const {
- if (index.row() < 0 || index.row() > m_animals.count())
+ if (index.row() < 0 || index.row() >= m_animals.count())
return QVariant();
const Animal &animal = m_animals[index.row()];
--
GitLab