From e3fcf7b47a34902bb391f982d4b67323a2017a2a Mon Sep 17 00:00:00 2001
From: Fredrik Orderud <forderud@gmail.com>
Date: Thu, 13 Jun 2019 14:57:18 +0200
Subject: [PATCH] Change UpdateRegistry argument type from BOOL to bool
Also fix inconsistent argument type declaration in qaxserverdll.cpp.
Preparation before splitting this function in two.
Task-number: QTBUG-76269
Change-Id: I0d1da30718bdede9cf8709cd83464929bf6ab768
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
src/activeqt/control/qaxserver.cpp | 2 +-
src/activeqt/control/qaxserverdll.cpp | 2 +-
src/activeqt/control/qaxservermain.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index 7718fbf5..43f25ee8 100644
--- a/src/activeqt/control/qaxserver.cpp
+++ b/src/activeqt/control/qaxserver.cpp
@@ -223,7 +223,7 @@ QString qax_clean_type(const QString &type, const QMetaObject *mo)
// (Un)Register the ActiveX server in the registry.
// The QAxFactory implementation provides the information.
-HRESULT UpdateRegistry(BOOL bRegister)
+HRESULT UpdateRegistry(bool bRegister)
{
qAxIsServer = false;
const QChar dot(QLatin1Char('.'));
diff --git a/src/activeqt/control/qaxserverdll.cpp b/src/activeqt/control/qaxserverdll.cpp
index 20b030c1..e9d3edeb 100644
--- a/src/activeqt/control/qaxserverdll.cpp
+++ b/src/activeqt/control/qaxserverdll.cpp
@@ -72,7 +72,7 @@ extern void qAxCleanup();
extern HANDLE qAxInstance;
static uint qAxThreadId = 0;
-extern HRESULT UpdateRegistry(int bRegister);
+extern HRESULT UpdateRegistry(bool bRegister);
extern HRESULT GetClassObject(const GUID &clsid, const GUID &iid, void **ppUnk);
STDAPI DllRegisterServer()
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp
index c9472d4a..f431f2a2 100644
--- a/src/activeqt/control/qaxservermain.cpp
+++ b/src/activeqt/control/qaxservermain.cpp
@@ -78,7 +78,7 @@ extern bool qAxOutProcServer;
extern wchar_t qAxModuleFilename[MAX_PATH];
extern QString qAxInit();
extern void qAxCleanup();
-extern HRESULT UpdateRegistry(BOOL bRegister);
+extern HRESULT UpdateRegistry(bool bRegister);
extern HRESULT GetClassObject(const GUID &clsid, const GUID &iid, void **ppUnk);
extern ulong qAxLockCount();
extern bool qax_winEventFilter(void *message);
--
GitLab