diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-20 13:56:16 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-20 13:47:45 +0100 |
commit | aee42a7bf199ce537273184428a892e74d7deea7 (patch) | |
tree | ebcb2f526fbc8d910c3e3a4638f7af344d038ff2 /drawinglayer/source/processor3d | |
parent | 4a8d86d490743022699b3333fe1a053cae63a1d3 (diff) |
clang-tidy modernize-concat-nested-namespace in drawinglayer
Change-Id: If2644743ab0d9b78d42d1d2fe6fa22c83472d2c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87065
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer/source/processor3d')
6 files changed, 17 insertions, 30 deletions
diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx index 537a88860f9e..a21cc1a19145 100644 --- a/drawinglayer/source/processor3d/baseprocessor3d.cxx +++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx @@ -24,10 +24,8 @@ using namespace com::sun::star; -namespace drawinglayer +namespace drawinglayer::processor3d { - namespace processor3d - { void BaseProcessor3D::processBasePrimitive3D(const primitive3d::BasePrimitive3D& /*rCandidate*/) { } @@ -71,7 +69,7 @@ namespace drawinglayer } } } - } // end of namespace processor3d -} // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx index 0127c6a8268f..67435afc8811 100644 --- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx +++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx @@ -28,10 +28,8 @@ #include <drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx> -namespace drawinglayer +namespace drawinglayer::processor3d { - namespace processor3d - { CutFindProcessor::CutFindProcessor(const geometry::ViewInformation3D& rViewInformation, const basegfx::B3DPoint& rFront, const basegfx::B3DPoint& rBack, @@ -190,7 +188,7 @@ namespace drawinglayer } } } - } // end of namespace processor3d -} // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index ab07e055d894..36862b0db230 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -41,10 +41,8 @@ using namespace com::sun::star; -namespace drawinglayer +namespace drawinglayer::processor3d { - namespace processor3d - { void DefaultProcessor3D::impRenderGradientTexturePrimitive3D(const primitive3d::GradientTexturePrimitive3D& rPrimitive, bool bTransparence) { const primitive3d::Primitive3DContainer& rSubSequence = rPrimitive.getChildren(); @@ -600,7 +598,7 @@ namespace drawinglayer DefaultProcessor3D::~DefaultProcessor3D() { } - } // end of namespace processor3d -} // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx index d935546c1118..b1493d699d5b 100644 --- a/drawinglayer/source/processor3d/geometry2dextractor.cxx +++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx @@ -33,10 +33,8 @@ using namespace com::sun::star; -namespace drawinglayer +namespace drawinglayer::processor3d { - namespace processor3d - { // as tooling, the process() implementation takes over API handling and calls this // virtual render method when the primitive implementation is BasePrimitive3D-based. void Geometry2DExtractingProcessor::processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) @@ -150,7 +148,7 @@ namespace drawinglayer maBColorModifierStack() { } - } // end of namespace processor3d -} // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx index 10e9143f2f40..a3f05f0af644 100644 --- a/drawinglayer/source/processor3d/shadow3dextractor.cxx +++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx @@ -34,10 +34,8 @@ using namespace com::sun::star; -namespace drawinglayer +namespace drawinglayer::processor3d { - namespace processor3d - { // as tooling, the process() implementation takes over API handling and calls this // virtual render method when the primitive implementation is BasePrimitive3D-based. void Shadow3DExtractingProcessor::processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) @@ -298,7 +296,6 @@ namespace drawinglayer return maPrimitive2DSequence; } - } // end of namespace processor3d -} // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index 983bc499c49d..6fb14245500f 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -414,10 +414,8 @@ public: bool getIsLine() const { return mbIsLine; } }; -namespace drawinglayer +namespace drawinglayer::processor3d { - namespace processor3d - { void ZBufferProcessor3D::rasterconvertB3DPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolygon& rHairline) const { if(getTransparenceCounter()) @@ -649,7 +647,7 @@ namespace drawinglayer mpRasterPrimitive3Ds.reset(); } } - } // end of namespace processor3d -} // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |