diff options
Diffstat (limited to 'src/gui/itemmodels/qfileinfogatherer_p.h')
-rw-r--r-- | src/gui/itemmodels/qfileinfogatherer_p.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/itemmodels/qfileinfogatherer_p.h b/src/gui/itemmodels/qfileinfogatherer_p.h index e4b2bc889f..3d5f59c22e 100644 --- a/src/gui/itemmodels/qfileinfogatherer_p.h +++ b/src/gui/itemmodels/qfileinfogatherer_p.h @@ -24,7 +24,6 @@ #include <qfilesystemwatcher.h> #endif #include <qabstractfileiconprovider.h> -#include <qpair.h> #include <qstack.h> #include <qdatetime.h> #include <qdir.h> @@ -32,6 +31,8 @@ #include <private/qfilesystemengine_p.h> +#include <utility> + QT_REQUIRE_CONFIG(filesystemmodel); QT_BEGIN_NAMESPACE @@ -124,7 +125,7 @@ class Q_GUI_EXPORT QFileInfoGatherer : public QThread Q_OBJECT Q_SIGNALS: - void updates(const QString &directory, const QList<QPair<QString, QFileInfo>> &updates); + void updates(const QString &directory, const QList<std::pair<QString, QFileInfo>> &updates); void newListOfFiles(const QString &directory, const QStringList &listOfFiles) const; void nameResolved(const QString &fileName, const QString &resolvedName) const; void directoryLoaded(const QString &path); @@ -148,6 +149,8 @@ public: QAbstractFileIconProvider *iconProvider() const; bool resolveSymlinks() const; + void requestAbort(); + public Q_SLOTS: void list(const QString &directoryPath); void fetchExtendedInformation(const QString &path, const QStringList &files); @@ -159,12 +162,15 @@ private Q_SLOTS: void driveAdded(); void driveRemoved(); +protected: + bool event(QEvent *event) override; + private: void run() override; // called by run(): void getFileInfos(const QString &path, const QStringList &files); void fetch(const QFileInfo &info, QElapsedTimer &base, bool &firstTime, - QList<QPair<QString, QFileInfo>> &updatedFiles, const QString &path); + QList<std::pair<QString, QFileInfo>> &updatedFiles, const QString &path); private: void createWatcher(); @@ -175,7 +181,6 @@ private: QStack<QString> path; QStack<QStringList> files; // end protected by mutex - QAtomicInt abort; #if QT_CONFIG(filesystemwatcher) QFileSystemWatcher *m_watcher = nullptr; |