diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-20 21:12:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 03:30:09 +0200 |
| commit | 9dc738821e6618b1ba51b46f98205acfe74cbea4 (patch) | |
| tree | 52ec05d44e90a925ebc877b8ca5a87bef02c5102 /src/imports/folderlistmodel | |
| parent | 5dac3d9f846d0a9cffb95608219fefd4079a7bc2 (diff) | |
Do not use deprecated API
Change-Id: I0c61f9cb4abe926d5f1e0a3acda7117d8d54efb6
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'src/imports/folderlistmodel')
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 8 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.h | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index 0aabb7ae74..b937fbdbc3 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -274,8 +274,6 @@ QQuickFolderListModel::QQuickFolderListModel(QObject *parent) d->roleNames[FileLastModifiedRole] = "fileModified"; d->roleNames[FileLastReadRole] = "fileAccessed"; d->roleNames[FileIsDirRole] = "fileIsDir"; - setRoleNames(d->roleNames); - d->init(); } @@ -323,6 +321,12 @@ QVariant QQuickFolderListModel::data(const QModelIndex &index, int role) const return rv; } +QHash<int, QByteArray> QQuickFolderListModel::roleNames() const +{ + Q_D(const QQuickFolderListModel); + return d->roleNames; +} + /*! \qmlproperty int FolderListModel::count diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h index 830a30b146..d00283685b 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.h +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h @@ -97,6 +97,7 @@ public: virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + virtual QHash<int, QByteArray> roleNames() const; //![abslistmodel] //![count] |