diff options
Diffstat (limited to 'src/labs/folderlistmodel/fileinfothread_p.h')
| -rw-r--r-- | src/labs/folderlistmodel/fileinfothread_p.h | 62 |
1 files changed, 21 insertions, 41 deletions
diff --git a/src/labs/folderlistmodel/fileinfothread_p.h b/src/labs/folderlistmodel/fileinfothread_p.h index 1ed3a9904b..379c7a981d 100644 --- a/src/labs/folderlistmodel/fileinfothread_p.h +++ b/src/labs/folderlistmodel/fileinfothread_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef FILEINFOTHREAD_P_H #define FILEINFOTHREAD_P_H @@ -63,6 +27,8 @@ #include "fileproperty_p.h" #include "qquickfolderlistmodel_p.h" +QT_BEGIN_NAMESPACE + class FileInfoThread : public QThread { Q_OBJECT @@ -74,7 +40,7 @@ Q_SIGNALS: void statusChanged(QQuickFolderListModel::Status status) const; public: - FileInfoThread(QObject *parent = 0); + FileInfoThread(QObject *parent = nullptr); ~FileInfoThread(); void clear(); @@ -105,6 +71,19 @@ protected: void findChangeRange(const QList<FileProperty> &list, int &fromIndex, int &toIndex); private: + enum class UpdateType { + None = 1 << 0, + // The order of the files in the current folder changed. + Sort = 1 << 1, + // A subset of files in the current folder changed. + Contents = 1 << 2 + }; + Q_DECLARE_FLAGS(UpdateTypes, UpdateType) + + // Declare these ourselves, as Q_DECLARE_OPERATORS_FOR_FLAGS needs the enum to be public. + friend constexpr UpdateTypes operator|(UpdateType f1, UpdateTypes f2) noexcept; + friend constexpr UpdateTypes operator&(UpdateType f1, UpdateTypes f2) noexcept; + QMutex mutex; QWaitCondition condition; volatile bool abort; @@ -119,8 +98,7 @@ private: QString rootPath; QStringList nameFilters; bool needUpdate; - bool folderUpdate; - bool sortUpdate; + UpdateTypes updateTypes; bool showFiles; bool showDirs; bool showDirsFirst; @@ -130,4 +108,6 @@ private: bool caseSensitive; }; +QT_END_NAMESPACE + #endif // FILEINFOTHREAD_P_H |