From 8e7897588d7185ef1964e8120669c1de3d1ce734 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 22 Sep 2017 14:12:07 +0300 Subject: Rename the basegfx::tools namespace to basegfx::utils Reduce potential confusion with the global tools namespace. Will hopefully make it possible to remove the annoying initial :: when referring to the global tools namespace. Unless we have even more tools subnamespaces somewhere. Thorsten said it was OK. Change-Id: Id088dfe8f4244cb79df9aa988995b31a1758c996 Reviewed-on: https://gerrit.libreoffice.org/42644 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- tools/source/generic/color.cxx | 4 ++-- tools/source/generic/poly.cxx | 4 ++-- tools/source/generic/poly2.cxx | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tools') diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index a58f29e71307..86689502a7c4 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -273,7 +273,7 @@ void Color::ApplyTintOrShade(sal_Int16 n100thPercent) if (n100thPercent == 0) return; - basegfx::BColor aBColor = basegfx::tools::rgb2hsl(getBColor()); + basegfx::BColor aBColor = basegfx::utils::rgb2hsl(getBColor()); double fFactor = 1.0 - (std::abs(double(n100thPercent)) / 10000.0); double fResult; @@ -287,7 +287,7 @@ void Color::ApplyTintOrShade(sal_Int16 n100thPercent) } aBColor.setBlue(fResult); - aBColor = basegfx::tools::hsl2rgb(aBColor); + aBColor = basegfx::utils::hsl2rgb(aBColor); SetRed(sal_uInt8(( aBColor.getRed() * 255.0) + 0.5)); SetGreen(sal_uInt8((aBColor.getGreen() * 255.0) + 0.5)); diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 217565a1ae60..db15b735e664 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1775,7 +1775,7 @@ basegfx::B2DPolygon Polygon::getB2DPolygon() const } // if exist, remove double first/last points, set closed and correct control points - basegfx::tools::checkClosed(aRetval); + basegfx::utils::checkClosed(aRetval); if(aRetval.isClosed()) { @@ -1795,7 +1795,7 @@ basegfx::B2DPolygon Polygon::getB2DPolygon() const } // set closed flag - basegfx::tools::checkClosed(aRetval); + basegfx::utils::checkClosed(aRetval); } } diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index 0c4f7ed9d665..74fd7927cb59 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -325,8 +325,8 @@ void PolyPolygon::ImplDoOperation( const tools::PolyPolygon& rPolyPoly, tools::P // normalize the two polypolygons before. Force properly oriented // polygons. - aMergePolyPolygonA = basegfx::tools::prepareForPolygonOperation( aMergePolyPolygonA ); - aMergePolyPolygonB = basegfx::tools::prepareForPolygonOperation( aMergePolyPolygonB ); + aMergePolyPolygonA = basegfx::utils::prepareForPolygonOperation( aMergePolyPolygonA ); + aMergePolyPolygonB = basegfx::utils::prepareForPolygonOperation( aMergePolyPolygonB ); switch( nOperation ) { @@ -335,7 +335,7 @@ void PolyPolygon::ImplDoOperation( const tools::PolyPolygon& rPolyPoly, tools::P case PolyClipOp::UNION: { // merge A and B (OR) - aMergePolyPolygonA = basegfx::tools::solvePolygonOperationOr(aMergePolyPolygonA, aMergePolyPolygonB); + aMergePolyPolygonA = basegfx::utils::solvePolygonOperationOr(aMergePolyPolygonA, aMergePolyPolygonB); break; } @@ -343,7 +343,7 @@ void PolyPolygon::ImplDoOperation( const tools::PolyPolygon& rPolyPoly, tools::P case PolyClipOp::INTERSECT: { // cut poly 1 against polys 2..n (AND) - aMergePolyPolygonA = basegfx::tools::solvePolygonOperationAnd(aMergePolyPolygonA, aMergePolyPolygonB); + aMergePolyPolygonA = basegfx::utils::solvePolygonOperationAnd(aMergePolyPolygonA, aMergePolyPolygonB); break; } } -- cgit