From f03b2f7711e3a0e90fb21672273959a2a9ed1c38 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 19 Aug 2020 14:13:49 +0200 Subject: Turn QFileDevice::MemoryMapFlags into a proper QFlag Task-number: QTBUG-85700 Change-Id: I2a741b67927fa7185acece51d774b90b0b88c705 Reviewed-by: Edward Welbourne --- src/corelib/io/qfiledevice.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/corelib/io/qfiledevice.h') 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 -- cgit v1.2.3