Kaydet (Commit) 26d5407a authored tarafından Mario J. Rugiero's avatar Mario J. Rugiero Kaydeden (comit) Noel Grandin

basegfx tree cleanup

- Eliminated an unnecessary boost/bind.hxx include.
- Replaced simple old-style for loops that iterated over a container by ranged based for loops.
- Replaced for_each by ranged based for loops wherever valid.

Change-Id: Ib5c8291cf6d417047b350560f0428723efeccd1c
Reviewed-on: https://gerrit.libreoffice.org/19679Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst c7e8f21a
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
#include <algorithm> #include <algorithm>
#include <boost/bind.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Point.hpp>
......
...@@ -113,31 +113,26 @@ public: ...@@ -113,31 +113,26 @@ public:
void flip() void flip()
{ {
std::for_each( maPolygons.begin(), for (auto& aPolygon : maPolygons)
maPolygons.end(), aPolygon.flip();
std::mem_fun_ref( &basegfx::B2DPolygon::flip ));
} }
void removeDoublePoints() void removeDoublePoints()
{ {
std::for_each( maPolygons.begin(), for (auto& aPolygon : maPolygons)
maPolygons.end(), aPolygon.removeDoublePoints();
std::mem_fun_ref( &basegfx::B2DPolygon::removeDoublePoints ));
} }
void transform(const basegfx::B2DHomMatrix& rMatrix) void transform(const basegfx::B2DHomMatrix& rMatrix)
{ {
for(size_t a(0L); a < maPolygons.size(); a++) for (auto& aPolygon : maPolygons)
{ aPolygon.transform(rMatrix);
maPolygons[a].transform(rMatrix);
}
} }
void makeUnique() void makeUnique()
{ {
std::for_each( maPolygons.begin(), for (auto& aPolygon : maPolygons)
maPolygons.end(), aPolygon.makeUnique();
std::mem_fun_ref( &basegfx::B2DPolygon::makeUnique ));
} }
const basegfx::B2DPolygon* begin() const const basegfx::B2DPolygon* begin() const
......
...@@ -107,64 +107,50 @@ public: ...@@ -107,64 +107,50 @@ public:
void flip() void flip()
{ {
std::for_each( maPolygons.begin(), for (auto& aPolygon : maPolygons)
maPolygons.end(), aPolygon.flip();
std::mem_fun_ref( &::basegfx::B3DPolygon::flip ));
} }
void removeDoublePoints() void removeDoublePoints()
{ {
std::for_each( maPolygons.begin(), for (auto& aPolygon : maPolygons)
maPolygons.end(), aPolygon.removeDoublePoints();
std::mem_fun_ref( &::basegfx::B3DPolygon::removeDoublePoints ));
} }
void transform(const ::basegfx::B3DHomMatrix& rMatrix) void transform(const ::basegfx::B3DHomMatrix& rMatrix)
{ {
for(size_t a(0L); a < maPolygons.size(); a++) for (auto& aPolygon : maPolygons)
{ aPolygon.transform(rMatrix);
maPolygons[a].transform(rMatrix);
}
} }
void clearBColors() void clearBColors()
{ {
for(size_t a(0L); a < maPolygons.size(); a++) for (auto& aPolygon : maPolygons)
{ aPolygon.clearBColors();
maPolygons[a].clearBColors();
}
} }
void transformNormals(const ::basegfx::B3DHomMatrix& rMatrix) void transformNormals(const ::basegfx::B3DHomMatrix& rMatrix)
{ {
for(size_t a(0L); a < maPolygons.size(); a++) for (auto& aPolygon : maPolygons)
{ aPolygon.transformNormals(rMatrix);
maPolygons[a].transformNormals(rMatrix);
}
} }
void clearNormals() void clearNormals()
{ {
for(size_t a(0L); a < maPolygons.size(); a++) for (auto& aPolygon : maPolygons)
{ aPolygon.clearNormals();
maPolygons[a].clearNormals();
}
} }
void transformTextureCoordinates(const ::basegfx::B2DHomMatrix& rMatrix) void transformTextureCoordinates(const ::basegfx::B2DHomMatrix& rMatrix)
{ {
for(size_t a(0L); a < maPolygons.size(); a++) for (auto& aPolygon : maPolygons)
{ aPolygon.transformTextureCoordinates(rMatrix);
maPolygons[a].transformTextureCoordinates(rMatrix);
}
} }
void clearTextureCoordinates() void clearTextureCoordinates()
{ {
for(size_t a(0L); a < maPolygons.size(); a++) for (auto& aPolygon : maPolygons)
{ aPolygon.clearTextureCoordinates();
maPolygons[a].clearTextureCoordinates();
}
} }
const basegfx::B3DPolygon* begin() const const basegfx::B3DPolygon* begin() const
......
...@@ -493,9 +493,8 @@ namespace basegfx ...@@ -493,9 +493,8 @@ namespace basegfx
B2DPolygon getPolygon() const B2DPolygon getPolygon() const
{ {
B2DPolygon aRes; B2DPolygon aRes;
std::for_each( maPoints.begin(), for (auto const& aPoint : maPoints)
maPoints.end(), aRes.append(aPoint, 1);
[&aRes](const B2DPoint& aPoint) mutable { aRes.append(aPoint, 1); });
aRes.setClosed( true ); aRes.setClosed( true );
return aRes; return aRes;
} }
...@@ -897,13 +896,8 @@ namespace basegfx ...@@ -897,13 +896,8 @@ namespace basegfx
// sometimes not enough, but a usable compromise // sometimes not enough, but a usable compromise
aPolygonPool.reserve( rRanges.size() ); aPolygonPool.reserve( rRanges.size() );
std::for_each( aSweepLineEvents.begin(), for (auto& aSweepLineEvent : aSweepLineEvents)
aSweepLineEvents.end(), handleSweepLineEvent(aSweepLineEvent, aActiveEdgeList, aPolygonPool, aRes);
[&](SweepLineEvent& aSweepLineEvent) mutable { handleSweepLineEvent(
aSweepLineEvent,
aActiveEdgeList,
aPolygonPool,
aRes); } );
return aRes; return aRes;
} }
......
...@@ -164,10 +164,8 @@ public: ...@@ -164,10 +164,8 @@ public:
tools::importFromSvgD( tools::importFromSvgD(
randomPoly, randomPoly,
OUString::createFromAscii(randomSvg), false, 0); OUString::createFromAscii(randomSvg), false, 0);
std::for_each(randomPoly.begin(), for (auto const& aPolygon : randomPoly)
randomPoly.end(), aRandomIntersections.appendElement(aPolygon.getB2DRange(), B2VectorOrientation::Negative);
[this](const B2DPolygon& aPolygon) mutable {
this->aRandomIntersections.appendElement(aPolygon.getB2DRange(), B2VectorOrientation::Negative); } );
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment