summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs/qfilesystemmodel.h
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-04-11 22:52:21 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-12 10:41:29 +0200
commit94519a441cf1ea77f1422c44a7ef8ec15171ad04 (patch)
treef078305e2bc8c5733768b95f03f54dc7f1efed3d /src/widgets/dialogs/qfilesystemmodel.h
parent4f929e01e0dbdbbc618083e5a10cdfb7edc7d9bc (diff)
Address Qt 5 to-do comments related to QFileSystemModel.
- QFileSystemModel::rmdir() and QFileSystemModel::remove() changed to non-const -- they don't change the object, but they do change the file system, and the Qt way is to be non-const if having side-effects on external entities. - The comment on incompatibility between entryList and QFileInfo will not be fixed as doing so is likely to break existing code. - The comment on removing the internal resolvedSymLinks variable has been removed, as the variable is still used. Task-number: QTBUG-25088 Change-Id: I20456e4d116076403d9c4d4692ee05c178a1ed17 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/dialogs/qfilesystemmodel.h')
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h
index 5a9139266d..875044e785 100644
--- a/src/widgets/dialogs/qfilesystemmodel.h
+++ b/src/widgets/dialogs/qfilesystemmodel.h
@@ -138,12 +138,12 @@ public:
QDateTime lastModified(const QModelIndex &index) const;
QModelIndex mkdir(const QModelIndex &parent, const QString &name);
- bool rmdir(const QModelIndex &index) const; // ### Qt5: should not be const
+ bool rmdir(const QModelIndex &index);
inline QString fileName(const QModelIndex &index) const;
inline QIcon fileIcon(const QModelIndex &index) const;
QFile::Permissions permissions(const QModelIndex &index) const;
inline QFileInfo fileInfo(const QModelIndex &index) const;
- bool remove(const QModelIndex &index) const;
+ bool remove(const QModelIndex &index);
protected:
QFileSystemModel(QFileSystemModelPrivate &, QObject *parent = 0);