From e5e58e0cc103adabc18f7f3a4d5cccc526321edc Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 22 Jun 2021 11:35:46 +0200 Subject: Rename PermisionType to spell permission correctly Thanks to Giuseppe for pointing it out in API change review. Task-number: QTBUG-94407 Change-Id: I3b8fb653b5efa7ded51f81aadb35d361e7dbf19c Reviewed-by: Assam Boudjelthia (cherry picked from commit ccac1b185abd84e4a1c500bef42961d95f5f882e) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qcoreapplication.cpp | 8 ++++---- src/corelib/kernel/qcoreapplication.h | 4 ++-- src/corelib/kernel/qcoreapplication_android.cpp | 6 +++--- src/corelib/kernel/qcoreapplication_p.h | 4 ++-- src/corelib/kernel/qpermission.h | 5 ++++- src/corelib/kernel/qpermission.qdoc | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index b59781a4bf..7536f2eabf 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -3101,7 +3101,7 @@ void QCoreApplication::setEventDispatcher(QAbstractEventDispatcher *eventDispatc } QFuture - QCoreApplicationPrivate::requestPermission(QPermission::PermisionType permission) + QCoreApplicationPrivate::requestPermission(QPermission::PermissionType permission) { Q_UNUSED(permission) return defaultPermissionFuture(); @@ -3115,7 +3115,7 @@ void QCoreApplication::setEventDispatcher(QAbstractEventDispatcher *eventDispatc } QFuture - QCoreApplicationPrivate::checkPermission(QPermission::PermisionType permission) + QCoreApplicationPrivate::checkPermission(QPermission::PermissionType permission) { Q_UNUSED(permission) return defaultPermissionFuture(); @@ -3155,7 +3155,7 @@ void QCoreApplication::setEventDispatcher(QAbstractEventDispatcher *eventDispatc \sa checkPermission() */ QFuture -QCoreApplication::requestPermission(QPermission::PermisionType permission) +QCoreApplication::requestPermission(QPermission::PermissionType permission) { return QCoreApplicationPrivate::requestPermission(permission); } @@ -3213,7 +3213,7 @@ QCoreApplication::requestPermission(const QString &permission) \sa requestPermission() */ QFuture -QCoreApplication::checkPermission(QPermission::PermisionType permission) +QCoreApplication::checkPermission(QPermission::PermissionType permission) { return QCoreApplicationPrivate::checkPermission(permission); } diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index add9feeb40..f02d7e84e8 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -165,11 +165,11 @@ public: #ifndef QT_NO_QOBJECT #if QT_CONFIG(future) static QFuture requestPermission( - QPermission::PermisionType permission); + QPermission::PermissionType permission); static QFuture requestPermission(const QString &permission); static QFuture checkPermission( - QPermission::PermisionType permission); + QPermission::PermissionType permission); static QFuture checkPermission(const QString &permission); #endif void installNativeEventFilter(QAbstractNativeEventFilter *filterObj); diff --git a/src/corelib/kernel/qcoreapplication_android.cpp b/src/corelib/kernel/qcoreapplication_android.cpp index d073f19f2a..b1c22f362a 100644 --- a/src/corelib/kernel/qcoreapplication_android.cpp +++ b/src/corelib/kernel/qcoreapplication_android.cpp @@ -75,7 +75,7 @@ static int nextRequestCode() return counter.fetchAndAddRelaxed(1); } -static QStringList nativeStringsFromPermission(QPermission::PermisionType permission) +static QStringList nativeStringsFromPermission(QPermission::PermissionType permission) { static const auto precisePerm = QStringLiteral("android.permission.ACCESS_FINE_LOCATION"); static const auto coarsePerm = QStringLiteral("android.permission.ACCESS_COARSE_LOCATION"); @@ -236,7 +236,7 @@ QFuture groupRequestToSingleResult(const QStringL } QFuture -QCoreApplicationPrivate::requestPermission(QPermission::PermisionType permission) +QCoreApplicationPrivate::requestPermission(QPermission::PermissionType permission) { const auto nativePermissions = nativeStringsFromPermission(permission); @@ -282,7 +282,7 @@ QCoreApplicationPrivate::checkPermission(const QString &permission) } QFuture -QCoreApplicationPrivate::checkPermission(QPermission::PermisionType permission) +QCoreApplicationPrivate::checkPermission(QPermission::PermissionType permission) { const auto nativePermissions = nativeStringsFromPermission(permission); diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index dd310f9cea..55e81de358 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -205,11 +205,11 @@ public: inline QString qmljsDebugArgumentsString() const { return qmljs_debug_arguments; } #if QT_CONFIG(future) && !defined QT_NO_QOBJECT static QFuture requestPermission( - QPermission::PermisionType permission); + QPermission::PermissionType permission); static QFuture requestPermission(const QString &permission); static QFuture checkPermission( - QPermission::PermisionType permission); + QPermission::PermissionType permission); static QFuture checkPermission(const QString &permission); #endif diff --git a/src/corelib/kernel/qpermission.h b/src/corelib/kernel/qpermission.h index b20dba8849..ac7a0ab3f8 100644 --- a/src/corelib/kernel/qpermission.h +++ b/src/corelib/kernel/qpermission.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE namespace QPermission { -enum PermisionType { +enum PermissionType { Camera, Microphone, Bluetooth, @@ -65,6 +65,9 @@ enum PermisionType { WriteCalendar }; +// ### 6.2 remove as soon as multimedia merges its typo fix +using PermisionType = PermissionType; + enum PermissionResult { Authorized, Denied, diff --git a/src/corelib/kernel/qpermission.qdoc b/src/corelib/kernel/qpermission.qdoc index a5c33eb477..8298d0ffbe 100644 --- a/src/corelib/kernel/qpermission.qdoc +++ b/src/corelib/kernel/qpermission.qdoc @@ -35,7 +35,7 @@ */ /*! - \enum QPermission::PermisionType + \enum QPermission::PermissionType Predefined sets of permission values. -- cgit v1.2.3