From 9a08d3e79fee46b33a75d17f76f0ff63687a648e Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Thu, 19 Jan 2012 09:51:18 +1000 Subject: Fix range checking in AbstractItemModel examples Fix range checking in AbstractItemModel examples Task-number: QTBUG-23574 Change-Id: I6f2d4c18e1fb33ee369ebc75f501e524e8e63615 Reviewed-by: Martin Jones --- examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/declarative/qtquick1/modelviews') 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()]; -- cgit v1.2.3 From e6b224aa2872d7d1030fa98bd30603e16f8f9604 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 20 Jan 2012 14:04:27 +1000 Subject: Update obsolete contact address. Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern Reviewed-by: Alan Alpert --- examples/declarative/qtquick1/modelviews/abstractitemmodel/main.cpp | 2 +- examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp | 2 +- examples/declarative/qtquick1/modelviews/abstractitemmodel/model.h | 2 +- examples/declarative/qtquick1/modelviews/abstractitemmodel/view.qml | 2 +- examples/declarative/qtquick1/modelviews/gridview/gridview-example.qml | 2 +- examples/declarative/qtquick1/modelviews/listview/content/PetsModel.qml | 2 +- .../qtquick1/modelviews/listview/content/PressAndHoldButton.qml | 2 +- .../declarative/qtquick1/modelviews/listview/content/RecipesModel.qml | 2 +- .../declarative/qtquick1/modelviews/listview/content/TextButton.qml | 2 +- examples/declarative/qtquick1/modelviews/listview/dynamiclist.qml | 2 +- .../declarative/qtquick1/modelviews/listview/expandingdelegates.qml | 2 +- examples/declarative/qtquick1/modelviews/listview/highlight.qml | 2 +- examples/declarative/qtquick1/modelviews/listview/highlightranges.qml | 2 +- examples/declarative/qtquick1/modelviews/listview/sections.qml | 2 +- examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.cpp | 2 +- examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.h | 2 +- examples/declarative/qtquick1/modelviews/objectlistmodel/main.cpp | 2 +- examples/declarative/qtquick1/modelviews/objectlistmodel/view.qml | 2 +- examples/declarative/qtquick1/modelviews/package/Delegate.qml | 2 +- examples/declarative/qtquick1/modelviews/package/view.qml | 2 +- examples/declarative/qtquick1/modelviews/parallax/parallax.qml | 2 +- examples/declarative/qtquick1/modelviews/parallax/qml/ParallaxView.qml | 2 +- examples/declarative/qtquick1/modelviews/parallax/qml/Smiley.qml | 2 +- examples/declarative/qtquick1/modelviews/pathview/pathview-example.qml | 2 +- examples/declarative/qtquick1/modelviews/stringlistmodel/main.cpp | 2 +- examples/declarative/qtquick1/modelviews/stringlistmodel/view.qml | 2 +- .../declarative/qtquick1/modelviews/visualitemmodel/visualitemmodel.qml | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) (limited to 'examples/declarative/qtquick1/modelviews') diff --git a/examples/declarative/qtquick1/modelviews/abstractitemmodel/main.cpp b/examples/declarative/qtquick1/modelviews/abstractitemmodel/main.cpp index 4629173cd2..b087cf3fa8 100644 --- a/examples/declarative/qtquick1/modelviews/abstractitemmodel/main.cpp +++ b/examples/declarative/qtquick1/modelviews/abstractitemmodel/main.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp b/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp index 2e4c7e2a15..078294f900 100644 --- a/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp +++ b/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.h b/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.h index 1fe46bd14e..260c9f9ab2 100644 --- a/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.h +++ b/examples/declarative/qtquick1/modelviews/abstractitemmodel/model.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/abstractitemmodel/view.qml b/examples/declarative/qtquick1/modelviews/abstractitemmodel/view.qml index 61134e04f2..ee04f178f2 100644 --- a/examples/declarative/qtquick1/modelviews/abstractitemmodel/view.qml +++ b/examples/declarative/qtquick1/modelviews/abstractitemmodel/view.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/gridview/gridview-example.qml b/examples/declarative/qtquick1/modelviews/gridview/gridview-example.qml index a128a53a13..2d7704a2cb 100644 --- a/examples/declarative/qtquick1/modelviews/gridview/gridview-example.qml +++ b/examples/declarative/qtquick1/modelviews/gridview/gridview-example.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/listview/content/PetsModel.qml b/examples/declarative/qtquick1/modelviews/listview/content/PetsModel.qml index 76ddccbb0c..53233128b6 100644 --- a/examples/declarative/qtquick1/modelviews/listview/content/PetsModel.qml +++ b/examples/declarative/qtquick1/modelviews/listview/content/PetsModel.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/listview/content/PressAndHoldButton.qml b/examples/declarative/qtquick1/modelviews/listview/content/PressAndHoldButton.qml index f160a1de4b..29ee1df3c7 100644 --- a/examples/declarative/qtquick1/modelviews/listview/content/PressAndHoldButton.qml +++ b/examples/declarative/qtquick1/modelviews/listview/content/PressAndHoldButton.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/listview/content/RecipesModel.qml b/examples/declarative/qtquick1/modelviews/listview/content/RecipesModel.qml index 287adbffee..9230f5f445 100644 --- a/examples/declarative/qtquick1/modelviews/listview/content/RecipesModel.qml +++ b/examples/declarative/qtquick1/modelviews/listview/content/RecipesModel.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/listview/content/TextButton.qml b/examples/declarative/qtquick1/modelviews/listview/content/TextButton.qml index bc684dc1b0..c3ecf9c99f 100644 --- a/examples/declarative/qtquick1/modelviews/listview/content/TextButton.qml +++ b/examples/declarative/qtquick1/modelviews/listview/content/TextButton.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/listview/dynamiclist.qml b/examples/declarative/qtquick1/modelviews/listview/dynamiclist.qml index 7550494cba..c97fed9bbb 100644 --- a/examples/declarative/qtquick1/modelviews/listview/dynamiclist.qml +++ b/examples/declarative/qtquick1/modelviews/listview/dynamiclist.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/listview/expandingdelegates.qml b/examples/declarative/qtquick1/modelviews/listview/expandingdelegates.qml index 91f45c92bc..91c07b3ad8 100644 --- a/examples/declarative/qtquick1/modelviews/listview/expandingdelegates.qml +++ b/examples/declarative/qtquick1/modelviews/listview/expandingdelegates.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/listview/highlight.qml b/examples/declarative/qtquick1/modelviews/listview/highlight.qml index 9ab98b82c0..659bb56f3b 100644 --- a/examples/declarative/qtquick1/modelviews/listview/highlight.qml +++ b/examples/declarative/qtquick1/modelviews/listview/highlight.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/listview/highlightranges.qml b/examples/declarative/qtquick1/modelviews/listview/highlightranges.qml index 7d0c154b96..464a18a58d 100644 --- a/examples/declarative/qtquick1/modelviews/listview/highlightranges.qml +++ b/examples/declarative/qtquick1/modelviews/listview/highlightranges.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/listview/sections.qml b/examples/declarative/qtquick1/modelviews/listview/sections.qml index 3e9ba51dd6..79b47096bf 100644 --- a/examples/declarative/qtquick1/modelviews/listview/sections.qml +++ b/examples/declarative/qtquick1/modelviews/listview/sections.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.cpp b/examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.cpp index 0f42e12a2b..f5582b2e57 100644 --- a/examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.cpp +++ b/examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.h b/examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.h index f934343d8a..a81df42a9a 100644 --- a/examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.h +++ b/examples/declarative/qtquick1/modelviews/objectlistmodel/dataobject.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/objectlistmodel/main.cpp b/examples/declarative/qtquick1/modelviews/objectlistmodel/main.cpp index a68e8fbe90..130112a35f 100644 --- a/examples/declarative/qtquick1/modelviews/objectlistmodel/main.cpp +++ b/examples/declarative/qtquick1/modelviews/objectlistmodel/main.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/objectlistmodel/view.qml b/examples/declarative/qtquick1/modelviews/objectlistmodel/view.qml index db1b313761..c52decee70 100644 --- a/examples/declarative/qtquick1/modelviews/objectlistmodel/view.qml +++ b/examples/declarative/qtquick1/modelviews/objectlistmodel/view.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/package/Delegate.qml b/examples/declarative/qtquick1/modelviews/package/Delegate.qml index b9b07a380a..8e41b05f5b 100644 --- a/examples/declarative/qtquick1/modelviews/package/Delegate.qml +++ b/examples/declarative/qtquick1/modelviews/package/Delegate.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/package/view.qml b/examples/declarative/qtquick1/modelviews/package/view.qml index 2686313a3f..e6100f6400 100644 --- a/examples/declarative/qtquick1/modelviews/package/view.qml +++ b/examples/declarative/qtquick1/modelviews/package/view.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/parallax/parallax.qml b/examples/declarative/qtquick1/modelviews/parallax/parallax.qml index 3a55096df0..eba0736ee5 100644 --- a/examples/declarative/qtquick1/modelviews/parallax/parallax.qml +++ b/examples/declarative/qtquick1/modelviews/parallax/parallax.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/parallax/qml/ParallaxView.qml b/examples/declarative/qtquick1/modelviews/parallax/qml/ParallaxView.qml index faa834e5db..d9c8100e1e 100644 --- a/examples/declarative/qtquick1/modelviews/parallax/qml/ParallaxView.qml +++ b/examples/declarative/qtquick1/modelviews/parallax/qml/ParallaxView.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/parallax/qml/Smiley.qml b/examples/declarative/qtquick1/modelviews/parallax/qml/Smiley.qml index efacc68693..0ab2f28986 100644 --- a/examples/declarative/qtquick1/modelviews/parallax/qml/Smiley.qml +++ b/examples/declarative/qtquick1/modelviews/parallax/qml/Smiley.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/pathview/pathview-example.qml b/examples/declarative/qtquick1/modelviews/pathview/pathview-example.qml index 4663c51e15..d6370f24e0 100644 --- a/examples/declarative/qtquick1/modelviews/pathview/pathview-example.qml +++ b/examples/declarative/qtquick1/modelviews/pathview/pathview-example.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/stringlistmodel/main.cpp b/examples/declarative/qtquick1/modelviews/stringlistmodel/main.cpp index 133d130d28..af9aa565a2 100644 --- a/examples/declarative/qtquick1/modelviews/stringlistmodel/main.cpp +++ b/examples/declarative/qtquick1/modelviews/stringlistmodel/main.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/stringlistmodel/view.qml b/examples/declarative/qtquick1/modelviews/stringlistmodel/view.qml index 29da59d73c..db2ef57676 100644 --- a/examples/declarative/qtquick1/modelviews/stringlistmodel/view.qml +++ b/examples/declarative/qtquick1/modelviews/stringlistmodel/view.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** diff --git a/examples/declarative/qtquick1/modelviews/visualitemmodel/visualitemmodel.qml b/examples/declarative/qtquick1/modelviews/visualitemmodel/visualitemmodel.qml index 670f507bec..053a7a2d5d 100644 --- a/examples/declarative/qtquick1/modelviews/visualitemmodel/visualitemmodel.qml +++ b/examples/declarative/qtquick1/modelviews/visualitemmodel/visualitemmodel.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the examples of the Qt Toolkit. ** -- cgit v1.2.3