diff options
Diffstat (limited to 'src/gui/itemmodels/qfilesystemmodel.h')
-rw-r--r-- | src/gui/itemmodels/qfilesystemmodel.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/gui/itemmodels/qfilesystemmodel.h b/src/gui/itemmodels/qfilesystemmodel.h index d614ec2329..9888249fc5 100644 --- a/src/gui/itemmodels/qfilesystemmodel.h +++ b/src/gui/itemmodels/qfilesystemmodel.h @@ -9,7 +9,6 @@ #include <QtCore/qpair.h> #include <QtCore/qdir.h> #include <QtGui/qicon.h> -#include <QtCore/qdiriterator.h> QT_REQUIRE_CONFIG(filesystemmodel); @@ -35,9 +34,19 @@ Q_SIGNALS: public: enum Roles { FileIconRole = Qt::DecorationRole, + + FileInfoRole = Qt::UserRole - 4, // New values go before, -5, -6 ..etc + QT7_ONLY( + FilePathRole = Qt::UserRole - 3, + FileNameRole = Qt::UserRole - 2, + FilePermissions = Qt::UserRole - 1, + ) + + QT6_ONLY( FilePathRole = Qt::UserRole + 1, FileNameRole = Qt::UserRole + 2, - FilePermissions = Qt::UserRole + 3 + FilePermissions = Qt::UserRole + 3, + ) }; enum Option @@ -114,7 +123,6 @@ public: qint64 size(const QModelIndex &index) const; QString type(const QModelIndex &index) const; - // ### Qt7 merge the two overloads, with tz QTimeZone::LocalTime QDateTime lastModified(const QModelIndex &index) const; QDateTime lastModified(const QModelIndex &index, const QTimeZone &tz) const; @@ -135,13 +143,6 @@ private: Q_DECLARE_PRIVATE(QFileSystemModel) Q_DISABLE_COPY(QFileSystemModel) - Q_PRIVATE_SLOT(d_func(), void _q_directoryChanged(const QString &directory, const QStringList &list)) - Q_PRIVATE_SLOT(d_func(), void _q_performDelayedSort()) - Q_PRIVATE_SLOT(d_func(), - void _q_fileSystemChanged(const QString &path, - const QList<QPair<QString, QFileInfo>> &)) - Q_PRIVATE_SLOT(d_func(), void _q_resolvedName(const QString &fileName, const QString &resolvedName)) - friend class QFileDialogPrivate; }; |