diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-03 11:49:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-03 13:15:35 +0200 |
| commit | ea59fc4831b9d2430de51faa8c3e0a24e6d90cd1 (patch) | |
| tree | 787d37c831d4b2dfb5fafb9b2e194c73f2943d21 /vcl/inc | |
| parent | ed1e2967064e098459324818baa5466ad2a90492 (diff) | |
Resolve unnecessary typedef
Change-Id: Ide89f6082f877046eac0415f23a3e29c5f7f1e65
Reviewed-on: https://gerrit.libreoffice.org/58554
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/impoctree.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/octree.hxx | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/vcl/inc/impoctree.hxx b/vcl/inc/impoctree.hxx index 073720a9e319..97de164ed405 100644 --- a/vcl/inc/impoctree.hxx +++ b/vcl/inc/impoctree.hxx @@ -125,13 +125,13 @@ inline OctreeNode* ImpNodeCache::ImplGetFreeNode() if ( !pActNode ) { - pActNode = new NODE; + pActNode = new OctreeNode; pActNode->pNextInCache = nullptr; } pNode = pActNode; pActNode = pNode->pNextInCache; - memset( pNode, 0, sizeof( NODE ) ); + memset( pNode, 0, sizeof( OctreeNode ) ); return pNode; } diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx index 41a34987d40f..9178ce730381 100644 --- a/vcl/inc/octree.hxx +++ b/vcl/inc/octree.hxx @@ -26,7 +26,7 @@ #define OCTREE_BITS 5 #define OCTREE_BITS_1 10 -typedef struct OctreeNode +struct OctreeNode { sal_uLong nCount; sal_uLong nRed; @@ -37,7 +37,7 @@ typedef struct OctreeNode OctreeNode* pNextInCache; sal_uInt16 nPalIndex; bool bLeaf; -} NODE; +}; class ImpNodeCache; class BitmapReadAccess; @@ -45,19 +45,19 @@ class BitmapReadAccess; class VCL_PLUGIN_PUBLIC Octree { private: - void CreatePalette( NODE* pNode ); - void GetPalIndex( NODE* pNode ); + void CreatePalette( OctreeNode* pNode ); + void GetPalIndex( OctreeNode* pNode ); - SAL_DLLPRIVATE void ImplDeleteOctree( NODE** ppNode ); - SAL_DLLPRIVATE void ImplAdd( NODE** ppNode ); + SAL_DLLPRIVATE void ImplDeleteOctree( OctreeNode** ppNode ); + SAL_DLLPRIVATE void ImplAdd( OctreeNode** ppNode ); SAL_DLLPRIVATE void ImplReduce(); BitmapPalette aPal; sal_uLong nLeafCount; sal_uLong nLevel; - NODE* pTree; - NODE* pReduce[ OCTREE_BITS + 1 ]; + OctreeNode* pTree; + OctreeNode* pReduce[ OCTREE_BITS + 1 ]; BitmapColor const * pColor; std::unique_ptr<ImpNodeCache> pNodeCache; const BitmapReadAccess* pAcc; |