diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-09-12 23:32:42 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-09-12 23:32:42 (GMT) |
commit | b04672e479ae245063e641c77d43e311c0851dc0 (patch) | |
tree | 0180cd812448ec5dd3811fd68076cefd8f78ad0d | |
parent | 2b527006a3e9147a447a08d78004e20a7ac3d17c (diff) | |
download | Qt-b04672e479ae245063e641c77d43e311c0851dc0.zip Qt-b04672e479ae245063e641c77d43e311c0851dc0.tar.gz Qt-b04672e479ae245063e641c77d43e311c0851dc0.tar.bz2 |
Fix slot naming clash
Reviewed-by: David Boddie
-rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp | 4 | ||||
-rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp index 4983840..abab33c 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp @@ -167,7 +167,7 @@ QDeclarativeFolderListModel::QDeclarativeFolderListModel(QObject *parent) connect(&d->model, SIGNAL(rowsRemoved(const QModelIndex&,int,int)) , this, SLOT(removed(const QModelIndex&,int,int))); connect(&d->model, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)) - , this, SLOT(dataChanged(const QModelIndex&,const QModelIndex&))); + , this, SLOT(handleDataChanged(const QModelIndex&,const QModelIndex&))); connect(&d->model, SIGNAL(modelReset()), this, SLOT(refresh())); connect(&d->model, SIGNAL(layoutChanged()), this, SLOT(refresh())); } @@ -363,7 +363,7 @@ void QDeclarativeFolderListModel::removed(const QModelIndex &index, int start, i } } -void QDeclarativeFolderListModel::dataChanged(const QModelIndex &start, const QModelIndex &end) +void QDeclarativeFolderListModel::handleDataChanged(const QModelIndex &start, const QModelIndex &end) { if (start.parent() == d->folderIndex) emit dataChanged(index(start.row(),0), index(end.row(),0)); diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h index 1bab5f84..24edecd 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h @@ -138,7 +138,7 @@ private Q_SLOTS: void refresh(); void inserted(const QModelIndex &index, int start, int end); void removed(const QModelIndex &index, int start, int end); - void dataChanged(const QModelIndex &start, const QModelIndex &end); + void handleDataChanged(const QModelIndex &start, const QModelIndex &end); private: Q_DISABLE_COPY(QDeclarativeFolderListModel) |