aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2023-06-13 09:01:21 +0300
committerOrgad Shaneh <orgads@gmail.com>2023-06-13 15:23:50 +0000
commit251910aacf46f2c97c7d7f80adabd47d8d23b819 (patch)
tree6f6b05432ebc933dc2af1ea20eb4a40e0757029b
parentde5d87625270b0e35aaecb580b6818d1a84cb30d (diff)
QDotNetAdapter: Simplify delegate macroHEADdev
Change-Id: I86e3af57f429c72475deacc724878bedcbba04ab Reviewed-by: Miguel Costa <miguel.costa@qt.io>
-rw-r--r--include/qdotnetadapter.h38
1 files changed, 18 insertions, 20 deletions
diff --git a/include/qdotnetadapter.h b/include/qdotnetadapter.h
index 2191ecb..fc9b74e 100644
--- a/include/qdotnetadapter.h
+++ b/include/qdotnetadapter.h
@@ -74,26 +74,24 @@ public:
}
#define QDOTNETADAPTER_DELEGATE(d) \
- instance().d, assemblyPath, typeFullName, \
- QString(#d).sliced(2), \
- delegateName.arg(QString(#d).sliced(2))
-
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnLoadAssembly));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnResolveStaticMethod));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnResolveConstructor));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnResolveInstanceMethod));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnResolveSafeMethod));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnAddEventHandler));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnRemoveEventHandler));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnRemoveAllEventHandlers));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnAddObjectRef));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnFreeDelegateRef));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnFreeObjectRef));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnFreeTypeRef));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnAddInterfaceProxy));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnSetInterfaceMethod));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnStats));
- host->resolveFunction(QDOTNETADAPTER_DELEGATE(fnGetObject));
+ instance().fn##d, assemblyPath, typeFullName, #d, delegateName.arg(#d)
+
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(LoadAssembly));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(ResolveStaticMethod));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(ResolveConstructor));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(ResolveInstanceMethod));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(ResolveSafeMethod));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(AddEventHandler));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(RemoveEventHandler));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(RemoveAllEventHandlers));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(AddObjectRef));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(FreeDelegateRef));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(FreeObjectRef));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(FreeTypeRef));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(AddInterfaceProxy));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(SetInterfaceMethod));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(Stats));
+ host->resolveFunction(QDOTNETADAPTER_DELEGATE(GetObject));
#undef QDOTNETADAPTER_DELEGATE