Clean up QAccessible based on header review comments

Fix the change of the InvalidEvent value to be the same as in Qt 6.7,
where AcceleratorChanged was the last valid event.
Add trailing comma and Q_ENUM. Remove superfluous inline, make
QAccessibleAnnouncementEvent constructor explicit, declare destructor as
override.

Amends 010952a55e and
9ec1de2528 based on header review.

Change-Id: I96f00871acd2bb340ac7fc762a7fca8ac2f61dc9
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
(cherry picked from commit 902dfd08a03b86cb65bfb5da55faad671f7dad20)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
bb10
Volker Hilsheimer 2024-06-14 10:55:38 +02:00 committed by Qt Cherry-pick Bot
parent 5cb79f8850
commit 63aece5ae7
2 changed files with 7 additions and 5 deletions

View File

@ -610,7 +610,7 @@ protected:
class Q_GUI_EXPORT QAccessibleAnnouncementEvent : public QAccessibleEvent
{
public:
inline QAccessibleAnnouncementEvent(QObject *object, const QString &message)
explicit QAccessibleAnnouncementEvent(QObject *object, const QString &message)
: QAccessibleEvent(object, QAccessible::InvalidEvent)
, m_message(message)
, m_politeness(QAccessible::AnnouncementPoliteness::Polite)
@ -618,7 +618,7 @@ public:
m_type = QAccessible::Announcement;
}
inline QAccessibleAnnouncementEvent(QAccessibleInterface *iface, const QString &message)
explicit QAccessibleAnnouncementEvent(QAccessibleInterface *iface, const QString &message)
: QAccessibleEvent(iface, QAccessible::InvalidEvent)
, m_message(message)
, m_politeness(QAccessible::AnnouncementPoliteness::Polite)
@ -626,7 +626,7 @@ public:
m_type = QAccessible::Announcement;
}
~QAccessibleAnnouncementEvent();
~QAccessibleAnnouncementEvent() override;
QString message() const { return m_message; }
QAccessible::AnnouncementPoliteness politeness() const { return m_politeness; }

View File

@ -104,7 +104,8 @@ public:
Announcement = 0x80D0,
IdentifierChanged = 0x80E0,
InvalidEvent
// was declared after AcceleratorChanged, without explicit value
InvalidEvent = AcceleratorChanged + 1,
};
Q_ENUM(Event)
@ -369,10 +370,11 @@ public:
Custom,
Level,
};
Q_ENUM(Attribute)
enum class AnnouncementPoliteness {
Polite,
Assertive
Assertive,
};
Q_ENUM(AnnouncementPoliteness)
// ### remove once qtdeclarative dependencies are up-to-date