diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-15 13:57:36 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-17 15:06:52 +0200 |
commit | 8914595d4623390e4bac9ebbdf0d5ae9ab69aa8a (patch) | |
tree | 2fe937925e9cde3e835119c57f12807bc1f419db /include/vcl/sysdata.hxx | |
parent | d69795b9c9d2dac7b751c6fe8b4663c0c26a129b (diff) |
loplugin:unusedfields in vcl part1
Change-Id: I67d176003f39992cd0ff9271a7d6ce26d2cb6619
Reviewed-on: https://gerrit.libreoffice.org/38828
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl/sysdata.hxx')
-rw-r--r-- | include/vcl/sysdata.hxx | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index bb2ddf8b510a..18c4376c40a0 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -69,13 +69,9 @@ struct SystemEnvData void* pWidget; // the corresponding widget void* pVisual; // the visual in use int nScreen; // the current screen of the window - int nDepth; // depth of said visual - long aColormap; // the colormap being used - void* pAppContext; // the application context in use // note: this is a "long" in Xlib *but* in the protocol it's only 32-bit // however, the GTK3 vclplug wants to store pointers in here! sal_IntPtr aShellWindow; // the window of the frame's shell - void* pShellWidget; // the frame's shell widget const char* pToolkit; // the toolkit in use (gtk2 vs gtk3) #endif @@ -95,11 +91,7 @@ struct SystemEnvData , pWidget(nullptr) , pVisual(nullptr) , nScreen(0) - , nDepth(0) - , aColormap(0) - , pAppContext(nullptr) , aShellWindow(0) - , pShellWidget(nullptr) , pToolkit(nullptr) #endif { @@ -146,12 +138,7 @@ struct SystemGraphicsData #elif defined( IOS ) CGContextRef rCGContext; // CoreGraphics graphic context #elif defined( UNX ) - void* pDisplay; // the relevant display connection long hDrawable; // a drawable - void* pVisual; // the visual in use - int nScreen; // the current screen of the drawable - int nDepth; // depth of said visual - long aColormap; // the colormap being used void* pXRenderFormat; // render format for drawable #endif SystemGraphicsData() @@ -166,12 +153,7 @@ struct SystemGraphicsData #elif defined( IOS ) , rCGContext( NULL ) #elif defined( UNX ) - , pDisplay( nullptr ) , hDrawable( 0 ) - , pVisual( nullptr ) - , nScreen( 0 ) - , nDepth( 0 ) - , aColormap( 0 ) , pXRenderFormat( nullptr ) #endif { } @@ -179,7 +161,6 @@ struct SystemGraphicsData struct SystemWindowData { - unsigned long nSize; // size in bytes of this structure #if defined(_WIN32) // meaningless on Windows #elif defined( MACOSX ) bool bOpenGL; // create a OpenGL providing NSView @@ -205,7 +186,6 @@ struct SystemGlyphData struct SystemFontData { - unsigned long nSize; // size in bytes of this structure #if defined( UNX ) void* nFontId; // native font id int nFontFlags; // native font flags @@ -216,15 +196,15 @@ struct SystemFontData bool bVerticalCharacterType; // Is the font using vertical character type SystemFontData() - : nSize( sizeof( SystemFontData ) ) + : #if defined( UNX ) - , nFontId( nullptr ) - , nFontFlags( 0 ) + nFontId( nullptr ), + nFontFlags( 0 ), #endif - , bFakeBold( false ) - , bFakeItalic( false ) - , bAntialias( true ) - , bVerticalCharacterType( false ) + bFakeBold( false ), + bFakeItalic( false ), + bAntialias( true ), + bVerticalCharacterType( false ) { } }; @@ -235,7 +215,6 @@ typedef std::vector<SystemGlyphData> SystemGlyphDataVector; struct SystemTextLayoutData { - unsigned long nSize; // size in bytes of this structure SystemGlyphDataVector rGlyphData; // glyph data int orientation; // Text orientation }; |