De-duplicate vtables III: QAccessible

By making the destructor (usually the first non-inline, non-pure,
virtual function, and therefore the trigger for most compilers to
emit the vtable and type_info structures for the class in that TU)
out-of-line, vtables and, more importantly, type_info strucures for
the class are pinned to a single TU. This prevents false negative
dynamic_cast and catch evaluation.

In this third batch, we de-inline dtors of exported public classes
from the QAccessible subsytem.

Since they are already exported, users of these classes are unaffected
by the change, but since it's public API, and the dtors may have been
de-virtualized and inlined into application code, we need to avoid
adding code to the out-of-line dtor until Qt 6.

Change-Id: I5324bd1b3b9210a3ac5cf4eee9317a34e4a3b048
Reported-by: Volker Krause <volker.krause@kdab.com>
Task-number: QTBUG-45582
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 25 insertions, 11 deletions

diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index faa8cd719d..66cd067ace 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -399,7 +399,7 @@ public:
     class ActivationObserver
     {
     public:
-        virtual ~ActivationObserver() {}
+        virtual ~ActivationObserver();
         virtual void accessibilityActiveChanged(bool active) = 0;
     };
     static void installActivationObserver(ActivationObserver *);
@@ -514,7 +514,7 @@ protected:
 class Q_GUI_EXPORT QAccessibleTextInterface
 {
 public:
-    virtual ~QAccessibleTextInterface() {}
+    virtual ~QAccessibleTextInterface();
     // selection
     virtual void selection(int selectionIndex, int *startOffset, int *endOffset) const = 0;
     virtual int selectionCount() const = 0;
@@ -547,7 +547,7 @@ public:
 class Q_GUI_EXPORT QAccessibleEditableTextInterface
 {
 public:
-    virtual ~QAccessibleEditableTextInterface() {}
+    virtual ~QAccessibleEditableTextInterface();
 
     virtual void deleteText(int startOffset, int endOffset) = 0;
     virtual void insertText(int offset, const QString &text) = 0;
@@ -557,8 +557,7 @@ public:
 class Q_GUI_EXPORT QAccessibleValueInterface
 {
 public:
-
-    virtual ~QAccessibleValueInterface() {}
+    virtual ~QAccessibleValueInterface();
 
     virtual QVariant currentValue() const = 0;
     virtual void setCurrentValue(const QVariant &value) = 0;
@@ -570,7 +569,7 @@ public:
 class Q_GUI_EXPORT QAccessibleTableCellInterface
 {
 public:
-    virtual ~QAccessibleTableCellInterface() {}
+    virtual ~QAccessibleTableCellInterface();
 
     virtual bool isSelected() const = 0;
 
@@ -587,7 +586,7 @@ public:
 class Q_GUI_EXPORT QAccessibleTableInterface
 {
 public:
-    virtual ~QAccessibleTableInterface() {}
+    virtual ~QAccessibleTableInterface();
 
     virtual QAccessibleInterface *caption() const = 0;
     virtual QAccessibleInterface *summary() const = 0;
@@ -622,7 +621,7 @@ class Q_GUI_EXPORT QAccessibleActionInterface
 {
     Q_DECLARE_TR_FUNCTIONS(QAccessibleActionInterface)
 public:
-    virtual ~QAccessibleActionInterface() {}
+    virtual ~QAccessibleActionInterface();
 
     virtual QStringList actionNames() const = 0;
     virtual QString localizedActionName(const QString &name) const;
@@ -647,7 +646,7 @@ public:
 class Q_GUI_EXPORT QAccessibleImageInterface
 {
 public:
-    virtual ~QAccessibleImageInterface() {}
+    virtual ~QAccessibleImageInterface();
 
     virtual QString imageDescription() const = 0;
     virtual QSize imageSize() const = 0;
@@ -691,8 +690,7 @@ public:
         m_uniqueId = QAccessible::uniqueId(iface);
     }
 
-    virtual ~QAccessibleEvent()
-    {}
+    virtual ~QAccessibleEvent();
 
     QAccessible::Event type() const { return m_type; }
     QObject *object() const { return m_object; }
@@ -726,6 +724,7 @@ public:
     {
         m_type = QAccessible::StateChanged;
     }
+    ~QAccessibleStateChangeEvent();
 
     QAccessible::State changedStates() const {
         return m_changedStates;
@@ -752,6 +751,8 @@ public:
         m_type = QAccessible::TextCaretMoved;
     }
 
+    ~QAccessibleTextCursorEvent();
+
     void setCursorPosition(int position) { m_cursorPosition = position; }
     int cursorPosition() const { return m_cursorPosition; }
 
@@ -776,6 +777,8 @@ public:
         m_type = QAccessible::TextSelectionChanged;
     }
 
+    ~QAccessibleTextSelectionEvent();
+
     void setSelection(int start, int end) {
         m_selectionStart = start;
         m_selectionEnd = end;
@@ -805,6 +808,8 @@ public:
         m_type = QAccessible::TextInserted;
     }
 
+    ~QAccessibleTextInsertEvent();
+
     QString textInserted() const {
         return m_text;
     }
@@ -833,6 +838,8 @@ public:
         m_type = QAccessible::TextRemoved;
     }
 
+    ~QAccessibleTextRemoveEvent();
+
     QString textRemoved() const {
         return m_text;
     }
@@ -860,6 +867,9 @@ public:
     {
         m_type = QAccessible::TextUpdated;
     }
+
+    ~QAccessibleTextUpdateEvent();
+
     QString textRemoved() const {
         return m_oldText;
     }
@@ -892,6 +902,8 @@ public:
         m_type = QAccessible::ValueChanged;
     }
 
+    ~QAccessibleValueChangeEvent();
+
     void setValue(const QVariant & val) { m_value= val; }
     QVariant value() const { return m_value; }
 
@@ -926,6 +938,8 @@ public:
         m_type = QAccessible::TableModelChanged;
     }
 
+    ~QAccessibleTableModelChangeEvent();
+
     void setModelChangeType(ModelChangeType changeType) { m_modelChangeType = changeType; }
     ModelChangeType modelChangeType() const { return m_modelChangeType; }