Q{Contacts,Calendar}Permission: bool readWrite → enum AccessMode

The fact that read-access is always included makes a bool readWrite
property a little awkward to document and explain. An AccessMode enum
with values ReadOnly and ReadWrite is much easier, and will also lend
itself more easily as a constructor argument than a boolean.

Found in API review.

Pick-to: 6.5
Change-Id: I4f20dbe9f19c7bdb52248a6e544e36d731d5a2ee
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/corelib/kernel/qpermission/tst_qpermission.cpp b/tests/auto/corelib/kernel/qpermission/tst_qpermission.cpp
index 9eb7f7e829..907fc2a5c3 100644
--- a/tests/auto/corelib/kernel/qpermission/tst_qpermission.cpp
+++ b/tests/auto/corelib/kernel/qpermission/tst_qpermission.cpp
@@ -79,18 +79,18 @@ void tst_QPermission::conversionMaintainsState() const
     QCOMPARE_EQ(loc.availability(), QLocationPermission::Availability::Always);
 
     QCalendarPermission cal, cal_default;
-    QCOMPARE_EQ(cal_default.isReadWrite(), false);
+    QCOMPARE_EQ(cal_default.accessMode(), QCalendarPermission::AccessMode::ReadOnly);
 
-    cal.setReadWrite(true);
+    cal.setAccessMode(QCalendarPermission::AccessMode::ReadWrite);
 
-    QCOMPARE_EQ(cal.isReadWrite(), true);
+    QCOMPARE_EQ(cal.accessMode(), QCalendarPermission::AccessMode::ReadWrite);
 
     QContactsPermission con, con_default;
-    QCOMPARE_EQ(con_default.isReadWrite(), false);
+    QCOMPARE_EQ(con_default.accessMode(), QContactsPermission::AccessMode::ReadOnly);
 
-    con.setReadWrite(true);
+    con.setAccessMode(QContactsPermission::AccessMode::ReadWrite);
 
-    QCOMPARE_EQ(con.isReadWrite(), true);
+    QCOMPARE_EQ(con.accessMode(), QContactsPermission::AccessMode::ReadWrite);
 
     //
     // QCameraPermission, QMicrophonePermission, QBluetoothPermission don't have
@@ -125,7 +125,7 @@ void tst_QPermission::conversionMaintainsState() const
         auto v = p.value<QContactsPermission>();
         QCOMPARE_NE(v, std::nullopt);
         auto &r = *v;
-        QCOMPARE_EQ(r.isReadWrite(), con.isReadWrite());
+        QCOMPARE_EQ(r.accessMode(), con.accessMode());
         // check mismatched returns nullopt:
         QCOMPARE_EQ(p.value<QLocationPermission>(), std::nullopt);
     }
@@ -135,7 +135,7 @@ void tst_QPermission::conversionMaintainsState() const
         auto v = p.value<QCalendarPermission>();
         QCOMPARE_NE(v, std::nullopt);
         auto &r = *v;
-        QCOMPARE_EQ(r.isReadWrite(), cal.isReadWrite());
+        QCOMPARE_EQ(r.accessMode(), cal.accessMode());
         // check mismatched returns nullopt:
         QCOMPARE_EQ(p.value<QContactsPermission>(), std::nullopt);
     }