diff --git a/src/corelib/time/qcalendar.cpp b/src/corelib/time/qcalendar.cpp index 4a245f6d3f..d3dada33b3 100644 --- a/src/corelib/time/qcalendar.cpp +++ b/src/corelib/time/qcalendar.cpp @@ -890,7 +890,7 @@ bool QCalendarBackend::registerAlias(const QString &name) \sa availableCalendars(), registerAlias(), fromEnum(), fromId() */ -const QCalendarBackend *QCalendarBackend::fromName(QStringView name) +const QCalendarBackend *QCalendarBackend::fromName(QAnyStringView name) { if (calendarRegistry.isDestroyed()) return nullptr; @@ -900,20 +900,6 @@ const QCalendarBackend *QCalendarBackend::fromName(QStringView name) return it == calendarRegistry->byName.end() ? nullptr : *it; } -/*! - \internal - \overload - */ -const QCalendarBackend *QCalendarBackend::fromName(QLatin1String name) -{ - if (calendarRegistry.isDestroyed()) - return nullptr; - calendarRegistry->populate(); - const auto registryLock = qt_scoped_lock(registryMutex); - auto it = calendarRegistry->byName.find(QString(name)); - return it == calendarRegistry->byName.end() ? nullptr : *it; -} - /*! \internal Returns a pointer to a calendar backend, specified by ID. diff --git a/src/corelib/time/qcalendar.h b/src/corelib/time/qcalendar.h index c3d8800db8..a723209a1c 100644 --- a/src/corelib/time/qcalendar.h +++ b/src/corelib/time/qcalendar.h @@ -145,7 +145,9 @@ public: explicit QCalendar(); // Gregorian, optimised explicit QCalendar(System system); + // ### Qt 7: remove explicit QCalendar(QLatin1String name); + // ### Qt 7: use QAnyStringView explicit QCalendar(QStringView name); explicit QCalendar(SystemId id); diff --git a/src/corelib/time/qcalendarbackend_p.h b/src/corelib/time/qcalendarbackend_p.h index c3f57e7f74..83893571fc 100644 --- a/src/corelib/time/qcalendarbackend_p.h +++ b/src/corelib/time/qcalendarbackend_p.h @@ -56,6 +56,7 @@ #include #include #include +#include #include QT_BEGIN_NAMESPACE @@ -145,8 +146,7 @@ protected: private: const QCalendar::SystemId m_id; // QCalendar's access to its registry: - static const QCalendarBackend *fromName(QStringView name); - static const QCalendarBackend *fromName(QLatin1String name); + static const QCalendarBackend *fromName(QAnyStringView name); static const QCalendarBackend *fromId(QCalendar::SystemId id); // QCalendar's access to singletons: static const QCalendarBackend *fromEnum(QCalendar::System system);