diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-09-22 14:12:07 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-09-26 14:18:41 +0200 |
commit | 8e7897588d7185ef1964e8120669c1de3d1ce734 (patch) | |
tree | 8f48598670a5dc22703371943c05789d60b9a07d /include/drawinglayer | |
parent | 0b4135ec9945ea627318ecf5fccc4b7d0940ff0d (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'include/drawinglayer')
5 files changed, 6 insertions, 6 deletions
diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index db873c5ccf28..770a0a74baea 100644 --- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -149,7 +149,7 @@ namespace drawinglayer { private: /// the transformations - std::vector< basegfx::tools::B2DHomMatrixBufferedDecompose > maMatrixStack; + std::vector< basegfx::utils::B2DHomMatrixBufferedDecompose > maMatrixStack; protected: public: diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx index e63c3f61ae0b..1afe12eea5de 100644 --- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx +++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx @@ -42,7 +42,7 @@ namespace drawinglayer const TextSimplePortionPrimitive2D& mrSource; Primitive2DContainer mxResult; TextLayouterDevice maTextLayouter; - basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose maDecTrans; + basegfx::utils::B2DHomMatrixBufferedOnDemandDecompose maDecTrans; bool mbNoDXArray : 1; diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 25734d6c361d..37643195bfdc 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> -namespace basegfx { namespace tools { +namespace basegfx { namespace utils { class B2DHomMatrixBufferedOnDemandDecompose; }} @@ -65,7 +65,7 @@ namespace drawinglayer /// helper methods void impCreateGeometryContent( std::vector< Primitive2DReference >& rTarget, - basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose const & rDecTrans, + basegfx::utils::B2DHomMatrixBufferedOnDemandDecompose const & rDecTrans, const OUString& rText, sal_Int32 nTextPosition, sal_Int32 nTextLength, diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index e9199c4d8087..34b0feb4c8b1 100644 --- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -58,7 +58,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B3DHomMatrix& aTransform, SliceType3D aSliceType = SLICETYPE3D_REGULAR) - : maPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPolygon)), + : maPolyPolygon(basegfx::utils::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPolygon)), maSliceType(aSliceType) { maPolyPolygon.transform(aTransform); diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx index 105a9240b9a9..6cfe73613baf 100644 --- a/include/drawinglayer/texture/texture.hxx +++ b/include/drawinglayer/texture/texture.hxx @@ -25,7 +25,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/color/bcolor.hxx> -#include <basegfx/tools/gradienttools.hxx> +#include <basegfx/utils/gradienttools.hxx> #include <vector> |