diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 14:45:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 08:14:31 +0200 |
commit | ff1f6a5fc25db062e9a83521a657062f62f03ba6 (patch) | |
tree | 272dfa9af5ead31b61c1be34afcaf4402ff4ad77 /vcl/source/gdi | |
parent | 224b770fa77fe12ad5dc543ce020aca316b6558d (diff) |
remove UL/L suffixes from integer constants in initialiser/call expressions
Change-Id: Iae081567c4fa5b88edbd12cf2fbafd2b8f31b300
Reviewed-on: https://gerrit.libreoffice.org/41214
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r-- | vcl/source/gdi/animate.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/dibtools.cxx | 40 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 12 | ||||
-rw-r--r-- | vcl/source/gdi/impvect.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/pngwrite.cxx | 2 |
5 files changed, 32 insertions, 32 deletions
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 6b96cb971eca..2dab4e98c59a 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -788,7 +788,7 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation ) AInfo::AInfo() : pOutDev( nullptr ), pViewData( nullptr ), - nExtraData( 0L ), + nExtraData( 0 ), bPause( false ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index a7242f39b26e..002f617cdb1b 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -84,17 +84,17 @@ struct DIBInfoHeader sal_uInt32 nColsImportant; DIBInfoHeader() - : nSize(0UL), - nWidth(0UL), - nHeight(0UL), + : nSize(0), + nWidth(0), + nHeight(0), nPlanes(0), nBitCount(0), nCompression(0), nSizeImage(0), - nXPelsPerMeter(0UL), - nYPelsPerMeter(0UL), - nColsUsed(0UL), - nColsImportant(0UL) + nXPelsPerMeter(0), + nYPelsPerMeter(0), + nColsUsed(0), + nColsImportant(0) {} }; @@ -116,19 +116,19 @@ struct DIBV5Header : public DIBInfoHeader DIBV5Header() : DIBInfoHeader(), - nV5RedMask(0UL), - nV5GreenMask(0UL), - nV5BlueMask(0UL), - nV5AlphaMask(0UL), - nV5CSType(0UL), + nV5RedMask(0), + nV5GreenMask(0), + nV5BlueMask(0), + nV5AlphaMask(0), + nV5CSType(0), aV5Endpoints(), - nV5GammaRed(0UL), - nV5GammaGreen(0UL), - nV5GammaBlue(0UL), - nV5Intent(0UL), - nV5ProfileData(0UL), - nV5ProfileSize(0UL), - nV5Reserved(0UL) + nV5GammaRed(0), + nV5GammaGreen(0), + nV5GammaBlue(0), + nV5Intent(0), + nV5ProfileData(0), + nV5ProfileSize(0), + nV5Reserved(0) {} }; @@ -1594,7 +1594,7 @@ bool ImplReadDIB( { const SvStreamEndian nOldFormat(rIStm.GetEndian()); const sal_uLong nOldPos(rIStm.Tell()); - sal_uLong nOffset(0UL); + sal_uLong nOffset(0); bool bRet(false); rIStm.SetEndian(SvStreamEndian::LITTLE); diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 812e504880ab..e67191c8a5c0 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -99,7 +99,7 @@ Size GraphicReader::GetPreviewSize() const ImpGraphic::ImpGraphic() : meType ( GraphicType::NONE ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { @@ -150,7 +150,7 @@ ImpGraphic::ImpGraphic(ImpGraphic&& rImpGraphic) ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) : maEx ( rBitmap ), meType ( !rBitmap.IsEmpty() ? GraphicType::Bitmap : GraphicType::NONE ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { @@ -159,7 +159,7 @@ ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) : ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) : maEx ( rBitmapEx ), meType ( !rBitmapEx.IsEmpty() ? GraphicType::Bitmap : GraphicType::NONE ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { @@ -167,7 +167,7 @@ ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) : ImpGraphic::ImpGraphic(const VectorGraphicDataPtr& rVectorGraphicDataPtr) : meType( rVectorGraphicDataPtr.get() ? GraphicType::Bitmap : GraphicType::NONE ), - mnSizeBytes( 0UL ), + mnSizeBytes( 0 ), mbSwapOut( false ), mbDummyContext ( false ), maVectorGraphicData(rVectorGraphicDataPtr) @@ -178,7 +178,7 @@ ImpGraphic::ImpGraphic( const Animation& rAnimation ) : maEx ( rAnimation.GetBitmapEx() ), mpAnimation ( o3tl::make_unique<Animation>( rAnimation ) ), meType ( GraphicType::Bitmap ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { @@ -187,7 +187,7 @@ ImpGraphic::ImpGraphic( const Animation& rAnimation ) : ImpGraphic::ImpGraphic( const GDIMetaFile& rMtf ) : maMetaFile ( rMtf ), meType ( GraphicType::GdiMetafile ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 96cf9728d657..b8cf13fe727f 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -144,8 +144,8 @@ public: ImplPointArray::ImplPointArray() : mpArray ( nullptr ), - mnSize ( 0UL ), - mnRealSize ( 0UL ) + mnSize ( 0 ), + mnRealSize ( 0 ) { } @@ -290,8 +290,8 @@ public: }; ImplChain::ImplChain() : - mnArraySize ( 1024UL ), - mnCount ( 0UL ) + mnArraySize ( 1024 ), + mnCount ( 0 ) { mpCodes.reset( new sal_uInt8[ mnArraySize ] ); } diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index e18b8dd878c2..bb0ee05d0f37 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -113,7 +113,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, , mnFilterType(0) , mnBBP(0) , mbTrueAlpha(false) - , mnCRC(0UL) + , mnCRC(0) { if (!rBmpEx.IsEmpty()) { |