summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qlistmodelinterface.cpp
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@nokia.com>2010-11-09 01:23:37 (GMT)
committerLorn Potter <lorn.potter@nokia.com>2010-11-09 01:23:37 (GMT)
commit6b8a95b2521d843ec2b3f7c787c15b92e4ea686f (patch)
tree346bc8925d83b2729f485d1259729fca931de07d /src/declarative/util/qlistmodelinterface.cpp
parentbb8f085611f4cb91b7bde7220d407948edcc572c (diff)
parente00af84cc9230df411981d2f3b9296b61d5d1c50 (diff)
downloadQt-6b8a95b2521d843ec2b3f7c787c15b92e4ea686f.zip
Qt-6b8a95b2521d843ec2b3f7c787c15b92e4ea686f.tar.gz
Qt-6b8a95b2521d843ec2b3f7c787c15b92e4ea686f.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/declarative/util/qlistmodelinterface.cpp')
-rw-r--r--src/declarative/util/qlistmodelinterface.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/declarative/util/qlistmodelinterface.cpp b/src/declarative/util/qlistmodelinterface.cpp
index acf4dd6..1e2dfb7 100644
--- a/src/declarative/util/qlistmodelinterface.cpp
+++ b/src/declarative/util/qlistmodelinterface.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
/*!
\internal
\class QListModelInterface
+ \since 4.7
\brief The QListModelInterface class can be subclassed to provide C++ models to QDeclarativeGraphics Views
This class is comprised primarily of pure virtual functions which
@@ -70,15 +71,10 @@ QT_BEGIN_NAMESPACE
Returns the number of data entries in the model.
*/
-/*! \fn QHash<int,QVariant> QListModelInterface::data(int index, const QList<int>& roles) const
+/*! \fn QVariant QListModelInterface::data(int index, int role) const
Returns the data at the given \a index for the specified \a roles.
*/
-/*! \fn bool QListModelInterface::setData(int index, const QHash<int,QVariant>& values)
- Sets the data at the given \a index. \a values is a mapping of
- QVariant values to roles. Returns false.
-*/
-
/*! \fn QList<int> QListModelInterface::roles() const
Returns the list of roles for which the list model interface
provides data.