[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 2 commits - include/drawinglayer

[Tomaž Vajngerl (via logerrit)]

 include/drawinglayer/attribute/fillgradientattribute.hxx |   12 +-----------
 include/drawinglayer/attribute/fillgraphicattribute.hxx  |    9 ++-------
 include/drawinglayer/attribute/fillhatchattribute.hxx    |   12 +-----------
 3 files changed, 4 insertions(+), 29 deletions(-)

New commits:
commit fe9dff6c29898fc61901cb2c40105d2cbaed9a6a
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Oct 21 21:01:43 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Wed Oct 21 21:01:43 2020 +0200

    cleanup namespaces for fill*attribute.hxx
    
    Change-Id: I2aee131512e0eb194843f207de63e63af7ed219a

diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx
index 7b07d7022855..f9d9e2245d9a 100644
--- a/include/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
@@ -30,10 +30,7 @@ class BColor;
 namespace drawinglayer::attribute
 {
 class ImpFillGradientAttribute;
-}
 
-namespace drawinglayer::attribute
-{
 enum class GradientStyle
 {
     Linear,
@@ -44,10 +41,6 @@ enum class GradientStyle
     Rect
 };
 
-} // end of namespace drawinglayer::attribute
-
-namespace drawinglayer::attribute
-{
 class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute
 {
 public:
diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx
index 1649d1b38881..976d7bd37586 100644
--- a/include/drawinglayer/attribute/fillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx
@@ -32,10 +32,7 @@ class B2DRange;
 namespace drawinglayer::attribute
 {
 class ImpFillGraphicAttribute;
-}
 
-namespace drawinglayer::attribute
-{
 class DRAWINGLAYER_DLLPUBLIC FillGraphicAttribute
 {
 public:
diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx
index 5d97fbc17026..a929b5715906 100644
--- a/include/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/include/drawinglayer/attribute/fillhatchattribute.hxx
@@ -30,10 +30,7 @@ class BColor;
 namespace drawinglayer::attribute
 {
 class ImpFillHatchAttribute;
-}
 
-namespace drawinglayer::attribute
-{
 enum class HatchStyle
 {
     Single,
@@ -41,10 +38,6 @@ enum class HatchStyle
     Triple
 };
 
-} // end of namespace drawinglayer::attribute
-
-namespace drawinglayer::attribute
-{
 class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute
 {
 public:
commit 81b82d049fdcc2fb1c1c2fe6a4a050a9505a1522
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Oct 21 20:59:32 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Wed Oct 21 20:59:32 2020 +0200

    pragma once for fill*attribute.hxx
    
    Change-Id: I588b0214bcd75b77c9c72b4c6f320a6dd8a82e01

diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx
index cc2fab0518dc..7b07d7022855 100644
--- a/include/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX
-#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <o3tl/cow_wrapper.hxx>
@@ -88,6 +87,4 @@ public:
 
 } // end of namespace drawinglayer::attribute
 
-#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx
index 4ee0ab3f3ed5..1649d1b38881 100644
--- a/include/drawinglayer/attribute/fillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX
-#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX
+
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <o3tl/cow_wrapper.hxx>
@@ -68,6 +68,4 @@ public:
 
 } // end of namespace drawinglayer::attribute
 
-#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx
index f13e46bf903b..5d97fbc17026 100644
--- a/include/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/include/drawinglayer/attribute/fillhatchattribute.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX
-#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <o3tl/cow_wrapper.hxx>
@@ -95,6 +94,4 @@ public:
 
 } // end of namespace drawinglayer::attribute
 
-#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */