diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-28 13:50:17 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-28 13:50:37 +0100 |
commit | 4e3da621fe26c2ad85258692c63a044d0541bd64 (patch) | |
tree | 05607d0de471c5d9451b197945243f735ee168b0 /cppu | |
parent | 4b60941b60262be4861f5e8fba95366d3187c445 (diff) |
Some more loplugin:cstylecast clean-up
Change-Id: I132d22e2af3cf673c17d8964f690d48990834884
Diffstat (limited to 'cppu')
-rw-r--r-- | cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx | 4 | ||||
-rw-r--r-- | cppu/source/uno/copy.hxx | 6 | ||||
-rw-r--r-- | cppu/source/uno/lbmap.cxx | 2 | ||||
-rw-r--r-- | cppu/source/uno/sequence.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index bb29e13b9511..5e03243df2ae 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -163,7 +163,7 @@ void Mapping::mapInterface( OSL_ASSERT(pOId); // try to get any known interface from target environment - m_to.get()->pExtEnv->getRegisteredInterface(m_to.get()->pExtEnv, (void **)ppOut, pOId, pTypeDescr); + m_to.get()->pExtEnv->getRegisteredInterface(m_to.get()->pExtEnv, reinterpret_cast<void **>(ppOut), pOId, pTypeDescr); if (!*ppOut) // not yet there, register new proxy interface { @@ -179,7 +179,7 @@ void Mapping::mapInterface( // proxy may be exchanged during registration m_to.get()->pExtEnv->registerProxyInterface(m_to.get()->pExtEnv, - (void **)&pProxy, + reinterpret_cast<void **>(&pProxy), Proxy_free, pOId, pTypeDescr); diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index fc2ca00ceeb2..24d7864825c6 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -479,16 +479,16 @@ inline uno_Sequence * icopyConstructSequence( if (pDest != 0) { char * pElements = pDest->elements; - void ** pSourceElements = (void **)pSource->elements; + void ** pSourceElements = reinterpret_cast<void **>(pSource->elements); typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType ); for ( sal_Int32 nPos = nElements; nPos--; ) { - ((void **)pElements)[nPos] = 0; + reinterpret_cast<void **>(pElements)[nPos] = 0; if (((void **)pSourceElements)[nPos]) { (*mapping->mapInterface)( - mapping, (void **)pElements + nPos, + mapping, reinterpret_cast<void **>(pElements) + nPos, pSourceElements[nPos], reinterpret_cast<typelib_InterfaceTypeDescription *>( pElementTypeDescr) ); diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index aa6587f74237..2354e7d88c4e 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -228,7 +228,7 @@ static void SAL_CALL mediate_mapInterface( uno_Mapping * pFrom2Uno = that->aFrom2Uno.get(); uno_Interface * pUnoI = 0; - (*pFrom2Uno->mapInterface)( pFrom2Uno, (void **) &pUnoI, pInterface, pInterfaceTypeDescr ); + (*pFrom2Uno->mapInterface)( pFrom2Uno, reinterpret_cast<void **>(&pUnoI), pInterface, pInterfaceTypeDescr ); if (0 == pUnoI) { void * pOut = *ppOut; diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 9575fcc7c05b..7dc3e9f861bc 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -568,7 +568,7 @@ static inline bool icopyConstructFromElements( pSeq = reallocSeq( pSeq, sizeof(void *), nAlloc ); if (pSeq != 0) { - void ** pDestElements = (void **) pSeq->elements; + void ** pDestElements = reinterpret_cast<void **>(pSeq->elements); for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { _acquire( pDestElements[nPos] = |