summaryrefslogtreecommitdiff
path: root/basegfx/source/polygon
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-02-15 22:31:33 +0200
committerTor Lillqvist <tml@collabora.com>2017-02-15 21:50:23 +0000
commit013d9789c753d46f0a038e54db6e21f4d4922891 (patch)
tree52480d6515d2def1f568a2f6023ee0799cd9b2af /basegfx/source/polygon
parentd007cef2dfd0c4d7b009b4f943464c6c4854d88d (diff)
Drop :: prefix from std in [a-b]*/
Change-Id: I0422aaf39bbce889c95ed9a81a0784cb03a1badd Reviewed-on: https://gerrit.libreoffice.org/34320 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'basegfx/source/polygon')
-rw-r--r--basegfx/source/polygon/b2dlinegeometry.cxx4
-rw-r--r--basegfx/source/polygon/b2dpolygon.cxx12
-rw-r--r--basegfx/source/polygon/b2dpolygoncutandtouch.cxx4
-rw-r--r--basegfx/source/polygon/b2dpolygontools.cxx4
-rw-r--r--basegfx/source/polygon/b2dpolygontriangulator.cxx6
-rw-r--r--basegfx/source/polygon/b2dpolypolygoncutter.cxx20
-rw-r--r--basegfx/source/polygon/b2dpolypolygontools.cxx4
-rw-r--r--basegfx/source/polygon/b2dtrapezoid.cxx6
-rw-r--r--basegfx/source/polygon/b3dpolygon.cxx16
-rw-r--r--basegfx/source/polygon/b3dpolygontools.cxx4
-rw-r--r--basegfx/source/polygon/b3dpolypolygon.cxx2
-rw-r--r--basegfx/source/polygon/b3dpolypolygontools.cxx8
12 files changed, 45 insertions, 45 deletions
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx
index 1b5b7be6da61..916d5263a5d6 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -245,7 +245,7 @@ namespace basegfx
{
// before splitting recursively with internal simple criteria, use
// ExtremumPosFinder to remove those
- ::std::vector< double > aExtremumPositions;
+ std::vector< double > aExtremumPositions;
aExtremumPositions.reserve(4);
aEdge.getAllExtremumPositions(aExtremumPositions);
@@ -257,7 +257,7 @@ namespace basegfx
if(nCount > 1)
{
// create order from left to right
- ::std::sort(aExtremumPositions.begin(), aExtremumPositions.end());
+ std::sort(aExtremumPositions.begin(), aExtremumPositions.end());
}
for(sal_uInt32 b(0); b < nCount;)
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index 2cf40a12175c..8ec8d63104bc 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -52,7 +52,7 @@ public:
class CoordinateDataArray2D
{
- typedef ::std::vector< CoordinateData2D > CoordinateData2DVector;
+ typedef std::vector< CoordinateData2D > CoordinateData2DVector;
CoordinateData2DVector maVector;
@@ -152,7 +152,7 @@ public:
for(sal_uInt32 a(0); a < nHalfSize; a++)
{
- ::std::swap(*aStart, *aEnd);
+ std::swap(*aStart, *aEnd);
++aStart;
--aEnd;
}
@@ -239,13 +239,13 @@ public:
void flip()
{
- ::std::swap(maPrevVector, maNextVector);
+ std::swap(maPrevVector, maNextVector);
}
};
class ControlVectorArray2D
{
- typedef ::std::vector< ControlVectorPair2D > ControlVectorPair2DVector;
+ typedef std::vector< ControlVectorPair2D > ControlVectorPair2DVector;
ControlVectorPair2DVector maVector;
sal_uInt32 mnUsedVectors;
@@ -443,7 +443,7 @@ public:
aEnd->flip();
// swap entries
- ::std::swap(*aStart, *aEnd);
+ std::swap(*aStart, *aEnd);
++aStart;
--aEnd;
@@ -530,7 +530,7 @@ public:
// subdividing the bezier segment.
// Ideal here is a subdivision at the extreme values, so use
// getAllExtremumPositions to get all extremas in one run
- ::std::vector< double > aExtremas;
+ std::vector< double > aExtremas;
aExtremas.reserve(4);
aEdge.getAllExtremumPositions(aExtremas);
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 9b8bf8413158..22c2e9219854 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -67,7 +67,7 @@ namespace basegfx
double getCut() const { return mfCut; }
};
- typedef ::std::vector< temporaryPoint > temporaryPointVector;
+ typedef std::vector< temporaryPoint > temporaryPointVector;
class temporaryPolygonData
{
@@ -97,7 +97,7 @@ namespace basegfx
if(nCount)
{
// sort temp points to assure increasing fCut values and increasing indices
- ::std::sort(rTempPoints.begin(), rTempPoints.end());
+ std::sort(rTempPoints.begin(), rTempPoints.end());
// prepare loop
B2DCubicBezier aEdge;
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index 23e01233852c..8253c24f6226 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -1123,14 +1123,14 @@ namespace basegfx
return false;
}
- void applyLineDashing(const B2DPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fDotDashLength)
+ void applyLineDashing(const B2DPolygon& rCandidate, const std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fDotDashLength)
{
const sal_uInt32 nPointCount(rCandidate.count());
const sal_uInt32 nDotDashCount(rDotDashArray.size());
if(fTools::lessOrEqual(fDotDashLength, 0.0))
{
- fDotDashLength = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
+ fDotDashLength = std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
}
if(fTools::more(fDotDashLength, 0.0) && (pLineTarget || pGapTarget) && nPointCount)
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx
index c54a700aef6a..a986a7cff4e2 100644
--- a/basegfx/source/polygon/b2dpolygontriangulator.cxx
+++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx
@@ -104,8 +104,8 @@ namespace basegfx
void setNext(EdgeEntry* pNext) { mpNext = pNext; }
};
- typedef ::std::vector< EdgeEntry > EdgeEntries;
- typedef ::std::vector< EdgeEntry* > EdgeEntryPointers;
+ typedef std::vector< EdgeEntry > EdgeEntries;
+ typedef std::vector< EdgeEntry* > EdgeEntryPointers;
class Triangulator
{
@@ -245,7 +245,7 @@ namespace basegfx
if(!maStartEntries.empty())
{
// sort initial list
- ::std::sort(maStartEntries.begin(), maStartEntries.end());
+ std::sort(maStartEntries.begin(), maStartEntries.end());
// insert to own simply linked list
EdgeEntries::iterator aPos(maStartEntries.begin());
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index dce8afd48d63..88cafdedcd39 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -90,11 +90,11 @@ namespace basegfx
}
};
- typedef ::std::vector< PN > PNV;
- typedef ::std::vector< VN > VNV;
- typedef ::std::vector< SN > SNV;
- typedef ::std::pair< basegfx::B2DPoint /*orig*/, basegfx::B2DPoint /*repl*/ > CorrectionPair;
- typedef ::std::vector< CorrectionPair > CorrectionTable;
+ typedef std::vector< PN > PNV;
+ typedef std::vector< VN > VNV;
+ typedef std::vector< SN > SNV;
+ typedef std::pair< basegfx::B2DPoint /*orig*/, basegfx::B2DPoint /*repl*/ > CorrectionPair;
+ typedef std::vector< CorrectionPair > CorrectionTable;
class solver
{
@@ -161,14 +161,14 @@ namespace basegfx
void impSwitchNext(PN& rPNa, PN& rPNb)
{
- ::std::swap(rPNa.mnIN, rPNb.mnIN);
+ std::swap(rPNa.mnIN, rPNb.mnIN);
if(mbIsCurve)
{
VN& rVNa = maVNV[rPNa.mnI];
VN& rVNb = maVNV[rPNb.mnI];
- ::std::swap(rVNa.maNext, rVNb.maNext);
+ std::swap(rVNa.maNext, rVNb.maNext);
}
if(!mbChanged)
@@ -429,7 +429,7 @@ namespace basegfx
void impSolve()
{
// sort by point to identify common nodes easier
- ::std::sort(maSNV.begin(), maSNV.end());
+ std::sort(maSNV.begin(), maSNV.end());
// handle common nodes
const sal_uInt32 nNodeCount(maSNV.size());
@@ -745,7 +745,7 @@ namespace basegfx
if(nCount > 1)
{
sal_uInt32 a, b;
- ::std::vector< StripHelper > aHelpers;
+ std::vector< StripHelper > aHelpers;
aHelpers.resize(nCount);
for(a = 0; a < nCount; a++)
@@ -825,7 +825,7 @@ namespace basegfx
else
{
sal_uInt32 a, b;
- ::std::vector< StripHelper > aHelpers;
+ std::vector< StripHelper > aHelpers;
aHelpers.resize(nCount);
for(a = 0; a < nCount; a++)
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index 8e8f4c505abc..990ec1b331b8 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -231,12 +231,12 @@ namespace basegfx
return fabs(getSignedArea(rCandidate));
}
- void applyLineDashing(const B2DPolyPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fFullDashDotLen)
+ void applyLineDashing(const B2DPolyPolygon& rCandidate, const std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fFullDashDotLen)
{
if(0.0 == fFullDashDotLen && rDotDashArray.size())
{
// calculate fFullDashDotLen from rDotDashArray
- fFullDashDotLen = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
+ fFullDashDotLen = std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
}
if(rCandidate.count() && fFullDashDotLen > 0.0)
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index 21c5c86cc9db..c707e61b218c 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -59,7 +59,7 @@ namespace basegfx
// define vector of simple edges
- typedef ::std::vector< TrDeSimpleEdge > TrDeSimpleEdges;
+ typedef std::vector< TrDeSimpleEdge > TrDeSimpleEdges;
// helper class for holding a traversing edge. It will always have some
// distance in YPos. The slope (in a numerically useful form, see comments) is
@@ -180,7 +180,7 @@ namespace basegfx
// define double linked list of edges (for fast random insert)
- typedef ::std::list< TrDeEdgeEntry > TrDeEdgeEntries;
+ typedef std::list< TrDeEdgeEntry > TrDeEdgeEntries;
} // end of anonymous namespace
} // end of namespace basegfx
@@ -250,7 +250,7 @@ namespace basegfx
// local data
sal_uInt32 mnInitialEdgeEntryCount;
TrDeEdgeEntries maTrDeEdgeEntries;
- ::std::vector< B2DPoint > maPoints;
+ std::vector< B2DPoint > maPoints;
/// new points allocated for cuts
PointBlockAllocator maNewPoints;
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index 69a375eed4c5..e77143c58cef 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -67,7 +67,7 @@ public:
class CoordinateDataArray3D
{
- typedef ::std::vector< CoordinateData3D > CoordinateData3DVector;
+ typedef std::vector< CoordinateData3D > CoordinateData3DVector;
CoordinateData3DVector maVector;
@@ -222,7 +222,7 @@ public:
for(sal_uInt32 a(0); a < nHalfSize; a++)
{
- ::std::swap(*aStart, *aEnd);
+ std::swap(*aStart, *aEnd);
++aStart;
--aEnd;
}
@@ -243,7 +243,7 @@ public:
class BColorArray
{
- typedef ::std::vector< ::basegfx::BColor > BColorDataVector;
+ typedef std::vector< ::basegfx::BColor > BColorDataVector;
BColorDataVector maVector;
sal_uInt32 mnUsedEntries;
@@ -387,7 +387,7 @@ public:
for(sal_uInt32 a(0); a < nHalfSize; a++)
{
- ::std::swap(*aStart, *aEnd);
+ std::swap(*aStart, *aEnd);
++aStart;
--aEnd;
}
@@ -397,7 +397,7 @@ public:
class NormalsArray3D
{
- typedef ::std::vector< ::basegfx::B3DVector > NormalsData3DVector;
+ typedef std::vector< ::basegfx::B3DVector > NormalsData3DVector;
NormalsData3DVector maVector;
sal_uInt32 mnUsedEntries;
@@ -540,7 +540,7 @@ public:
for(sal_uInt32 a(0); a < nHalfSize; a++)
{
- ::std::swap(*aStart, *aEnd);
+ std::swap(*aStart, *aEnd);
++aStart;
--aEnd;
}
@@ -560,7 +560,7 @@ public:
class TextureCoordinate2D
{
- typedef ::std::vector< ::basegfx::B2DPoint > TextureData2DVector;
+ typedef std::vector< ::basegfx::B2DPoint > TextureData2DVector;
TextureData2DVector maVector;
sal_uInt32 mnUsedEntries;
@@ -703,7 +703,7 @@ public:
for(sal_uInt32 a(0); a < nHalfSize; a++)
{
- ::std::swap(*aStart, *aEnd);
+ std::swap(*aStart, *aEnd);
++aStart;
--aEnd;
}
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index 95b0bef4e046..0e09d996dd37 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -94,14 +94,14 @@ namespace basegfx
return fRetval;
}
- void applyLineDashing(const B3DPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B3DPolyPolygon* pLineTarget, B3DPolyPolygon* pGapTarget, double fDotDashLength)
+ void applyLineDashing(const B3DPolygon& rCandidate, const std::vector<double>& rDotDashArray, B3DPolyPolygon* pLineTarget, B3DPolyPolygon* pGapTarget, double fDotDashLength)
{
const sal_uInt32 nPointCount(rCandidate.count());
const sal_uInt32 nDotDashCount(rDotDashArray.size());
if(fTools::lessOrEqual(fDotDashLength, 0.0))
{
- fDotDashLength = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
+ fDotDashLength = std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
}
if(fTools::more(fDotDashLength, 0.0) && (pLineTarget || pGapTarget) && nPointCount)
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx
index 1ff3cac901b9..74c8b835298a 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -29,7 +29,7 @@
class ImplB3DPolyPolygon
{
- typedef ::std::vector< ::basegfx::B3DPolygon > PolygonVector;
+ typedef std::vector< ::basegfx::B3DPolygon > PolygonVector;
PolygonVector maPolygons;
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
index 79ff6e91d6a1..b097f1c82886 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -243,7 +243,7 @@ namespace basegfx
}
// min/max limitations
- nHorSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nHorSeg));
+ nHorSeg = std::min(nMaxSegments, std::max(nMinSegments, nHorSeg));
if(!nVerSeg)
{
@@ -251,7 +251,7 @@ namespace basegfx
}
// min/max limitations
- nVerSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nVerSeg));
+ nVerSeg = std::min(nMaxSegments, std::max(nMinSegments, nVerSeg));
// create constants
const double fVerDiffPerStep((fVerStop - fVerStart) / (double)nVerSeg);
@@ -342,7 +342,7 @@ namespace basegfx
}
// min/max limitations
- nHorSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nHorSeg));
+ nHorSeg = std::min(nMaxSegments, std::max(nMinSegments, nHorSeg));
if(!nVerSeg)
{
@@ -350,7 +350,7 @@ namespace basegfx
}
// min/max limitations
- nVerSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nVerSeg));
+ nVerSeg = std::min(nMaxSegments, std::max(nMinSegments, nVerSeg));
// vertical loop
for(sal_uInt32 a(0); a < nVerSeg; a++)