diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 07:09:52 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 07:09:52 (GMT) |
| commit | db0cfede616fbed94333615d1f6c1fabad46d088 (patch) | |
| tree | 5a220aaee185584921124163d8f977f61de13e5d /src/declarative/util | |
| parent | bfbba2d4b3e6371ee6d4b6c1b0ff1c54680b8872 (diff) | |
| download | Qt-db0cfede616fbed94333615d1f6c1fabad46d088.zip Qt-db0cfede616fbed94333615d1f6c1fabad46d088.tar.gz Qt-db0cfede616fbed94333615d1f6c1fabad46d088.tar.bz2 | |
Rename ListModel::set() to ListModel::setProperty()
As QML doesn't support slot overloading, the two ListModel::set()
calls must be separated.
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qmllistmodel.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/util/qmllistmodel_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index fee9b6d..e975a5f 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -705,7 +705,7 @@ void QmlListModel::set(int index, const QScriptValue& valuemap) } /*! - \qmlmethod ListModel::set(int index, string property, variant value) + \qmlmethod ListModel::setProperty(int index, string property, variant value) Changes the \a property of the item at \a index in the list model to \a value. @@ -717,7 +717,7 @@ void QmlListModel::set(int index, const QScriptValue& valuemap) \sa append() */ -void QmlListModel::set(int index, const QString& property, const QVariant& value) +void QmlListModel::setProperty(int index, const QString& property, const QVariant& value) { if ( !_root || index >= _root->values.count()) { qmlInfo(this) << tr("set: index %1 out of range").arg(index); diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h index 47236d0..e18d3fd 100644 --- a/src/declarative/util/qmllistmodel_p.h +++ b/src/declarative/util/qmllistmodel_p.h @@ -80,7 +80,7 @@ public: Q_INVOKABLE void insert(int index, const QScriptValue&); Q_INVOKABLE QScriptValue get(int index) const; Q_INVOKABLE void set(int index, const QScriptValue&); - Q_INVOKABLE void set(int index, const QString& property, const QVariant& value); + Q_INVOKABLE void setProperty(int index, const QString& property, const QVariant& value); Q_INVOKABLE void move(int from, int to, int count); Q_SIGNALS: |