diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:27:13 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:27:13 +0200 |
commit | e56bec5ccd7bdd91e0389381dc4e2f1e48f2c32d (patch) | |
tree | 27fddaf04e20cf3a4eb81b9894d12a5df9ffd6b6 /rsc/source/tools | |
parent | f61f7609db7520246346c5c2c1c5c0496e4773ef (diff) |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I27516cc532e46b6e43a2f2f292246f1414e9f9b3
Diffstat (limited to 'rsc/source/tools')
-rw-r--r-- | rsc/source/tools/rsctools.cxx | 6 | ||||
-rw-r--r-- | rsc/source/tools/rsctree.cxx | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 83526835b7f6..45f29afe004a 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -187,7 +187,7 @@ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) else ppCmd->Append( rsc_strdup( *(ppArgv +i) ) ); } - ppCmd->Append( (void *)0 ); + ppCmd->Append( static_cast<void *>(nullptr) ); return NULL; } @@ -214,7 +214,7 @@ void RscPtrPtr :: Reset() if( pMem[ i ] ) rtl_freeMemory( pMem[ i ] ); } - rtl_freeMemory( (void *)pMem ); + rtl_freeMemory( static_cast<void *>(pMem) ); }; nCount = 0; pMem = NULL; @@ -225,7 +225,7 @@ sal_uInt32 RscPtrPtr :: Append( void * pBuffer ) if( !pMem ) pMem = static_cast<void **>(rtl_allocateMemory( (nCount +1) * sizeof( void * ) )); else - pMem = static_cast<void **>(rtl_reallocateMemory( (void *)pMem, + pMem = static_cast<void **>(rtl_reallocateMemory( static_cast<void *>(pMem), ((nCount +1) * sizeof( void * ) ) )); pMem[ nCount ] = pBuffer; diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx index 10f3d40c97e0..a45880ac0245 100644 --- a/rsc/source/tools/rsctree.cxx +++ b/rsc/source/tools/rsctree.cxx @@ -69,15 +69,15 @@ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ) } else { - pList = (BiNode *)0; + pList = nullptr; } if( NULL != (pTmp = pMiddle->Left()) ) // rechten Zeiger auf Null - pTmp->pRight = (BiNode *)0; + pTmp->pRight = nullptr; // linken Zeiger auf Null BiNode * pRightNode = pMiddle->Right(); if (pRightNode) - pRightNode->pLeft = (BiNode *)0; + pRightNode->pLeft = nullptr; pMiddle->pLeft = ChangeDLListBTree( pList ); pMiddle->pRight = ChangeDLListBTree( pRightNode ); @@ -198,7 +198,7 @@ NameNode* NameNode::SearchParent( const NameNode * pSearch ) const return Right()->SearchParent( pSearch ); } } - return (NameNode *)NULL; + return nullptr; } // search for a node. @@ -327,7 +327,7 @@ void NameNode::SubOrderTree( NameNode * pOrderNode ) IdNode * IdNode::Search( sal_uInt32 nTypeName ) const { - return static_cast<IdNode *>(NameNode::Search( (const void *)&nTypeName )); + return static_cast<IdNode *>(NameNode::Search( static_cast<const void *>(&nTypeName) )); } COMPARE IdNode::Compare( const NameNode * pSearch ) const @@ -358,7 +358,7 @@ sal_uInt32 IdNode::GetId() const StringNode * StringNode::Search( const char * pSearch ) const { - return static_cast<StringNode *>(NameNode::Search( (const void *)pSearch )); + return static_cast<StringNode *>(NameNode::Search( static_cast<const void *>(pSearch) )); } COMPARE StringNode::Compare( const NameNode * pSearch ) const |