diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-19 14:13:49 +0200 |
|---|---|---|
| committer | Andreas Hartmetz <ahartmetz@gmail.com> | 2020-09-02 21:53:42 +0000 |
| commit | f03b2f7711e3a0e90fb21672273959a2a9ed1c38 (patch) | |
| tree | 70c41e948606bfb79218a8b3afa0c1243a3a5d30 /src/corelib/io/qfiledevice.h | |
| parent | 067fb7915a469fa83aac60f345cee08db087a587 (diff) | |
Turn QFileDevice::MemoryMapFlags into a proper QFlag
Task-number: QTBUG-85700
Change-Id: I2a741b67927fa7185acece51d774b90b0b88c705
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/io/qfiledevice.h')
| -rw-r--r-- | src/corelib/io/qfiledevice.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/io/qfiledevice.h b/src/corelib/io/qfiledevice.h index 2d524193c5..e6546a7eb8 100644 --- a/src/corelib/io/qfiledevice.h +++ b/src/corelib/io/qfiledevice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -118,11 +118,11 @@ public: virtual Permissions permissions() const; virtual bool setPermissions(Permissions permissionSpec); - // ### Qt 6: rename to MemoryMapFlag & make it a QFlags - enum MemoryMapFlags { + enum MemoryMapFlag { NoOptions = 0, MapPrivateOption = 0x0001 }; + Q_DECLARE_FLAGS(MemoryMapFlags, MemoryMapFlag) uchar *map(qint64 offset, qint64 size, MemoryMapFlags flags = NoOptions); bool unmap(uchar *address); @@ -148,6 +148,8 @@ private: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QFileDevice::Permissions) +Q_DECLARE_OPERATORS_FOR_FLAGS(QFileDevice::FileHandleFlags) +Q_DECLARE_OPERATORS_FOR_FLAGS(QFileDevice::MemoryMapFlags) QT_END_NAMESPACE |