summaryrefslogtreecommitdiff
path: root/bridges/inc/unointerfaceproxy.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-12-01 15:24:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-12-04 07:24:52 +0100
commit68f86457525c60f580954280d1a759aa174e8e96 (patch)
treed4f0d44d52cf3e744f1555074217e0f42007ac71 /bridges/inc/unointerfaceproxy.hxx
parent9634a818e8a9432db52bc8fcd534e7437e6bacee (diff)
new loplugin salcall: remove unnecessary SAL_CALL
In this first commit, I use the plugin to verify the consistency of our SAL_CALL annotations. The point being to make the next commit more mechanical in nature, purely using the rewriter. There are various chunks of unix-only code that have never had to be compiled by MSVC, hence the inconsistencies. In bridges, I had to inline some typedefs to make the verification code happy, since it cannot see into typedefs. Change-Id: Iec6e274bed857febf7295cfcf5e9f21fe4a34da0 Reviewed-on: https://gerrit.libreoffice.org/45502 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'bridges/inc/unointerfaceproxy.hxx')
-rw-r--r--bridges/inc/unointerfaceproxy.hxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/bridges/inc/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx
index ba3ddcbb5624..77cd8e98a346 100644
--- a/bridges/inc/unointerfaceproxy.hxx
+++ b/bridges/inc/unointerfaceproxy.hxx
@@ -39,25 +39,21 @@ namespace bridges { namespace cpp_uno { namespace shared {
class Bridge;
-extern "C" typedef void SAL_CALL FreeUnoInterfaceProxy(
+extern "C" void SAL_CALL freeUnoInterfaceProxy(
uno_ExtEnvironment * pEnv, void * pProxy);
-FreeUnoInterfaceProxy freeUnoInterfaceProxy;
// private:
-extern "C" typedef void SAL_CALL UnoInterfaceProxyDispatch(
+extern "C" void SAL_CALL unoInterfaceProxyDispatch(
uno_Interface * pUnoI, typelib_TypeDescription const * pMemberDescr,
void * pReturn, void * pArgs[], uno_Any ** ppException);
-UnoInterfaceProxyDispatch unoInterfaceProxyDispatch;
// this function is not defined in the generic part, but instead has to be
// defined individually for each CPP--UNO bridge
// private:
-extern "C" typedef void SAL_CALL AcquireProxy(uno_Interface *);
-AcquireProxy acquireProxy;
+extern "C" void SAL_CALL acquireProxy(uno_Interface *);
// private:
-extern "C" typedef void SAL_CALL ReleaseProxy(uno_Interface *);
-ReleaseProxy releaseProxy;
+extern "C" void SAL_CALL releaseProxy(uno_Interface *);
/**
* A uno proxy wrapping a cpp interface.