[Libreoffice-commits] core.git: include/drawinglayer

[Tomaž Vajngerl (via logerrit)]

 include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx |   75 +-----------
 1 file changed, 11 insertions(+), 64 deletions(-)

New commits:
commit e1fc2e2dbc556e8bbe072ee3d58b16ca66936ee1
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Mar 8 22:40:12 2020 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Mar 9 20:01:11 2020 +0100

    cleanup namespaces in polypolygonprimitive2d.hxx
    
    Change-Id: I5016acaf0cba3176b8b6a514b7a7cb68ded930b9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90196
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index f830aacf2c73..e7127129b931 100644
--- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -31,13 +31,10 @@
 #include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <basegfx/color/bcolor.hxx>
 
-
-// PolyPolygonHairlinePrimitive2D class
-
-namespace drawinglayer
+namespace drawinglayer::primitive2d
 {
-    namespace primitive2d
-    {
+        // PolyPolygonHairlinePrimitive2D class
+
         /** PolyPolygonHairlinePrimitive2D class
 
             This primitive defines a multi-PolygonHairlinePrimitive2D and is
@@ -73,16 +70,9 @@ namespace drawinglayer
             /// provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+        // PolyPolygonMarkerPrimitive2D class
 
-// PolyPolygonMarkerPrimitive2D class
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
         /** PolyPolygonMarkerPrimitive2D class
 
             This primitive defines a multi-PolygonMarkerPrimitive2D and is
@@ -128,16 +118,9 @@ namespace drawinglayer
             /// provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+        // PolyPolygonStrokePrimitive2D class
 
-// PolyPolygonStrokePrimitive2D class
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
         /** PolyPolygonStrokePrimitive2D class
 
             This primitive defines a multi-PolygonStrokePrimitive2D and is
@@ -184,16 +167,9 @@ namespace drawinglayer
             /// provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+        // PolyPolygonColorPrimitive2D class
 
-// PolyPolygonColorPrimitive2D class
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
         /** PolyPolygonColorPrimitive2D class
 
             This primitive defines a tools::PolyPolygon filled with a single color.
@@ -228,16 +204,9 @@ namespace drawinglayer
             /// provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+        // PolyPolygonGradientPrimitive2D class
 
-// PolyPolygonGradientPrimitive2D class
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
         /** PolyPolygonColorPrimitive2D class
 
             This primitive defines a tools::PolyPolygon filled with a gradient. The
@@ -280,16 +249,9 @@ namespace drawinglayer
             /// provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+        // PolyPolygonHatchPrimitive2D class
 
-// PolyPolygonHatchPrimitive2D class
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
         /** PolyPolygonHatchPrimitive2D class
 
             This primitive defines a tools::PolyPolygon filled with a hatch. The
@@ -338,16 +300,9 @@ namespace drawinglayer
             /// provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+        // PolyPolygonGraphicPrimitive2D class
 
-// PolyPolygonGraphicPrimitive2D class
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
         /** PolyPolygonGraphicPrimitive2D class
 
             This primitive defines a tools::PolyPolygon filled with bitmap data
@@ -386,16 +341,9 @@ namespace drawinglayer
             /// provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
 
+        // PolyPolygonSelectionPrimitive2D class
 
-// PolyPolygonSelectionPrimitive2D class
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
         /** PolyPolygonSelectionPrimitive2D class
 
             This primitive defines a tools::PolyPolygon which gets filled with a defined color
@@ -448,8 +396,7 @@ namespace drawinglayer
             /// provide unique ID
             virtual sal_uInt32 getPrimitive2DID() const override;
         };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace primitive2d::drawinglayer
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */