diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-11 21:24:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 15:50:23 +0200 |
| commit | 3a09d852db28245633d06d0c79744a7780b19f1a (patch) | |
| tree | 76214ef8b55b52b5b110790a53b94d99929d4c00 /vcl | |
| parent | 0251dee849113ca12ad83a4db627516aa1e8e3a5 (diff) | |
Avoid reserved identifiers
Change-Id: Ie832e82ca3767114457780581444f6fc8aa9fdd2
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index b6881401f07e..a154be861d02 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -1609,10 +1609,10 @@ void X11SalFrame::SetAlwaysOnTop( bool bOnTop ) } } -#define _FRAMESTATE_MASK_GEOMETRY \ +#define FRAMESTATE_MASK_GEOMETRY \ (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | \ WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT) -#define _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY \ +#define FRAMESTATE_MASK_MAXIMIZED_GEOMETRY \ (WINDOWSTATE_MASK_MAXIMIZED_X | WINDOWSTATE_MASK_MAXIMIZED_Y | \ WINDOWSTATE_MASK_MAXIMIZED_WIDTH | WINDOWSTATE_MASK_MAXIMIZED_HEIGHT) @@ -1622,7 +1622,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState ) return; // Request for position or size change - if (pState->mnMask & _FRAMESTATE_MASK_GEOMETRY) + if (pState->mnMask & FRAMESTATE_MASK_GEOMETRY) { Rectangle aPosSize; @@ -1633,8 +1633,8 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState ) if( ! IsChildWindow() && (pState->mnMask & WINDOWSTATE_MASK_STATE) && (pState->mnState & WINDOWSTATE_STATE_MAXIMIZED) && - (pState->mnMask & _FRAMESTATE_MASK_GEOMETRY) == _FRAMESTATE_MASK_GEOMETRY && - (pState->mnMask & _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY) == _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY + (pState->mnMask & FRAMESTATE_MASK_GEOMETRY) == FRAMESTATE_MASK_GEOMETRY && + (pState->mnMask & FRAMESTATE_MASK_MAXIMIZED_GEOMETRY) == FRAMESTATE_MASK_MAXIMIZED_GEOMETRY ) { XSizeHints* pHints = XAllocSizeHints(); @@ -1666,7 +1666,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState ) { bool bDoAdjust = false; // initialize with current geometry - if ((pState->mnMask & _FRAMESTATE_MASK_GEOMETRY) != _FRAMESTATE_MASK_GEOMETRY) + if ((pState->mnMask & FRAMESTATE_MASK_GEOMETRY) != FRAMESTATE_MASK_GEOMETRY) GetPosSize (aPosSize); // change requested properties @@ -1792,7 +1792,7 @@ bool X11SalFrame::GetWindowState( SalFrameState* pState ) pState->mnWidth = aPosSize.GetWidth(); pState->mnHeight = aPosSize.GetHeight(); - pState->mnMask = _FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE; + pState->mnMask = FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE; if (! maRestorePosSize.IsEmpty() ) { @@ -1802,7 +1802,7 @@ bool X11SalFrame::GetWindowState( SalFrameState* pState ) pState->mnMaximizedY = aPosSize.Top(); pState->mnMaximizedWidth = aPosSize.GetWidth(); pState->mnMaximizedHeight = aPosSize.GetHeight(); - pState->mnMask |= _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY; + pState->mnMask |= FRAMESTATE_MASK_MAXIMIZED_GEOMETRY; } return true; |