Disentangle QIODevice dependencies

Move the QIODevice::OpenMode enum into a base class, so that
we can remove the full QIODevice (and thus QObject) dependency
from qdatastream.h and qtextstream.h.

This is required so that we can include QDataStream in qmetatype.h
without getting circular dependencies.

As a nice side effect, QDataStream and QTextStream can now inherit
QIODeviceBase and provide the OpenMode enum directly in their
class scope.

Change-Id: Ifa68b7b1d8d95687ed032f6c9206f92e63bfacdf
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>

1 files changed, 6 insertions, 16 deletions

diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h
index 7012bbacba..fa43efdb4d 100644
--- a/src/corelib/io/qiodevice.h
+++ b/src/corelib/io/qiodevice.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.
@@ -41,6 +41,7 @@
 #define QIODEVICE_H
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qiodevicebase.h>
 #ifndef QT_NO_QOBJECT
 #include <QtCore/qobject.h>
 #else
@@ -61,27 +62,16 @@ class QIODevicePrivate;
 
 class Q_CORE_EXPORT QIODevice
 #ifndef QT_NO_QOBJECT
-    : public QObject
+    : public QObject,
+#else
+    :
 #endif
+      public QIODeviceBase
 {
 #ifndef QT_NO_QOBJECT
     Q_OBJECT
 #endif
 public:
-    enum OpenModeFlag {
-        NotOpen = 0x0000,
-        ReadOnly = 0x0001,
-        WriteOnly = 0x0002,
-        ReadWrite = ReadOnly | WriteOnly,
-        Append = 0x0004,
-        Truncate = 0x0008,
-        Text = 0x0010,
-        Unbuffered = 0x0020,
-        NewOnly = 0x0040,
-        ExistingOnly = 0x0080
-    };
-    Q_DECLARE_FLAGS(OpenMode, OpenModeFlag)
-
     QIODevice();
 #ifndef QT_NO_QOBJECT
     explicit QIODevice(QObject *parent);