diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 13:30:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-27 11:28:29 +0100 |
| commit | c98d3303027bd8bf8e0881b61918710ac479864c (patch) | |
| tree | e6843dfd93352f134207cbc482451e8f17266bc2 /vcl/unx/generic | |
| parent | 44a485c2baaf5bab81748f992915459bdaa58615 (diff) | |
replace Color(COL_*) with COL_*
using
git grep -lwP "Color\s*\(\s*(COL_\w+)\s*\)"
| xargs perl -pi -e "s/Color\s*\(\s*(COL_\w+)\s*\)//g"
and then some manual fixup where the resulting expression no longer
compiled
Change-Id: I0e268d78611c3be40bba9f60ecfdc087a36c0df4
Reviewed-on: https://gerrit.libreoffice.org/50372
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 5da3e9637d74..68f4a2c4ea75 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -355,8 +355,8 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( rPal.SetEntryCount( 2 ); pDstPal = &rPal; - rPal[ 0 ] = Color( COL_BLACK ); - rPal[ 1 ] = Color( COL_WHITE ); + rPal[ 0 ] = Color(COL_BLACK); + rPal[ 1 ] = Color(COL_WHITE); } else if( pImage->depth == 8 && bGrey ) { @@ -518,8 +518,8 @@ XImage* X11SalBitmap::ImplCreateXImage( if( pImage->depth == 1 ) { xPal.reset(new BitmapPalette( 2 )); - (*xPal)[ 0 ] = Color( COL_BLACK ); - (*xPal)[ 1 ] = Color( COL_WHITE ); + (*xPal)[ 0 ] = Color(COL_BLACK); + (*xPal)[ 1 ] = Color(COL_WHITE); } else if( pImage->depth == 8 && mbGrey ) { diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index ba0aac67b129..4bdf8469671b 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2400,7 +2400,7 @@ void X11SalFrame::UpdateSettings( AllSettings& rSettings ) { StyleSettings aStyleSettings = rSettings.GetStyleSettings(); aStyleSettings.SetCursorBlinkTime( 500 ); - aStyleSettings.SetMenuBarTextColor( aStyleSettings.GetPersonaMenuBarTextColor().get_value_or( Color( COL_BLACK ) ) ); + aStyleSettings.SetMenuBarTextColor( aStyleSettings.GetPersonaMenuBarTextColor().get_value_or( COL_BLACK ) ); rSettings.SetStyleSettings( aStyleSettings ); } |