summaryrefslogtreecommitdiff
path: root/cppcanvas/source/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-07-16 15:34:53 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-07-16 20:37:01 +0200
commitbaed93c8022bf64226fcbc6dbcb0132b35eb2328 (patch)
tree7eff32281aad46e03842c54ac9b997e4a9e08a63 /cppcanvas/source/inc
parent1ebe85bc1fc6cf2adeb05aac78749806e20a71c2 (diff)
compact namespace: cppcanvas
Change-Id: I53826803bd7749b7fead5e464e2dc65212d5bb9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98908 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppcanvas/source/inc')
-rw-r--r--cppcanvas/source/inc/action.hxx5
-rw-r--r--cppcanvas/source/inc/canvasgraphichelper.hxx6
-rw-r--r--cppcanvas/source/inc/implrenderer.hxx7
-rw-r--r--cppcanvas/source/inc/outdevstate.hxx6
-rw-r--r--cppcanvas/source/inc/tools.hxx5
5 files changed, 7 insertions, 22 deletions
diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index bf122292a2fd..082e6d43f523 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -30,9 +30,7 @@ namespace basegfx
/* Definition of Action interface */
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
/** Interface for internal render actions
@@ -142,7 +140,6 @@ namespace cppcanvas
*/
virtual sal_Int32 getActionCount() const = 0;
};
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index f003ec977d8e..0716199ddbeb 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -35,10 +35,7 @@ namespace com::sun::star::rendering
/* Definition of CanvasGraphicHelper class */
-namespace cppcanvas
-{
-
- namespace internal
+namespace cppcanvas::internal
{
class CanvasGraphicHelper : public virtual CanvasGraphic
@@ -65,7 +62,6 @@ namespace cppcanvas
CanvasSharedPtr mpCanvas;
};
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 6c260c3f3ecd..81702c332d0b 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -50,10 +50,7 @@ namespace basegfx {
class B2DPolygon;
}
-namespace cppcanvas
-{
-
- namespace internal
+namespace cppcanvas::internal
{
struct OutDevState;
struct ActionFactoryParameters;
@@ -241,7 +238,7 @@ namespace cppcanvas
const Renderer::Parameters& mrParms;
sal_Int32& mrCurrActionIndex;
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx
index 590a7b2ec674..16cc3c4ff25a 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -33,9 +33,7 @@
#include <vcl/outdevstate.hxx>
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
struct OutDevState
{
@@ -120,7 +118,7 @@ namespace cppcanvas
bool isTextOverlineColorSet;
bool isTextLineColorSet;
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index fab00805a93e..dadd1b3a0b93 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -22,14 +22,11 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <cppcanvas/color.hxx>
-namespace cppcanvas
-{
- namespace tools
+namespace cppcanvas::tools
{
css::uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA );
IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Sequence< double >& rColor );
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */