1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QMetaEnum::fromType() instead of staticMetaObject.enumerator()

Browse Source 
The old way relied on the order of enums within the type; using
fromType() makes the enum specific.

Change-Id: I418473a6983861ca105ccc5eb249f441dbbb28cf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2025-06-06 16:09:13 +02:00
parent f67ef4934b
commit 3905d3c4df
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/time/qcalendar/tst_qcalendar.cpp
View File

@ -124,9 +124,7 @@ void tst_QCalendar::basic_data()
{ {
QTest::addColumn<QCalendar::System>("system"); QTest::addColumn<QCalendar::System>("system");
QMetaEnum e = QCalendar::staticMetaObject.enumerator(0); const QMetaEnum e = QMetaEnum::fromType<QCalendar::System>();
Q_ASSERT(qstrcmp(e.name(), "System") == 0);
for (int i = 0; i <= int(QCalendar::System::Last); ++i) { for (int i = 0; i <= int(QCalendar::System::Last); ++i) {
// There may be gaps in the enum's numbering; and Last is a duplicate: // There may be gaps in the enum's numbering; and Last is a duplicate:
if (e.value(i) != -1 && qstrcmp(e.key(i), "Last")) if (e.value(i) != -1 && qstrcmp(e.key(i), "Last"))