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

Clean up QAccessible based on header review comments

Browse Source 
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 010952a55ee9ca9731f8ad15f2773d0bae645840 and
9ec1de2528b871099d416d15592fcc5ef9242a64 based on header review.

Pick-to: 6.8
Change-Id: I96f00871acd2bb340ac7fc762a7fca8ac2f61dc9
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
This commit is contained in:
Volker Hilsheimer 2024-06-14 10:55:38 +02:00
parent 877ba5504c
commit 902dfd08a0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/accessible/qaccessible.h
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_priority(QAccessible::AnnouncementPriority::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_priority(QAccessible::AnnouncementPriority::Polite)
@ -626,7 +626,7 @@ public:
m_type = QAccessible::Announcement;
}
~QAccessibleAnnouncementEvent();
~QAccessibleAnnouncementEvent() override;
QString message() const { return m_message; }
QAccessible::AnnouncementPriority priority() const { return m_priority; }

6
src/gui/accessible/qaccessible_base.h
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 AnnouncementPriority {
Polite,
Assertive
Assertive,
};
Q_ENUM(AnnouncementPriority)