From e1c1e832e99794f953c5736d97808ef83b349bce Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Sat, 11 Apr 2020 12:08:45 +0200 Subject: clean-up NS and pragma once for LineAttribute, StrokeAttribute MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic914fcb9a0bf9b30feff40ec39c1002ac6eae1cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92068 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- include/drawinglayer/attribute/lineattribute.hxx | 18 ++++-------------- include/drawinglayer/attribute/strokeattribute.hxx | 20 +++++--------------- 2 files changed, 9 insertions(+), 29 deletions(-) (limited to 'include') diff --git a/include/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx index 4f01c1f574cb..90c50f904fe9 100644 --- a/include/drawinglayer/attribute/lineattribute.hxx +++ b/include/drawinglayer/attribute/lineattribute.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX -#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX +#pragma once #include @@ -27,22 +26,16 @@ #include #include - -// predefines - namespace basegfx { class BColor; } -namespace drawinglayer { namespace attribute { +namespace drawinglayer::attribute { class ImpLineAttribute; -}} - +} -namespace drawinglayer +namespace drawinglayer::attribute { - namespace attribute - { class DRAWINGLAYER_DLLPUBLIC LineAttribute { public: @@ -77,10 +70,7 @@ namespace drawinglayer css::drawing::LineCap getLineCap() const; double getMiterMinimumAngle() const; }; - } // end of namespace attribute } // end of namespace drawinglayer -#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx index 40e15707b25f..fd9409e9519d 100644 --- a/include/drawinglayer/attribute/strokeattribute.hxx +++ b/include/drawinglayer/attribute/strokeattribute.hxx @@ -17,25 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX -#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX +#pragma once #include #include #include - -// predefines - -namespace drawinglayer { namespace attribute { +namespace drawinglayer::attribute { class ImpStrokeAttribute; -}} +} - -namespace drawinglayer +namespace drawinglayer::attribute { - namespace attribute - { class DRAWINGLAYER_DLLPUBLIC StrokeAttribute { public: @@ -66,10 +59,7 @@ namespace drawinglayer const ::std::vector< double >& getDotDashArray() const; double getFullDotDashLen() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer - +} // end of namespace drawinglayer::attribute -#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit