1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h
index fb5069f620..dafe877974 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h
@@ -20,15 +20,13 @@ QT_BEGIN_NAMESPACE
 // The main UI Automation class.
 class QWindowsUiaMainProvider :
     public QWindowsUiaBaseProvider,
-    public IRawElementProviderSimple,
-    public IRawElementProviderFragment,
-    public IRawElementProviderFragmentRoot
+    public QComObject<IRawElementProviderSimple, IRawElementProviderFragment, IRawElementProviderFragmentRoot>
 {
     Q_OBJECT
     Q_DISABLE_COPY_MOVE(QWindowsUiaMainProvider)
 public:
     static QWindowsUiaMainProvider *providerForAccessible(QAccessibleInterface *accessible);
-    explicit QWindowsUiaMainProvider(QAccessibleInterface *a, int initialRefCount = 1);
+    explicit QWindowsUiaMainProvider(QAccessibleInterface *a);
     virtual ~QWindowsUiaMainProvider();
     static void notifyFocusChange(QAccessibleEvent *event);
     static void notifyStateChange(QAccessibleStateChangeEvent *event);
@@ -36,10 +34,10 @@ public:
     static void notifyNameChange(QAccessibleEvent *event);
     static void notifySelectionChange(QAccessibleEvent *event);
     static void notifyTextChange(QAccessibleEvent *event);
+    static void raiseNotification(QAccessibleAnnouncementEvent *event);
 
     // IUnknown
     HRESULT STDMETHODCALLTYPE QueryInterface(REFIID id, LPVOID *iface) override;
-    ULONG STDMETHODCALLTYPE AddRef() override;
     ULONG STDMETHODCALLTYPE Release() override;
 
     // IRawElementProviderSimple methods
@@ -62,7 +60,11 @@ public:
 
 private:
     QString automationIdForAccessible(const QAccessibleInterface *accessible);
-    ULONG m_ref;
+    static void fillVariantArrayForRelation(QAccessibleInterface *accessible, QAccessible::Relation relation, VARIANT *pRetVal);
+    static void setAriaProperties(QAccessibleInterface *accessible, VARIANT *pRetVal);
+    static void setStyle(QAccessibleInterface *accessible, VARIANT *pRetVal);
+    /** Returns the UIA style ID for a heading level from 1 to 9. */
+    static int styleIdForHeadingLevel(int headingLevel);
     static QMutex m_mutex;
 };