[Libreoffice-commits] core.git: include/drawinglayer
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Tue Feb 4 07:35:33 UTC 2020
include/drawinglayer/primitive2d/animatedprimitive2d.hxx | 25 ++-------------
1 file changed, 4 insertions(+), 21 deletions(-)
New commits:
commit fd5ca0888d0d4ea18323ad684188e493fd5a3469
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Feb 3 17:55:18 2020 +0100
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Feb 4 08:34:59 2020 +0100
clean-up and join namespaces in animatedprimitive2d.hxx
Change-Id: I9c60f2f9e12fe0271efa8546cbcef08178f9552c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87934
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
index cfd64f5c90f0..677235111e2d 100644
--- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
@@ -26,22 +26,17 @@
#include <memory>
// predefines
-namespace drawinglayer
-{
-namespace animation
+namespace drawinglayer::animation
{
class AnimationEntry;
}
-}
namespace basegfx
{
class B2DHomMatrix;
}
-namespace drawinglayer
-{
-namespace primitive2d
+namespace drawinglayer::primitive2d
{
/** AnimatedSwitchPrimitive2D class
@@ -107,13 +102,7 @@ public:
get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor,
const geometry::ViewInformation2D& rViewInformation) const override;
};
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
-namespace drawinglayer
-{
-namespace primitive2d
-{
/** AnimatedBlinkPrimitive2D class
Basically the same mechanism as in AnimatedSwitchPrimitive2D, but the
@@ -135,13 +124,7 @@ public:
/// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
};
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
-namespace drawinglayer
-{
-namespace primitive2d
-{
/** AnimatedInterpolatePrimitive2D class
Specialized on multi-step animations based on matrix transformations. The
@@ -169,7 +152,7 @@ public:
/// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
};
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::primitive2d
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list