diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-04-28 23:09:13 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:27:52 +0300 |
commit | d883c12556a71c5d3719454b1f95809a505f0ace (patch) | |
tree | 6f0c1cc518a3727db95b72d609ec9db793041b20 /canvas | |
parent | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (diff) |
Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even
in many files in include. So let's be consistent. In the majority of
cases, prefer the easier-on-the-eyes choice, not the "safe" one.
In those files in include where *all* existing uses of ::vcl:: indeed
used the :: prefix, there let's keep it for consistency.
Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper_text.cxx | 4 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_devicehelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/directx/dx_textlayout_drawhelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/directx/dx_vcltools.cxx | 2 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/canvasbitmaphelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 22 | ||||
-rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 20 | ||||
-rw-r--r-- | canvas/source/vcl/devicehelper.cxx | 8 | ||||
-rw-r--r-- | canvas/source/vcl/impltools.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/spritecanvashelper.cxx | 12 | ||||
-rw-r--r-- | canvas/source/vcl/spritehelper.cxx | 4 |
13 files changed, 46 insertions, 46 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 7a918f4b38be..64686fce6bd0 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -319,7 +319,7 @@ namespace cairocanvas // TODO(F1): Add support for floating point bitmap formats uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, uno::UNO_QUERY_THROW); - ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap(xIntBmp); + ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap(xIntBmp); if( !!aBmpEx ) return aBmpEx; diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 2a98ea7b6e09..92782af3cb49 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -135,7 +135,7 @@ namespace cairocanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); + aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); } // extract alpha, and make color opaque @@ -217,7 +217,7 @@ namespace cairocanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(renderState.DeviceColor ); + aColor = vcl::unotools::stdColorSpaceSequenceToColor(renderState.DeviceColor ); } // setup font color diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 684b61afcf2c..7fd8a4663334 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -113,7 +113,7 @@ namespace cairocanvas const Size aPixelSize( mpRefDevice->LogicToPixel(Size(1,1)) ); mpRefDevice->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aPixelSize ); + return vcl::unotools::size2DFromSize( aPixelSize ); } geometry::RealSize2D DeviceHelper::getPhysicalSize() @@ -127,7 +127,7 @@ namespace cairocanvas const Size aLogSize( mpRefDevice->PixelToLogic(mpRefDevice->GetOutputSizePixel()) ); mpRefDevice->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aLogSize ); + return vcl::unotools::size2DFromSize( aLogSize ); } uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 15883c668f41..e9ae26121a45 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -103,7 +103,7 @@ namespace dxcanvas Color aColor( COL_WHITE ); if( rRenderState.DeviceColor.getLength() > 2 ) - aColor = ::vcl::unotools::doubleSequenceToColor( + aColor = vcl::unotools::doubleSequenceToColor( rRenderState.DeviceColor, mxGraphicDevice->getDeviceColorSpace()); aColor.SetTransparency(0); diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx index f65b5fcaa594..727008049e68 100644 --- a/canvas/source/directx/dx_vcltools.cxx +++ b/canvas/source/directx/dx_vcltools.cxx @@ -500,7 +500,7 @@ namespace dxcanvas if( !xIntBmp.is() ) return false; - ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap( xIntBmp ); + ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap( xIntBmp ); if( !aBmpEx ) return false; diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index da0c735e0bcc..37122d8740ca 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -163,7 +163,7 @@ namespace oglcanvas const Size aPixelSize( pChildWindow->LogicToPixel(Size(1,1)) ); pChildWindow->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aPixelSize ); + return vcl::unotools::size2DFromSize( aPixelSize ); } geometry::RealSize2D SpriteDeviceHelper::getPhysicalSize() @@ -178,7 +178,7 @@ namespace oglcanvas const Size aLogSize( pChildWindow->PixelToLogic(pChildWindow->GetOutputSizePixel()) ); pChildWindow->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aLogSize ); + return vcl::unotools::size2DFromSize( aLogSize ); } uno::Reference< rendering::XLinePolyPolygon2D > SpriteDeviceHelper::createCompatibleLinePolyPolygon( diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index efbd61e72369..5c0a310d8d8e 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -95,7 +95,7 @@ namespace vclcanvas if( !mpBackBuffer ) return geometry::IntegerSize2D(); - return ::vcl::unotools::integerSize2DFromSize( mpBackBuffer->getBitmapSizePixel() ); + return vcl::unotools::integerSize2DFromSize( mpBackBuffer->getBitmapSizePixel() ); } void CanvasBitmapHelper::clear() @@ -118,7 +118,7 @@ namespace vclcanvas BitmapEx aRes( mpBackBuffer->getBitmapReference() ); - aRes.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize), + aRes.Scale( vcl::unotools::sizeFromRealSize2D(newSize), beFast ? BMP_SCALE_DEFAULT : BMP_SCALE_BESTQUALITY ); return uno::Reference< rendering::XBitmap >( diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 5bf8b372655c..37a51769a888 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -723,7 +723,7 @@ namespace vclcanvas { // optimized case: identity matrix, or only // translational components. - mpOutDev->getOutDev().DrawBitmapEx( ::vcl::unotools::pointFromB2DPoint( aOutputPos ), + mpOutDev->getOutDev().DrawBitmapEx( vcl::unotools::pointFromB2DPoint( aOutputPos ), aBmpEx ); if( mp2ndOutDev ) @@ -743,7 +743,7 @@ namespace vclcanvas aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aBmpEx.GetMask() ); } - mp2ndOutDev->getOutDev().DrawBitmapEx( ::vcl::unotools::pointFromB2DPoint( aOutputPos ), + mp2ndOutDev->getOutDev().DrawBitmapEx( vcl::unotools::pointFromB2DPoint( aOutputPos ), aBmpEx ); } @@ -838,7 +838,7 @@ namespace vclcanvas } // output GraphicObject - const ::Point aPt( ::vcl::unotools::pointFromB2DPoint( aOutputPos ) ); + const ::Point aPt( vcl::unotools::pointFromB2DPoint( aOutputPos ) ); const ::Size aSz( ::basegfx::fround( aScale.getX() * aBmpSize.Width() ), ::basegfx::fround( aScale.getY() * aBmpSize.Height() ) ); @@ -904,7 +904,7 @@ namespace vclcanvas if( !mpOutDev.get() ) return geometry::IntegerSize2D(); // we're disposed - return ::vcl::unotools::integerSize2DFromSize( mpOutDev->getOutDev().GetOutputSizePixel() ); + return vcl::unotools::integerSize2DFromSize( mpOutDev->getOutDev().GetOutputSizePixel() ); } uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize, @@ -925,7 +925,7 @@ namespace vclcanvas Bitmap aBitmap( rOutDev.GetBitmap(aEmptyPoint, aBmpSize) ); - aBitmap.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize), + aBitmap.Scale( vcl::unotools::sizeFromRealSize2D(newSize), beFast ? BMP_SCALE_DEFAULT : BMP_SCALE_BESTQUALITY ); return uno::Reference< rendering::XBitmap >( @@ -941,7 +941,7 @@ namespace vclcanvas rLayout = getMemoryLayout(); // TODO(F2): Support alpha canvas here - const Rectangle aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); + const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); OutputDevice& rOutDev( mpOutDev->getOutDev() ); @@ -1002,7 +1002,7 @@ namespace vclcanvas rOutDev.EnableMapMode( false ); rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW ); - const Rectangle aRect( ::vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); + const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) ); const sal_uInt16 nBitCount( ::std::min( (sal_uInt16)24U, (sal_uInt16)rOutDev.GetBitCount() ) ); const BitmapPalette* pPalette = NULL; @@ -1144,7 +1144,7 @@ namespace vclcanvas "Mismatching memory layout" ); // TODO(F2): Support alpha canvas here - rOutDev.DrawPixel( ::vcl::unotools::pointFromIntegerPoint2D( pos ), + rOutDev.DrawPixel( vcl::unotools::pointFromIntegerPoint2D( pos ), ::canvas::tools::stdIntSequenceToColor( color )); } @@ -1175,7 +1175,7 @@ namespace vclcanvas // TODO(F2): Support alpha canvas here return ::canvas::tools::colorToStdIntSequence( rOutDev.GetPixel( - ::vcl::unotools::pointFromIntegerPoint2D( pos ))); + vcl::unotools::pointFromIntegerPoint2D( pos ))); } rendering::IntegerBitmapLayout CanvasHelper::getMemoryLayout() @@ -1222,7 +1222,7 @@ namespace vclcanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor( + aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); } @@ -1297,7 +1297,7 @@ namespace vclcanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor( + aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); } diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index b46746e2cf8b..77b085319efd 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -133,8 +133,8 @@ namespace vclcanvas // calc length of bound rect diagonal const ::basegfx::B2DVector aBoundRectDiagonal( - ::vcl::unotools::b2DPointFromPoint( rBounds.TopLeft() ) - - ::vcl::unotools::b2DPointFromPoint( rBounds.BottomRight() ) ); + vcl::unotools::b2DPointFromPoint( rBounds.TopLeft() ) - + vcl::unotools::b2DPointFromPoint( rBounds.BottomRight() ) ); const double nDiagonalLength( aBoundRectDiagonal.getLength() ); // create direction of gradient: @@ -153,7 +153,7 @@ namespace vclcanvas aLeftBottom, aRightTop, aRightBottom, - ::vcl::unotools::b2DRectangleFromRectangle( rBounds ) ); + vcl::unotools::b2DRectangleFromRectangle( rBounds ) ); // render gradient @@ -643,11 +643,11 @@ namespace vclcanvas aTextureTransform ); rOutDev.SetLineColor( COL_RED ); rOutDev.SetFillColor(); - rOutDev.DrawRect( ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); + rOutDev.DrawRect( vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); rOutDev.SetLineColor( COL_BLUE ); ::Polygon aPoly1( - ::vcl::unotools::rectangleFromB2DRectangle( aRect )); + vcl::unotools::rectangleFromB2DRectangle( aRect )); ::basegfx::B2DPolygon aPoly2( aPoly1.getB2DPolygon() ); aPoly2.transform( aTextureTransform ); ::Polygon aPoly3( aPoly2 ); @@ -767,7 +767,7 @@ namespace vclcanvas aTotalTransform ); const ::Rectangle aIntegerTextureDeviceRect( - ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); + vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); if( bRectangularPolygon && aIntegerTextureDeviceRect == aPolygonDeviceRect ) @@ -911,7 +911,7 @@ namespace vclcanvas // start point from it. ::basegfx::B2DRectangle aTextureSpacePolygonRect; ::canvas::tools::calcTransformedRectBounds( aTextureSpacePolygonRect, - ::vcl::unotools::b2DRectangleFromRectangle( + vcl::unotools::b2DRectangleFromRectangle( aPolygonDeviceRect ), aInverseTextureTransform ); @@ -939,12 +939,12 @@ namespace vclcanvas aSingleTextureRect, aPureTotalTransform ); - const ::Point aPtRepeat( ::vcl::unotools::pointFromB2DPoint( + const ::Point aPtRepeat( vcl::unotools::pointFromB2DPoint( aSingleDeviceTextureRect.getMinimum() ) ); const ::Size aSz( ::basegfx::fround( aScale.getX() * aBmpSize.Width ), ::basegfx::fround( aScale.getY() * aBmpSize.Height ) ); - const ::Size aIntegerNextTileX( ::vcl::unotools::sizeFromB2DSize(aNextTileX) ); - const ::Size aIntegerNextTileY( ::vcl::unotools::sizeFromB2DSize(aNextTileY) ); + const ::Size aIntegerNextTileX( vcl::unotools::sizeFromB2DSize(aNextTileX) ); + const ::Size aIntegerNextTileY( vcl::unotools::sizeFromB2DSize(aNextTileY) ); const ::Point aPt( textures[0].RepeatModeX == rendering::TexturingMode::NONE ? ::basegfx::fround( aOutputPos.getX() ) : aPtRepeat.X(), diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx index dd600fc05f33..63fdc8a2268d 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -57,7 +57,7 @@ namespace vclcanvas const Size aPixelSize( rOutDev.LogicToPixel(Size(1,1)) ); rOutDev.SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aPixelSize ); + return vcl::unotools::size2DFromSize( aPixelSize ); } geometry::RealSize2D DeviceHelper::getPhysicalSize() @@ -72,7 +72,7 @@ namespace vclcanvas const Size aLogSize( rOutDev.PixelToLogic(rOutDev.GetOutputSizePixel()) ); rOutDev.SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aLogSize ); + return vcl::unotools::size2DFromSize( aLogSize ); } uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( @@ -115,7 +115,7 @@ namespace vclcanvas return uno::Reference< rendering::XBitmap >(); // we're disposed return uno::Reference< rendering::XBitmap >( - new CanvasBitmap( ::vcl::unotools::sizeFromIntegerSize2D(size), + new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size), false, *rDevice.get(), mpOutDev ) ); @@ -136,7 +136,7 @@ namespace vclcanvas return uno::Reference< rendering::XBitmap >(); // we're disposed return uno::Reference< rendering::XBitmap >( - new CanvasBitmap( ::vcl::unotools::sizeFromIntegerSize2D(size), + new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size), true, *rDevice.get(), mpOutDev ) ); diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index 4167d1f19eb6..cc25ea084bc9 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -87,7 +87,7 @@ namespace vclcanvas uno::Reference< rendering::XIntegerReadOnlyBitmap > xIntBmp( xBitmap, uno::UNO_QUERY_THROW ); - ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap( xIntBmp ); + ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap( xIntBmp ); if( !!aBmpEx ) return aBmpEx; @@ -181,7 +181,7 @@ namespace vclcanvas rViewState, rRenderState); - return ::vcl::unotools::pointFromB2DPoint( aPoint ); + return vcl::unotools::pointFromB2DPoint( aPoint ); } ::tools::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 51a234feca1c..d003736013ed 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -71,8 +71,8 @@ namespace vclcanvas OutputDevice& rBackBuffer, const ::basegfx::B2DRange& rArea ) { - const ::Point& rPos( ::vcl::unotools::pointFromB2DPoint( rArea.getMinimum()) ); - const ::Size& rSize( ::vcl::unotools::sizeFromB2DSize( rArea.getRange()) ); + const ::Point& rPos( vcl::unotools::pointFromB2DPoint( rArea.getMinimum()) ); + const ::Size& rSize( vcl::unotools::sizeFromB2DSize( rArea.getRange()) ); rOutDev.DrawOutDev( rPos, rSize, rPos, rSize, rBackBuffer ); } @@ -82,7 +82,7 @@ namespace vclcanvas const ::basegfx::B2IRange& rArea ) { const Rectangle& rRequestedArea( - ::vcl::unotools::rectangleFromB2IRectangle( rArea ) ); + vcl::unotools::rectangleFromB2IRectangle( rArea ) ); // clip output to actual update region (otherwise a) // wouldn't save much render time, and b) will clutter @@ -444,8 +444,8 @@ namespace vclcanvas else { // scroll rOutDev content - rOutDev.CopyArea( ::vcl::unotools::pointFromB2IPoint( aDestPos ), - ::vcl::unotools::pointFromB2IPoint( aSourceRect.getMinimum() ), + rOutDev.CopyArea( vcl::unotools::pointFromB2IPoint( aDestPos ), + vcl::unotools::pointFromB2IPoint( aSourceRect.getMinimum() ), // TODO(Q2): use numeric_cast to check range ::Size( static_cast<sal_Int32>(aSourceRect.getRange().getX()), static_cast<sal_Int32>(aSourceRect.getRange().getY()) ) ); @@ -583,7 +583,7 @@ namespace vclcanvas rSortedUpdateSprites.end(), ::boost::bind( &spriteRedrawStub2, ::boost::ref( *maVDev.get() ), - ::vcl::unotools::b2DPointFromPoint( + vcl::unotools::b2DPointFromPoint( aOutputPosition), _1 ) ); diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 675ea920ef6a..e79e012e939b 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -114,8 +114,8 @@ namespace vclcanvas // rounded to integer values. From now on, only those // rounded values are used, to keep clip and content in // sync. - ::Size aOutputSize( ::vcl::unotools::sizeFromB2DSize( rOrigOutputSize ) ); - ::Point aOutPos( ::vcl::unotools::pointFromB2DPoint( rPos ) ); + ::Size aOutputSize( vcl::unotools::sizeFromB2DSize( rOrigOutputSize ) ); + ::Point aOutPos( vcl::unotools::pointFromB2DPoint( rPos ) ); // TODO(F3): Support for alpha-VDev |