diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-05-08 20:32:06 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-05-09 21:11:31 +0200 |
commit | 3e4c31ad4009389cb4350a169d505bbb3f11a402 (patch) | |
tree | 06268e43ffb73d76ce2360aee21241ccfc5a3326 /drawinglayer/inc/texture/texture.hxx | |
parent | 8657bbe5ea03cd510b5805054412a56ba59e862c (diff) |
drawinglayer: clean-up namespaces in texture.hxx
Change-Id: I0977858ea5b9d2b7ddfaa8012ef50170ee02f27d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93829
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'drawinglayer/inc/texture/texture.hxx')
-rw-r--r-- | drawinglayer/inc/texture/texture.hxx | 78 |
1 files changed, 2 insertions, 76 deletions
diff --git a/drawinglayer/inc/texture/texture.hxx b/drawinglayer/inc/texture/texture.hxx index 64595a46222c..24e23a4b241c 100644 --- a/drawinglayer/inc/texture/texture.hxx +++ b/drawinglayer/inc/texture/texture.hxx @@ -28,11 +28,8 @@ #include <vector> #include <functional> - -namespace drawinglayer +namespace drawinglayer::texture { - namespace texture - { class GeoTexSvx { public: @@ -47,14 +44,7 @@ namespace drawinglayer virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { /// helper class for processing equal number of matrices and colors /// for texture processing struct B2DHomMatrixAndBColor @@ -62,14 +52,7 @@ namespace drawinglayer basegfx::B2DHomMatrix maB2DHomMatrix; basegfx::BColor maBColor; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { class GeoTexSvxGradient : public GeoTexSvx { protected: @@ -95,14 +78,7 @@ namespace drawinglayer std::vector< B2DHomMatrixAndBColor >& rEntries, basegfx::BColor& rOuterColor) = 0; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { class GeoTexSvxGradientLinear final : public GeoTexSvxGradient { double mfUnitMinX; @@ -125,14 +101,7 @@ namespace drawinglayer basegfx::BColor& rOuterColor) override; virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { class GeoTexSvxGradientAxial final : public GeoTexSvxGradient { double mfUnitMinX; @@ -154,14 +123,7 @@ namespace drawinglayer basegfx::BColor& rOuterColor) override; virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { class GeoTexSvxGradientRadial final : public GeoTexSvxGradient { public: @@ -180,14 +142,7 @@ namespace drawinglayer basegfx::BColor& rOuterColor) override; virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { class GeoTexSvxGradientElliptical final : public GeoTexSvxGradient { public: @@ -207,14 +162,7 @@ namespace drawinglayer basegfx::BColor& rOuterColor) override; virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { class GeoTexSvxGradientSquare final : public GeoTexSvxGradient { public: @@ -234,14 +182,7 @@ namespace drawinglayer basegfx::BColor& rOuterColor) override; virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { class GeoTexSvxGradientRect final : public GeoTexSvxGradient { public: @@ -261,14 +202,7 @@ namespace drawinglayer basegfx::BColor& rOuterColor) override; virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { class GeoTexSvxHatch final : public GeoTexSvx { basegfx::B2DRange maOutputRange; @@ -295,14 +229,7 @@ namespace drawinglayer double getDistanceToHatch(const basegfx::B2DPoint& rUV) const; const basegfx::B2DHomMatrix& getBackTextureTransform() const; }; - } // end of namespace texture -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace texture - { // This class applies a tiling to the unit range. The given range // will be repeated inside the unit range in X and Y and for each // tile a matrix will be created (by appendTransformations) that @@ -334,8 +261,7 @@ namespace drawinglayer void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices) const; sal_uInt32 getNumberOfTiles() const; }; - } // end of namespace texture -} // end of namespace drawinglayer +} // end of namespace drawinglayer::texture /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |