summaryrefslogtreecommitdiff
path: root/canvas/source/tools
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-02-15 23:55:18 +0200
committerTor Lillqvist <tml@collabora.com>2017-02-15 23:01:23 +0000
commit6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 (patch)
tree3f669db44367a2a072b899a1a1b87eb25ee607af /canvas/source/tools
parent3e1e49561bb734475d2b7d1db1beef0d3e9b53cd (diff)
Drop :: prefix from std in c*/
Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155 Reviewed-on: https://gerrit.libreoffice.org/34324 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'canvas/source/tools')
-rw-r--r--canvas/source/tools/canvascustomspritehelper.cxx6
-rw-r--r--canvas/source/tools/canvastools.cxx12
-rw-r--r--canvas/source/tools/spriteredrawmanager.cxx28
-rw-r--r--canvas/source/tools/surface.cxx8
-rw-r--r--canvas/source/tools/surfaceproxy.cxx4
5 files changed, 29 insertions, 29 deletions
diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx
index 37d010cd932c..0cbefbc5bf15 100644
--- a/canvas/source/tools/canvascustomspritehelper.cxx
+++ b/canvas/source/tools/canvascustomspritehelper.cxx
@@ -107,7 +107,7 @@ namespace canvas
{
// aClipBoundsB = maCurrClipBounds, i.e. last
// clip, intersected with sprite area
- typedef ::std::vector< ::basegfx::B2DRectangle > VectorOfRects;
+ typedef std::vector< ::basegfx::B2DRectangle > VectorOfRects;
VectorOfRects aClipDifferences;
// get all rectangles covered by exactly one
@@ -171,11 +171,11 @@ namespace canvas
"CanvasCustomSpriteHelper::init(): Invalid owning sprite canvas" );
mpSpriteCanvas = rOwningSpriteCanvas;
- maSize.setX( ::std::max( 1.0,
+ maSize.setX( std::max( 1.0,
ceil( rSpriteSize.Width ) ) ); // round up to nearest int,
// enforce sprite to have at
// least (1,1) pixel size
- maSize.setY( ::std::max( 1.0,
+ maSize.setY( std::max( 1.0,
ceil( rSpriteSize.Height ) ) );
}
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 640c3a3e3b93..ee41f6732d2a 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -69,8 +69,8 @@ namespace canvas
geometry::RealSize2D createInfiniteSize2D()
{
return geometry::RealSize2D(
- ::std::numeric_limits<double>::infinity(),
- ::std::numeric_limits<double>::infinity() );
+ std::numeric_limits<double>::infinity(),
+ std::numeric_limits<double>::infinity() );
}
rendering::RenderState& initRenderState( rendering::RenderState& renderState )
@@ -1052,7 +1052,7 @@ namespace canvas
bool clipScrollArea( ::basegfx::B2IRange& io_rSourceArea,
::basegfx::B2IPoint& io_rDestPoint,
- ::std::vector< ::basegfx::B2IRange >& o_ClippedAreas,
+ std::vector< ::basegfx::B2IRange >& o_ClippedAreas,
const ::basegfx::B2IRange& rBounds )
{
::basegfx::B2IRange aResultingDestArea;
@@ -1228,7 +1228,7 @@ namespace canvas
// longest line in gradient bound rect
const int nGradientSize(
static_cast<int>(
- ::std::max(
+ std::max(
::basegfx::B2DVector(aRightBottom-aLeftTop).getLength(),
::basegfx::B2DVector(aRightTop-aLeftBottom).getLength() ) + 1.0 ) );
@@ -1237,8 +1237,8 @@ namespace canvas
// use at least three steps, and at utmost the number of color
// steps
- return ::std::max( 3,
- ::std::min(
+ return std::max( 3,
+ std::min(
nGradientSize / nStripSize,
nColorSteps ) );
}
diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx
index aaf99c5eaea5..3cf44368c3f8 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -235,10 +235,10 @@ namespace canvas
// sort sprites after prio
VectorOfSprites aSortedSpriteVector;
- ::std::copy( maSprites.begin(),
+ std::copy( maSprites.begin(),
maSprites.end(),
- ::std::back_insert_iterator< VectorOfSprites >(aSortedSpriteVector) );
- ::std::sort( aSortedSpriteVector.begin(),
+ std::back_insert_iterator< VectorOfSprites >(aSortedSpriteVector) );
+ std::sort( aSortedSpriteVector.begin(),
aSortedSpriteVector.end(),
aSpriteComparator );
@@ -254,18 +254,18 @@ namespace canvas
aUpdatableSprites.push_back( rSprite );
}
- ::std::sort( aUpdatableSprites.begin(),
+ std::sort( aUpdatableSprites.begin(),
aUpdatableSprites.end(),
aSpriteComparator );
VectorOfSprites::iterator aEnd=
- ::std::unique( aUpdatableSprites.begin(),
+ std::unique( aUpdatableSprites.begin(),
aUpdatableSprites.end() );
// for each unique sprite, check the change event vector,
// calculate the update operation from that, and add the
// result to the aUpdateArea.
- ::std::for_each( aUpdatableSprites.begin(),
+ std::for_each( aUpdatableSprites.begin(),
aEnd,
SpriteUpdater( rUpdateAreas,
maChangeRecords) );
@@ -279,11 +279,11 @@ namespace canvas
// (i.e. the difference between aSortedSpriteVector and
// aUpdatableSprites).
VectorOfSprites aUnchangedSprites;
- ::std::set_difference( aSortedSpriteVector.begin(),
+ std::set_difference( aSortedSpriteVector.begin(),
aSortedSpriteVector.end(),
aUpdatableSprites.begin(),
aEnd,
- ::std::back_insert_iterator< VectorOfSprites >(aUnchangedSprites),
+ std::back_insert_iterator< VectorOfSprites >(aUnchangedSprites),
aSpriteComparator );
// add each remaining unchanged sprite to connected ranges,
@@ -318,7 +318,7 @@ namespace canvas
bool SpriteRedrawManager::isAreaUpdateScroll( ::basegfx::B2DRectangle& o_rMoveStart,
::basegfx::B2DRectangle& o_rMoveEnd,
const UpdateArea& rUpdateArea,
- ::std::size_t nNumSprites ) const
+ std::size_t nNumSprites ) const
{
// check for a solitary move, which consists of exactly two
// pure-move entries, the first with valid, the second with
@@ -378,7 +378,7 @@ namespace canvas
}
bool SpriteRedrawManager::isAreaUpdateOpaque( const UpdateArea& rUpdateArea,
- ::std::size_t nNumSprites ) const
+ std::size_t nNumSprites ) const
{
// check whether the sprites in the update area's list will
// fully cover the given area _and_ do that in an opaque way
@@ -406,9 +406,9 @@ namespace canvas
// and check whether _any_ of the sprites tells that its area
// update will not be opaque.
- return ::std::none_of( rUpdateArea.maComponentList.begin(),
+ return std::none_of( rUpdateArea.maComponentList.begin(),
aEnd,
- [&aTrueArea, this]( const ::std::pair< ::basegfx::B2DRange, SpriteInfo >& cp )
+ [&aTrueArea, this]( const std::pair< ::basegfx::B2DRange, SpriteInfo >& cp )
{ return this->isAreaUpdateNotOpaque(aTrueArea, cp); } );
}
@@ -421,9 +421,9 @@ namespace canvas
// component (return false)
const SpriteConnectedRanges::ComponentListType::const_iterator aEnd(
rUpdateArea.maComponentList.end() );
- return ::std::any_of( rUpdateArea.maComponentList.begin(),
+ return std::any_of( rUpdateArea.maComponentList.begin(),
aEnd,
- []( const ::std::pair< ::basegfx::B2DRange, SpriteInfo >& cp )
+ []( const std::pair< ::basegfx::B2DRange, SpriteInfo >& cp )
{ return cp.second.needsUpdate(); } );
}
diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx
index e596ea535dae..adea0c2a983d 100644
--- a/canvas/source/tools/surface.cxx
+++ b/canvas/source/tools/surface.cxx
@@ -208,10 +208,10 @@ namespace canvas
::basegfx::fround(rArea.getMaximum().getY()) );
// clip the positions to the area this surface covers
- aPos1.setX(::std::max(aPos1.getX(),maSourceOffset.getX()));
- aPos1.setY(::std::max(aPos1.getY(),maSourceOffset.getY()));
- aPos2.setX(::std::min(aPos2.getX(),maSourceOffset.getX()+maSize.getX()));
- aPos2.setY(::std::min(aPos2.getY(),maSourceOffset.getY()+maSize.getY()));
+ aPos1.setX(std::max(aPos1.getX(),maSourceOffset.getX()));
+ aPos1.setY(std::max(aPos1.getY(),maSourceOffset.getY()));
+ aPos2.setX(std::min(aPos2.getX(),maSourceOffset.getX()+maSize.getX()));
+ aPos2.setY(std::min(aPos2.getY(),maSourceOffset.getY()+maSize.getY()));
// if the resulting area is empty, return immediately
::basegfx::B2IVector aSize(aPos2 - aPos1);
diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx
index a9fb781fcb9a..2699820ccb1c 100644
--- a/canvas/source/tools/surfaceproxy.cxx
+++ b/canvas/source/tools/surfaceproxy.cxx
@@ -63,9 +63,9 @@ namespace canvas
// the current surface is located at the position [x,y]
// and has the size [min(restx,pagesizex),min(resty,pagesizey)
::basegfx::B2IPoint aOffset(x,y);
- ::basegfx::B2ISize aSize( ::std::min( aImageSize.getX()-x,
+ ::basegfx::B2ISize aSize( std::min( aImageSize.getX()-x,
aPageSize.getX() ),
- ::std::min( aImageSize.getY()-y,
+ std::min( aImageSize.getY()-y,
aPageSize.getY() ) );
maSurfaceList.push_back(